You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2015/05/11 20:54:37 UTC

[20/39] cloudstack-www git commit: one modification test and a silly build script

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9d662cb1/content/build/stylesheets/bootswatch.min.css
----------------------------------------------------------------------
diff --git a/content/build/stylesheets/bootswatch.min.css b/content/build/stylesheets/bootswatch.min.css
new file mode 100644
index 0000000..b8910f3
--- /dev/null
+++ b/content/build/stylesheets/bootswatch.min.css
@@ -0,0 +1 @@
+body{padding-top:100px}#banner{border-bottom:0}.page-header h1{font-size:4em}.affix{top:70px}footer{margin:5em 0}footer li{float:left;margin-right:1.5em;margin-bottom:1.5em}footer p{margin-bottom:0;clear:left}.splash{padding:6em 0 2em;color:#fff;text-align:center;background:-webkit-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-o-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-ms-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-moz-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:linear-gradient(20deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background-attachment:fixed;background-color:#1c2533}.splash .alert{margin:4em 0 2em}.splash h1{font-size:4em}.splash #social{margin-top:6em}.section-tout{padding:4em 0 3em;background-color:#eaf1f1;border-top:1px solid rgba(255,255,255,0.1);border-bottom:1px solid rgba(0,0,0,0.1)}.section-tout [class^="icon-"]{margin-right:.5em}.section-tout p{margin-botto
 m:3em}.section-preview{padding:4em 0 4em}.section-preview .preview{margin-bottom:4em;background-color:#eaf1f1;border:1px solid rgba(0,0,0,0.1);border-radius:6px}.section-preview .preview .image{padding:5px}.section-preview .preview .image img{border:1px solid rgba(0,0,0,0.1)}.section-preview .preview .options{padding:0 2em 2em;text-align:center}.section-preview .preview .options p{margin-bottom:2em}.section-preview .dropdown-menu{text-align:left}.section-preview .lead{margin-bottom:2em}@media(max-width:767px){.section-preview .image img{width:100%}}.bsa .one .bsa_it_ad{background-color:transparent!important;border:none!important}.bsa .one .bsa_it_ad .bsa_it_t,.bsa .one .bsa_it_ad .bsa_it_d{color:inherit!important}.bsa .one .bsa_it_p{display:none}

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9d662cb1/content/build/stylesheets/font-awesome.css
----------------------------------------------------------------------
diff --git a/content/build/stylesheets/font-awesome.css b/content/build/stylesheets/font-awesome.css
new file mode 100644
index 0000000..54b6e06
--- /dev/null
+++ b/content/build/stylesheets/font-awesome.css
@@ -0,0 +1,304 @@
+/*  Font Awesome
+    the iconic font designed for use with Twitter Bootstrap
+    -------------------------------------------------------
+    The full suite of pictographic icons, examples, and documentation
+    can be found at: http://fortawesome.github.com/Font-Awesome/
+
+    License
+    -------------------------------------------------------
+    The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
+    http://creativecommons.org/licenses/by/3.0/ A mention of
+    'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
+    source code is considered acceptable attribution (most common on the web).
+    If human readable source code is not available to the end user, a mention in
+    an 'About' or 'Credits' screen is considered acceptable (most common in desktop
+    or mobile software).
+
+    Contact
+    -------------------------------------------------------
+    Email: dave@davegandy.com
+    Twitter: http://twitter.com/fortaweso_me
+    Work: http://lemonwi.se co-founder
+
+    */
+
+@font-face {
+  font-family: "FontAwesome";
+  src: url('../font/fontawesome-webfont.eot');
+  src: url('../font/fontawesome-webfont.eot?#iefix') format('eot'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+/*  Font Awesome styles
+    ------------------------------------------------------- */
+[class^="icon-"]:before, [class*=" icon-"]:before {
+  font-family: FontAwesome;
+  font-weight: normal;
+  font-style: normal;
+  display: inline-block;
+  text-decoration: inherit;
+}
+a [class^="icon-"], a [class*=" icon-"] {
+  display: inline-block;
+  text-decoration: inherit;
+}
+/* makes the font 33% larger relative to the icon container */
+.icon-large:before {
+  vertical-align: top;
+  font-size: 1.3333333333333333em;
+}
+.btn [class^="icon-"], .btn [class*=" icon-"] {
+  /* keeps button heights with and without icons the same */
+
+  line-height: .9em;
+}
+li [class^="icon-"], li [class*=" icon-"] {
+  display: inline-block;
+  width: 1.25em;
+  text-align: center;
+}
+li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] {
+  /* 1.5 increased font size for icon-large * 1.25 width */
+
+  width: 1.875em;
+}
+li[class^="icon-"], li[class*=" icon-"] {
+  margin-left: 0;
+  list-style-type: none;
+}
+li[class^="icon-"]:before, li[class*=" icon-"]:before {
+  text-indent: -2em;
+  text-align: center;
+}
+li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
+  text-indent: -1.3333333333333333em;
+}
+/*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+    readers do not read off random characters that represent icons */
+.icon-glass:before                { content: "\f000"; }
+.icon-music:before                { content: "\f001"; }
+.icon-search:before               { content: "\f002"; }
+.icon-envelope:before             { content: "\f003"; }
+.icon-heart:before                { content: "\f004"; }
+.icon-star:before                 { content: "\f005"; }
+.icon-star-empty:before           { content: "\f006"; }
+.icon-user:before                 { content: "\f007"; }
+.icon-film:before                 { content: "\f008"; }
+.icon-th-large:before             { content: "\f009"; }
+.icon-th:before                   { content: "\f00a"; }
+.icon-th-list:before              { content: "\f00b"; }
+.icon-ok:before                   { content: "\f00c"; }
+.icon-remove:before               { content: "\f00d"; }
+.icon-zoom-in:before              { content: "\f00e"; }
+
+.icon-zoom-out:before             { content: "\f010"; }
+.icon-off:before                  { content: "\f011"; }
+.icon-signal:before               { content: "\f012"; }
+.icon-cog:before                  { content: "\f013"; }
+.icon-trash:before                { content: "\f014"; }
+.icon-home:before                 { content: "\f015"; }
+.icon-file:before                 { content: "\f016"; }
+.icon-time:before                 { content: "\f017"; }
+.icon-road:before                 { content: "\f018"; }
+.icon-download-alt:before         { content: "\f019"; }
+.icon-download:before             { content: "\f01a"; }
+.icon-upload:before               { content: "\f01b"; }
+.icon-inbox:before                { content: "\f01c"; }
+.icon-play-circle:before          { content: "\f01d"; }
+.icon-repeat:before               { content: "\f01e"; }
+
+/* \f020 doesn't work in Safari. all shifted one down */
+.icon-refresh:before              { content: "\f021"; }
+.icon-list-alt:before             { content: "\f022"; }
+.icon-lock:before                 { content: "\f023"; }
+.icon-flag:before                 { content: "\f024"; }
+.icon-headphones:before           { content: "\f025"; }
+.icon-volume-off:before           { content: "\f026"; }
+.icon-volume-down:before          { content: "\f027"; }
+.icon-volume-up:before            { content: "\f028"; }
+.icon-qrcode:before               { content: "\f029"; }
+.icon-barcode:before              { content: "\f02a"; }
+.icon-tag:before                  { content: "\f02b"; }
+.icon-tags:before                 { content: "\f02c"; }
+.icon-book:before                 { content: "\f02d"; }
+.icon-bookmark:before             { content: "\f02e"; }
+.icon-print:before                { content: "\f02f"; }
+
+.icon-camera:before               { content: "\f030"; }
+.icon-font:before                 { content: "\f031"; }
+.icon-bold:before                 { content: "\f032"; }
+.icon-italic:before               { content: "\f033"; }
+.icon-text-height:before          { content: "\f034"; }
+.icon-text-width:before           { content: "\f035"; }
+.icon-align-left:before           { content: "\f036"; }
+.icon-align-center:before         { content: "\f037"; }
+.icon-align-right:before          { content: "\f038"; }
+.icon-align-justify:before        { content: "\f039"; }
+.icon-list:before                 { content: "\f03a"; }
+.icon-indent-left:before          { content: "\f03b"; }
+.icon-indent-right:before         { content: "\f03c"; }
+.icon-facetime-video:before       { content: "\f03d"; }
+.icon-picture:before              { content: "\f03e"; }
+
+.icon-pencil:before               { content: "\f040"; }
+.icon-map-marker:before           { content: "\f041"; }
+.icon-adjust:before               { content: "\f042"; }
+.icon-tint:before                 { content: "\f043"; }
+.icon-edit:before                 { content: "\f044"; }
+.icon-share:before                { content: "\f045"; }
+.icon-check:before                { content: "\f046"; }
+.icon-move:before                 { content: "\f047"; }
+.icon-step-backward:before        { content: "\f048"; }
+.icon-fast-backward:before        { content: "\f049"; }
+.icon-backward:before             { content: "\f04a"; }
+.icon-play:before                 { content: "\f04b"; }
+.icon-pause:before                { content: "\f04c"; }
+.icon-stop:before                 { content: "\f04d"; }
+.icon-forward:before              { content: "\f04e"; }
+
+.icon-fast-forward:before         { content: "\f050"; }
+.icon-step-forward:before         { content: "\f051"; }
+.icon-eject:before                { content: "\f052"; }
+.icon-chevron-left:before         { content: "\f053"; }
+.icon-chevron-right:before        { content: "\f054"; }
+.icon-plus-sign:before            { content: "\f055"; }
+.icon-minus-sign:before           { content: "\f056"; }
+.icon-remove-sign:before          { content: "\f057"; }
+.icon-ok-sign:before              { content: "\f058"; }
+.icon-question-sign:before        { content: "\f059"; }
+.icon-info-sign:before            { content: "\f05a"; }
+.icon-screenshot:before           { content: "\f05b"; }
+.icon-remove-circle:before        { content: "\f05c"; }
+.icon-ok-circle:before            { content: "\f05d"; }
+.icon-ban-circle:before           { content: "\f05e"; }
+
+.icon-arrow-left:before           { content: "\f060"; }
+.icon-arrow-right:before          { content: "\f061"; }
+.icon-arrow-up:before             { content: "\f062"; }
+.icon-arrow-down:before           { content: "\f063"; }
+.icon-share-alt:before            { content: "\f064"; }
+.icon-resize-full:before          { content: "\f065"; }
+.icon-resize-small:before         { content: "\f066"; }
+.icon-plus:before                 { content: "\f067"; }
+.icon-minus:before                { content: "\f068"; }
+.icon-asterisk:before             { content: "\f069"; }
+.icon-exclamation-sign:before     { content: "\f06a"; }
+.icon-gift:before                 { content: "\f06b"; }
+.icon-leaf:before                 { content: "\f06c"; }
+.icon-fire:before                 { content: "\f06d"; }
+.icon-eye-open:before             { content: "\f06e"; }
+
+.icon-eye-close:before            { content: "\f070"; }
+.icon-warning-sign:before         { content: "\f071"; }
+.icon-plane:before                { content: "\f072"; }
+.icon-calendar:before             { content: "\f073"; }
+.icon-random:before               { content: "\f074"; }
+.icon-comment:before              { content: "\f075"; }
+.icon-magnet:before               { content: "\f076"; }
+.icon-chevron-up:before           { content: "\f077"; }
+.icon-chevron-down:before         { content: "\f078"; }
+.icon-retweet:before              { content: "\f079"; }
+.icon-shopping-cart:before        { content: "\f07a"; }
+.icon-folder-close:before         { content: "\f07b"; }
+.icon-folder-open:before          { content: "\f07c"; }
+.icon-resize-vertical:before      { content: "\f07d"; }
+.icon-resize-horizontal:before    { content: "\f07e"; }
+
+.icon-bar-chart:before            { content: "\f080"; }
+.icon-twitter-sign:before         { content: "\f081"; }
+.icon-facebook-sign:before        { content: "\f082"; }
+.icon-camera-retro:before         { content: "\f083"; }
+.icon-key:before                  { content: "\f084"; }
+.icon-cogs:before                 { content: "\f085"; }
+.icon-comments:before             { content: "\f086"; }
+.icon-thumbs-up:before            { content: "\f087"; }
+.icon-thumbs-down:before          { content: "\f088"; }
+.icon-star-half:before            { content: "\f089"; }
+.icon-heart-empty:before          { content: "\f08a"; }
+.icon-signout:before              { content: "\f08b"; }
+.icon-linkedin-sign:before        { content: "\f08c"; }
+.icon-pushpin:before              { content: "\f08d"; }
+.icon-external-link:before        { content: "\f08e"; }
+
+.icon-signin:before               { content: "\f090"; }
+.icon-trophy:before               { content: "\f091"; }
+.icon-github-sign:before          { content: "\f092"; }
+.icon-upload-alt:before           { content: "\f093"; }
+.icon-lemon:before                { content: "\f094"; }
+.icon-phone:before                { content: "\f095"; }
+.icon-check-empty:before          { content: "\f096"; }
+.icon-bookmark-empty:before       { content: "\f097"; }
+.icon-phone-sign:before           { content: "\f098"; }
+.icon-twitter:before              { content: "\f099"; }
+.icon-facebook:before             { content: "\f09a"; }
+.icon-github:before               { content: "\f09b"; }
+.icon-unlock:before               { content: "\f09c"; }
+.icon-credit-card:before          { content: "\f09d"; }
+.icon-rss:before                  { content: "\f09e"; }
+
+.icon-hdd:before                  { content: "\f0a0"; }
+.icon-bullhorn:before             { content: "\f0a1"; }
+.icon-bell:before                 { content: "\f0a2"; }
+.icon-certificate:before          { content: "\f0a3"; }
+.icon-hand-right:before           { content: "\f0a4"; }
+.icon-hand-left:before            { content: "\f0a5"; }
+.icon-hand-up:before              { content: "\f0a6"; }
+.icon-hand-down:before            { content: "\f0a7"; }
+.icon-circle-arrow-left:before    { content: "\f0a8"; }
+.icon-circle-arrow-right:before   { content: "\f0a9"; }
+.icon-circle-arrow-up:before      { content: "\f0aa"; }
+.icon-circle-arrow-down:before    { content: "\f0ab"; }
+.icon-globe:before                { content: "\f0ac"; }
+.icon-wrench:before               { content: "\f0ad"; }
+.icon-tasks:before                { content: "\f0ae"; }
+
+.icon-filter:before               { content: "\f0b0"; }
+.icon-briefcase:before            { content: "\f0b1"; }
+.icon-fullscreen:before           { content: "\f0b2"; }
+
+.icon-group:before                { content: "\f0c0"; }
+.icon-link:before                 { content: "\f0c1"; }
+.icon-cloud:before                { content: "\f0c2"; }
+.icon-beaker:before               { content: "\f0c3"; }
+.icon-cut:before                  { content: "\f0c4"; }
+.icon-copy:before                 { content: "\f0c5"; }
+.icon-paper-clip:before           { content: "\f0c6"; }
+.icon-save:before                 { content: "\f0c7"; }
+.icon-sign-blank:before           { content: "\f0c8"; }
+.icon-reorder:before              { content: "\f0c9"; }
+.icon-list-ul:before              { content: "\f0ca"; }
+.icon-list-ol:before              { content: "\f0cb"; }
+.icon-strikethrough:before        { content: "\f0cc"; }
+.icon-underline:before            { content: "\f0cd"; }
+.icon-table:before                { content: "\f0ce"; }
+
+.icon-magic:before                { content: "\f0d0"; }
+.icon-truck:before                { content: "\f0d1"; }
+.icon-pinterest:before            { content: "\f0d2"; }
+.icon-pinterest-sign:before       { content: "\f0d3"; }
+.icon-google-plus-sign:before     { content: "\f0d4"; }
+.icon-google-plus:before          { content: "\f0d5"; }
+.icon-money:before                { content: "\f0d6"; }
+.icon-caret-down:before           { content: "\f0d7"; }
+.icon-caret-up:before             { content: "\f0d8"; }
+.icon-caret-left:before           { content: "\f0d9"; }
+.icon-caret-right:before          { content: "\f0da"; }
+.icon-columns:before              { content: "\f0db"; }
+.icon-sort:before                 { content: "\f0dc"; }
+.icon-sort-down:before            { content: "\f0dd"; }
+.icon-sort-up:before              { content: "\f0de"; }
+
+.icon-envelope-alt:before         { content: "\f0e0"; }
+.icon-linkedin:before             { content: "\f0e1"; }
+.icon-undo:before                 { content: "\f0e2"; }
+.icon-legal:before                { content: "\f0e3"; }
+.icon-dashboard:before            { content: "\f0e4"; }
+.icon-comment-alt:before          { content: "\f0e5"; }
+.icon-comments-alt:before         { content: "\f0e6"; }
+.icon-bolt:before                 { content: "\f0e7"; }
+.icon-sitemap:before              { content: "\f0e8"; }
+.icon-umbrella:before             { content: "\f0e9"; }
+.icon-paste:before                { content: "\f0ea"; }
+
+.icon-user-md:before              { content: "\f200"; }

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9d662cb1/content/build/survey.html
----------------------------------------------------------------------
diff --git a/content/build/survey.html b/content/build/survey.html
new file mode 100644
index 0000000..2d52ae8
--- /dev/null
+++ b/content/build/survey.html
@@ -0,0 +1,158 @@
+<!doctype html>
+<html>  
+  <head>
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
+
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
+  </head>
+  <body>
+    <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" alt="Apache Cloudstack"></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<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="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 <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</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="http://docs.cloudstack.apache.org" target="_blank">Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-installation" target="_blank">Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-administration" target="_blank">Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes" target="_blank">Release Notes</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="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</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>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack Survey</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<iframe height="3650" allowtransparency="true" frameborder="0" scrolling="no" style="width:100%;border:none" src="http://www.formwize.com/run/survey3.cfm?id=7191&amp;embed">
+<a href="http://www.formwize.com/run/survey3.cfm?id=7191" title="CloudStack Survey">Fill out my form</a>
+</iframe>
+
+
+
+            <footer>
+                <p>Copyright © 2015 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>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9d662cb1/content/build/trademark-guidelines.html
----------------------------------------------------------------------
diff --git a/content/build/trademark-guidelines.html b/content/build/trademark-guidelines.html
new file mode 100644
index 0000000..a9ccc25
--- /dev/null
+++ b/content/build/trademark-guidelines.html
@@ -0,0 +1,298 @@
+<!doctype html>
+<html>  
+  <head>
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
+
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
+  </head>
+  <body>
+    <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" alt="Apache Cloudstack"></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<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="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 <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</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="http://docs.cloudstack.apache.org" target="_blank">Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-installation" target="_blank">Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-administration" target="_blank">Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes" target="_blank">Release Notes</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="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</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>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack Trademark Guidelines</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>Apache CloudStack, CloudStack, the CloudStack word design, the Apache 
+CloudStack word design, the cloud monkey logo, either separately or in 
+combination are hereinafter referred to as "CloudStack Trademarks" and 
+are trademarks or registered trademarks of the Apache Software 
+Foundation. Excepting the provisions outlined below you may not use the 
+CloudStack trademarks or any confusingly similar mark as a trademark for 
+your product, to imply endorsement by the project, or use the CloudStack 
+trademarks in any other manner that might cause confusion in the 
+marketplace.</p>
+
+<p>Trademark law dictates that owners must police their marks or risk the 
+loss of the marks.</p>
+
+<p>The Apache Software Foundation has an established trademark policy 
+(<a href="http://www.apache.org/foundation/marks">http://www.apache.org/foundation/marks</a>) 
+that when in conflict should be considered the canonical standard (with one 
+exception noted below).</p>
+
+<p>However, the Apache Software Foundation has given the responsibility for 
+brand management to the project's Project Management Committee. Thus 
+this document should be taken as additive to the Apache Software 
+Foundation's trademark guideline. Nothing contained herein provides an 
+exception to those guidelines (again, with one exception below).</p>
+
+<p><em>Exception:</em> The Apache CloudStack PMC is the contact point for all requests
+related to the use of the CloudStack Trademarks. In places where the Apache
+Software Foundation's formal trademark usage documentation and policies specify
+trademarks@apache.org, requesters should use press@cloudstack.apache.org or
+private@cloudstack.apache.org.  In places where the Apache Software
+Foundation's policies specify that explicit approval must come from the VP
+Brand Management, requesters will be given authoritative approval from a
+representative of the Apache CloudStack PMC instead.  The Apache Software
+Foundation has delegated approval authority to the Apache CloudStack PMC,
+specifically related to the CloudStack Trademarks.</p>
+
+<h2 id="mark-usage">Mark usage</h2>
+
+<h3 id="wordmark">Wordmark</h3>
+
+<p>The word 'CloudStack' is a registered trademark, 
+and should use the '®' symbol. In places where that symbol is not 
+reasonably used it is acceptable to use '(R)' as an alternative.</p>
+
+<h3 id="other-cloudstack-marks">Other CloudStack marks</h3>
+
+<p>The CloudStack word design, the Apache CloudStack word design, the
+'Apache CloudStack' wordmark  and the 
+cloud monkey logo are all trademarks and should not appear without the 
+'™' symbol being present.</p>
+
+<h3 id="apache-cloudstack-logo-tm">Apache CloudStack Logo (TM)</h3>
+
+<p>The Apache CloudStack logo with the "TM" symbol present may be 
+downloaded here:</p>
+
+<ul>
+  <li><a href="http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack.ai">Apache CloudStack logo with "open source cloud computing" tagline (.ai file)</a></li>
+  <li><a href="http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_sans_tagline.ai">Apache CloudStack logo without the tagline (.ai file)</a></li>
+  <li><a href="http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_with_cloud_monkey.ai">Apache CloudStack logo with "open source cloud computing" tagline and the Cloud Monkey (.ai file)</a></li>
+  <li><a href="http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack.jpg">Apache CloudStack logo with "open source cloud computing" tagline (JPEG file)</a></li>
+  <li><a href="http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack_sans_tagline.jpg">Apache CloudStack logo without the tagline (JPEG file)</a></li>
+  <li><a href="http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack_with_cloud_monkey.jpg">Apache CloudStack logo with "open source cloud computing" tagline and the Cloud Monkey (JPEG file)</a></li>
+</ul>
+
+<h2 id="events">Events</h2>
+
+<h3 id="exhibiting-at-events">Exhibiting at Events:</h3>
+
+<p>Apache CloudStack committers may, without prior approval, use the 
+CloudStack Trademarks to promote exhibits or sessions at events with the 
+aim to promote Apache CloudStack, though the general adherence to the 
+ASF's trademark guidelines is still required.</p>
+
+<h3 id="sponsoring-events">Sponsoring Events:</h3>
+
+<p>Sponsoring events can provide good visibility for the project, however 
+it frequently requires funds that the project does not have access to. 
+Many outside organizations wish to provide this type of visibility.</p>
+
+<p>The following is required:</p>
+
+<ul>
+  <li>Sponsorship discussed and approved on the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#112;&#114;&#101;&#115;&#115;&#064;&#099;&#108;&#111;&#117;&#100;&#115;&#116;&#097;&#099;&#107;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">&#112;&#114;&#101;&#115;&#115;&#064;&#099;&#108;&#111;&#117;&#100;&#115;&#116;&#097;&#099;&#107;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;</a> mailing list.</li>
+  <li>Requests for approval will be acknowledged by a member of the PMC and approved automatically if no issues are raised 72 hours after acknowledgement.</li>
+  <li>Sponsorship must be provided with no additional affiliation - and only project provided marks used.</li>
+  <li>At least one committer must be planning to represent the project.</li>
+</ul>
+
+<h3 id="cloudstack-specific-conferences">CloudStack Specific Conferences:</h3>
+
+<p>The following is required:</p>
+
+<ul>
+  <li>Project approval from the PMC is needed via the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#112;&#114;&#101;&#115;&#115;&#064;&#099;&#108;&#111;&#117;&#100;&#115;&#116;&#097;&#099;&#107;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">&#112;&#114;&#101;&#115;&#115;&#064;&#099;&#108;&#111;&#117;&#100;&#115;&#116;&#097;&#099;&#107;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;</a> mailing list.</li>
+  <li>Requests for approval will be acknowledged by a member of the PMC and approved automatically if no issues are raised 72 hours after acknowledgement.</li>
+  <li>Membership on committees deciding content should be open to any Committer.</li>
+  <li>At least one committer must be planning to attend the event.</li>
+</ul>
+
+<h3 id="meetup-groups-hackfests-barcamps-birds-of-a-feather-and-other-small-events">Meetup groups, hackfests, barcamps, Birds of a Feather, and other small events:</h3>
+
+<p>Local area user events are encouraged.</p>
+
+<ul>
+  <li>Events which include the CloudStack name, should be styled: "Apache CloudStack"</li>
+  <li>Annotation on the group's web presence should indicate that there is no affiliation between the group and the project.</li>
+  <li>A link to the project's website should be present.</li>
+</ul>
+
+<h2 id="non-software-goods">Non-software goods</h2>
+
+<p>Creating non-software goods (e.g.: stickers, event give-aways, etc…) to help
+promote the Apache CloudStack project is encouraged.  However, there are some
+requirements that must be met prior to producing the goods.  Additionally,
+goods bearing any of the CloudStack marks may not be sold without explicit
+written permission.</p>
+
+<p>The following is required:</p>
+
+<ul>
+  <li>The design (mock-up) must be shared with the CloudStack PMC via <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#112;&#114;&#101;&#115;&#115;&#064;&#099;&#108;&#111;&#117;&#100;&#115;&#116;&#097;&#099;&#107;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">&#112;&#114;&#101;&#115;&#115;&#064;&#099;&#108;&#111;&#117;&#100;&#115;&#116;&#097;&#099;&#107;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;</a>.</li>
+  <li>Requests for approval will be acknowledged by a member of the PMC and approved automatically if no issues are raised 72 hours after acknowledgement.</li>
+  <li>Permission may be granted for requests that are intended to promote the Apache CloudStack project.</li>
+  <li>Permission will likely <em>not</em> be granted for requests that are indented to, or percieved to by the PMC, reflect negatively on Apache CloudStack.</li>
+  <li>Approval may be contingent on specific requested changed in how the mark(s) are applied.</li>
+</ul>
+
+<h2 id="websites">Websites</h2>
+
+<p>No additional guidelines are required above and beyond the 
+<a href="http://www.apache.org/foundation/marks/domains.html">Third Party Domain Name Branding Policy</a>. 
+In general:</p>
+
+<blockquote>
+  <p>you may not use Apache marks such as "ApacheFoo" or "Foo" in your own 
+domain names if that use would be likely to confuse a relevant consumer 
+about the source of software or services provided through your domain 
+with products or services provided by the Apache Foo project or the 
+Apache Software Foundation as a whole. You should apply the 
+"likelihood of confusion" test described in our 
+<a href="http://www.apache.org/foundation/marks/">formal Trademark Policy</a>, and 
+please realize that the use of Apache marks in third party domain 
+names is generally not "nominative fair use."</p>
+</blockquote>
+
+
+            <footer>
+                <p>Copyright © 2015 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>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9d662cb1/content/build/users.html
----------------------------------------------------------------------
diff --git a/content/build/users.html b/content/build/users.html
new file mode 100644
index 0000000..10f2aca
--- /dev/null
+++ b/content/build/users.html
@@ -0,0 +1,372 @@
+<!doctype html>
+<html>  
+  <head>
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
+
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
+  </head>
+  <body>
+    <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" alt="Apache Cloudstack"></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<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="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 <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</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="http://docs.cloudstack.apache.org" target="_blank">Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-installation" target="_blank">Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-administration" target="_blank">Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes" target="_blank">Release Notes</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="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</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>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack Users</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>The following organisations are known users of Apache CloudStack (or a commercial distribution of CloudStack)</p>
+
+<p>Our users include many major service providers running CloudStack to offer public cloud services, product vendors who incorporate or integrate with Cloudstack in their own products, organisations who have used Cloudstack to build their own private clouds, and systems integrators that offer CloudStack related services.</p>
+
+<p><strong>Are you using CloudStack ?</strong></p>
+
+<p>If you are using CloudStack in your organisation and your company is not listed here, please complete our brief adoption <a href="/survey.html">survey</a>. We’re happy to keep your company name anonymous if you require.</p>
+
+<p><strong>Noticed Something wrong ?</strong></p>
+
+<p>If you noticed something wrong  with your entry here (or if you’d like us to remove it), please complete our adoption <a href="/survey.html">survey</a>. We will use the information you give us in this survey to update the contents of this page</p>
+
+<ul>
+  <li><a href="http://www.actonmagic.com">ActOnMagic</a></li>
+  <li><a href="http://www.appcore.com">Appcore</a></li>
+  <li><a href="http://www.ayaline.com">Ayaline</a></li>
+  <li><a href="http://btcloud.bt.com">BT</a></li>
+  <li><a href="http://www.cloudops.com">CloudOps</a></li>
+  <li><a href="http://www.companycloud.nl">DATACENTER Services</a></li>
+  <li><a href="http://www.datacentrix.co.za">DataCentrix</a></li>
+  <li><a href="http://www.datapipe.com">Datapipe</a></li>
+  <li><a href="http://www.dataways.gr">DATAWAYS SA</a></li>
+  <li><a href="http://www.enlanube.com.co">En La Nube</a></li>
+  <li><a href="http://www.exaserve.com">Exaserve</a></li>
+  <li><a href="http://inria.fr">INRIA</a></li>
+  <li><a href="http://kumo.com.co">Kumo</a></li>
+  <li><a href="http://m5cloud.com">M5 Hosting Inc</a></li>
+  <li><a href="http://nectar.org.au">Melbourne University</a></li>
+  <li><a href="http://neobitti.fi">Neobitti</a></li>
+  <li><a href="http://stacksquare.com">Overweb srl</a></li>
+  <li><a href="http://www.reliablenetworks.com">Reliable Networks</a></li>
+  <li><a href="http://www.redbridge.se">Redbridge</a></li>
+  <li><a href="https://www.safeswisscloud.ch">SafeSwiss Cloud</a></li>
+  <li><a href="http://www.sjcloud.cn/index.xhtml">SJC Inc</a></li>
+  <li><a href="http://tucha.ua">Tucha</a></li>
+  <li><a href="http://www.upcnet.es">UPCnet</a></li>
+  <li><a href="http://www.wirenc.com">wirenc.com</a></li>
+  <li><a href="http://youngsoft.com">Youngsoft Inc</a></li>
+  <li>
+    <p><a href="http://zeromachine.net">Zeromachine</a></p>
+  </li>
+  <li>1 degreenorth</li>
+  <li>5th Planet</li>
+  <li>Accudata Systems</li>
+  <li>Acentrix</li>
+  <li>ActiveEon</li>
+  <li>Add Value</li>
+  <li>Alcatel-Lucent</li>
+  <li>Amdocs</li>
+  <li>Amysta</li>
+  <li>Angani</li>
+  <li>Anolim</li>
+  <li>Apalia</li>
+  <li>Appcara Inc.</li>
+  <li>Appcore</li>
+  <li>Appdel</li>
+  <li>AppFirst</li>
+  <li>Apple</li>
+  <li>AppSphere</li>
+  <li>Ascenty</li>
+  <li>ASG</li>
+  <li>AST Modular</li>
+  <li>Autodesk</li>
+  <li>AXEKA</li>
+  <li>Axelaris</li>
+  <li>Backbone Technology</li>
+  <li>Bechtle AG</li>
+  <li>Bell Canada</li>
+  <li>BigREDGroup</li>
+  <li>British Telecom (BT)</li>
+  <li>BT Cloud</li>
+  <li>BT Engage IT</li>
+  <li>Business Connexion</li>
+  <li>CA Technologies</li>
+  <li>CANCOM</li>
+  <li>Caringo</li>
+  <li>Centracon</li>
+  <li>CentralWay</li>
+  <li>China Telecom</li>
+  <li>Citrix Systems</li>
+  <li>Clavis IT</li>
+  <li>Cloud3</li>
+  <li>CloudCentral</li>
+  <li>Cloudera</li>
+  <li>Cloudian, Inc.</li>
+  <li>CloudOps</li>
+  <li>Cloudsoft Corporation</li>
+  <li>Colt</li>
+  <li>COMBIS</li>
+  <li>COMLINE Computer + Softwarelösungen</li>
+  <li>COMPAREX</li>
+  <li>Comping</li>
+  <li>Computer Services Group</li>
+  <li>Contegix</li>
+  <li>Control Circle</li>
+  <li>Convergence Group</li>
+  <li>CumuLogic, Inc</li>
+  <li>Datacentrix</li>
+  <li>Datapipe</li>
+  <li>DBR360</li>
+  <li>Dell</li>
+  <li>Digital China Advanced Systems</li>
+  <li>Disney</li>
+  <li>DU</li>
+  <li>e-Contact</li>
+  <li>Edmunds.com</li>
+  <li>Encloud</li>
+  <li>Ennit</li>
+  <li>EnterpriseDB</li>
+  <li>Entisys Solutions</li>
+  <li>Evry</li>
+  <li>EXA Serve</li>
+  <li>Exoscale</li>
+  <li>Experteq IT Services</li>
+  <li>FPG Technologies &amp; Solutions</li>
+  <li>Fritz &amp; Macziol</li>
+  <li>Fujitsu FIP Corporation</li>
+  <li>GigaSpaces Technologies</li>
+  <li>Globo.com</li>
+  <li>GreenQloud</li>
+  <li>Gridstore</li>
+  <li>Haaga Helia</li>
+  <li>Hillstone Networks, Inc</li>
+  <li>Hokkaido University</li>
+  <li>Homeaway</li>
+  <li>Host.net</li>
+  <li>Hostbill</li>
+  <li>Huawei</li>
+  <li>IDC Frontier</li>
+  <li>Ikoula</li>
+  <li>IndiQus Technologies</li>
+  <li>InMobi</li>
+  <li>Interoute</li>
+  <li>ISWest</li>
+  <li>Janz IT</li>
+  <li>Joe’s Cloud Computing</li>
+  <li>Juniper Networks</li>
+  <li>KDDI</li>
+  <li>KIVBF</li>
+  <li>KocSistem</li>
+  <li>Kommunale Informatoinsverarbeitung Baden-Franken</li>
+  <li>KT/Korea Telecom</li>
+  <li>Kumo</li>
+  <li>Kyuden Infocom</li>
+  <li>Kyushu University</li>
+  <li>LCS</li>
+  <li>LeaseWeb</li>
+  <li>Logicworks</li>
+  <li>Makro Factory oHG</li>
+  <li>MCPc</li>
+  <li>Microland Ltd</li>
+  <li>MittelstandsCLOUD</li>
+  <li>MK Netzdienste</li>
+  <li>NAMU Tech</li>
+  <li>NEOS</li>
+  <li>NetStandard</li>
+  <li>Networkers AG</li>
+  <li>Nokia</li>
+  <li>NTT</li>
+  <li>NVision Group</li>
+  <li>OpenERP</li>
+  <li>Opscode  (now Chef)</li>
+  <li>Orange</li>
+  <li>OverBright</li>
+  <li>Ozona Consulting</li>
+  <li>PCextreme</li>
+  <li>PosAm</li>
+  <li>PPTV</li>
+  <li>PromonLogicalis</li>
+  <li>Proteus</li>
+  <li>Quality Software (Hostbill)</li>
+  <li>RealCloud (PKN)</li>
+  <li>Redapt</li>
+  <li>RedBridge</li>
+  <li>RightScale, Inc.</li>
+  <li>Royal Melbourne Institute of Technology (RMIT)</li>
+  <li>Safe Swiss Cloud</li>
+  <li>SAP</li>
+  <li>Scalr</li>
+  <li>Schuberg Philis</li>
+  <li>ScienceLogic, Inc.</li>
+  <li>SCSK</li>
+  <li>sepago GmbH</li>
+  <li>ShapeBlue</li>
+  <li>Shopzilla</li>
+  <li>Slovak Telekom</li>
+  <li>SoftLayer</li>
+  <li>SoftwareONE</li>
+  <li>SolidFire</li>
+  <li>SSI</li>
+  <li>StackIQ</li>
+  <li>Stratosec</li>
+  <li>SunGard AS</li>
+  <li>SwiftStack</li>
+  <li>Taiwan Mobile</li>
+  <li>Targus Technologies</li>
+  <li>Tata</li>
+  <li>Tendril</li>
+  <li>TNTG Limited</li>
+  <li>TomTom</li>
+  <li>Trader Media Group</li>
+  <li>TrendMicro/TCloud Computing</li>
+  <li>UniSystems</li>
+  <li>University of Melbourne</li>
+  <li>University of Sao Paolo</li>
+  <li>UShareSoft</li>
+  <li>Verio</li>
+  <li>Verizon</li>
+  <li>Vision Solutions, Inc.</li>
+  <li>VMTurbo</li>
+  <li>WebMD</li>
+  <li>X-IO Technologies</li>
+  <li>Xtendsys</li>
+  <li>Zajil Telecom</li>
+  <li>Zenoss</li>
+  <li>Zynga</li>
+</ul>
+
+
+
+            <footer>
+                <p>Copyright © 2015 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>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9d662cb1/content/build/videos.html
----------------------------------------------------------------------
diff --git a/content/build/videos.html b/content/build/videos.html
new file mode 100644
index 0000000..cbcf8db
--- /dev/null
+++ b/content/build/videos.html
@@ -0,0 +1,162 @@
+<!doctype html>
+<html>  
+  <head>
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
+
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
+  </head>
+  <body>
+    <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" alt="Apache Cloudstack"></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<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="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 <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</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="http://docs.cloudstack.apache.org" target="_blank">Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-installation" target="_blank">Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-administration" target="_blank">Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes" target="_blank">Release Notes</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="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</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>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <h2 id="i-classicon-filmi-videos-and-screencasts-on-apache-cloudstack"><i class="icon-film"></i> Videos and Screencasts on Apache CloudStack</h2>
+
+<p>Looking for more info on Apache CloudStack? We've collected a number of videos that explore and explain Apache CloudStack.</p>
+
+<h3 id="introduction-to-apache-cloudstack">Introduction to Apache CloudStack</h3>
+
+<p>A short introduction to Apache CloudStack, and some of the people who help create it.</p>
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/oJ4b8HFmFTc" frameborder="0" allowfullscreen=""></iframe>
+
+<h3 id="apache-cloudstack-architecture-part-1">Apache CloudStack Architecture (Part 1)</h3>
+
+<p>Chiradeep Vittal discusses Apache CloudStack's architecture at a CloudStack Developer On-Ramp. The first of two videos.</p>
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/D1K_8rvDhic" frameborder="0" allowfullscreen=""></iframe>
+
+<h3 id="apache-cloudstack-architecture-part-2">Apache CloudStack Architecture (Part 2)</h3>
+
+<p>Alex Huang talks about CloudStack architecture at a CloudStack Developer On-Ramp. This is the second of two videos.</p>
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/uSwisRfJVdM" frameborder="0" allowfullscreen=""></iframe>
+
+
+
+            <footer>
+                <p>Copyright © 2015 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>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9d662cb1/content/build/who.html
----------------------------------------------------------------------
diff --git a/content/build/who.html b/content/build/who.html
new file mode 100644
index 0000000..aaee11a
--- /dev/null
+++ b/content/build/who.html
@@ -0,0 +1,355 @@
+<!doctype html>
+<html>  
+  <head>
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
+
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
+  </head>
+  <body>
+    <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" alt="Apache Cloudstack"></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<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="http://planet.apache.org/cloudstack/" target="_blank">Planet</a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="http://cloudstack.apache.org/software/features.html" target="_blank">Features<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="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 <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</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="http://docs.cloudstack.apache.org" target="_blank">Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-installation" target="_blank">Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-administration" target="_blank">Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes" target="_blank">Release Notes</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="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</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>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <!-- ordering is by username
+PMC members are listed in both the PMC member section and the Committer section
+-->
+
+<div class="row">
+
+<div class="col-lg-12">
+
+<div class="page-header">
+
+<h1 id="indicators">Apache CloudStack: Project Membership</h1>
+
+</div>
+
+</div>
+
+</div>
+
+<p>This page includes all of the Apache CloudStack Project Management Committee (PMC) members and committers, and their ASF usernames.</p>
+
+<h2 id="pmc">PMC</h2>
+
+<p>** Alex Huang ** (ahuang)</p>
+
+<p>** Alex Karasulu ** (akarasulu)</p>
+
+<p>** Alena Prokharchyk ** (alena1108)</p>
+
+<p>** Animesh ** (animesh)</p>
+
+<p>** Chip Childers ** (chipchilders)</p>
+
+<p>** Chiradeep Vittal ** (chiradeep)</p>
+
+<p>** Daan ** (dahn)</p>
+
+<p>** Ian Duffy ** (duffy)</p>
+
+<p>** Disheng Su ** (edison)</p>
+
+<p>** Giles Sirett ** (giles)</p>
+
+<p>** Go Chiba ** (gochiba)</p>
+
+<p>** Matt Richard Hogstrom ** (hogstrom)</p>
+
+<p>** Hugo Trippaers ** (hugo)</p>
+
+<p>** Ilya Musayev ** (ilya)</p>
+
+<p>** John Burwell ** (jburwell)</p>
+
+<p>** Jim Jagielski ** (jim)</p>
+
+<p>** John Kinsella ** (jlk)</p>
+
+<p>** Joe Brockmeier ** (jzb)</p>
+
+<p>** David Nalley ** (ke4qqq)</p>
+
+<p>** Kevin Kluge ** (kluge)</p>
+
+<p>** Marcus Sorensen ** (mlsorensen)</p>
+
+<p>** Mohammad Nour El-Din ** (mnour)</p>
+
+<p>** Mark R. Hinkle ** (mrhinkle)</p>
+
+<p>** Mike Tutkowski ** (mtutkowski)</p>
+
+<p>** Noah Slater ** (nslater)</p>
+
+<p>** Olivier Lamy ** (olamy)</p>
+
+<p>** Pierre-Luc Dion ** (pdion891)</p>
+
+<p>** Rajani Karuturi ** (rajani)</p>
+
+<p>** Sebastien Goasguen ** (sebgoa)</p>
+
+<p>** Prasanna ** (tsp)</p>
+
+<p>** Wido den Hollander ** (widodh)</p>
+
+<p>** William Chan ** (willchan)</p>
+
+<h2 id="committers">Committers</h2>
+
+<p>** Ahmad Emneina ** (ahmad)</p>
+
+<p>** Amogh Vasekar ** (amoghvk)</p>
+
+<p>** Anthony Xu ** (anthonyxu)</p>
+
+<p>** Abhinandan Prateek ** (aprateek)</p>
+
+<p>** Brian Federle ** (bfederle)</p>
+
+<p>** Rohit Yadav ** (bhaisaab)</p>
+
+<p>** Brett Porter ** (brett)</p>
+
+<p>** Clayton Weise ** (claytonweise)</p>
+
+<p>** Chris Suich ** (csuich2)</p>
+
+<p>** Darren Shepherd ** (darren)</p>
+
+<p>** Dave Cahill ** (dcahill)</p>
+
+<p>** Demetrius Tsitrelis ** (demetriust)</p>
+
+<p>** Devdeep Singh ** (devdeep)</p>
+
+<p>** Xin Zhang ** (frankzhang)</p>
+
+<p>** Gavin Lee ** (gavinlee)</p>
+
+<p>** Girish Prabhakar Shilamkar ** (girish)</p>
+
+<p>** Toshiaki Hatano ** (haeena)</p>
+
+<p>** Geoff Higginbottom ** (higster)</p>
+
+<p>** Isaac Chiang ** (isaacchiang)</p>
+
+<p>** Jayapal ** (jayapal)</p>
+
+<p>** Jason Bausewein ** (jbausewein)</p>
+
+<p>** Jessica Wang ** (jessicawang)</p>
+
+<p>** Jessica Tomechak ** (jtomechak)</p>
+
+<p>** Hiroaki Kawai ** (kawai)</p>
+
+<p>** Kelcey Damage ** (kdamage)</p>
+
+<p>** Kelven Yang ** (kelveny)</p>
+
+<p>** Kirk Kosinski ** (kirk)</p>
+
+<p>** Kishan ** (kishan)</p>
+
+<p>** Laszlo Hornyak ** (kocka)</p>
+
+<p>** Koushik Das ** (koushik)</p>
+
+<p>** Likitha Shetty ** (likithas)</p>
+
+<p>** Min Chen ** (mchen)</p>
+
+<p>** Mice Xia ** (mice)</p>
+
+<p>** Bruno Demion ** (milamber)</p>
+
+<p>** Murali Mohan Reddy ** (muralireddy)</p>
+
+<p>** Nitin ** (nitin)</p>
+
+<p>** Noa Resare ** (noa)</p>
+
+<p>** Nux ** (nux)</p>
+
+<p>** Olga Smola ** (olgasmola)</p>
+
+<p>** Paul Angus ** (paul_a)</p>
+
+<p>** Phong Nguyen ** (pnguyen)</p>
+
+<p>** Prachi Damle ** (prachidamle)</p>
+
+<p>** Pranav Saxena ** (pranavs)</p>
+
+<p>** Radhika Nair ** (radhika)</p>
+
+<p>** Rajesh Battala ** (rajeshbattala)</p>
+
+<p>** Sailaja Mada ** (sailajamada)</p>
+
+<p>** Saksham Srivastava ** (saksham)</p>
+
+<p>** Sangeetha Hariharan ** (sangeethah)</p>
+
+<p>** Sanjay Tripathi ** (sanjaytripathi)</p>
+
+<p>** Sanjeev Neelarapu ** (sanjeev)</p>
+
+<p>** Santhosh ** (santhoshedukulla)</p>
+
+<p>** Sateesh Chodapuneedi ** (sateesh)</p>
+
+<p>** Sonny Heng Chhen ** (schhen)</p>
+
+<p>** Sam Robertson ** (slriv)</p>
+
+<p>** Sowmya Krishnan ** (sowmya)</p>
+
+<p>** Sudhap ** (sudhap)</p>
+
+<p>** Venkata Swamy ** (swamy)</p>
+
+<p>** Will Stevens ** (swill)</p>
+
+<p>** Srikanteswararao Talluri ** (talluri)</p>
+
+<p>** Anh Tu Nguyen ** (tuna)</p>
+
+<p>** Vijayendra Bhamidipati ** (vijayendrabvs)</p>
+
+<p>** Wei Zhou ** (weizhou)</p>
+
+<p>** Sheng Yang ** (yasker)</p>
+
+<p>** Yoshikazu Nojima ** (ynojima)</p>
+
+
+            <footer>
+                <p>Copyright © 2015 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>

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/9d662cb1/source/users.markdown
----------------------------------------------------------------------
diff --git a/source/users.markdown b/source/users.markdown
index 86235f7..5fa9e57 100644
--- a/source/users.markdown
+++ b/source/users.markdown
@@ -22,7 +22,7 @@ Our users include many major service providers running CloudStack to offer publi
 
 **Are you using CloudStack ?**
 
-If you are using CloudStack in your organisation and your company isn’t listed here, please complete our brief adoption [survey](/survey.html). We’re happy to keep your company name anonymous if you require.
+If you are using CloudStack in your organisation and your company is not listed here, please complete our brief adoption [survey](/survey.html). We’re happy to keep your company name anonymous if you require.
 
 **Noticed Something wrong ?**