Return-Path: 
 <commits-return-31739-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0580310562
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Fri, 27 Sep 2013 17:32:26 +0000 (UTC)
Received: (qmail 95976 invoked by uid 500); 27 Sep 2013 17:32:25 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 95953 invoked by uid 500); 27 Sep 2013 17:32:25 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 95945 invoked by uid 99); 27 Sep 2013 17:32:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Sep 2013 17:32:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_FILL_THIS_FORM_SHORT
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Sep 2013 17:32:17 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0A70F2388CB2;
	Fri, 27 Sep 2013 17:31:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1526989 [3/3] - in /cloudstack/site/trunk: content/
 content/css/ content/develop/ content/docs/api/ templates/
Date: Fri, 27 Sep 2013 17:31:54 -0000
To: commits@cloudstack.apache.org
From: chipchilders@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130927173155.0A70F2388CB2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Added: cloudstack/site/trunk/content/developers.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/developers.mdtext?rev=1526989&view=auto
==============================================================================
--- cloudstack/site/trunk/content/developers.mdtext (added)
+++ cloudstack/site/trunk/content/developers.mdtext Fri Sep 27 17:31:53 2013
@@ -0,0 +1,183 @@
+Title: Developer Resources for Apache CloudStack
+
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Developer Resources for Apache CloudStack</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<div class="row">
+
+<div class="col-lg-8">
+
+<h2>Contributing as a Non-Committer</h2>
+
+<p>If you're a committer on an Apache project, it means that you can commit directly to the project's repository. For instance, with Apache CloudStack committers are allowed to directly push commits into the git repository.</p>
+
+<p>Non-committers, however, have to submit patches for review. Don't worry, it's not an onerous process at all. The first time you submit a patch, it will take a minute or two to create an account on <a href="http://reviews.apache.org/">Review Board</a>, but it's a piece of cake from start to finish.</p>
+
+<h3> Assumptions </h3>
+
+<p>For the purpose of this post, we'll assume that you already have a system with <a href="http://git-scm.com/">Git</a> and have found a bug to fix or have a feature that you'd like to submit, and you're willing to contribute that code or documentation under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License 2.0</a>.</p>
+
+<p>Further, if you're fixing a bug we'll assume that you've either filed a bug report or are submitting a fix for a known bug. If you find a bug and would like to fix it, that's awesome! Please be sure to file the bug too, though.</p>
+
+<p>If you want to add a feature, you should bring it up for discussion on the <a href="mailto:dev@cloudstack.apache.org">dev@cloudstack.apache.org</a> mailing list before implementing it. This ensures that it meshes with the plans that other contributors have for Apache CloudStack, and that you're not doing redundant work. Other developers may also have ideas for the feature or suggestions that will help you land the feature without having to re-do the work. More information about our mailing lists can be found <a href="/mailing-lists.html">here</a>.</p>
+
+<p>In short, communication is a vital part of making a contribution to an Apache project.</p>
+
+<h3> Getting Started </h3>
+
+<p>First, lets make sure that you've added your name and email to your `~/.gitconfig`:</p>
+
+<pre>
+$ git config --global user.name "Your Name"
+$ git config --global user.email you@domain.com
+</pre>
+
+<p>You'll grab the CloudStack source with git:</p>
+
+<pre>
+$ git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git
+</pre>
+
+<p>If you already have the source, make sure you're working with the most recent version. Do a `git pull` if you cloned the source more than a few hours ago. (Apache CloudStack development can move pretty fast!)</p>
+
+<pre>
+$ git checkout -b mybranch
+</pre>
+
+<p>This does two things: One, it creates the branch <em>mybranch</em> and two, it changes your working branch to <em>mybranch</em>. Running `git branch` will show you which branch you're working on, with an asterisk next to the active branch, like so:</p>
+
+<pre>
+[user@localhost cloudstack]$ git branch
+  master
+  * mybranch
+  </pre>
+
+<p>Make whatever changes you're going to make, be sure to use <code>git add</code> to stage the changes, and then you're going to commit the changes to your working branch:</p>
+
+<pre>git commit -m "Insert a meaningful summary of changes here."</pre>
+
+<p>Finally, you're going to create a patch to upload to <a href="http://reviews.apache.org/">Review Board</a>:</p>
+
+<pre>git format-patch master --stdout > ~/patch-name.patch</pre>
+
+<h3>Using Review Board</h3>
+
+<p>Review Board is the main method of sending patches to the Apache CloudStack project. That's not to say that a patch sent directly to the mailing list will be ignored, but the <em>strong preference</em> is that patches be submitted through Review Board. Don't worry, it's a very easy tool to use.</p>
+
+<p>If you haven't already, create an account with Review Board. Registering only requires an email address, first name, and last name. After you're registered, head to <a href="https://reviews.apache.org/r/new/">New Review Request</a> and select the repository (<strong>cloudstack-git</strong>) and upload the patch (diff) created with git.</p>
+
+<p>Click <strong>Create Review Request</strong> and then fill out the information required. Specifically:</p>
+
+<ol>
+<li>Summary</li>
+<li>Groups (choose cloudstack)</li>
+<li>People (only use if you need specific committers to review changes)</li>
+<li>Description</li>
+<li>Testing Done</li>
+</ol>
+
+<p>The <strong>Summary</strong> will be the subject that's sent to the cloudstack-dev mailing list. So if your summary is "fixed feature foo" the subject of the mail sent to the list will be "Review Request: fixed feature foo". Try to be descriptive with the Summary. If you're submitting a patch for a bug, please be sure to include the bug number in the summary. (Like "Bugfix CS-15942: Fixing problem with redundant routers.")</p>
+
+<p>The description should be a full description of what you've done. Please be specific, and include enough information that any reviewer will be able to look at your patch without asking for follow-up information.   You need to include the bug ID that your patch relates to as well (ex:  CLOUDSTACK-XXX ).</p>
+
+<p>If you're submitting a patch that modifies code, adds features, etc. you should test before submitting. Please be sure to describe your tests here.</p>
+
+<p>Once you're sure everything is OK, go ahead and submit the patch. But that's <em>not</em> the end of the process. The work isn't done until the patch is committed!</p>
+
+<h3> Review </h3>
+
+<p>Once you've submitted your patch, you should receive a response within a few days. If you receive no response within a week, please ping the cloudstack-dev mailing list. One of the features of Review Board is that shows all of the requests and when they were posted, and the committers know that they should be responsible for reviewing patches in a timely fashion.</p>
+
+<p>When your patch is reviewed, it may be accepted as-is or you may be asked to make changes. If you're asked to make changes, please work with the committer to see the patch through to acceptance.</p>
+
+<p>If the patch is accepted and committed, you have one last task (don't worry, it's minor and kind of satisfying).</p>
+
+<p>Go back to Review Board, click <strong>My Dashboard</strong> and then <strong>Outgoing Reviews</strong>. Go to your submission, you should see a "Ship it!" message from the reviewer. Click the <strong>Close</strong> button and choose <strong>Submitted</strong>. The status has now changed from <em>pending</em> to <em>submitted</em>.</p>
+
+<p>That's it &ndash; you've helped make Apache CloudStack a better project. Thanks!</p>
+
+<h3>Screencast</h3>
+
+<p>If you are new to git you might want to watch this screencast:</p>
+
+<iframe width="560" height="315" src="//www.youtube.com/embed/3c5JIW4onGk?list=PLb899uhkHRoZCRE00h_9CRgUSiHEgFDbC" frameborder="0" allowfullscreen></iframe>
+
+<h3>Further Reading</h3>
+
+<p>You might want to peruse the <a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a> page on Apache.org, and the <a href="http://commons.apache.org/patches.html">On Contributing Patches</a> doc as well. Note that some of that does not apply to Apache CloudStack, as we're using git rather than Subversion. But do respect the original style of the CloudStack code, and ensure that you're using spaces rather than tabs, and your patches have Unix line endings (LF) rather than Windows-type line endings (CRLF).</p>
+
+</div>
+
+<div class="col-lg-4">
+
+
+<div class="list-group">
+
+<div class="list-group-item active">Resources</div>
+
+<a href="https://issues.apache.org/jira/browse/CLOUDSTACK" class="list-group-item">Jira</a>
+
+<a href="https://reviews.apache.org/dashboard/" class="list-group-item">Reviewboard</a>
+
+<a href="https://builds.apache.org/view/A-D/view/Cloudstack/" class="list-group-item">ASF Jenkins</a>
+
+<a href="http://jenkins.buildacloud.org/" class="list-group-item">CloudStack Jenkins</a>
+
+<a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101" class="list-group-item">CloudStack Development 101</a>
+
+<a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment" class="list-group-item">Setting up a Dev Environment</a>
+
+<a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Coding+conventions" class="list-group-item">Code Conventions</a>
+
+<a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing" class="list-group-item">Testing CloudStack</a>
+
+</div>
+
+
+
+<div class="panel panel-success">
+
+<div class="panel-heading">
+                
+<h3 class="panel-title">Git Repositories</h3>
+              
+</div>
+              
+<div class="panel-body">
+                
+<p>The git repositories are hosted on Apache infrastructure, and can be found here:</p>
+
+<ul>
+<li>Apache CloudStack <a href="https://git-wip-us.apache.org/repos/asf/cloudstack.git">https://git-wip-us.apache.org/repos/asf/cloudstack.git</a></li>
+<li>Apache CloudStack CloudMonkey <a href="https://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey.git">https://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey.git</a></li>
+</ul>
+
+<p>To get the most recent source for Apache CloudStack, use:</p>
+
+<pre>
+git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git
+</pre>
+
+<p>Similarly, clone the cloudstack-cloudmonkey repository to get access to the most recent source for CloudMonkey.</p>
+
+<p>For projects related to Apache CloudStack, see the <a href="https://github.com/cloudstack-extras">CloudStack-extras repositories on GitHub</a>.</p>
+              
+</div>
+            
+</div>
+
+
+</div>
+
+</div>

Modified: cloudstack/site/trunk/content/docs/api/index.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/docs/api/index.mdtext?rev=1526989&r1=1526988&r2=1526989&view=diff
==============================================================================
--- cloudstack/site/trunk/content/docs/api/index.mdtext (original)
+++ cloudstack/site/trunk/content/docs/api/index.mdtext Fri Sep 27 17:31:53 2013
@@ -1,10 +1,25 @@
-Title: Apache CloudStack API Docs
+Title: Apache CloudStack API Documentation
 
-# What's here
-You'll find  versioned API reference material for Apache CloudStack broken
-down by the default permission schemes (root admin, domain admin, and user). 
+<div class="row">
 
-# Versions here
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack API Documentation</h1>
+
+</div>
+
+</div>
+
+</div>
+
+Below are API reference material for Apache CloudStack, provided by major feature version.  Each feature version supports three levels of access, and the available API commands for each level are provided seperately.
+
+If you find problems or see ways in which this API reference can be enhanced
+we would welcome your help, please file a bug in the
+[CloudStack bug tracker](https://issues.apache.org/jira/browse/CLOUDSTACK)
+or by submitting a patch.
 
 ## 4.2.x
 
@@ -24,12 +39,3 @@ down by the default permission schemes (
 * [Domain Admin API](apidocs-4.0.0/TOC_Domain_Admin.html)
 * [User API](apidocs-4.0.0/TOC_User.html)
 
-
-# Problems, enhancements
-
-If you find problems or see ways in which this API reference can be enhanced
-we would welcome your help, please file a bug in the 
-[CloudStack bug tracker](https://issues.apache.org/jira/browse/CLOUDSTACK)
-or by submitting a patch. 
-
-

Modified: cloudstack/site/trunk/content/downloads.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/downloads.mdtext?rev=1526989&r1=1526988&r2=1526989&view=diff
==============================================================================
--- cloudstack/site/trunk/content/downloads.mdtext (original)
+++ cloudstack/site/trunk/content/downloads.mdtext Fri Sep 27 17:31:53 2013
@@ -1,29 +1,124 @@
 Title: Apache CloudStack Downloads
 
-#Latest Release
+<div class="row">
 
-## Official Source Code Release
+<div class="col-lg-12">
 
-The latest release of Apache CloudStack can be downloaded from here:
+<div class="page-header">
 
-*    [apache-cloudstack-4.2.0.src.tar.bz2](http://www.apache.org/dyn/closer.cgi/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2) [ [PGP](http://www.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.asc) ][ [MD5](http://www.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.md5) ][ [SHA512](http://www.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.sha) ]
+<h1 id="indicators">Apache CloudStack 4.2.0</h1>
 
-Full release notes can be found in the [Version 4.2.0 Release Notes](http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.2.0/html/Release_Notes/index.html) document.
+</div>
 
-Instructions for building from source and installing Apache CloudStack can be found in the [Installation Guide](http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.2.0/html/Installation_Guide/index.html).
+</div>
 
-Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack 4.2.0 can be found in the upgrade section of the [Release Notes](http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.2.0/html/Release_Notes/upgrade-instructions.html).
+</div>
 
-## Getting CloudStack from a Package Repository
+<div class="bs-example">
 
-For easier installation or upgrades, the official source code release has been supplemented by community members who have chosen to provide package repositories.
+<div class="row">
 
-* DEB package repository: [http://cloudstack.apt-get.eu/ubuntu](http://cloudstack.apt-get.eu/ubuntu)
-* RPM package repository: [http://cloudstack.apt-get.eu/rhel/4.2/](http://cloudstack.apt-get.eu/rhel/4.2/)
+<div class="col-lg-6">
 
-Instructions for using these community provided repositories can be found in the [Configure package repository](http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.2.0/html/Installation_Guide/configure-package-repository.html) section of the Installation Guide.
+<h4>Source Release</h4>
 
-## Getting the CloudMonkey CLI Tool
+<p>Apache CloudStack's most current release is 4.2.0.
+</p>
+
+<p>
+<a href="http://www.apache.org/dyn/closer.cgi/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2"><button type="button" class="btn btn-primary btn-lg">Get the 4.2.0 Source!</button></a>
+
+<a href="http://www.apache.org/dist/cloudstack/releases/KEYS"><button type="button" class="btn btn-info btn-xs">KEYS</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.asc"><button type="button" class="btn btn-info btn-xs">PGP</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.md5"><button type="button" class="btn btn-info btn-xs">MD5</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
+
+</p>
+
+<p>Full release notes can be found in the <a href="/docs/en-US/Apache_CloudStack/4.2.0/html/Release_Notes/index.html">Version 4.2.0 Release Notes</a> document.</p>
+
+<p>Instructions for building from source and installing Apache CloudStack can be found in the <a href="/docs/en-US/Apache_CloudStack/4.2.0/html/Installation_Guide/index.html">Installation Guide</a>.</p>
+
+<p>Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack 4.2.0 can be found in the upgrade section of the <a href="/docs/en-US/Apache_CloudStack/4.2.0/html/Release_Notes/upgrade-instructions.html">Releaes Notes</a>.</p>
+
+<h4>Packages</h4>
+
+<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have chosen to provide package repositories.</p>
+
+<ul>
+<li>DEB package repository: <a href="http://cloudstack.apt-get.eu/ubuntu">http://cloudstack.apt-get.eu/ubuntu</a>
+<li>RPM package repository: <a href="http://cloudstack.apt-get.eu/rhel/4.2/">http://cloudstack.apt-get.eu/rhel/4.2/</a>
+</ul>
+
+<p>Instructions for using these community provided repositories can be found in the <a href="/docs/en-US/Apache_CloudStack/4.2.0/html/Installation_Guide/configure-package-repository.html">Configure Package Repository</a> section of the Installation Guide.</p>
+
+</div>
+
+<div class="col-lg-6">
+
+<div class="panel panel-default">
+
+<div class="panel-heading">
+
+<h3 class="panel-title">Verifying Downloads</h3>
+
+</div>
+              
+<div class="panel-body">
+
+<p>
+It's essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures.
+The PGP signatures can be verified using PGP or GPG. First download the
+<a href="https://dist.apache.org/repos/dist/release/cloudstack/KEYS">KEYS</a> as well as the asc
+signature file for the relevant distribution. Make sure you get these files from the
+main distribution directory, rather than from a mirror. Then verify the signatures using:
+</p>
+<pre>
+    % pgpk -a KEYS
+    % pgpv apache-cloudstack-X.X.X-src.tar.bz2.asc
+</pre>
+<p>or</p>
+<pre>
+    % pgp -ka KEYS
+    % pgp apache-cloudstack-X.X.X-src.tar.bz2.asc
+</pre>
+<p>or</p>
+<pre>
+    % gpg --import KEYS
+    % gpg --verify apache-cloudstack-X.X.X-src.tar.bz2.asc
+</pre>
+<p>
+Additionally, you can verify the MD5 or SHA512 signatures on the files.
+</p>
+
+</div>
+
+</div>
+
+</div>
+
+</div>
+
+</div>
+                
+
+
+
+<a name="cloudmonkey"></a>
+
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack CloudMonkey 5.0.0</h1>
+
+</div>
+
+</div>
+
+</div>
 
 The latest source code release of Apache CloudStack's CloudMonkey CLI tool can be downloaded from here:
 
@@ -42,45 +137,22 @@ Thought a clean upgrade is recommended:
     $ pip uninstall cloudmonkey
     $ pip install cloudmonkey
 
-## Verify the integrity of the files
-
-It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. 
-The PGP signatures can be verified using PGP or GPG. First download the 
-[KEYS](https://dist.apache.org/repos/dist/release/cloudstack/KEYS) as well as the asc 
-signature file for the relevant distribution. Make sure you get these files from the 
-main distribution directory, rather than from a mirror. Then verify the signatures using:
-
-    % pgpk -a KEYS
-    % pgpv apache-cloudstack-4.0.2-src.tar.bz2.asc
-
-or
-
-    % pgp -ka KEYS
-    % pgp apache-cloudstack-4.0.2-src.tar.bz2.asc
-
-or
-
-    % gpg --import KEYS
-    % gpg --verify apache-cloudstack-4.0.2-src.tar.bz2.asc
-
-Additionally, you can verify the MD5 or SHA512 signatures on the files. (If you're checking an earlier version of CloudStack, replace the version number as appropriate.)
 
-#Apache CloudStack Git Repository
+<a name="archives"></a>
 
-The git repositories are hosted on Apache infrastructure, and can be found here:
+<div class="row">
 
-- Apache CloudStack [https://git-wip-us.apache.org/repos/asf/cloudstack.git](https://git-wip-us.apache.org/repos/asf/cloudstack.git)
-- Apache CloudStack CloudMonkey [https://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey.git](https://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey.git)
+<div class="col-lg-12">
 
-To get the most recent source for Apache CloudStack, use:
+<div class="page-header">
 
-    git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git
+<h1 id="indicators">Archived Releases</h1>
 
-Similarly, clone the cloudstack-cloudmonkey repository to get access to the most recent source for CloudMonkey.
+</div>
 
-For projects related to Apache CloudStack, see the [CloudStack-extras repositories on GitHub](https://github.com/cloudstack-extras).
+</div>
 
-#Older CloudStack Releases
+</div>
 
 * [apache-cloudstack-4.1.1.src.tar.bz2](http://archive.apache.org/dist/cloudstack/releases/4.1.1/apache-cloudstack-4.1.1-src.tar.bz2) [ [PGP](http://archive.apache.org/dist/cloudstack/releases/4.1.1/apache-cloudstack-4.1.1-src.tar.bz2.asc) ][ [MD5](http://archive.apache.org/dist/cloudstack/releases/4.1.1/apache-cloudstack-4.1.1-src.tar.bz2.md5) ][ [SHA512](http://archive.apache.org/dist/cloudstack/releases/4.1.1/apache-cloudstack-4.1.1-src.tar.bz2.sha) ]
 * [apache-cloudstack-4.1.0.src.tar.bz2](http://archive.apache.org/dist/cloudstack/releases/4.1.0/apache-cloudstack-4.1.0-src.tar.bz2) [ [PGP](http://archive.apache.org/dist/cloudstack/releases/4.1.0/apache-cloudstack-4.1.0-src.tar.bz2.asc) ][ [MD5](http://archive.apache.org/dist/cloudstack/releases/4.1.0/apache-cloudstack-4.1.0-src.tar.bz2.md5) ][ [SHA512](http://archive.apache.org/dist/cloudstack/releases/4.1.0/apache-cloudstack-4.1.0-src.tar.bz2.sha) ]
@@ -93,4 +165,4 @@ Releases of CloudStack as a Citrix proje
 Please note the the released listed below are NOT Apache project releases.  These links are being provided to the user community, as a convenience only.
 
 - [Binaries for Red Hat Enterprise Linux 6.2 and CentOS 6.2](http://sourceforge.net/projects/cloudstack/files/CloudStack%20Acton/3.0.2/CloudStack-oss-3.0.2-1-rhel6.2.tar.gz/download)
-- [Binaries for Ubuntu 10.04 LTS](http://sourceforge.net/projects/cloudstack/files/CloudStack%20Acton/3.0.2/CloudStack-oss-3.0.2-1-ubuntu10.04.tar.gz/download)
\ No newline at end of file
+- [Binaries for Ubuntu 10.04 LTS](http://sourceforge.net/projects/cloudstack/files/CloudStack%20Acton/3.0.2/CloudStack-oss-3.0.2-1-ubuntu10.04.tar.gz/download)

Added: cloudstack/site/trunk/content/history.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/history.mdtext?rev=1526989&view=auto
==============================================================================
--- cloudstack/site/trunk/content/history.mdtext (added)
+++ cloudstack/site/trunk/content/history.mdtext Fri Sep 27 17:31:53 2013
@@ -0,0 +1,25 @@
+Title: History of Apache CloudStack
+
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">CloudStack's History</h1>
+
+</div>
+
+</div>
+
+</div>
+
+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).
+
+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.
+
+In April 2012, Citrix re-licensed CloudStack under the Apache Software License 2.0 (ASLv2) and submitted CloudStack to the [Apache Incubator](http://incubator.apache.org/). It was [accepted into the Incubator on April 16th, 2012](http://incubator.apache.org/projects/cloudstack.html).
+
+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.
+
+Apache CloudStack graduated from the Incubator on March 20, 2013, and the announcement was released on [March 25, 2013](https://blogs.apache.org/cloudstack/entry/the_apache_software_foundation_announces).

Modified: cloudstack/site/trunk/content/index.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/index.mdtext?rev=1526989&r1=1526988&r2=1526989&view=diff
==============================================================================
--- cloudstack/site/trunk/content/index.mdtext (original)
+++ cloudstack/site/trunk/content/index.mdtext Fri Sep 27 17:31:53 2013
@@ -1,22 +1,152 @@
 Title: Apache CloudStack: Open Source Cloud Computing
 
-## <i class="icon-cloud"></i> What is CloudStack?
+<div class="row">
 
+<div class="col-lg-12">
+
+<div class="bs-example">
+
+<div class="jumbotron">
+
+<div class="row">
+
+<div class="col-lg-8">
+
+<h1>Apache CloudStack&#8482;</h1>
+
+<p>Open Source Cloud Computing&#8482;</p>
+              
+</div>
+
+<div class="col-lg-4">
+
+<img src="images/monkey.png" style="width: 210px;">
+
+</div>
+
+</div>
+
+</div>
+            
+</div>
+          
+</div>
+        
+</div>
+
+<div class="row">
+          
+<div class="col-lg-6">
+            
+<div class="panel panel-default">
+              
+<div class="panel-heading">
+
+About CloudStack
+
+</div>
+              
+<div class="panel-body">
+
+<p>
 Apache CloudStack is open source software designed to deploy and manage large networks of virtual machines, as a highly available, highly scalable Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used by a number of service providers to offer public cloud services, and by many companies to provide an on-premises (private) cloud offering, or as part of a hybrid cloud solution.
+</p>
 
+<p>
 CloudStack is a turnkey solution that includes the entire "stack" of features most organizations want with an IaaS cloud: compute orchestration, Network-as-a-Service, user and account management, a full and open native API, resource accounting, and a first-class User Interface (UI).
+</p>
 
-CloudStack currently supports the most popular hypervisors: VMware, KVM, XenServer and Xen Cloud Platform (XCP). 
+<p>
+CloudStack currently supports the most popular hypervisors: VMware, KVM, XenServer and Xen Cloud Platform (XCP).
+</p>
 
+<p>
 Users can manage their cloud with an easy to use Web interface, command line tools, and/or a full-featured RESTful API. In addition, CloudStack provides an API that's compatible with AWS EC2 and S3 for organizations that wish to deploy hybrid clouds.
+</p>   
+         
+<a href="about.html"><button type="button" class="btn btn-info">Learn More</button></a> 
+ 
+</div>
+            
+</div>
+
+<div class="panel panel-default">
+
+<div class="panel-heading">
+
+Join Us
+
+</div>
+
+<div class="panel-body">
+
+<p>
+Learn more about getting involved with Apache CloudStack on the <a href="contribute.html">Contributing to Apache CloudStack</a> page, or go straight to our <a href="developers.html">Developer Resources</a> page.
+</p>
+
+</div>
+
+</div>
+          
+</div>
+
+<div class="col-lg-6">
+            
+<div class="panel panel-default">
+              
+<div class="panel-heading">
+
+Get CloudStack
+
+</div>
+              
+<div class="panel-body">
+
+<p class="text-warning">Apache CloudStack 4.2.0 is out!</p>
+
+<p>
+Looking to other versions of Apache CloudStack? You can find our archives on the download page as well.
+</p>
+
+<a href="downloads.html"><button type="button" class="btn btn-success">Download Now</button></a>
+              
+</div>
+            
+</div>
+
+<div class="panel panel-default">
+
+<div class="panel-heading">
+
+CloudStack Collaboration Conference
+
+</div>
+
+<div class="panel-body">
+
+<p>
+The Apache CloudStack community will be coming together for our third collaboration conference in Amsterdam on November 20th through 22nd. If you're a CloudStack user, developer or integrator, this is the conference for you!
+</p>
+
+<a href="http://cloudstackcollab.org/"><button type="button" class="btn btn-info">Learn More</button></a>
+
+</div>
+
+</div>
+            
+<div class="panel panel-default">
+
+<div class="panel-heading">What are people saying?</div>
 
-## <i class="icon-cloud"></i> Get CloudStack
+<div class="panel-body">
 
-Looking to download Apache CloudStack? You can find the most recent release and download instructions on the [download page](http://cloudstack.apache.org/downloads.html). The most recent release is Apache CloudStack 4.1.1.
+<a class="twitter-timeline" href="https://twitter.com/search?q=cloudstack" data-widget-id="383337162126544896" data-chrome="nofooter transparent noheader noborders noscrollbar">Tweets about "cloudstack"</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 
-You can also download the source code [via the Apache CloudStack git repository](https://git-wip-us.apache.org/repos/asf?p=cloudstack.git).  
+</div>
 
-## <i class="icon-cloud"></i> Get Involved
+</div>
 
-Learn more about getting involved with Apache CloudStack on the [Contributing to Apache CloudStack](http://cloudstack.apache.org/contribute.html) page. 
+</div>
 
+</div>

Modified: cloudstack/site/trunk/content/mailing-lists.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/mailing-lists.mdtext?rev=1526989&r1=1526988&r2=1526989&view=diff
==============================================================================
--- cloudstack/site/trunk/content/mailing-lists.mdtext (original)
+++ cloudstack/site/trunk/content/mailing-lists.mdtext Fri Sep 27 17:31:53 2013
@@ -1,6 +1,18 @@
 Title: Apache CloudStack Mailing Lists
 
-#Apache CloudStack Mailing Lists
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack Mailing Lists</h1>
+
+</div>
+
+</div>
+
+</div>
 
 If you're interested in learning more or participating in the Apache CloudStack project, the mailing lists are the best way to do that. While the project has several communications channels, the mailing lists are the most active and the official channels for making decisions about the project itself. <em>["If it didn't happen on a mailing list, it didn't happen."](http://community.apache.org/newbiefaq.html#NewbieFAQ-IsthereaCodeofConductforApacheprojects?")</em>
 

Modified: cloudstack/site/trunk/content/security.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/security.mdtext?rev=1526989&r1=1526988&r2=1526989&view=diff
==============================================================================
--- cloudstack/site/trunk/content/security.mdtext (original)
+++ cloudstack/site/trunk/content/security.mdtext Fri Sep 27 17:31:53 2013
@@ -1,10 +1,22 @@
-Title: Apache CloudStack: Security
+Title: Apache CloudStack Security
 
-## Apache CloudStack Security
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack Security</h1>
+
+</div>
+
+</div>
+
+</div>
 
 The Apache CloudStack project understands that as a core infrastructure project, the application security of Apache CloudStack is of critical importance to the community and users.
 
-### Apache CloudStack Security Team
+## Apache CloudStack Security Team
 
 The PMC has decided to create a "Security Team" for CloudStack.  The Security Team's charter is to manage the response to vulnerabilities reported with Apache CloudStack.  This includes communication with the report, issue verification, issue correction, public communication creation, and vendor coordination.  The Security Team may ask assistance from other community members to help verify or correct a reported issue.
 
@@ -12,7 +24,9 @@ Members of the PMC are eligible to join 
 
 Community members engaged by the Security Team are expected to hold the issue in confidence until public announcement of the vulnerability.  This protects the users of the software and gives reasonable time for the response process to be implemented.  Further information can be found on the ASF's [How it Works](http://www.apache.org/foundation/how-it-works.html) page.
 
-### Reporting Potential Vulnerabilities in Apache CloudStack
+The CloudStack security team works closely with, and under the direction of, the [ASF security team](http://www.apache.org/security/).
+
+## Reporting Potential Vulnerabilities in Apache CloudStack
 
 If you've found an issue that you believe is a security vulnerability in a released version of CloudStack, please report it to [security@cloudstack.apache.org](mailto:security@cloudstack.apache.org) with details about the vulnerability, how it might be exploited, and any additional information that might be useful.
 
@@ -20,7 +34,7 @@ Upon notification, the ACS security team
 
 The security team asks that you **please do not create publicly-viewable JIRA tickets related to the issue**. If validated, a JIRA ticket with the security flag set will be created for tracking the issue in a non-public manner.
 
-### Procedure for Responding to Potential Security Issues
+## Procedure for Responding to Potential Security Issues
 
 <ul>
   <li> Upon receiving notice of a potential security issue, a security team member will create a bug to track the investigation, this bug must be flagged as a security issue. Security flag should mean contents of ticket are not visible to non-security team members
@@ -50,7 +64,7 @@ The security team asks that you **please
   <li> After the vulnerability is addressed, the CloudStack community should review development processes to see how the community can minimize the chance of similar vulnerabilities being introduced in the future.
 </ul>
 
-### For further information
+## For further information
 
 Further information about Apache CloudStack's security practices can be found in the [CloudStack Security wiki page](https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Security).
 

Modified: cloudstack/site/trunk/content/trademark-guidelines.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/trademark-guidelines.mdtext?rev=1526989&r1=1526988&r2=1526989&view=diff
==============================================================================
--- cloudstack/site/trunk/content/trademark-guidelines.mdtext (original)
+++ cloudstack/site/trunk/content/trademark-guidelines.mdtext Fri Sep 27 17:31:53 2013
@@ -1,4 +1,18 @@
-# Trademark Guidelines for the Apache CloudStack Project
+Title: Apache CloudStack Trademark Guidelines
+
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack Trademark Guidelines</h1>
+
+</div>
+
+</div>
+
+</div>
 
 Apache CloudStack, CloudStack, the CloudStack word design, the Apache 
 CloudStack word design, the cloud monkey logo, either separately or in 

Modified: cloudstack/site/trunk/content/who.mdtext
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/who.mdtext?rev=1526989&r1=1526988&r2=1526989&view=diff
==============================================================================
--- cloudstack/site/trunk/content/who.mdtext (original)
+++ cloudstack/site/trunk/content/who.mdtext Fri Sep 27 17:31:53 2013
@@ -1,14 +1,26 @@
-Title: Apache CloudStack: Who We Are
+Title: Apache CloudStack Project Membership
 
 <!-- ordering is by username
 PMC members are listed in both the PMC member section and the Committer section
 --> 
 
-## Who We Are
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack Project Membership</h1>
+
+</div>
+
+</div>
+
+</div>
 
 This page includes all of the Apache CloudStack Project Management Committee (PMC) members and committers, and their ASF usernames. 
 
-### PMC 
+## PMC 
 
 **Alex Huang** (ahuang)
 
@@ -53,7 +65,7 @@ This page includes all of the Apache Clo
 **William Chan** (willchan)
 
 
-### Committers
+## Committers
 
 **Ahmad Emneina** (ahmad)
 

Modified: cloudstack/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/templates/skeleton.html?rev=1526989&r1=1526988&r2=1526989&view=diff
==============================================================================
--- cloudstack/site/trunk/templates/skeleton.html (original)
+++ cloudstack/site/trunk/templates/skeleton.html Fri Sep 27 17:31:53 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">
 
     {% if headers.atom %}
       <link rel="alternate" href="{{ headers.atom.url }}"
@@ -18,131 +18,80 @@
     {% if headers.notice %}<!-- {{ headers.notice }} -->{% endif %}
         <!-- 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>
-
-    <header class="main" id="overview">
-    <div class="container">
-    </div>
-    </header>
-
-    <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 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="span9">
-        <p>{% block content %} {{ content|markdown }} {% endblock %}</p>
+            <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>
-
-      <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 class="container">
+        <div class="bs-docs-section">
+            {% block content %} {{ content|markdown }} {% endblock %}
+
+            <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>