cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r880145 [1/4] - in /websites/staging/cloudstack/trunk/content: ./ css/ develop/ docs/api/ software/
Date Fri, 27 Sep 2013 17:34:23 GMT
Author: buildbot
Date: Fri Sep 27 17:34:22 2013
New Revision: 880145

Log:
Staging update by buildbot for cloudstack

Added:
    websites/staging/cloudstack/trunk/content/developers.html
    websites/staging/cloudstack/trunk/content/history.html
Removed:
    websites/staging/cloudstack/trunk/content/develop/
Modified:
    websites/staging/cloudstack/trunk/content/   (props changed)
    websites/staging/cloudstack/trunk/content/about.html
    websites/staging/cloudstack/trunk/content/bylaws.html
    websites/staging/cloudstack/trunk/content/cloudstack-faq.html
    websites/staging/cloudstack/trunk/content/contribute.html
    websites/staging/cloudstack/trunk/content/css/bootstrap.css
    websites/staging/cloudstack/trunk/content/docs/api/index.html
    websites/staging/cloudstack/trunk/content/downloads.html
    websites/staging/cloudstack/trunk/content/index.html
    websites/staging/cloudstack/trunk/content/mailing-lists.html
    websites/staging/cloudstack/trunk/content/security.html
    websites/staging/cloudstack/trunk/content/software.html
    websites/staging/cloudstack/trunk/content/software/features.html
    websites/staging/cloudstack/trunk/content/software/videos.html
    websites/staging/cloudstack/trunk/content/trademark-guidelines.html
    websites/staging/cloudstack/trunk/content/who.html

Propchange: websites/staging/cloudstack/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Sep 27 17:34:22 2013
@@ -1 +1 @@
-1526899
+1526989

Modified: websites/staging/cloudstack/trunk/content/about.html
==============================================================================
--- websites/staging/cloudstack/trunk/content/about.html (original)
+++ websites/staging/cloudstack/trunk/content/about.html Fri Sep 27 17:34:22 2013
@@ -6,8 +6,8 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 
     <link href="/css/bootstrap.css" rel="stylesheet">
-    <link href="/css/bootstrap-responsive.css" rel="stylesheet">
     <link href="/css/font-awesome.css" rel="stylesheet">
+    <link href="http://bootswatch.com/assets/css/bootswatch.min.css" rel="stylesheet">
 
     
 
@@ -15,125 +15,88 @@
     
         <!-- Twitter Bootstrap and jQuery after this line. -->
         <script src="http://code.jquery.com/jquery-latest.js"></script>
-        <script src="js/bootstrap.js"</script>
+        <script src="/js/bootstrap.js"</script>
         <script>
             $('.dropdown-toggle').dropdown();
             $('.nav-collapse').collapse();
         </script>
   </head>
   <body>
-
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-          <a href="/index.html"><img class="logo" src="/images/new-logo-sm.png"></a>
-          <div class="navbar-search">
-              <form name="search" id="search" action="http://www.google.com/search" method="get">
-                  <input value="cloudstack.apache.org" name="sitesearch" type="hidden"/> 
-                  <input class="span2" type="text" name="q" id="query">
-                  <button type="submit" id="submit">Search <i class="icon-search"></i></button>
-              </form>
-          </div>
-      </div>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="/index.html" class="navbar-brand"><img class="" src="/images/new-logo-sm.png" style="width: 200px"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <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</a></li>
+                <li><a tabindex="-1" href="/history.html">History</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>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <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</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org" target="_blank">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html" target="_blank">ASF Sponsors</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="/docs/" target="_blank">Get the Docs!</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="/docs/api/">API Documentation</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="/downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="/downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="/downloads.html#archives">Release Archive</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
     </div>
-
-    <header class="main" id="overview">
     <div class="container">
-    </div>
-    </header>
+        <div class="bs-docs-section">
+             <div class="row">
 
-    <div class="container-fluid">
-        <div class="row-fluid">
-            <div class="span3">
-                <ul class="nav nav-list navbar well">
-                    <li>
-                    <h4>Sitemap
-                        <i class="icon-sitemap"></i>
-                    </h4></li>
-                    <hr>
-                    <li><h5>Apache CloudStack</h5></li>
-                    <li><a href="http://cloudstack.apache.org/downloads.html">
-                        <i class="icon-chevron-right"></i>
-                    Downloads</a></li>
-                    <li><a href="https://blogs.apache.org/cloudstack/">
-                        <i class="icon-chevron-right"></i>
-                    News</a></li>
-                    <li><a href="http://cloudstack.apache.org/about.html">
-                        <i class="icon-chevron-right"></i>
-                        About</a></li>
-                    <li><a href="http://cloudstack.apache.org/who.html">
-                        <i class="icon-chevron-right"></i>
-                        Who We Are</a></li>
-                    <li><a href="http://cloudstack.apache.org/trademark-guidelines.html">
-                        <i class="icon-chevron-right"></i>
-                        Trademark Guidelines</a></li>
-                    <li><a href="http://cloudstack.apache.org/security.html">
-                        <i class="icon-chevron-right"></i>
-                        Security</a></li>
-                <hr>
-                <li><h5>Community</h5></li>
-                <li><a href="http://cloudstack.apache.org/contribute.html">
-                    <i class="icon-chevron-right"></i>
-                    Get Involved
-                </a></li>
-                <li><a href="http://cloudstack.apache.org/cloudstack-faq.html">
-                    <i class="icon-chevron-right"></i>
-                    CloudStack FAQ
-                </a></li>
-                <li><a href="http://cloudstack.apache.org/mailing-lists.html">
-                    <i class="icon-chevron-right"></i>
-                    Mailing Lists</a></li>
-                <li><a href="http://lanyrd.com/topics/apache-cloudstack/">
-                    <i class="icon-chevron-right"></i>
-                    Events &amp; Meetups</a></li>
-                <li><a href="http://cloudstack.apache.org/bylaws.html">
-                    <i class="icon-chevron-right"></i>
-                    Project Bylaws</a></li>
-                <li><a href="https://cwiki.apache.org/CLOUDSTACK/cloudstack-books.html">
-                    <i class="icon-chevron-right"></i>
-                    Books</a></li>
-                <hr>
-                <li><h5>Development</h5></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment">
-                    <i class="icon-chevron-right"></i>
-                    Development Environment</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/non-committer.html">
-                    <i class="icon-chevron-right"></i>
-                    Contributing for Non-Committers</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/developer-faq.html">
-                    <i class="icon-chevron-right"></i>
-                    Developer's FAQ</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/coding-conventions.html">
-                    <i class="icon-chevron-right"></i>
-                    Coding Conventions</a></li>
-                <hr>
-                <li><h5>Documentation</h5></li>
-                <li><a href="http://cloudstack.apache.org/docs">
-                    <i class="icon-chevron-right"></i>
-                    CloudStack Documentation</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home">
-                    <i class="icon-chevron-right"></i>
-                    Apache CloudStack Wiki</a></li>
-                <li><a href="http://cloudstack.apache.org/docs/api/index.html">
-                    <i class="icon-chevron-right"></i>
-                    API Documentation</a></li>
-                <hr>
-                <li><h5>Apache Software Foundation</h5></li>
-                <li><a href="http://www.apache.org/">
-                    <i class="icon-chevron-right"></i>
-                    Apache Software Foundation</a></li>
-                <li><a href="http://www.apache.org/foundation/thanks.html">
-                    <i class="icon-chevron-right"></i>
-                    ASF Sponsors</a></li>
-                <li><a href="http://www.apache.org/security/">
-                    <i class="icon-chevron-right"></i>
-                    Security</a></li>
-                </ul>
-            </div>
-            <div class="span9">
-        <p> <h2 id="open-source-cloud-computing-apache-cloudstack">Open Source Cloud Computing: Apache CloudStack</h2>
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">About Apache CloudStack</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<h1 id="what-is-apache-cloudstack">What is Apache CloudStack?</h1>
 <p>Apache CloudStack is a top-level project of the Apache Software Foundation (ASF). The project develops open source software for deploying public and private Infrastructure-as-a-Service (IaaS) clouds.</p>
 <p>CloudStack provides an open and flexible cloud orchestration platform to deliver reliable and scalable private and public clouds. What's that <em>mean</em>, exactly? </p>
-<h3 id="features-and-functionality">Features and Functionality</h3>
+<h1 id="features-and-functionality">Features and Functionality</h1>
 <p>Apache CloudStack is a Java-based project that provides a management server and agents (if needed) for hypervisor hosts so that you can run an IaaS cloud. Some, but not all, of the features and functionality provided by CloudStack:</p>
 <ul>
 <li>Works with hosts running XenServer/XCP, KVM, and/or VMware ESXi with vSphere.</li>
@@ -147,24 +110,18 @@
 <li>User management.</li>
 </ul>
 <p>In short, organizations can use Apache CloudStack to deploy a full-featured public or private IaaS cloud.</p>
-<h3 id="apache-cloudstack-history">Apache CloudStack History</h3>
-<p>The CloudStack project began as a project of a start-up known as VMOps in 2008. The company eventually changed its name to Cloud.com, and it released much of the source to CloudStack in May 2010 under the GNU General Public License version 3 (GPLv3). </p>
-<p>Cloud.com was purchased in July 2011 by Citrix, and the remainder of CloudStack's code was released (again, under the GPLv3) in August 2011. Citrix released CloudStack 3.0 in early 2012.</p>
-<p>In April 2012, Citrix re-licensed CloudStack under the Apache Software License 2.0 (ASLv2) and submitted CloudStack to the <a href="http://incubator.apache.org/">Apache Incubator</a>. It was <a href="http://incubator.apache.org/projects/cloudstack.html">accepted into the Incubator on April 16th, 2012</a>. </p>
-<p>After getting its infrastructure and community processes in place, CloudStack made its first major release (4.0.0-incubating) from the Apache Incubator on November 6th, 2012. The first minor release (4.0.1-incubating) came out on February 12, 2013. </p>
-<p>Apache CloudStack graduated from the Incubator on March 20, 2013, and the announcement was released on <a href="https://blogs.apache.org/cloudstack/entry/the_apache_software_foundation_announces">March 25, 2013</a>. </p>
-<h3 id="people-of-apache-cloudstack">People of Apache CloudStack</h3>
+<h1 id="people-of-apache-cloudstack">People of Apache CloudStack</h1>
 <p>Apache projects are managed by a <a href="http://www.apache.org/dev/pmc.html#what-is-a-pmc">Project Management Committee</a> (PMC), and much of the work is done by the project's <a href="http://www.apache.org/dev/committers.html">committers</a>. Note that committer status is <em>not</em> limited to developers, but is conferred to individuals who have made sustained contributions of high quality, and have shown a committment to mentoring other contributors and following the Apache Way.</p>
-<p>The current Vice President of Apache CloudStack and chair of the PMC is Chip Childers, a full list of PMC members and contributors is available on the page <em><a href="/who.html">Who We Are</a></em>.</p> </p>
-            </div>
-        </div>
+<p>The current Vice President of Apache CloudStack and chair of the PMC is Chip Childers, a full list of PMC members and contributors is available on the page <em><a href="/who.html">Who We Are</a></em>.</p> 
 
-      <hr>
-      <footer>
-      <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
-      "Apache", "CloudStack", "Apache CloudStack", and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
-      </footer>
-    </div>
+            <footer>
+                <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
 
+        </div>
+    </div>
+</div>
   </body>
 </html>

Modified: websites/staging/cloudstack/trunk/content/bylaws.html
==============================================================================
--- websites/staging/cloudstack/trunk/content/bylaws.html (original)
+++ websites/staging/cloudstack/trunk/content/bylaws.html Fri Sep 27 17:34:22 2013
@@ -6,8 +6,8 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 
     <link href="/css/bootstrap.css" rel="stylesheet">
-    <link href="/css/bootstrap-responsive.css" rel="stylesheet">
     <link href="/css/font-awesome.css" rel="stylesheet">
+    <link href="http://bootswatch.com/assets/css/bootswatch.min.css" rel="stylesheet">
 
     
 
@@ -15,122 +15,85 @@
     
         <!-- Twitter Bootstrap and jQuery after this line. -->
         <script src="http://code.jquery.com/jquery-latest.js"></script>
-        <script src="js/bootstrap.js"</script>
+        <script src="/js/bootstrap.js"</script>
         <script>
             $('.dropdown-toggle').dropdown();
             $('.nav-collapse').collapse();
         </script>
   </head>
   <body>
-
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-          <a href="/index.html"><img class="logo" src="/images/new-logo-sm.png"></a>
-          <div class="navbar-search">
-              <form name="search" id="search" action="http://www.google.com/search" method="get">
-                  <input value="cloudstack.apache.org" name="sitesearch" type="hidden"/> 
-                  <input class="span2" type="text" name="q" id="query">
-                  <button type="submit" id="submit">Search <i class="icon-search"></i></button>
-              </form>
-          </div>
-      </div>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="/index.html" class="navbar-brand"><img class="" src="/images/new-logo-sm.png" style="width: 200px"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <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</a></li>
+                <li><a tabindex="-1" href="/history.html">History</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>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <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</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org" target="_blank">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html" target="_blank">ASF Sponsors</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="/docs/" target="_blank">Get the Docs!</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="/docs/api/">API Documentation</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="/downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="/downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="/downloads.html#archives">Release Archive</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
     </div>
-
-    <header class="main" id="overview">
     <div class="container">
-    </div>
-    </header>
+        <div class="bs-docs-section">
+             <div class="row">
 
-    <div class="container-fluid">
-        <div class="row-fluid">
-            <div class="span3">
-                <ul class="nav nav-list navbar well">
-                    <li>
-                    <h4>Sitemap
-                        <i class="icon-sitemap"></i>
-                    </h4></li>
-                    <hr>
-                    <li><h5>Apache CloudStack</h5></li>
-                    <li><a href="http://cloudstack.apache.org/downloads.html">
-                        <i class="icon-chevron-right"></i>
-                    Downloads</a></li>
-                    <li><a href="https://blogs.apache.org/cloudstack/">
-                        <i class="icon-chevron-right"></i>
-                    News</a></li>
-                    <li><a href="http://cloudstack.apache.org/about.html">
-                        <i class="icon-chevron-right"></i>
-                        About</a></li>
-                    <li><a href="http://cloudstack.apache.org/who.html">
-                        <i class="icon-chevron-right"></i>
-                        Who We Are</a></li>
-                    <li><a href="http://cloudstack.apache.org/trademark-guidelines.html">
-                        <i class="icon-chevron-right"></i>
-                        Trademark Guidelines</a></li>
-                    <li><a href="http://cloudstack.apache.org/security.html">
-                        <i class="icon-chevron-right"></i>
-                        Security</a></li>
-                <hr>
-                <li><h5>Community</h5></li>
-                <li><a href="http://cloudstack.apache.org/contribute.html">
-                    <i class="icon-chevron-right"></i>
-                    Get Involved
-                </a></li>
-                <li><a href="http://cloudstack.apache.org/cloudstack-faq.html">
-                    <i class="icon-chevron-right"></i>
-                    CloudStack FAQ
-                </a></li>
-                <li><a href="http://cloudstack.apache.org/mailing-lists.html">
-                    <i class="icon-chevron-right"></i>
-                    Mailing Lists</a></li>
-                <li><a href="http://lanyrd.com/topics/apache-cloudstack/">
-                    <i class="icon-chevron-right"></i>
-                    Events &amp; Meetups</a></li>
-                <li><a href="http://cloudstack.apache.org/bylaws.html">
-                    <i class="icon-chevron-right"></i>
-                    Project Bylaws</a></li>
-                <li><a href="https://cwiki.apache.org/CLOUDSTACK/cloudstack-books.html">
-                    <i class="icon-chevron-right"></i>
-                    Books</a></li>
-                <hr>
-                <li><h5>Development</h5></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment">
-                    <i class="icon-chevron-right"></i>
-                    Development Environment</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/non-committer.html">
-                    <i class="icon-chevron-right"></i>
-                    Contributing for Non-Committers</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/developer-faq.html">
-                    <i class="icon-chevron-right"></i>
-                    Developer's FAQ</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/coding-conventions.html">
-                    <i class="icon-chevron-right"></i>
-                    Coding Conventions</a></li>
-                <hr>
-                <li><h5>Documentation</h5></li>
-                <li><a href="http://cloudstack.apache.org/docs">
-                    <i class="icon-chevron-right"></i>
-                    CloudStack Documentation</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home">
-                    <i class="icon-chevron-right"></i>
-                    Apache CloudStack Wiki</a></li>
-                <li><a href="http://cloudstack.apache.org/docs/api/index.html">
-                    <i class="icon-chevron-right"></i>
-                    API Documentation</a></li>
-                <hr>
-                <li><h5>Apache Software Foundation</h5></li>
-                <li><a href="http://www.apache.org/">
-                    <i class="icon-chevron-right"></i>
-                    Apache Software Foundation</a></li>
-                <li><a href="http://www.apache.org/foundation/thanks.html">
-                    <i class="icon-chevron-right"></i>
-                    ASF Sponsors</a></li>
-                <li><a href="http://www.apache.org/security/">
-                    <i class="icon-chevron-right"></i>
-                    Security</a></li>
-                </ul>
-            </div>
-            <div class="span9">
-        <p> <h1 id="1-introduction">1. Introduction</h1>
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack Project Bylaws</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<h1 id="1-introduction">1. Introduction</h1>
 <p>1.1. This document defines the bylaws under which the Apache CloudStack project
 operates. It defines the roles and responsibilities of the project, who may
 vote, how voting works, how conflicts are resolved and specifies the rules for
@@ -346,16 +309,16 @@ mailing list.</p>
 project development mailing list.</p>
 <p>3.5. Voting Timeframes</p>
 <p>Formal votes are open for a period of at least 72 hours to allow all active
-voters time to consider the vote.</p> </p>
-            </div>
-        </div>
+voters time to consider the vote.</p> 
 
-      <hr>
-      <footer>
-      <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
-      "Apache", "CloudStack", "Apache CloudStack", and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
-      </footer>
-    </div>
+            <footer>
+                <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
 
+        </div>
+    </div>
+</div>
   </body>
 </html>

Modified: websites/staging/cloudstack/trunk/content/cloudstack-faq.html
==============================================================================
--- websites/staging/cloudstack/trunk/content/cloudstack-faq.html (original)
+++ websites/staging/cloudstack/trunk/content/cloudstack-faq.html Fri Sep 27 17:34:22 2013
@@ -6,8 +6,8 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 
     <link href="/css/bootstrap.css" rel="stylesheet">
-    <link href="/css/bootstrap-responsive.css" rel="stylesheet">
     <link href="/css/font-awesome.css" rel="stylesheet">
+    <link href="http://bootswatch.com/assets/css/bootswatch.min.css" rel="stylesheet">
 
     
 
@@ -15,157 +15,122 @@
     
         <!-- Twitter Bootstrap and jQuery after this line. -->
         <script src="http://code.jquery.com/jquery-latest.js"></script>
-        <script src="js/bootstrap.js"</script>
+        <script src="/js/bootstrap.js"</script>
         <script>
             $('.dropdown-toggle').dropdown();
             $('.nav-collapse').collapse();
         </script>
   </head>
   <body>
-
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-          <a href="/index.html"><img class="logo" src="/images/new-logo-sm.png"></a>
-          <div class="navbar-search">
-              <form name="search" id="search" action="http://www.google.com/search" method="get">
-                  <input value="cloudstack.apache.org" name="sitesearch" type="hidden"/> 
-                  <input class="span2" type="text" name="q" id="query">
-                  <button type="submit" id="submit">Search <i class="icon-search"></i></button>
-              </form>
-          </div>
-      </div>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="/index.html" class="navbar-brand"><img class="" src="/images/new-logo-sm.png" style="width: 200px"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <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</a></li>
+                <li><a tabindex="-1" href="/history.html">History</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>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <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</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org" target="_blank">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html" target="_blank">ASF Sponsors</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="/docs/" target="_blank">Get the Docs!</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="/docs/api/">API Documentation</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="/downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="/downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="/downloads.html#archives">Release Archive</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
     </div>
-
-    <header class="main" id="overview">
     <div class="container">
-    </div>
-    </header>
+        <div class="bs-docs-section">
+             <div class="row">
 
-    <div class="container-fluid">
-        <div class="row-fluid">
-            <div class="span3">
-                <ul class="nav nav-list navbar well">
-                    <li>
-                    <h4>Sitemap
-                        <i class="icon-sitemap"></i>
-                    </h4></li>
-                    <hr>
-                    <li><h5>Apache CloudStack</h5></li>
-                    <li><a href="http://cloudstack.apache.org/downloads.html">
-                        <i class="icon-chevron-right"></i>
-                    Downloads</a></li>
-                    <li><a href="https://blogs.apache.org/cloudstack/">
-                        <i class="icon-chevron-right"></i>
-                    News</a></li>
-                    <li><a href="http://cloudstack.apache.org/about.html">
-                        <i class="icon-chevron-right"></i>
-                        About</a></li>
-                    <li><a href="http://cloudstack.apache.org/who.html">
-                        <i class="icon-chevron-right"></i>
-                        Who We Are</a></li>
-                    <li><a href="http://cloudstack.apache.org/trademark-guidelines.html">
-                        <i class="icon-chevron-right"></i>
-                        Trademark Guidelines</a></li>
-                    <li><a href="http://cloudstack.apache.org/security.html">
-                        <i class="icon-chevron-right"></i>
-                        Security</a></li>
-                <hr>
-                <li><h5>Community</h5></li>
-                <li><a href="http://cloudstack.apache.org/contribute.html">
-                    <i class="icon-chevron-right"></i>
-                    Get Involved
-                </a></li>
-                <li><a href="http://cloudstack.apache.org/cloudstack-faq.html">
-                    <i class="icon-chevron-right"></i>
-                    CloudStack FAQ
-                </a></li>
-                <li><a href="http://cloudstack.apache.org/mailing-lists.html">
-                    <i class="icon-chevron-right"></i>
-                    Mailing Lists</a></li>
-                <li><a href="http://lanyrd.com/topics/apache-cloudstack/">
-                    <i class="icon-chevron-right"></i>
-                    Events &amp; Meetups</a></li>
-                <li><a href="http://cloudstack.apache.org/bylaws.html">
-                    <i class="icon-chevron-right"></i>
-                    Project Bylaws</a></li>
-                <li><a href="https://cwiki.apache.org/CLOUDSTACK/cloudstack-books.html">
-                    <i class="icon-chevron-right"></i>
-                    Books</a></li>
-                <hr>
-                <li><h5>Development</h5></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment">
-                    <i class="icon-chevron-right"></i>
-                    Development Environment</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/non-committer.html">
-                    <i class="icon-chevron-right"></i>
-                    Contributing for Non-Committers</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/developer-faq.html">
-                    <i class="icon-chevron-right"></i>
-                    Developer's FAQ</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/coding-conventions.html">
-                    <i class="icon-chevron-right"></i>
-                    Coding Conventions</a></li>
-                <hr>
-                <li><h5>Documentation</h5></li>
-                <li><a href="http://cloudstack.apache.org/docs">
-                    <i class="icon-chevron-right"></i>
-                    CloudStack Documentation</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home">
-                    <i class="icon-chevron-right"></i>
-                    Apache CloudStack Wiki</a></li>
-                <li><a href="http://cloudstack.apache.org/docs/api/index.html">
-                    <i class="icon-chevron-right"></i>
-                    API Documentation</a></li>
-                <hr>
-                <li><h5>Apache Software Foundation</h5></li>
-                <li><a href="http://www.apache.org/">
-                    <i class="icon-chevron-right"></i>
-                    Apache Software Foundation</a></li>
-                <li><a href="http://www.apache.org/foundation/thanks.html">
-                    <i class="icon-chevron-right"></i>
-                    ASF Sponsors</a></li>
-                <li><a href="http://www.apache.org/security/">
-                    <i class="icon-chevron-right"></i>
-                    Security</a></li>
-                </ul>
-            </div>
-            <div class="span9">
-        <p> <h1 id="frequently-asked-questions-faq-about-cloudstack">Frequently Asked Questions (FAQ) about CloudStack</h1>
-<p>This page is for Frequently Asked Questions (FAQ) having to do with Apache CloudStack as a project and its use. For questions specifically about development, see the <a href="developer's%20FAQ">/develop/developer-faq.html</a>. </p>
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack FAQ</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>This page is for Frequently Asked Questions (FAQ) having to do with Apache CloudStack as a project and its use. For questions specifically about development, see the <a href="/develop/developer-faq.html">developer's FAQ</a>. </p>
 <p>Have a question that's not answered here? You might want to ask on the <a href="/mailing-lists.html">CloudStack users mailing list</a>. </p>
 <ul>
 <li><a href="/cloudstack-faq.html#what">What is CloudStack?</a></li>
 <li><a href="/cloudstack-faq.html#private">Can I create my own private templates?</a></li>
 <li><a href="/cloudstack-faq.html#users">How are users, accounts, and domains handled in CloudStack?</a></li>
 </ul>
-<h2 id="what-is-apache-cloudstack">What is Apache CloudStack?</h2>
-<p><a name="what">Apache CloudStack is a complete software suite</a> for creating Infrastructure as a Service (IaaS) clouds. Target environments include service providers and enterprises.</p>
+<h3 id="what-is-apache-cloudstack">What is Apache CloudStack?</h3>
+<p><a name="what"> </a></p>
+<p>Apache CloudStack is a complete software suite</a> for creating Infrastructure as a Service (IaaS) clouds. Target environments include service providers and enterprises.</p>
 <ul>
 <li>The Apache CloudStack platform enables service providers to set up an on-demand, elastic cloud computing service. It enables a utility computing service by allowing service providers to offer self-service virtual machine instances, storage volumes, and networking configurations over the Internet.</li>
 <li>The Apache CloudStack platform enables enterprises to set up a private cloud for use by their own employees. The current generation of virtualization infrastructure targets enterprise IT departments who manage virtual machines the same way they would manage physical machines. The Apache CloudStack platform, on the other hand, enables self-service of virtual machines by users outside of the IT department. </li>
 <li>As an open source IaaS, Apache CloudStack is available to individuals and organizations that wish to study and implement an IaaS for personal, educational, and/or production use.</li>
 </ul>
 <p>The CloudStack platform includes the Management Server and extensions to industry-standard hypervisor software (<em>e.g.</em> XenServer, vSphere, KVM) installed on Hosts running in the cloud. The Management Server is deployed on a farm of management servers. The administrator provisions resources (Hosts, storage devices, IP addresses, etc.) into the Management Server and the Management Server manages those resources. The Management server presents web interfaces to end users and administrators that enable them to take actions on some or all of their instances in the IaaS cloud.</p>
-<h2 id="can-i-create-my-own-private-templates">Can I create my own private templates?</h2>
-<p><a name="private">Yes. Every template has a privacy level associated with it. Privacy levels include:</a></p>
+<h3 id="can-i-create-my-own-private-templates">Can I create my own private templates?</h3>
+<p><a name="private"> </a></p>
+<p>Yes. Every template has a privacy level associated with it. Privacy levels include:</a></p>
 <ul>
 <li><strong>Public</strong>: The template is available to all users in the zone.</li>
 <li><strong>Private</strong>: The template is available only to its owner. A user can make her private templates available to specific users.</li>
 </ul>
 <p>Administrators and end users can add templates to the system. Users can see the template owner when viewing the template.</p>
 <p>(Templates define the base OS image that will be used when a guest is first booted. For example, a template might be a 64-bit version of CentOS 5.3.)</p>
-<h2 id="how-are-users-accounts-and-domains-handled-in-cloudstack">How are users, accounts, and domains handled in CloudStack?</h2>
-<p><a name="users">Apache CloudStack users are assigned</a> accounts. An account is typically a customer of the service provider or a department in a large organization. Accounts are the unit of isolation in the cloud. Accounts are grouped by domains. Domains usually contain accounts that have some logical relationship to each other and a set of delegated administrators with some authority over the domain and its subdomains. For example, a service provider with several resellers could create a domain for each reseller.</p>
-<p>Multiple users can exist in an account.  Users are like aliases in the account.  Users in the same account are not isolated from each other.  Most installations need not surface the notion of users; they just have one user per account.</p> </p>
-            </div>
-        </div>
+<h3 id="how-are-users-accounts-and-domains-handled-in-cloudstack">How are users, accounts, and domains handled in CloudStack?</h3>
+<p><a name="users"> </a></p>
+<p>Apache CloudStack users are assigned</a> accounts. An account is typically a customer of the service provider or a department in a large organization. Accounts are the unit of isolation in the cloud. Accounts are grouped by domains. Domains usually contain accounts that have some logical relationship to each other and a set of delegated administrators with some authority over the domain and its subdomains. For example, a service provider with several resellers could create a domain for each reseller.</p>
+<p>Multiple users can exist in an account.  Users are like aliases in the account.  Users in the same account are not isolated from each other.  Most installations need not surface the notion of users; they just have one user per account.</p> 
+
+            <footer>
+                <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
 
-      <hr>
-      <footer>
-      <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
-      "Apache", "CloudStack", "Apache CloudStack", and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
-      </footer>
+        </div>
     </div>
-
+</div>
   </body>
 </html>

Modified: websites/staging/cloudstack/trunk/content/contribute.html
==============================================================================
--- websites/staging/cloudstack/trunk/content/contribute.html (original)
+++ websites/staging/cloudstack/trunk/content/contribute.html Fri Sep 27 17:34:22 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Get Involved</title>
+    <title>Get Involved with Apache CloudStack</title>
 
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 
     <link href="/css/bootstrap.css" rel="stylesheet">
-    <link href="/css/bootstrap-responsive.css" rel="stylesheet">
     <link href="/css/font-awesome.css" rel="stylesheet">
+    <link href="http://bootswatch.com/assets/css/bootswatch.min.css" rel="stylesheet">
 
     
 
@@ -15,125 +15,87 @@
     
         <!-- Twitter Bootstrap and jQuery after this line. -->
         <script src="http://code.jquery.com/jquery-latest.js"></script>
-        <script src="js/bootstrap.js"</script>
+        <script src="/js/bootstrap.js"</script>
         <script>
             $('.dropdown-toggle').dropdown();
             $('.nav-collapse').collapse();
         </script>
   </head>
   <body>
-
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-          <a href="/index.html"><img class="logo" src="/images/new-logo-sm.png"></a>
-          <div class="navbar-search">
-              <form name="search" id="search" action="http://www.google.com/search" method="get">
-                  <input value="cloudstack.apache.org" name="sitesearch" type="hidden"/> 
-                  <input class="span2" type="text" name="q" id="query">
-                  <button type="submit" id="submit">Search <i class="icon-search"></i></button>
-              </form>
-          </div>
-      </div>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="/index.html" class="navbar-brand"><img class="" src="/images/new-logo-sm.png" style="width: 200px"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <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</a></li>
+                <li><a tabindex="-1" href="/history.html">History</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>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <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</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org" target="_blank">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html" target="_blank">ASF Sponsors</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="/docs/" target="_blank">Get the Docs!</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="/docs/api/">API Documentation</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="/downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="/downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="/downloads.html#archives">Release Archive</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
     </div>
-
-    <header class="main" id="overview">
     <div class="container">
-    </div>
-    </header>
+        <div class="bs-docs-section">
+             <div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Getting Involved Apache CloudStack</h1>
+
+</div>
+
+</div>
+
+</div>
 
-    <div class="container-fluid">
-        <div class="row-fluid">
-            <div class="span3">
-                <ul class="nav nav-list navbar well">
-                    <li>
-                    <h4>Sitemap
-                        <i class="icon-sitemap"></i>
-                    </h4></li>
-                    <hr>
-                    <li><h5>Apache CloudStack</h5></li>
-                    <li><a href="http://cloudstack.apache.org/downloads.html">
-                        <i class="icon-chevron-right"></i>
-                    Downloads</a></li>
-                    <li><a href="https://blogs.apache.org/cloudstack/">
-                        <i class="icon-chevron-right"></i>
-                    News</a></li>
-                    <li><a href="http://cloudstack.apache.org/about.html">
-                        <i class="icon-chevron-right"></i>
-                        About</a></li>
-                    <li><a href="http://cloudstack.apache.org/who.html">
-                        <i class="icon-chevron-right"></i>
-                        Who We Are</a></li>
-                    <li><a href="http://cloudstack.apache.org/trademark-guidelines.html">
-                        <i class="icon-chevron-right"></i>
-                        Trademark Guidelines</a></li>
-                    <li><a href="http://cloudstack.apache.org/security.html">
-                        <i class="icon-chevron-right"></i>
-                        Security</a></li>
-                <hr>
-                <li><h5>Community</h5></li>
-                <li><a href="http://cloudstack.apache.org/contribute.html">
-                    <i class="icon-chevron-right"></i>
-                    Get Involved
-                </a></li>
-                <li><a href="http://cloudstack.apache.org/cloudstack-faq.html">
-                    <i class="icon-chevron-right"></i>
-                    CloudStack FAQ
-                </a></li>
-                <li><a href="http://cloudstack.apache.org/mailing-lists.html">
-                    <i class="icon-chevron-right"></i>
-                    Mailing Lists</a></li>
-                <li><a href="http://lanyrd.com/topics/apache-cloudstack/">
-                    <i class="icon-chevron-right"></i>
-                    Events &amp; Meetups</a></li>
-                <li><a href="http://cloudstack.apache.org/bylaws.html">
-                    <i class="icon-chevron-right"></i>
-                    Project Bylaws</a></li>
-                <li><a href="https://cwiki.apache.org/CLOUDSTACK/cloudstack-books.html">
-                    <i class="icon-chevron-right"></i>
-                    Books</a></li>
-                <hr>
-                <li><h5>Development</h5></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment">
-                    <i class="icon-chevron-right"></i>
-                    Development Environment</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/non-committer.html">
-                    <i class="icon-chevron-right"></i>
-                    Contributing for Non-Committers</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/developer-faq.html">
-                    <i class="icon-chevron-right"></i>
-                    Developer's FAQ</a></li>
-                <li><a href="http://cloudstack.apache.org/develop/coding-conventions.html">
-                    <i class="icon-chevron-right"></i>
-                    Coding Conventions</a></li>
-                <hr>
-                <li><h5>Documentation</h5></li>
-                <li><a href="http://cloudstack.apache.org/docs">
-                    <i class="icon-chevron-right"></i>
-                    CloudStack Documentation</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home">
-                    <i class="icon-chevron-right"></i>
-                    Apache CloudStack Wiki</a></li>
-                <li><a href="http://cloudstack.apache.org/docs/api/index.html">
-                    <i class="icon-chevron-right"></i>
-                    API Documentation</a></li>
-                <hr>
-                <li><h5>Apache Software Foundation</h5></li>
-                <li><a href="http://www.apache.org/">
-                    <i class="icon-chevron-right"></i>
-                    Apache Software Foundation</a></li>
-                <li><a href="http://www.apache.org/foundation/thanks.html">
-                    <i class="icon-chevron-right"></i>
-                    ASF Sponsors</a></li>
-                <li><a href="http://www.apache.org/security/">
-                    <i class="icon-chevron-right"></i>
-                    Security</a></li>
-                </ul>
-            </div>
-            <div class="span9">
-        <p> <h1 id="getting-involved-with-apache-cloudstack">Getting Involved with Apache CloudStack</h1>
 <p>Interested in helping out with Apache CloudStack? Great! We welcome participation from anybody willing to work <a href="http://theapacheway.com/">The Apache Way</a> and make a contribution. </p>
-<p>Note that you <strong>do not have to be a developer</strong> in order to contribute to Apache CloudStack. We need folks to help with documentation, translation, promotion, and having someone with snazzy Web design skills would not be a bad thing! Want to give a talk about Apache CloudStack, or even organize a CloudStack event? <a href="http://cloudstack.apache.org/mailing-lists.html">We're all ears &ndash; join us on the Marketing list and we'll help you get started</a>!</p>
-<p>Developers, of course, are also welcome. See the <a href="/develop/non-committer.html">Contributing as a Non-Committer</a> page, as well as the <a href="/develop/coding-conventions.html">Coding Conventions</a> page and <a href="/develop/developer-faq.html">Developer's FAQ</a>.</p>
+<p>Note that you <strong>do not have to be a developer</strong> in order to contribute to Apache CloudStack. We need folks to help with documentation, translation, promotion, and having someone with snazzy Web design skills would not be a bad thing! Want to give a talk about Apache CloudStack, or even organize a CloudStack event? <a href="/mailing-lists.html">We're all ears &ndash; join us on the Marketing list and we'll help you get started</a>!</p>
+<p>Developers, of course, are also welcome. See the <a href="/developers.html">Developer Resources</a> page!</p>
 <p>If you just want to report a bug, that's easily done in our <a href="https://issues.apache.org/jira/browse/CLOUDSTACK">Jira bug tracking tool</a>.</p>
 <h2 id="where-to-ask-for-help">Where To Ask For Help</h2>
 <p>Need some help getting started? Feel free to ask on the <a href="/mailing-lists.html">mailing list</a> or find us on one of the following IRC channels on irc.freenode.net:</p>
@@ -141,16 +103,16 @@
 <li>#cloudstack - General Apache CloudStack conversation and end user support </li>
 <li>#cloudstack-dev - Development discussions </li>
 <li>#cloudstack-meeting - Weekly and ad-hoc meeting room for the Apache CloudStack community</li>
-</ul> </p>
-            </div>
-        </div>
+</ul> 
 
-      <hr>
-      <footer>
-      <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
-      "Apache", "CloudStack", "Apache CloudStack", and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
-      </footer>
-    </div>
+            <footer>
+                <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
 
+        </div>
+    </div>
+</div>
   </body>
 </html>



Mime
View raw message