You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/12/17 14:15:06 UTC

svn commit: r1646231 [1/3] - in /incubator/brooklyn/site: ./ community/ documentation/ quickstart/

Author: heneveld
Date: Wed Dec 17 13:15:05 2014
New Revision: 1646231

URL: http://svn.apache.org/r1646231
Log:
copied across old versions, updated website in root from merged files, and added v/latest and 0.7.0-SNAPSHOT

Modified:
    incubator/brooklyn/site/community/committers.html
    incubator/brooklyn/site/community/how-to-contribute-docs.html
    incubator/brooklyn/site/community/how-to-contribute.html
    incubator/brooklyn/site/community/index.html
    incubator/brooklyn/site/community/migrate-to-apache.html
    incubator/brooklyn/site/documentation.html
    incubator/brooklyn/site/documentation/increase-entropy.html
    incubator/brooklyn/site/documentation/install-on-server.html
    incubator/brooklyn/site/documentation/passwordless-ssh.html
    incubator/brooklyn/site/documentation/ssh-key.html
    incubator/brooklyn/site/download.html
    incubator/brooklyn/site/glossary.html
    incubator/brooklyn/site/index.html
    incubator/brooklyn/site/quickstart/catalog.xml
    incubator/brooklyn/site/quickstart/index.html
    incubator/brooklyn/site/quickstart/policies-and-catalogs.html

Modified: incubator/brooklyn/site/community/committers.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/committers.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/community/committers.html (original)
+++ incubator/brooklyn/site/community/committers.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
 <title>Committer's Guide - Apache Brooklyn (incubating)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
 </head>
 
 <body>
@@ -23,7 +23,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+                <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
                 <ul class="nav navbar-nav navbar-right">
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+                    <li class="dropdown">
+                        <a href="/learnmore/index.html">learn more</a>
+                        <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/learnmore/index.html">Learn More</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- learnmore -->
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+                    <li class=""><a href="/download.html">download</a></li><!-- download -->
                     
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+                        <a href="/quickstart/index.html">get started</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/quickstart/index.html">Get Started</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+                                <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
                             </li>
                             
                         </ul>
@@ -53,15 +74,23 @@
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <a href="/documentation.html">documentation</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/documentation.html">All Documentation</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/v/latest">User Guide</a>
+                            </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                                <a href="/glossary.html">Glossary</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                                <a href="/documentation/install-on-server.html">Installing on a Server</a>
                             </li>
                             
                         </ul>
@@ -69,28 +98,32 @@
                     
                     
                     
-                    <li class="dropdown active">
-                        <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+                    <li class="dropdown">
+                        <a href="/community/index.html">community</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/community/index.html">Community Home</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+                                <a href="/community/how-to-contribute.html">How to Contribute</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+                                <a href="/community/migrate-to-apache.html">How to Migrate</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+                                <a href="/community/committers.html">Committer's Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+                                <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
                             </li>
                             
                         </ul>
-                    </li><!-- community -->
+                    </li><!-- website/community -->
                     
                     
                 </ul>
@@ -225,15 +258,15 @@ committers</a></li>
         <div class="col-md-3">
             
             <div class="list-group">
-                <h4><a href="https://brooklyn.incubator.apache.org/community/index.html" class="list-group-item">Community</a></h4>
+                <h4><a href="/community/index.html" class="list-group-item">Community</a></h4>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html" class="list-group-item">How to contribute</a>
+                <a href="/community/how-to-contribute.html" class="list-group-item">How to Contribute</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html" class="list-group-item">How to migrate your brooklyncentral fork to Apache</a>
+                <a href="/community/migrate-to-apache.html" class="list-group-item">How to Migrate</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/committers.html" class="list-group-item active">Committer's Guide</a>
+                <a href="/community/committers.html" class="list-group-item active">Committer's Guide</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html" class="list-group-item">How to contribute documentation</a>
+                <a href="/community/how-to-contribute-docs.html" class="list-group-item">How to Contribute Documentation</a>
                 
             </div>
             
@@ -252,9 +285,9 @@ committers</a></li>
                 Foundation.
             </div>
             <div class="col-md-2">
-                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/community/committers.md">Edit This Page</a>
+                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/community/committers.md">Edit This Page</a>
                 <br />
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+                <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
             </div>
         </div>
     </div>
@@ -263,6 +296,7 @@ committers</a></li>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
 <script language="JavaScript" type="application/javascript">
     $(window).resize(function () { 
         $('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -274,5 +308,6 @@ committers</a></li>
         $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
     });</script>
 </body>
+
 </html>
 

Modified: incubator/brooklyn/site/community/how-to-contribute-docs.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/how-to-contribute-docs.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/community/how-to-contribute-docs.html (original)
+++ incubator/brooklyn/site/community/how-to-contribute-docs.html Wed Dec 17 13:15:05 2014
@@ -2,12 +2,12 @@
 <html lang="en">
 
 <head>
-<title>How to contribute documentation - Apache Brooklyn (incubating)</title>
+<title>How to Contribute Documentation - Apache Brooklyn (incubating)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
 </head>
 
 <body>
@@ -23,7 +23,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+                <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
                 <ul class="nav navbar-nav navbar-right">
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+                    <li class="dropdown">
+                        <a href="/learnmore/index.html">learn more</a>
+                        <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/learnmore/index.html">Learn More</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- learnmore -->
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+                    <li class=""><a href="/download.html">download</a></li><!-- download -->
                     
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+                        <a href="/quickstart/index.html">get started</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/quickstart/index.html">Get Started</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+                                <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
                             </li>
                             
                         </ul>
@@ -53,15 +74,23 @@
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <a href="/documentation.html">documentation</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/documentation.html">All Documentation</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                                <a href="/v/latest">User Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                                <a href="/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/documentation/install-on-server.html">Installing on a Server</a>
                             </li>
                             
                         </ul>
@@ -69,28 +98,32 @@
                     
                     
                     
-                    <li class="dropdown active">
-                        <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+                    <li class="dropdown">
+                        <a href="/community/index.html">community</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/community/index.html">Community Home</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+                                <a href="/community/how-to-contribute.html">How to Contribute</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+                                <a href="/community/migrate-to-apache.html">How to Migrate</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+                                <a href="/community/committers.html">Committer's Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+                                <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
                             </li>
                             
                         </ul>
-                    </li><!-- community -->
+                    </li><!-- website/community -->
                     
                     
                 </ul>
@@ -102,23 +135,34 @@
 <div class="container">
     <div class="row">
         <div class="col-md-9">
-            <h1>How to contribute documentation</h1>
-            <p>Welcome and thank you for your interest in contributing to Apache Brooklyn! This guide will take you through the
+            <h1>How to Contribute Documentation</h1>
+            <!-- TODO do we want this page?  can be simplified a lot since the process is identical as for how-to-contribute,
+     with the exception of the "Edit this Page" (and reminder we can accept small changes without CLA or Jira);
+     we could promote much of the content from README.md to here... -->
+
+<p>Welcome and thank you for your interest in contributing to Apache Brooklyn! This guide will take you through the
 process of making contributions to the Apache Brooklyn website and documentation.</p>
 
 <h2 id="two-types-of-documentation">Two types of documentation</h2>
 
+<p>The Brooklyn docs live in the <strong>docs</strong> project in the Brooklyn codebase,
+built using standard jekyll/markdown with a few extensions.</p>
+
 <p>The Brooklyn documentation is split into two parts:</p>
 
 <ul>
-  <li><strong>The main website and shared documentation</strong>. This covers the root website
-and all pages that are not part of the version-specific user manual. This
-guide describes how to work with this documentation.</li>
-  <li><strong>Version-specific user manual</strong>. These pages have a URL with a path that
-begins /v/<em>version-number</em> - for example,
-https://brooklyn.incubator.apache.org/v/0.7.0-M1. This documentation is part
-of the main source code, so please refer to the <a href="how-to-contribute.html">How to contribute source
-code</a> for help with modifying these pages.</li>
+  <li>
+    <p><strong>The main website and shared documentation</strong>. This covers the root website
+and all pages that are not part of the version-specific user guide.
+Content for this is in the <code>website</code> directory.</p>
+  </li>
+  <li>
+    <p><strong>Version-specific user guide</strong>. These pages have a URL with a path that
+begins /v/<em>version-number</em>: for example,
+https://brooklyn.incubator.apache.org/v/0.7.0-SNAPSHOT and <!-- BROOKLYN-VERSION -->
+the special <em>latest</em> set at https://brooklyn.incubator.apache.org/v/latest .<br />
+Content for this is in the <code>guide</code> directory.</p>
+  </li>
 </ul>
 
 <h2 id="contributor-license-agreement">Contributor license agreement</h2>
@@ -173,7 +217,7 @@ the next section for information on this
 <h2 id="contributing-using-github">Contributing using GitHub</h2>
 
 <p>Our GitHub repository is located at
-<a href="https://github.com/apache/incubator-brooklyn-site">https://github.com/apache/incubator-brooklyn-site</a></p>
+<a href="https://github.com/apache/incubator-brooklyn">https://github.com/apache/incubator-brooklyn</a></p>
 
 <p>Your commit messages must properly describes the changes that have been made and
 their purpose (<a href="http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html">here are some
@@ -232,19 +276,25 @@ patches attached to a Jira issue.  Our c
 this will ensure that you are properly attributed as the author of the patch
 when a committer merges it.</p>
 
+<h2 id="for-more-information">For More Information</h2>
+
+<p>Advanced instructions for building, previewing and publishing docs are in a <code>README.md</code> file
+in the <code>docs</code> folder; see those instructions
+<a href="https://github.com/apache/incubator-brooklyn/tree/master/docs/README.md">here</a>.</p>
+
         </div>
         <div class="col-md-3">
             
             <div class="list-group">
-                <h4><a href="https://brooklyn.incubator.apache.org/community/index.html" class="list-group-item">Community</a></h4>
+                <h4><a href="/community/index.html" class="list-group-item">Community</a></h4>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html" class="list-group-item">How to contribute</a>
+                <a href="/community/how-to-contribute.html" class="list-group-item">How to Contribute</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html" class="list-group-item">How to migrate your brooklyncentral fork to Apache</a>
+                <a href="/community/migrate-to-apache.html" class="list-group-item">How to Migrate</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/committers.html" class="list-group-item">Committer's Guide</a>
+                <a href="/community/committers.html" class="list-group-item">Committer's Guide</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html" class="list-group-item active">How to contribute documentation</a>
+                <a href="/community/how-to-contribute-docs.html" class="list-group-item active">How to Contribute Documentation</a>
                 
             </div>
             
@@ -263,9 +313,9 @@ when a committer merges it.</p>
                 Foundation.
             </div>
             <div class="col-md-2">
-                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/community/how-to-contribute-docs.md">Edit This Page</a>
+                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/community/how-to-contribute-docs.md">Edit This Page</a>
                 <br />
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+                <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
             </div>
         </div>
     </div>
@@ -274,6 +324,7 @@ when a committer merges it.</p>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
 <script language="JavaScript" type="application/javascript">
     $(window).resize(function () { 
         $('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -285,5 +336,6 @@ when a committer merges it.</p>
         $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
     });</script>
 </body>
+
 </html>
 

Modified: incubator/brooklyn/site/community/how-to-contribute.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/how-to-contribute.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/community/how-to-contribute.html (original)
+++ incubator/brooklyn/site/community/how-to-contribute.html Wed Dec 17 13:15:05 2014
@@ -2,12 +2,12 @@
 <html lang="en">
 
 <head>
-<title>How to contribute - Apache Brooklyn (incubating)</title>
+<title>How to Contribute - Apache Brooklyn (incubating)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
 </head>
 
 <body>
@@ -23,7 +23,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+                <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
                 <ul class="nav navbar-nav navbar-right">
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+                    <li class="dropdown">
+                        <a href="/learnmore/index.html">learn more</a>
+                        <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/learnmore/index.html">Learn More</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- learnmore -->
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+                    <li class=""><a href="/download.html">download</a></li><!-- download -->
                     
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+                        <a href="/quickstart/index.html">get started</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/quickstart/index.html">Get Started</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+                                <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
                             </li>
                             
                         </ul>
@@ -53,15 +74,23 @@
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <a href="/documentation.html">documentation</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/documentation.html">All Documentation</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/v/latest">User Guide</a>
+                            </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                                <a href="/glossary.html">Glossary</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                                <a href="/documentation/install-on-server.html">Installing on a Server</a>
                             </li>
                             
                         </ul>
@@ -69,28 +98,32 @@
                     
                     
                     
-                    <li class="dropdown active">
-                        <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+                    <li class="dropdown">
+                        <a href="/community/index.html">community</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/community/index.html">Community Home</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+                                <a href="/community/how-to-contribute.html">How to Contribute</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+                                <a href="/community/migrate-to-apache.html">How to Migrate</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+                                <a href="/community/committers.html">Committer's Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+                                <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
                             </li>
                             
                         </ul>
-                    </li><!-- community -->
+                    </li><!-- website/community -->
                     
                     
                 </ul>
@@ -102,7 +135,7 @@
 <div class="container">
     <div class="row">
         <div class="col-md-9">
-            <h1>How to contribute</h1>
+            <h1>How to Contribute</h1>
             <p>Welcome and thank you for your interest in contributing to Apache Brooklyn! This guide will take you through the
 process of making contributions to the Apache Brooklyn code base.</p>
 
@@ -184,15 +217,15 @@ attributed as the author of the patch wh
         <div class="col-md-3">
             
             <div class="list-group">
-                <h4><a href="https://brooklyn.incubator.apache.org/community/index.html" class="list-group-item">Community</a></h4>
+                <h4><a href="/community/index.html" class="list-group-item">Community</a></h4>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html" class="list-group-item active">How to contribute</a>
+                <a href="/community/how-to-contribute.html" class="list-group-item active">How to Contribute</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html" class="list-group-item">How to migrate your brooklyncentral fork to Apache</a>
+                <a href="/community/migrate-to-apache.html" class="list-group-item">How to Migrate</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/committers.html" class="list-group-item">Committer's Guide</a>
+                <a href="/community/committers.html" class="list-group-item">Committer's Guide</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html" class="list-group-item">How to contribute documentation</a>
+                <a href="/community/how-to-contribute-docs.html" class="list-group-item">How to Contribute Documentation</a>
                 
             </div>
             
@@ -211,9 +244,9 @@ attributed as the author of the patch wh
                 Foundation.
             </div>
             <div class="col-md-2">
-                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/community/how-to-contribute.md">Edit This Page</a>
+                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/community/how-to-contribute.md">Edit This Page</a>
                 <br />
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+                <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
             </div>
         </div>
     </div>
@@ -222,6 +255,7 @@ attributed as the author of the patch wh
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
 <script language="JavaScript" type="application/javascript">
     $(window).resize(function () { 
         $('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -233,5 +267,6 @@ attributed as the author of the patch wh
         $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
     });</script>
 </body>
+
 </html>
 

Modified: incubator/brooklyn/site/community/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/index.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/community/index.html (original)
+++ incubator/brooklyn/site/community/index.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
 <title>Community - Apache Brooklyn (incubating)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
 </head>
 
 <body>
@@ -23,7 +23,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+                <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
                 <ul class="nav navbar-nav navbar-right">
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+                    <li class="dropdown">
+                        <a href="/learnmore/index.html">learn more</a>
+                        <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/learnmore/index.html">Learn More</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- learnmore -->
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+                    <li class=""><a href="/download.html">download</a></li><!-- download -->
                     
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+                        <a href="/quickstart/index.html">get started</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/quickstart/index.html">Get Started</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+                                <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
                             </li>
                             
                         </ul>
@@ -53,15 +74,23 @@
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <a href="/documentation.html">documentation</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/documentation.html">All Documentation</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                                <a href="/v/latest">User Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                                <a href="/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/documentation/install-on-server.html">Installing on a Server</a>
                             </li>
                             
                         </ul>
@@ -70,27 +99,31 @@
                     
                     
                     <li class="dropdown active">
-                        <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+                        <a href="/community/index.html">community</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/community/index.html">Community Home</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+                                <a href="/community/how-to-contribute.html">How to Contribute</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+                                <a href="/community/migrate-to-apache.html">How to Migrate</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+                                <a href="/community/committers.html">Committer's Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+                                <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
                             </li>
                             
                         </ul>
-                    </li><!-- community -->
+                    </li><!-- website/community -->
                     
                     
                 </ul>
@@ -182,15 +215,15 @@ around European daylight hours.</p>
         <div class="col-md-3">
             
             <div class="list-group">
-                <h4><a href="https://brooklyn.incubator.apache.org/community/index.html" class="list-group-item active">Community</a></h4>
+                <h4><a href="/community/index.html" class="list-group-item active">Community</a></h4>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html" class="list-group-item">How to contribute</a>
+                <a href="/community/how-to-contribute.html" class="list-group-item">How to Contribute</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html" class="list-group-item">How to migrate your brooklyncentral fork to Apache</a>
+                <a href="/community/migrate-to-apache.html" class="list-group-item">How to Migrate</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/committers.html" class="list-group-item">Committer's Guide</a>
+                <a href="/community/committers.html" class="list-group-item">Committer's Guide</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html" class="list-group-item">How to contribute documentation</a>
+                <a href="/community/how-to-contribute-docs.html" class="list-group-item">How to Contribute Documentation</a>
                 
             </div>
             
@@ -209,9 +242,9 @@ around European daylight hours.</p>
                 Foundation.
             </div>
             <div class="col-md-2">
-                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/community/index.md">Edit This Page</a>
+                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/community/index.md">Edit This Page</a>
                 <br />
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+                <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
             </div>
         </div>
     </div>
@@ -220,6 +253,7 @@ around European daylight hours.</p>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
 <script language="JavaScript" type="application/javascript">
     $(window).resize(function () { 
         $('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -231,5 +265,6 @@ around European daylight hours.</p>
         $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
     });</script>
 </body>
+
 </html>
 

Modified: incubator/brooklyn/site/community/migrate-to-apache.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/migrate-to-apache.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/community/migrate-to-apache.html (original)
+++ incubator/brooklyn/site/community/migrate-to-apache.html Wed Dec 17 13:15:05 2014
@@ -2,12 +2,12 @@
 <html lang="en">
 
 <head>
-<title>How to migrate your brooklyncentral fork to Apache - Apache Brooklyn (incubating)</title>
+<title>How to Migrate - Apache Brooklyn (incubating)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
 </head>
 
 <body>
@@ -23,7 +23,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+                <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
                 <ul class="nav navbar-nav navbar-right">
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+                    <li class="dropdown">
+                        <a href="/learnmore/index.html">learn more</a>
+                        <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/learnmore/index.html">Learn More</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- learnmore -->
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+                    <li class=""><a href="/download.html">download</a></li><!-- download -->
                     
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+                        <a href="/quickstart/index.html">get started</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/quickstart/index.html">Get Started</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+                                <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
                             </li>
                             
                         </ul>
@@ -53,15 +74,23 @@
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <a href="/documentation.html">documentation</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/documentation.html">All Documentation</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                                <a href="/v/latest">User Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                                <a href="/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/documentation/install-on-server.html">Installing on a Server</a>
                             </li>
                             
                         </ul>
@@ -70,27 +99,31 @@
                     
                     
                     <li class="dropdown active">
-                        <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+                        <a href="/community/index.html">community</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/community/index.html">Community Home</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+                                <a href="/community/how-to-contribute.html">How to Contribute</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+                                <a href="/community/migrate-to-apache.html">How to Migrate</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+                                <a href="/community/committers.html">Committer's Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+                                <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
                             </li>
                             
                         </ul>
-                    </li><!-- community -->
+                    </li><!-- website/community -->
                     
                     
                 </ul>
@@ -102,7 +135,7 @@
 <div class="container">
     <div class="row">
         <div class="col-md-9">
-            <h1>How to migrate your brooklyncentral fork to Apache</h1>
+            <h1>How to Migrate</h1>
             <p>Prior to our adoption by the Apache Incubator, Brooklyn was developed in a
 GitHub repository at <code>https://github.com/brooklyncentral/brooklyn</code>. If you
 already have a fork of this repository, follow this guide to smoothly shift
@@ -220,15 +253,15 @@ and mailing lists on our <a href="index.
         <div class="col-md-3">
             
             <div class="list-group">
-                <h4><a href="https://brooklyn.incubator.apache.org/community/index.html" class="list-group-item">Community</a></h4>
+                <h4><a href="/community/index.html" class="list-group-item">Community</a></h4>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html" class="list-group-item">How to contribute</a>
+                <a href="/community/how-to-contribute.html" class="list-group-item">How to Contribute</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html" class="list-group-item active">How to migrate your brooklyncentral fork to Apache</a>
+                <a href="/community/migrate-to-apache.html" class="list-group-item active">How to Migrate</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/committers.html" class="list-group-item">Committer's Guide</a>
+                <a href="/community/committers.html" class="list-group-item">Committer's Guide</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html" class="list-group-item">How to contribute documentation</a>
+                <a href="/community/how-to-contribute-docs.html" class="list-group-item">How to Contribute Documentation</a>
                 
             </div>
             
@@ -247,9 +280,9 @@ and mailing lists on our <a href="index.
                 Foundation.
             </div>
             <div class="col-md-2">
-                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/community/migrate-to-apache.md">Edit This Page</a>
+                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/community/migrate-to-apache.md">Edit This Page</a>
                 <br />
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+                <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
             </div>
         </div>
     </div>
@@ -258,6 +291,7 @@ and mailing lists on our <a href="index.
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
 <script language="JavaScript" type="application/javascript">
     $(window).resize(function () { 
         $('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -269,5 +303,6 @@ and mailing lists on our <a href="index.
         $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
     });</script>
 </body>
+
 </html>
 

Modified: incubator/brooklyn/site/documentation.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation.html (original)
+++ incubator/brooklyn/site/documentation.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
 <title>Documentation - Apache Brooklyn (incubating)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
 </head>
 
 <body>
@@ -23,7 +23,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+                <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
                 <ul class="nav navbar-nav navbar-right">
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+                    <li class="dropdown">
+                        <a href="/learnmore/index.html">learn more</a>
+                        <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/learnmore/index.html">Learn More</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- learnmore -->
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+                    <li class=""><a href="/download.html">download</a></li><!-- download -->
                     
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+                        <a href="/quickstart/index.html">get started</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/quickstart/index.html">Get Started</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+                                <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
                             </li>
                             
                         </ul>
@@ -53,15 +74,23 @@
                     
                     
                     <li class="dropdown active">
-                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <a href="/documentation.html">documentation</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/documentation.html">All Documentation</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/v/latest">User Guide</a>
+                            </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                                <a href="/glossary.html">Glossary</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                                <a href="/documentation/install-on-server.html">Installing on a Server</a>
                             </li>
                             
                         </ul>
@@ -70,27 +99,31 @@
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+                        <a href="/community/index.html">community</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/community/index.html">Community Home</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+                                <a href="/community/how-to-contribute.html">How to Contribute</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+                                <a href="/community/migrate-to-apache.html">How to Migrate</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+                                <a href="/community/committers.html">Committer's Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+                                <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
                             </li>
                             
                         </ul>
-                    </li><!-- community -->
+                    </li><!-- website/community -->
                     
                     
                 </ul>
@@ -108,23 +141,25 @@
 <p>Our main user manual is organised by release version. Please pick the version that you are using:</p>
 
 <ul>
-  <li><a href="https://brooklyn.incubator.apache.org/v/0.7.0-M1">0.7.0-M1</a> -
+  <li><a href="/v/0.7.0-M1">0.7.0-M1</a> -
 Please note that this release was made prior to entering the Apache Incubator,
 and therefore it is not endorsed by Apache.</li>
 </ul>
 
 <h2 id="server-install">Server install</h2>
-<p>Follow this <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">guide</a> to install Brooklyn on a production server.</p>
+<p>Follow this <a href="documentation/install-on-server.html">guide</a> to install Brooklyn on a production server.</p>
 
         </div>
         <div class="col-md-3">
             
             <div class="list-group">
-                <h4><a href="https://brooklyn.incubator.apache.org/documentation.html" class="list-group-item active">Documentation</a></h4>
+                <h4><a href="/documentation.html" class="list-group-item active">Documentation</a></h4>
                 
-                <a href="https://brooklyn.incubator.apache.org/glossary.html" class="list-group-item">Glossary</a>
+                <a href="/v/latest" class="list-group-item">User Guide</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html" class="list-group-item">Installing on a server</a>
+                <a href="/glossary.html" class="list-group-item">Glossary</a>
+                
+                <a href="/documentation/install-on-server.html" class="list-group-item">Installing on a Server</a>
                 
             </div>
             
@@ -143,9 +178,9 @@ and therefore it is not endorsed by Apac
                 Foundation.
             </div>
             <div class="col-md-2">
-                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/documentation.md">Edit This Page</a>
+                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/documentation.md">Edit This Page</a>
                 <br />
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+                <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
             </div>
         </div>
     </div>
@@ -154,6 +189,7 @@ and therefore it is not endorsed by Apac
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
 <script language="JavaScript" type="application/javascript">
     $(window).resize(function () { 
         $('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -165,5 +201,6 @@ and therefore it is not endorsed by Apac
         $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
     });</script>
 </body>
+
 </html>
 

Modified: incubator/brooklyn/site/documentation/increase-entropy.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation/increase-entropy.html?rev=1646231&r1=1646230&r2=1646231&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation/increase-entropy.html (original)
+++ incubator/brooklyn/site/documentation/increase-entropy.html Wed Dec 17 13:15:05 2014
@@ -5,9 +5,9 @@
 <title>Increase entropy - Apache Brooklyn (incubating)</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-<link href="https://brooklyn.incubator.apache.org/style/css/bootstrap-theme.css" rel="stylesheet">
-<link href="https://brooklyn.incubator.apache.org/style/css/theme.css" rel="stylesheet">
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="/style/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="/style/css/website.css" rel="stylesheet">
 </head>
 
 <body>
@@ -23,7 +23,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="https://brooklyn.incubator.apache.org"><img src="https://brooklyn.incubator.apache.org/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
+                <a class="navbar-brand" href="/"><img src="/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -31,20 +31,41 @@
                 <ul class="nav navbar-nav navbar-right">
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/learnmore.html">learn more</a></li><!-- learnmore -->
+                    <li class="dropdown">
+                        <a href="/learnmore/index.html">learn more</a>
+                        <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/learnmore/index.html">Learn More</a>
+                            </li>
+                            <li class="divider"></li>
+                            
+                            <li>
+                                <a href="/learnmore/yaml-explained.html">YAML Explained</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/learnmore/theory.html">The Theory behind Brooklyn</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- learnmore -->
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+                    <li class=""><a href="/download.html">download</a></li><!-- download -->
                     
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+                        <a href="/quickstart/index.html">get started</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/quickstart/index.html">Get Started</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+                                <a href="/quickstart/policies-and-catalogs.html">Policies and Catalogs</a>
                             </li>
                             
                         </ul>
@@ -53,15 +74,23 @@
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <a href="/documentation.html">documentation</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/documentation.html">All Documentation</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                                <a href="/v/latest">User Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                                <a href="/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="/documentation/install-on-server.html">Installing on a Server</a>
                             </li>
                             
                         </ul>
@@ -70,27 +99,31 @@
                     
                     
                     <li class="dropdown">
-                        <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+                        <a href="/community/index.html">community</a>
                         <ul class="dropdown-menu" role="menu">
+                            <li>
+                                <a href="/community/index.html">Community Home</a>
+                            </li>
+                            <li class="divider"></li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute.html">How to contribute</a>
+                                <a href="/community/how-to-contribute.html">How to Contribute</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/migrate-to-apache.html">How to migrate your brooklyncentral fork to Apache</a>
+                                <a href="/community/migrate-to-apache.html">How to Migrate</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/committers.html">Committer's Guide</a>
+                                <a href="/community/committers.html">Committer's Guide</a>
                             </li>
                             
                             <li>
-                                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">How to contribute documentation</a>
+                                <a href="/community/how-to-contribute-docs.html">How to Contribute Documentation</a>
                             </li>
                             
                         </ul>
-                    </li><!-- community -->
+                    </li><!-- website/community -->
                     
                     
                 </ul>
@@ -145,9 +178,9 @@ sudo ln -s /dev/urandom /dev/random</cod
                 Foundation.
             </div>
             <div class="col-md-2">
-                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/documentation/increase-entropy.md">Edit This Page</a>
+                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/website/documentation/increase-entropy.md">Edit This Page</a>
                 <br />
-                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+                <a href="http://0.0.0.0:4000/community/how-to-contribute-docs.html">help with editing</a>
             </div>
         </div>
     </div>
@@ -156,6 +189,7 @@ sudo ln -s /dev/urandom /dev/random</cod
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
 <script language="JavaScript" type="application/javascript">
     $(window).resize(function () { 
         $('body').css('padding-top', parseInt($('#header').css("height"))+10);
@@ -167,5 +201,6 @@ sudo ln -s /dev/urandom /dev/random</cod
         $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
     });</script>
 </body>
+
 </html>