brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject svn commit: r1625092 - in /incubator/brooklyn/site: ./ community/ documentation/ learnmore/catalog/ quickstart/
Date Mon, 15 Sep 2014 16:24:23 GMT
Author: richard
Date: Mon Sep 15 16:24:22 2014
New Revision: 1625092

URL: http://svn.apache.org/r1625092
Log:
Update Brooklyn website (git: incubator-brooklyn-site 5f27e05)

Added:
    incubator/brooklyn/site/documentation/
    incubator/brooklyn/site/documentation/increase-entropy.html
      - copied, changed from r1623386, incubator/brooklyn/site/documentation.html
    incubator/brooklyn/site/documentation/install-on-server.html
    incubator/brooklyn/site/documentation/passwordless-ssh.html
      - copied, changed from r1623386, incubator/brooklyn/site/documentation.html
    incubator/brooklyn/site/documentation/ssh-key.html
      - copied, changed from r1623386, incubator/brooklyn/site/documentation.html
    incubator/brooklyn/site/glossary.html
      - copied, changed from r1623386, incubator/brooklyn/site/quickstart/policies-and-catalogs.html
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/download.html
    incubator/brooklyn/site/index.html
    incubator/brooklyn/site/learnmore.html
    incubator/brooklyn/site/learnmore/catalog/index.html
    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=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/community/committers.html (original)
+++ incubator/brooklyn/site/community/committers.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     

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=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/community/how-to-contribute-docs.html (original)
+++ incubator/brooklyn/site/community/how-to-contribute-docs.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     

Modified: incubator/brooklyn/site/community/how-to-contribute.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/how-to-contribute.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/community/how-to-contribute.html (original)
+++ incubator/brooklyn/site/community/how-to-contribute.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     

Modified: incubator/brooklyn/site/community/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/index.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/community/index.html (original)
+++ incubator/brooklyn/site/community/index.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     
@@ -97,7 +110,7 @@
 
     <p>Our main discussion list is our <em>dev</em> list - here you can ask questions and get
 help with issues, ranging from basic getting started through to detailed
-questions about brooklyn’s internals.</p>
+questions about Brooklyn’s internals.</p>
 
     <p>To subscribe, send an email to:
 <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#098;&#114;&#111;&#111;&#107;&#108;&#121;&#110;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">&#100;&#101;&#118;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#098;&#114;&#111;&#111;&#107;&#108;&#121;&#110;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;</a></p>
@@ -115,13 +128,13 @@ and <a href="https://mail-archives.apach
 
     <h3 id="historical-lists">Historical lists</h3>
 
-    <p>Before brooklyn joined the Apache Incubator, we had lists hosted on Google
+    <p>Before Brooklyn joined the Apache Incubator, we had lists hosted on Google
 Groups. These lists are now deprecated and it’s no longer possible to subscribe
 or post, but you may find useful information in the archives.</p>
 
     <ul>
-      <li><a href="https://groups.google.com/forum/#!forum/brooklyn-dev">Old brooklyn users list archive</a></li>
-      <li><a href="https://groups.google.com/forum/#!forum/brooklyn-dev">Old brooklyn dev list archive</a></li>
+      <li><a href="https://groups.google.com/forum/#!forum/brooklyn-dev">Old Brooklyn users list archive</a></li>
+      <li><a href="https://groups.google.com/forum/#!forum/brooklyn-dev">Old Brooklyn dev list archive</a></li>
     </ul>
 
     <p>Once again, these lists are deprecated, so please subscribe to the Apache-hosted

Modified: incubator/brooklyn/site/community/migrate-to-apache.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/community/migrate-to-apache.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/community/migrate-to-apache.html (original)
+++ incubator/brooklyn/site/community/migrate-to-apache.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     

Modified: incubator/brooklyn/site/documentation.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation.html (original)
+++ incubator/brooklyn/site/documentation.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class="active"><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown active">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     
@@ -100,9 +113,21 @@ Please note that this release was made p
 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>
+
         </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>
+                
+                <a href="https://brooklyn.incubator.apache.org/glossary.html" class="list-group-item">Glossary</a>
+                
+                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html" class="list-group-item">Installing on a server</a>
+                
+            </div>
+            
         </div>
     </div>
 </div>

Copied: incubator/brooklyn/site/documentation/increase-entropy.html (from r1623386, incubator/brooklyn/site/documentation.html)
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation/increase-entropy.html?p2=incubator/brooklyn/site/documentation/increase-entropy.html&p1=incubator/brooklyn/site/documentation.html&r1=1623386&r2=1625092&rev=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation.html (original)
+++ incubator/brooklyn/site/documentation/increase-entropy.html Mon Sep 15 16:24:22 2014
@@ -2,7 +2,7 @@
 <html lang="en">
 
 <head>
-<title>Documentation - Apache Brooklyn (incubating)</title>
+<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">
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class="active"><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     
@@ -89,16 +102,30 @@
 <div class="container">
     <div class="row">
         <div class="col-md-9">
-            <h1>Documentation</h1>
-            <h2 id="official-user-manual">Official User Manual</h2>
+            <h1>Increase entropy</h1>
+            <p>If you are installing AMP on a virtual machine, you may find it useful to increase the Linux kernel entropy to speed up the ssh connections to the managed entities. You can install and configure <code>rng-tools</code> or just use /dev/urandom`.</p>
+
+<h3 id="installing-rng-tool">Installing rng-tool</h3>
+<p>if you are using a RHEL-based OS:</p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash">yum -y -q install rng-tools
+<span class="nb">echo</span> <span class="s2">&quot;EXTRAOPTIONS=\&quot;-r /dev/urandom\&quot;&quot;</span> <span class="p">|</span> cat &gt;&gt; /etc/sysconfig/rngd
+/etc/init.d/rngd start</code></pre></div>
+
+<p>if you are using a Debian-based OS:</p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash">apt-get -y install rng-tools
+<span class="nb">echo</span> <span class="s2">&quot;HRNGDEVICE=/dev/urandom&quot;</span> <span class="p">|</span> cat &gt;&gt; /etc/default/rng-tools
+/etc/init.d/rng-tools start</code></pre></div>
+
+<p>The following links contain further <a href="http://my.itwnik.com/how-to-increase-linux-kernel-entropy/">information for RHEL or CentOS</a>, and <a href="http://www.howtoforge.com/helping-the-random-number-generator-to-gain-enough-entropy-with-rng-tools-debian-lenny">Ubuntu</a>.</p>
+
+<h3 id="using-devurandom">Using /dev/urandom</h3>
+<p>You can also just mv /dev/random then create it again linked to /dev/urandom, by issuing the following commands:</p>
 
-<p>Our main user manual is organised by release version. Please pick the version that you are using:</p>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash">sudo mv /dev/random /dev/random-real
+sudo ln -s /dev/urandom /dev/random</code></pre></div>
 
-<ul>
-  <li><a href="https://brooklyn.incubator.apache.org/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>
 
         </div>
         <div class="col-md-3">
@@ -118,7 +145,7 @@ 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-site/edit/master/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>
             </div>

Added: incubator/brooklyn/site/documentation/install-on-server.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation/install-on-server.html?rev=1625092&view=auto
==============================================================================
--- incubator/brooklyn/site/documentation/install-on-server.html (added)
+++ incubator/brooklyn/site/documentation/install-on-server.html Mon Sep 15 16:24:22 2014
@@ -0,0 +1,258 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+<title>Installing on a server - 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">
+</head>
+
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top" id="header" role="navigation">
+    <div class="container">
+        <div class="container-fluid">
+            <!-- Brand and toggle get grouped for better mobile display -->
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <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>
+            </div>
+
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <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=""><a href="https://brooklyn.incubator.apache.org/download.html">download</a></li><!-- download -->
+                    
+                    
+                    
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html">Getting Started - Policies and Catalogs</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- getstarted -->
+                    
+                    
+                    
+                    <li class="dropdown active">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
+                    
+                    
+                    
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/community/index.html">community</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/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>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/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>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- community -->
+                    
+                    
+                </ul>
+            </div><!-- /.navbar-collapse -->
+        </div><!-- /.container-fluid -->
+    </div>
+</nav>
+
+<div class="container">
+    <div class="row">
+        <div class="col-md-9">
+            <h1>Installing on a server</h1>
+            <p>Here we present two <em>alternatives</em> to install Brooklyn:</p>
+
+<ul>
+  <li><a href="#script">Running the <em>installation script</em></a></li>
+  <li><a href="#manual">Manual installation</a></li>
+</ul>
+
+<h2 id="a-idscripta-running-the-installation-script"><a id="script"></a> Running the installation script</h2>
+<p>There is a simple bash script available to help with the installation process. </p>
+
+<h4 id="script-prerequisites">Script prerequisites</h4>
+<p>The script assumes that the server is a recent <em>RHEL/CentOS 6.x Linux</em> or <em>Ubuntu 12.04</em> installation, but other Linux variants have been tested successfully.</p>
+
+<p>The script will install Java 7 and other required packages if they are not present. You must have root access over <a href="https://brooklyn.incubator.apache.org/documentation/passwordless-ssh.html">passwordless SSH</a> to install brooklyn, but the service runs as an ordinary user once installed. </p>
+
+<p>To manage the brooklyn service you must also be able to connect to port 8081 remotely.</p>
+
+<p>Once the above prerequisites are satisfied, you should be able to run successfully:</p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>curl -o brooklyn-install.sh http://git.io/GzkOKQ
+<span class="nv">$ </span>chmod +x ./brooklyn-install.sh
+<span class="nv">$ </span>./brooklyn-install.sh -s -r &lt;your-server-ip&gt;</code></pre></div>
+
+<h2 id="a-idmanuala-manual-installation"><a id="manual"></a> Manual installation</h2>
+
+<ol>
+  <li><a href="#prerequisites">Set up the prerequisites</a></li>
+  <li><a href="#download">Download Brooklyn</a></li>
+  <li><a href="#configuring-properties">Configuring brooklyn.properties</a></li>
+  <li><a href="#configuring-catalog">Configuring catalog.xml</a></li>
+  <li><a href="#confirm">Test the installation</a></li>
+</ol>
+
+<h3 id="a-idprerequisitesaset-up-the-prerequisites"><a id="prerequisites"></a>Set up the prerequisites</h3>
+
+<p>Before installing Apache Brooklyn, you will need to configure the host as follows. </p>
+
+<ul>
+  <li>install Java JRE or SDK (version 6 or later)</li>
+  <li>install <a href="https://brooklyn.incubator.apache.org/documentation//ssh-key.html">SSH key</a>, if not available.</li>
+  <li>enable <a href="https://brooklyn.incubator.apache.org/documentation/passwordless-ssh.html">passwordless ssh login</a>.</li>
+  <li>create a <code>~/.brooklyn</code> directory on the host with <code>$ mkdir ~/.brooklyn</code></li>
+  <li>Check your iptables service, and if enabled, make sure that it accepts all incoming connections to 8443+ ports.</li>
+  <li>[optional] Increase <a href="https://brooklyn.incubator.apache.org/documentation//increase-entropy.html">linux kernel entropy</a> for faster ssh connections.</li>
+</ul>
+
+<h2 id="a-iddownloadadownload-brooklyn"><a id="download"></a>Download Brooklyn</h2>
+
+<p>Download the <a href="http://repo1.maven.org/maven2/io/brooklyn/brooklyn-dist/0.7.0-M1/brooklyn-dist-0.7.0-M1-dist.tar.gz">Brooklyn distribution</a> and expand it to your home directory ( <code>~/</code> ), or in a location of your choice. Other <a href="https://brooklyn.incubator.apache.org/download.html">download options</a> are available.</p>
+
+<p>Expand the <code>tar.gz</code> archive:</p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>tar -zxf brooklyn-dist-0.7.0-M1-dist.tar.gz</code></pre></div>
+
+<p>This will create a <code>brooklyn-0.7.0-M1</code> folder.</p>
+
+<p>Let’s setup some paths for easy commands.</p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span><span class="nb">cd </span>brooklyn-0.7.0-M1
+<span class="nv">$ BROOKLYN_DIR</span><span class="o">=</span><span class="s2">&quot;$(pwd)&quot;</span>
+<span class="nv">$ </span><span class="nb">export </span><span class="nv">PATH</span><span class="o">=</span><span class="nv">$PATH</span>:<span class="nv">$BROOKLYN_DIR</span>/bin/</code></pre></div>
+
+<h2 id="a-idconfiguring-propertiesaconfiguring-brooklynproperties"><a id="configuring-properties"></a>Configuring brooklyn.properties</h2>
+<p>Brooklyn deploys applications to Locations. <em>Locations</em> can be clouds, machines with fixed IPs or localhost (for testing).</p>
+
+<p>By default Brooklyn loads configuration parameters (including credentials for any cloud accounts) from </p>
+
+<p><code>~/.brooklyn/brooklyn.properties</code> </p>
+
+<p>The <code>brooklyn.properties</code> is the main configuration file for deployment locations. Contains the connection details and credentials for all public or on-premises cloud providers, as well as controlling some application startup and security options.</p>
+
+<p>Create a <code>.brooklyn</code> folder in your home directory and download the template <a href="../quickstart/brooklyn.properties">brooklyn.properties</a> to that folder.</p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>mkdir -p ~/.brooklyn
+<span class="nv">$ </span>wget -O ~/.brooklyn/brooklyn.properties https://brooklyn.incubator.apache.org/quickstart/brooklyn.properties
+<span class="nv">$ </span>chmod <span class="m">600</span> ~/.brooklyn/brooklyn.properties</code></pre></div>
+
+<p>You may need to edit <code>~/.brooklyn/brooklyn.properties</code> to ensure that brooklyn can access cloud locations for application deployment.</p>
+
+<h2 id="a-idconfiguring-catalogaconfiguring-catalogxml"><a id="configuring-catalog"></a>Configuring catalog.xml</h2>
+<p>By default Brooklyn loads the catalog of available application components and services from 
+<code>~/.brooklyn/catalog.xml</code>. </p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>wget -O ~/.brooklyn/catalog.xml https://brooklyn.incubator.apache.org/quickstart/catalog.xml</code></pre></div>
+
+<p>The <code>catalog.xml</code> is the application blueprint catalog. The above example file contains some blueprints which will be automatically downloaded from the web if you run them.</p>
+
+<p>You may need to edit <code>~/.brooklyn/catalog.xml</code> to update links to any resources for download.</p>
+
+<h2 id="a-idconfirmaconfirm-installation"><a id="confirm"></a>Confirm installation</h2>
+<p>We can do a quick test drive by launching Brooklyn:</p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>brooklyn launch</code></pre></div>
+
+<p>Brooklyn will output the address of the management interface:</p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash">INFO  Starting brooklyn web-console on loopback interface because no security config is <span class="nb">set</span>
+
+INFO  Started Brooklyn console at http://127.0.0.1:8081/, running classpath://brooklyn.war and <span class="o">[]</span></code></pre></div>
+
+<p>Stop Brooklyn with ctrl-c.</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">Documentation</a></h4>
+                
+                <a href="https://brooklyn.incubator.apache.org/glossary.html" class="list-group-item">Glossary</a>
+                
+                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html" class="list-group-item active">Installing on a server</a>
+                
+            </div>
+            
+        </div>
+    </div>
+</div>
+
+<div id="footer">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-10 text-muted">
+                Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+                License v2.0</a>.
+                <br />
+                Apache Brooklyn is currently undergoing Incubation at The Apache Software
+                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/install-on-server.md">Edit This Page</a>
+                <br />
+                <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<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);
+        $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
+    });
+    
+    $(window).load(function () { 
+        $('body').css('padding-top', parseInt($('#header').css("height"))+10);        
+        $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
+    });</script>
+</body>
+</html>
+

Copied: incubator/brooklyn/site/documentation/passwordless-ssh.html (from r1623386, incubator/brooklyn/site/documentation.html)
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation/passwordless-ssh.html?p2=incubator/brooklyn/site/documentation/passwordless-ssh.html&p1=incubator/brooklyn/site/documentation.html&r1=1623386&r2=1625092&rev=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation.html (original)
+++ incubator/brooklyn/site/documentation/passwordless-ssh.html Mon Sep 15 16:24:22 2014
@@ -2,7 +2,7 @@
 <html lang="en">
 
 <head>
-<title>Documentation - Apache Brooklyn (incubating)</title>
+<title>Passwordless SSH login - 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">
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class="active"><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     
@@ -89,16 +102,37 @@
 <div class="container">
     <div class="row">
         <div class="col-md-9">
-            <h1>Documentation</h1>
-            <h2 id="official-user-manual">Official User Manual</h2>
+            <h1>Passwordless SSH login</h1>
+            <p>To enable passwordless SSH login to a *nix server, first you will need a pair of keys. If you don’t already have a keypair generated you’ll first of all need to create one.
+To generate a new keypair you run the following command:</p>
+
+<pre><code>your-user@host1:~$ ssh-keygen -t rsa
+</code></pre>
+
+<p>This will prompt you for a location to save the keys, and a pass-phrase:</p>
+
+<pre><code>Generating public/private rsa key pair.
+Enter file in which to save the key (/home/skx/.ssh/id_rsa): 
+Enter passphrase (empty for no passphrase): 
+Enter same passphrase again: 
+Your identification has been saved in /home/skx/.ssh/id_rsa.
+Your public key has been saved in /home/skx/.ssh/id_rsa.pub.
+</code></pre>
+
+<p>Then, assuming that you want to enable passwordless SSH login to the <code>host2</code> server from <code>host1</code> with the <code>id_rsa</code> and <code>id_rsa.pub</code> files you’ve just generated you should run the following command:</p>
+
+<pre><code>your-user@host1:~$ ssh-copy-id -i ~/.ssh/id_rsa.pub username@host2
+</code></pre>
+
+<p>If <code>host1</code> doesn’t have <code>ssh-copy-id</code> installed, you can either install <code>ssh-copy-id</code> or manually copy the <code>id_rsa.pub</code> key to the <code>host2</code> by issuing the following commands:</p>
+
+<pre><code>host1# cat ~/.ssh/id_rsa.pub | ssh user@host2 'cat &gt;&gt; .ssh/authorized_keys'
+</code></pre>
 
-<p>Our main user manual is organised by release version. Please pick the version that you are using:</p>
+<p>or if you need to make a <code>.ssh</code> directory on <code>host2</code></p>
 
-<ul>
-  <li><a href="https://brooklyn.incubator.apache.org/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>
+<pre><code>host1#cat ~/.ssh/id_rsa.pub | ssh user@host2 'mkdir .ssh; chmod 700 .ssh; cat &gt;&gt; .ssh/authorized_keys; chmod 644 .ssh/authorized_keys'
+</code></pre>
 
         </div>
         <div class="col-md-3">
@@ -118,7 +152,7 @@ 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-site/edit/master/documentation/passwordless-ssh.md">Edit This Page</a>
                 <br />
                 <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
             </div>

Copied: incubator/brooklyn/site/documentation/ssh-key.html (from r1623386, incubator/brooklyn/site/documentation.html)
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/documentation/ssh-key.html?p2=incubator/brooklyn/site/documentation/ssh-key.html&p1=incubator/brooklyn/site/documentation.html&r1=1623386&r2=1625092&rev=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/documentation.html (original)
+++ incubator/brooklyn/site/documentation/ssh-key.html Mon Sep 15 16:24:22 2014
@@ -2,7 +2,7 @@
 <html lang="en">
 
 <head>
-<title>Documentation - Apache Brooklyn (incubating)</title>
+<title>SSH keys - 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">
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class="active"><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     
@@ -89,16 +102,10 @@
 <div class="container">
     <div class="row">
         <div class="col-md-9">
-            <h1>Documentation</h1>
-            <h2 id="official-user-manual">Official User Manual</h2>
-
-<p>Our main user manual is organised by release version. Please pick the version that you are using:</p>
+            <h1>SSH keys</h1>
+            <p>Brooklyn requires an SSH key, which will be used to connect to cloud VMs. By default Brooklyn will look for SSH keys named <code>~/.ssh/id_rsa</code> or <code>~/.ssh/id_dsa</code>. If you do not already have an SSH key installed, create a new key.</p>
 
-<ul>
-  <li><a href="https://brooklyn.incubator.apache.org/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>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>ssh-keygen -t rsa -N <span class="s2">&quot;&quot;</span> -f ~/.ssh/id_rsa</code></pre></div>
 
         </div>
         <div class="col-md-3">
@@ -118,7 +125,7 @@ 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-site/edit/master/documentation/ssh-key.md">Edit This Page</a>
                 <br />
                 <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
             </div>

Modified: incubator/brooklyn/site/download.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/download.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/download.html (original)
+++ incubator/brooklyn/site/download.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     

Copied: incubator/brooklyn/site/glossary.html (from r1623386, incubator/brooklyn/site/quickstart/policies-and-catalogs.html)
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/glossary.html?p2=incubator/brooklyn/site/glossary.html&p1=incubator/brooklyn/site/quickstart/policies-and-catalogs.html&r1=1623386&r2=1625092&rev=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/quickstart/policies-and-catalogs.html (original)
+++ incubator/brooklyn/site/glossary.html Mon Sep 15 16:24:22 2014
@@ -2,7 +2,7 @@
 <html lang="en">
 
 <head>
-<title>Getting Started - Policies and Catalogs - Apache Brooklyn (incubating)</title>
+<title>Glossary - 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">
@@ -39,7 +39,7 @@
                     
                     
                     
-                    <li class="dropdown active">
+                    <li class="dropdown">
                         <a href="https://brooklyn.incubator.apache.org/quickstart/index.html">get started</a>
                         <ul class="dropdown-menu" role="menu">
                             
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown active">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     
@@ -89,67 +102,89 @@
 <div class="container">
     <div class="row">
         <div class="col-md-9">
-            <h1>Getting Started - Policies and Catalogs</h1>
-            <p>In the <a href="index.html">previous step</a> we downloaded Brooklyn and used it to deploy an application to a cloud, but at its heart Brooklyn is a policy driven <em>management</em> plane.</p>
-
-<p>Here we will introduce Polices using a simple demo app, which we will load from a Service Catalog.</p>
-
-<h2 id="service-catalogs">Service Catalogs</h2>
+            <h1>Glossary</h1>
+            
+<h4 id="autonomic">Autonomic</h4>
 
-<p>Download the template <a href="catalog.xml">catalog.xml</a> to your <code>~/.brooklyn/</code> folder, and relaunch Brooklyn.</p>
+<p>Refers to the self-managing characteristics of distributed computing resources,
+adapting to unpredictable changes while hiding intrinsic complexity to
+operators and users.</p>
 
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span><span class="nb">cd</span> ~/.brooklyn
-<span class="nv">$ </span>wget https://brooklyn.incubator.apache.org/v/0.7.0-M1/use/guide/quickstart/catalog.xml
+<h4 id="blueprint">Blueprint</h4>
 
-<span class="nv">$ </span>brooklyn launch</code></pre></div>
+<p>A description of an application or system, which can be used for its automated
+deployment and runtime management. The blueprint describes a model of the
+application (i.e. its components, their configuration, and their
+relationships), along with policies for runtime management. The blueprint can
+be described in <a href="#yaml">YAML</a>.</p>
 
-<p>Now when we open the web console, two applications are displayed from the catalog.</p>
+<h6 id="see-also">See also</h6>
+<ul>
+  <li><a href="https://brooklyn.incubator.apache.org/learnmore/catalog/index.html">Documentation</a> for the entity,
+policy and enricher blueprints that Apache Brooklyn supports out-of-the-box.</li>
+</ul>
 
-<p>Select the ‘Demo Web Cluster with DB’ and click ‘Next’.</p>
+<h4 id="effector">Effector</h4>
 
-<p><a href="add-application-catalog-web-cluster-with-db-largea.png"><img src="images/add-application-catalog-web-cluster-with-db.png" alt="Viewing Catalog entries in Add Application dialog." /></a></p>
+<p>An operation on an <a href="#entity">entity</a>.</p>
 
-<p>Select the Location that Brooklyn should deploy to, and name your application:</p>
+<h4 id="entity">Entity</h4>
 
-<p><a href="images/add-application-catalog-web-cluster-with-db-location-large.png"><img src="images/add-application-catalog-web-cluster-with-db-location.png" alt="Selecting a location and application name." /></a></p>
+<p>A component of an application or system. This could be a physical component, a
+service, a grouping of components, or a logical construct describing part of an
+application/system. It is a “managed element” in autonomic computing parlance.</p>
 
-<p>Click ‘Finish’ to launch the application as before.</p>
+<h4 id="policy">Policy</h4>
 
-<h3 id="exploring-and-testing-policies">Exploring and Testing Policies</h3>
+<p>Part of an autonomic management system, performing runtime management. A policy
+is associated with an <a href="#entity">entity</a>; it normally manages the health of that entity
+or an associated group of entities (e.g. HA policies or auto-scaling policies).</p>
 
-<p>The Demo Web Cluster with DB application is pre-configured with two polices.</p>
+<h4 id="sensor">Sensor</h4>
 
-<p>The app server cluster has an <code>AutoScalerPolicy</code>, and the loadbalancer has a <code>targets</code> policy.</p>
+<p>An attribute of an <a href="#entity">entity</a>.</p>
 
-<p>Use the Applications tab in the web console to drill down into the Policies section of the ControlledDynamicWebAppCluster’s Cluster of JBoss7Servers.</p>
+<h4 id="yaml">YAML</h4>
 
-<p>You will see that the <code>AutoScalerPolicy</code> is running.</p>
+<p>A human-readable data format.</p>
 
-<p><a href="images/jboss7-cluster-policies-large.png"><img src="images/jboss7-cluster-policies.png" alt="Inspecting the jboss7 cluster policies." /></a></p>
+<h6 id="see-also-1">See also</h6>
+<ul>
+  <li><a href="http://en.wikipedia.org/wiki/YAML">Wikipedia article</a> on YAML</li>
+</ul>
 
-<p>This policy automatically scales the cluster up or down to be the right size for the cluster’s current load. (One server is the minimum size allowed by the policy.)</p>
+<h4 id="apache-jclouds">Apache Jclouds</h4>
 
-<p>The loadbalancer’s <code>targets</code> policy ensures that the loadbalancer is updated as the cluster size changes.</p>
+<p>An open source Java library that provides a consistent interface to many
+clouds. Apache Brooklyn uses Apache Jclouds as its core cloud abstraction.</p>
 
-<p>Sitting idle, this cluster will only contain one server, but you can use a tool like <a href="http://jmeter.apache.org/">jmeter</a> pointed at the nginx endpoint to create load on the cluster. (Download a <a href="https://github.com/brooklyncentral/brooklyn/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx">jmeter test plan</a>.)</p>
+<h6 id="see-also-2">See also</h6>
+<ul>
+  <li><a href="https://jclouds.apache.org/">Project homepage</a></li>
+</ul>
 
-<p>As load is added, Brooklyn requests a new cloud machine, creates a new app server, and adds it to the cluster. As load is removed, servers are removed from the cluster, and the infrastructure is handed back to the cloud.</p>
+<h4 id="camp-and-tosca">CAMP and TOSCA</h4>
 
-<h3 id="next">Next</h3>
+<p>OASIS Cloud Application Management for Platforms (CAMP) and OASIS Topology and
+Orchestration Specification for Cloud Applications (TOSCA) are specifications
+that aim to standardise the portability and management of cloud applications.</p>
 
-<p>The <a href="https://brooklyn.incubator.apache.org/v/0.7.0-M1/use/examples/webcluster/index.html">Elastic Web Cluster Example</a> page
-details how to build this demo application from scratch in Java. It shows in more detail how Brooklyn can
-complement your application with policy driven management, and how applications can be
-run from the command line.</p>
+<h6 id="see-also-3">See also</h6>
+<ul>
+  <li><a href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=camp">CAMP homepage</a></li>
+  <li><a href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=tosca">TOSCA homepage</a></li>
+</ul>
 
 
         </div>
         <div class="col-md-3">
             
             <div class="list-group">
-                <h4><a href="https://brooklyn.incubator.apache.org/quickstart/index.html" class="list-group-item">Getting Started</a></h4>
+                <h4><a href="https://brooklyn.incubator.apache.org/documentation.html" class="list-group-item">Documentation</a></h4>
+                
+                <a href="https://brooklyn.incubator.apache.org/glossary.html" class="list-group-item active">Glossary</a>
                 
-                <a href="https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html" class="list-group-item active">Getting Started - Policies and Catalogs</a>
+                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html" class="list-group-item">Installing on a server</a>
                 
             </div>
             
@@ -168,7 +203,7 @@ run from the command line.</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/quickstart/policies-and-catalogs.md">Edit This Page</a>
+                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/glossary.md">Edit This Page</a>
                 <br />
                 <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help with editing</a>
             </div>

Modified: incubator/brooklyn/site/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/index.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/index.html (original)
+++ incubator/brooklyn/site/index.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     
@@ -97,10 +110,10 @@
 
       <p><em>Blueprints</em> describe your application, stored as <em>text files</em> in <em>version control</em></p>
 
-      <p><em>Compose</em> from the <em>dozens</em> of app supported components or your <em>own components</em> using <em>bash, Java, Chef…</em></p>
+      <p><em>Compose</em> from the <a href="learnmore/catalog/"><em>dozens</em> of supported components</a> or your <em>own components</em> using <em>bash, Java, Chef…</em></p>
 
       <div class="text-muted">
-        <h4 id="jboss-bull-cassandra-bull-qpid-bull-nginx-bull-many-more">JBoss • Cassandra • QPid • nginx • many more</h4>
+        <h4 id="jboss-bull-cassandra-bull-qpid-bull-nginx-bull-many-morelearnmorecatalog">JBoss • Cassandra • QPid • nginx • <a href="learnmore/catalog/">many more</a></h4>
       </div>
 
     </div>

Modified: incubator/brooklyn/site/learnmore.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/learnmore.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/learnmore.html (original)
+++ incubator/brooklyn/site/learnmore.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     
@@ -227,9 +240,9 @@ lessons:</p>
 <ul>
   <li>The truth is in the code (not any ancillary documents)</li>
   <li>If it isn’t tested then assume it isn’t working</li>
-  <li>Toolchain integration and API’s are key to a project’s success</li>
+  <li>Toolchain integration and APIs are key to a project’s success</li>
   <li>Even more critical is empowering all stakeholders to a project</li>
-  <li>Brooklyn’s focus on blueprinting and modeling as code and API’s serves these
+  <li>Brooklyn’s focus on blueprinting and modeling as code and APIs serves these
 principles.</li>
 </ul>
 

Modified: incubator/brooklyn/site/learnmore/catalog/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/learnmore/catalog/index.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/learnmore/catalog/index.html (original)
+++ incubator/brooklyn/site/learnmore/catalog/index.html Mon Sep 15 16:24:22 2014
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -16,13 +17,14 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html lang="en">
   <head>
-    <title>Brooklyn Objects</title>
-    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
-    <link rel="stylesheet" href="items.css" type="text/css" media="screen"/>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="items.css" type="text/css" media="screen"/>
+    <title>Brooklyn Objects</title>
   </head>
 
   <body>
@@ -48,8 +50,8 @@ under the License.
       </div>
     </div>
 
-    <script src="../../style/js/underscore-min.js" type="text/javascript"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
+    <script src="../../style/js/underscore-min.js" type="text/javascript"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     <script src="common.js" type="text/javascript"></script>
     <script src="items.js" type="text/javascript"></script>

Modified: incubator/brooklyn/site/quickstart/index.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/quickstart/index.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/quickstart/index.html (original)
+++ incubator/brooklyn/site/quickstart/index.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     

Modified: incubator/brooklyn/site/quickstart/policies-and-catalogs.html
URL: http://svn.apache.org/viewvc/incubator/brooklyn/site/quickstart/policies-and-catalogs.html?rev=1625092&r1=1625091&r2=1625092&view=diff
==============================================================================
--- incubator/brooklyn/site/quickstart/policies-and-catalogs.html (original)
+++ incubator/brooklyn/site/quickstart/policies-and-catalogs.html Mon Sep 15 16:24:22 2014
@@ -52,7 +52,20 @@
                     
                     
                     
-                    <li class=""><a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a></li><!-- documentation -->
+                    <li class="dropdown">
+                        <a href="https://brooklyn.incubator.apache.org/documentation.html">documentation</a>
+                        <ul class="dropdown-menu" role="menu">
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/glossary.html">Glossary</a>
+                            </li>
+                            
+                            <li>
+                                <a href="https://brooklyn.incubator.apache.org/documentation/install-on-server.html">Installing on a server</a>
+                            </li>
+                            
+                        </ul>
+                    </li><!-- documentation -->
                     
                     
                     



Mime
View raw message