You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by er...@apache.org on 2015/05/27 22:41:48 UTC

cloudstack-www git commit: Merge build from asf-site branch

Repository: cloudstack-www
Updated Branches:
  refs/heads/master 4fb064237 -> 9122c7339


Merge build from asf-site branch


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

Branch: refs/heads/master
Commit: 9122c7339540299cad908e6acbfbd27faac4c7be
Parents: 4fb0642
Author: Erik Weber <er...@huug.no>
Authored: Wed May 27 16:07:54 2015 +0200
Committer: Erik Weber <er...@huug.no>
Committed: Wed May 27 22:41:29 2015 +0200

----------------------------------------------------------------------
 content/about.html                | 2 +-
 content/api.html                  | 2 +-
 content/archives.html             | 2 +-
 content/bylaws.html               | 2 +-
 content/cloudstack-faq.html       | 2 +-
 content/contribute.html           | 2 +-
 content/developers.html           | 2 +-
 content/downloads.html            | 2 +-
 content/features.html             | 4 ++--
 content/history.html              | 2 +-
 content/index.html                | 4 ++--
 content/mailing-lists.html        | 2 +-
 content/security.html             | 2 +-
 content/software.html             | 2 +-
 content/survey.html               | 2 +-
 content/trademark-guidelines.html | 2 +-
 content/users.html                | 4 ++--
 content/videos.html               | 2 +-
 content/who.html                  | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/about.html
----------------------------------------------------------------------
diff --git a/content/about.html b/content/about.html
index ebea114..530be5b 100644
--- a/content/about.html
+++ b/content/about.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/api.html
----------------------------------------------------------------------
diff --git a/content/api.html b/content/api.html
index 7b4f053..f2f6a4d 100644
--- a/content/api.html
+++ b/content/api.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/archives.html
----------------------------------------------------------------------
diff --git a/content/archives.html b/content/archives.html
index 81af24e..04fe0de 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/bylaws.html
----------------------------------------------------------------------
diff --git a/content/bylaws.html b/content/bylaws.html
index 79ef1c4..fab929f 100644
--- a/content/bylaws.html
+++ b/content/bylaws.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/cloudstack-faq.html
----------------------------------------------------------------------
diff --git a/content/cloudstack-faq.html b/content/cloudstack-faq.html
index f4aec29..e71c34e 100644
--- a/content/cloudstack-faq.html
+++ b/content/cloudstack-faq.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/contribute.html
----------------------------------------------------------------------
diff --git a/content/contribute.html b/content/contribute.html
index 902e696..a9494fb 100644
--- a/content/contribute.html
+++ b/content/contribute.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/developers.html
----------------------------------------------------------------------
diff --git a/content/developers.html b/content/developers.html
index 02a344f..569c847 100644
--- a/content/developers.html
+++ b/content/developers.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads.html b/content/downloads.html
index 71762ff..c93dace 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/features.html
----------------------------------------------------------------------
diff --git a/content/features.html b/content/features.html
index 5673a9b..3a8eb65 100644
--- a/content/features.html
+++ b/content/features.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>
@@ -129,7 +129,7 @@
 
 <p>As a mature and turnkey Infrastructure-as-a-Service (IaaS) platform, Apache CloudStack has a comprehensive set of features. This is an extensive, but not exhaustive, set of features.</p>
 
-<p>Have a feature request? We'd invite you to <a href="/cloudstack/mailing-lists.html">bring it up on the mailing list</a>, and consider <a href="https://issues.apache.org/jira/browse/CLOUDSTACK">filing a feature request in our bug tracker</a>.</p>
+<p>Have a feature request? We'd invite you to <a href="/mailing-lists.html">bring it up on the mailing list</a>, and consider <a href="https://issues.apache.org/jira/browse/CLOUDSTACK">filing a feature request in our bug tracker</a>.</p>
 
 <table id="features" style="width: 100%;" border="1" cellpadding="2" cellspacing="2">
 <tbody>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/history.html
----------------------------------------------------------------------
diff --git a/content/history.html b/content/history.html
index e53e15b..47a282f 100644
--- a/content/history.html
+++ b/content/history.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 564e485..8d8c965 100644
--- a/content/index.html
+++ b/content/index.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>
@@ -247,7 +247,7 @@ Join Us
 					<li>CloudStack Days <a href="http://events.linuxfoundation.org/events/cloudstack-seattle">Seattle 2015</a></li>
 					<li>CloudStack Days <a href="http://events.linuxfoundation.org/events/cloudstack-austin">Austin 2015</a></li>
 					<li>CloudStack Days <a href="http://events.linuxfoundation.org/events/cloudstack-tokyo">Tokyo 2015</a></li>
-					<li>CloudStack Days <a href="http://events.linuxfoundation.org/events/cloudstack-dublin">Dublin 2015</a></li>
+					<li>CloudStack Collaboration Conference Europe <a href="http://events.linuxfoundation.org/events/cloudstack-collaboration-conference-europe">Dublin 2015</a></li>
 				</ul>
 			</p>
 			<p>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/mailing-lists.html
----------------------------------------------------------------------
diff --git a/content/mailing-lists.html b/content/mailing-lists.html
index 2ccbd5d..c6f8e00 100644
--- a/content/mailing-lists.html
+++ b/content/mailing-lists.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/security.html
----------------------------------------------------------------------
diff --git a/content/security.html b/content/security.html
index 0df56ac..11e7680 100644
--- a/content/security.html
+++ b/content/security.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/software.html
----------------------------------------------------------------------
diff --git a/content/software.html b/content/software.html
index 94b528e..c8cbb17 100644
--- a/content/software.html
+++ b/content/software.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/survey.html
----------------------------------------------------------------------
diff --git a/content/survey.html b/content/survey.html
index 03cd904..1358d4f 100644
--- a/content/survey.html
+++ b/content/survey.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/trademark-guidelines.html
----------------------------------------------------------------------
diff --git a/content/trademark-guidelines.html b/content/trademark-guidelines.html
index 0cd6ac8..a540939 100644
--- a/content/trademark-guidelines.html
+++ b/content/trademark-guidelines.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/users.html
----------------------------------------------------------------------
diff --git a/content/users.html b/content/users.html
index f62742d..1d60de4 100644
--- a/content/users.html
+++ b/content/users.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>
@@ -162,6 +162,7 @@
   <li><a href="http://www.datapipe.com">Datapipe</a></li>
   <li><a href="http://www.dataways.gr">DATAWAYS SA</a></li>
   <li><a href="http://www.enlanube.com.co">En La Nube</a></li>
+  <li><a href="https://www.evry.com">EVRY</a></li>
   <li><a href="http://www.exaserve.com">Exaserve</a></li>
   <li><a href="http://inria.fr">INRIA</a></li>
   <li><a href="http://kumo.com.co">Kumo</a></li>
@@ -249,7 +250,6 @@
   <li>Ennit</li>
   <li>EnterpriseDB</li>
   <li>Entisys Solutions</li>
-  <li>Evry</li>
   <li>EXA Serve</li>
   <li>Exoscale</li>
   <li>Experteq IT Services</li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/videos.html
----------------------------------------------------------------------
diff --git a/content/videos.html b/content/videos.html
index 3b25d12..545bfa2 100644
--- a/content/videos.html
+++ b/content/videos.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9122c733/content/who.html
----------------------------------------------------------------------
diff --git a/content/who.html b/content/who.html
index a609255..05944fa 100644
--- a/content/who.html
+++ b/content/who.html
@@ -67,7 +67,7 @@
                 <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="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
                 <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
                 <li><a tabindex="-1" href="who.html">Who We Are</a></li>
                 <li><a tabindex="-1" href="security.html">Security</a></li>