You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/14 02:12:54 UTC

[1/2] cloudstack-www git commit: Remove link to “planet.apache.org” and update conference links.

Repository: cloudstack-www
Updated Branches:
  refs/heads/master ff1b584f3 -> c40c08e57


Remove link to \u201cplanet.apache.org\u201d and update conference links.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/1f03555d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/1f03555d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/1f03555d

Branch: refs/heads/master
Commit: 1f03555d21a289f3d8a266c17ff53555cb94b6d2
Parents: ff1b584
Author: Rafael Weingartner <ra...@gmail.com>
Authored: Wed Feb 1 10:23:29 2017 -0500
Committer: Ubuntu <ub...@autonomiccs.com.br>
Committed: Thu Feb 2 01:29:55 2017 +0000

----------------------------------------------------------------------
 content/about.html                | 3 +--
 content/api.html                  | 3 +--
 content/api_archives.html         | 3 +--
 content/archives.html             | 3 +--
 content/bylaws.html               | 3 +--
 content/cloudstack-faq.html       | 3 +--
 content/contribute.html           | 3 +--
 content/developers.html           | 3 +--
 content/downloads.html            | 3 +--
 content/features.html             | 3 +--
 content/history.html              | 3 +--
 content/index.html                | 3 +--
 content/mailing-lists.html        | 3 +--
 content/security.html             | 3 +--
 content/software.html             | 3 +--
 content/survey.html               | 3 +--
 content/trademark-guidelines.html | 3 +--
 content/users.html                | 3 +--
 content/videos.html               | 3 +--
 content/who.html                  | 3 +--
 source/layouts/layout.erb         | 3 +--
 21 files changed, 21 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/about.html
----------------------------------------------------------------------
diff --git a/content/about.html b/content/about.html
index 78e171e..dbdf895 100644
--- a/content/about.html
+++ b/content/about.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/api.html
----------------------------------------------------------------------
diff --git a/content/api.html b/content/api.html
index 2052a6a..5d08442 100644
--- a/content/api.html
+++ b/content/api.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/api_archives.html
----------------------------------------------------------------------
diff --git a/content/api_archives.html b/content/api_archives.html
index 268f63a..41eea72 100644
--- a/content/api_archives.html
+++ b/content/api_archives.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/archives.html
----------------------------------------------------------------------
diff --git a/content/archives.html b/content/archives.html
index 0d53ca6..4e63d91 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/bylaws.html
----------------------------------------------------------------------
diff --git a/content/bylaws.html b/content/bylaws.html
index 63a23b7..5c36f57 100644
--- a/content/bylaws.html
+++ b/content/bylaws.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/cloudstack-faq.html
----------------------------------------------------------------------
diff --git a/content/cloudstack-faq.html b/content/cloudstack-faq.html
index b3c9fd4..22561ac 100644
--- a/content/cloudstack-faq.html
+++ b/content/cloudstack-faq.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/contribute.html
----------------------------------------------------------------------
diff --git a/content/contribute.html b/content/contribute.html
index 9373b2c..5860b92 100644
--- a/content/contribute.html
+++ b/content/contribute.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/developers.html
----------------------------------------------------------------------
diff --git a/content/developers.html b/content/developers.html
index 8be1f01..5b1e696 100644
--- a/content/developers.html
+++ b/content/developers.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads.html b/content/downloads.html
index 3e4dbd1..8da78b6 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/features.html
----------------------------------------------------------------------
diff --git a/content/features.html b/content/features.html
index 7924db0..f9035a5 100644
--- a/content/features.html
+++ b/content/features.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/history.html
----------------------------------------------------------------------
diff --git a/content/history.html b/content/history.html
index ba93ad2..65fefdb 100644
--- a/content/history.html
+++ b/content/history.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 1d07d98..0442df0 100644
--- a/content/index.html
+++ b/content/index.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/mailing-lists.html
----------------------------------------------------------------------
diff --git a/content/mailing-lists.html b/content/mailing-lists.html
index 626e8b8..cab3f96 100644
--- a/content/mailing-lists.html
+++ b/content/mailing-lists.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/security.html
----------------------------------------------------------------------
diff --git a/content/security.html b/content/security.html
index 4dde34a..ff9afdb 100644
--- a/content/security.html
+++ b/content/security.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/software.html
----------------------------------------------------------------------
diff --git a/content/software.html b/content/software.html
index 9e803d9..b0ad9c8 100644
--- a/content/software.html
+++ b/content/software.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/survey.html
----------------------------------------------------------------------
diff --git a/content/survey.html b/content/survey.html
index 525880f..4105e7d 100644
--- a/content/survey.html
+++ b/content/survey.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/trademark-guidelines.html
----------------------------------------------------------------------
diff --git a/content/trademark-guidelines.html b/content/trademark-guidelines.html
index aaf6018..382489c 100644
--- a/content/trademark-guidelines.html
+++ b/content/trademark-guidelines.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/users.html
----------------------------------------------------------------------
diff --git a/content/users.html b/content/users.html
index 35185bc..62bdc98 100644
--- a/content/users.html
+++ b/content/users.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/videos.html
----------------------------------------------------------------------
diff --git a/content/videos.html b/content/videos.html
index 26776a2..a88f563 100644
--- a/content/videos.html
+++ b/content/videos.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/content/who.html
----------------------------------------------------------------------
diff --git a/content/who.html b/content/who.html
index 8581a8e..23ec515 100644
--- a/content/who.html
+++ b/content/who.html
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/1f03555d/source/layouts/layout.erb
----------------------------------------------------------------------
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 301833d..e7a2bee 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -65,7 +65,6 @@
                 <li><a tabindex="-1" href="about.html">About</a></li>
                 <li class="divider"></li>
                 <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
                 <li><a tabindex="-1" href="history.html">History</a></li>
                 <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
@@ -79,7 +78,7 @@
                 <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
                 <li><a tabindex="-1" href="developers.html">Developers</a></li>
                 <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://lanyrd.com/topics/apache-cloudstack/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
               </ul>
             </li>
             <li class="dropdown">


[2/2] cloudstack-www git commit: Added some details about the commit process on README file

Posted by ra...@apache.org.
Added some details about the commit process on README file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/c40c08e5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/c40c08e5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/c40c08e5

Branch: refs/heads/master
Commit: c40c08e57732075abd2aff84934577d68744e916
Parents: 1f03555
Author: Rafael Weingartner <ra...@gmail.com>
Authored: Fri Feb 3 14:44:33 2017 -0500
Committer: Rafael Weingartner <ra...@gmail.com>
Committed: Tue Feb 7 12:31:10 2017 -0500

----------------------------------------------------------------------
 README.md | 50 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/c40c08e5/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index ec03e84..ac80a50 100644
--- a/README.md
+++ b/README.md
@@ -15,14 +15,42 @@ Build the site with:
 To serve it locally:
 
     $ middleman server
-
-IMPORTANT: To publish your changes, commit the build into the asf-site * branch *
-
-GOTCHA, *TODO*, the `build` directory needs to be renamed `content` in the asf-site branch for the site to be served properly.
-
-*TODO* check the `build.sh` script and make it better, simple build that stages all changes to `/content`
-
-Use GitHub PR to make changes.
-
-*TODO* Add gitHUB PR contribution instructions and better build instructions for committers
-
+	
+#Building
+To build the HTML files, you just need to execute the `build.sh`. The script will automatically generate the HTML files and then move them to the `content` folder.
+
+# Commiting 
+Use GitHub PR to make changes. **No one should commit directly to Apache remote repositories without opening a PR and waiting for proper review**.
+If you got the feedback and have amended the changes (if needed), it is time to **commit** the changes to **Apache Software Foundation (AFS) remote repository**. The ASF remote repository for this project is: `https://git-wip-us.apache.org/repos/asf/cloudstack-www.git`
+
+**IMPORTANT:** To publish your changes, you should commit into the **asf-site** branch (pay attention, this is the name of the branch in the remote repository). **Do not forget**, you also have to commit the same changes to the master; so, **master** and **asf-site** branches are synchronized.
+
+The **asf-site** branch is synchronized with a web server that delivers the Apache CloudStack web pages.
+
+GOTCHA, the `build` directory needs to be renamed to `content` in the asf-site branch for the site to be served properly; If you use the `build.sh` script, this step is already taken care of.
+
+## Step by step
+* Fork the repo to your own Github: `<your_github_user>`. To do that, you can access `https://github.com/apache/cloudstack-www` and click on `fork` on the right upper corner of the page.
+* Then, you can clone to you local git repo using: `git clone`; e.g. `git clone https://github.com/apache/cloudstack-www.git` or `git clone https://github.com/<your_github_user>/cloudstack-www.git`
+* `cd cloudstack-www`
+* __This step is only required for committers:__ (add the ASF remote repo) `git remote add upstream https://git-wip-us.apache.org/repos/asf/cloudstack-www.git`
+* if you have cloned  directly from Apache namespace on Github, then you need to add your namespace on Github as well, `git remote add <your_github_user> https://github.com/<your_github_user>/cloudstack-www.git`
+* (get the master branch): `git checkout -b master origin/master` or `git checkout -b master <your_github_user>/master`
+* Now, it is your turn to make the changes you want
+* `middleman build` will build/"compile" the HTML files from the sources
+* ` middleman server [-p <portnumber>]`. This will serve/deliver your HTML files over HTTP. You just gotta access them using a browser; e.g. `http://localhost:[port_configured]`. **Check your changes!!**
+* Execute `./build.sh`
+* `git add -A`
+* `git commit -am "your commit message"`
+* `git push `<your_github_user>` master`
+* Check if the changes appear properly on your Github project, and then create a PR against the Apache `cloudstack-www` repo.
+* Get feedback on the PR and proceed once PR review is accepted
+* If you are not a committer, your job finishes here. Congratulations you have made the Apache CloudStack website better  :thumbsup:
+* Continuing, for committers. Clone or add the repo of our contributor on Github using `git remote add <friend_contributor> https://github.com/<friend_contributor>/cloudstack-www.git`
+* `git checkout asf-site`
+* `git merge <repo_where_the_changes_are>/master`; e.g. `git merge <friend_contributor>/master` or `git merge <your_github_user>/master`
+* `git log -p`. Check if the changes were properly merged.
+* `git push upstream asf-site`
+* `git push upstream master`
+* The site will automatically be published live. This should not take long; if the changes are not showing up, check your browser cache. If changes do not show up and you have no idea why, call someone on `devs` mailing list.
+* Verify the changes on the live site. After this, your job is done, thank you very much for helping to improve the Apache CloudStack website :thumbsup:
\ No newline at end of file