Modified: brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/bundle.html
URL: 
http://svn.apache.org/viewvc/brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/bundle.html?rev=1828892&r1=1828891&r2=1828892&view=diff
==============================================================================
--- brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/bundle.html (original)
+++ brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/bundle.html Wed Apr 11 
12:24:01 2018
@@ -50,7 +50,7 @@
 
     
         
-        <link rel="stylesheet" href="../../website-1509027295765.css">
+        <link rel="stylesheet" href="../../website-1523449269765.css">
         
     
         
@@ -1043,7 +1043,7 @@
                 <a href="../../locations/">
             
                     
-                    Deploying Blueprint
+                    Deploying Blueprints
             
                 </a>
             
@@ -1615,12 +1615,26 @@
             
         </li>
     
-        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrade.html">
+        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/">
+            
+                    
+                    Upgrades
+            
+                </a>
+            
+
+            
+            <ul class="articles">
+                
+    
+        <li class="chapter " data-level="1.7.13.1" 
data-path="../../ops/upgrades/">
             
-                <a href="../../ops/upgrade.html">
+                <a href="../../ops/upgrades/#upgrading-brooklyn">
             
                     
-                    Upgrade
+                    Upgrading Brooklyn
             
                 </a>
             
@@ -1628,6 +1642,37 @@
             
         </li>
     
+        <li class="chapter " data-level="1.7.13.2" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/#upgrading-blueprints-and-bundles">
+            
+                    
+                    Upgrading Blueprints
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7.13.3" 
data-path="../../ops/upgrades/">
+            
+                <a 
href="../../ops/upgrades/#upgrading-systems-under-management">
+            
+                    
+                    Upgrading Systems under Management
+            
+                </a>
+            
+
+            
+        </li>
+    
+
+            </ul>
+            
+        </li>
+    
         <li class="chapter " data-level="1.7.14" 
data-path="../../ops/security-guidelines.html">
             
                 <a href="../../ops/security-guidelines.html">
@@ -2094,8 +2139,9 @@
     
                                 <section class="normal markdown-section">
                                 
-                                <h1 id="bundling">Bundling</h1>
-<h3 id="bundling-catalog-resources">Bundling Catalog Resources</h3>
+<h1>Bundling</h1>
+
+                                <h3 id="bundling-catalog-resources">Bundling 
Catalog Resources</h3>
 <p>It is possible to upload catalog items and associated resources as a single 
bundle to AMP.
 This is useful when you have a <a href="../../GLOSSARY.html#blueprint" 
class="glossary-term" title="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
@@ -2209,6 +2255,7 @@ be described in YAML or Java.">blueprint
 <p><strong>Note</strong>: All three entities copy a file from 
<code>classpath://myfile.sh</code>, but as they are in different bundles, the 
scripts copied to the server will be different.</p>
 
                                 
+
                                 </section>
                             
     </div>
@@ -2240,7 +2287,7 @@ be described in YAML or Java.">blueprint
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            
gitbook.page.hasChanged({"page":{"title":"Bundling","level":"1.5.7.5","depth":3,"next":{"title":"Brooklyn
 Server Command Line 
Arguments","level":"1.5.7.6","depth":3,"path":"blueprints/catalog/cli.md","ref":"blueprints/catalog/cli.md","articles":[]},"previous":{"title":"Catalog
 
Management","level":"1.5.7.4","depth":3,"path":"blueprints/catalog/management.md","ref":"blueprints/catalog/management.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1509027295765.css","pdf":"pdf-1509027295792.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2},"hi
 
ghlight":{},"theme-api":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{"face
 
book":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","brookl
 
yn_library_git":"https://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/bundle.md","mtime":"2017-10-26T13:41:38.656Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-10-26T14:14:53.591Z"},"basePath":"../..","book":{"language":""}});
+            
gitbook.page.hasChanged({"page":{"title":"Bundling","level":"1.5.7.5","depth":3,"next":{"title":"Brooklyn
 Server Command Line 
Arguments","level":"1.5.7.6","depth":3,"path":"blueprints/catalog/cli.md","ref":"blueprints/catalog/cli.md","articles":[]},"previous":{"title":"Catalog
 
Management","level":"1.5.7.4","depth":3,"path":"blueprints/catalog/management.md","ref":"blueprints/catalog/management.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1523449269765.css","pdf":"pdf-1523449269817.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2},"hi
 
ghlight":{},"theme-api":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{"face
 
book":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","brookl
 
yn_library_git":"https://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/bundle.md","mtime":"2018-04-11T12:18:40.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-04-11T12:21:07.465Z"},"basePath":"../..","book":{"language":""}});
         });
     </script>
 </div>

Modified: brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/cli.html
URL: 
http://svn.apache.org/viewvc/brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/cli.html?rev=1828892&r1=1828891&r2=1828892&view=diff
==============================================================================
--- brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/cli.html (original)
+++ brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/cli.html Wed Apr 11 
12:24:01 2018
@@ -50,7 +50,7 @@
 
     
         
-        <link rel="stylesheet" href="../../website-1509027295765.css">
+        <link rel="stylesheet" href="../../website-1523449269765.css">
         
     
         
@@ -1043,7 +1043,7 @@
                 <a href="../../locations/">
             
                     
-                    Deploying Blueprint
+                    Deploying Blueprints
             
                 </a>
             
@@ -1615,12 +1615,26 @@
             
         </li>
     
-        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrade.html">
+        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/">
+            
+                    
+                    Upgrades
+            
+                </a>
+            
+
+            
+            <ul class="articles">
+                
+    
+        <li class="chapter " data-level="1.7.13.1" 
data-path="../../ops/upgrades/">
             
-                <a href="../../ops/upgrade.html">
+                <a href="../../ops/upgrades/#upgrading-brooklyn">
             
                     
-                    Upgrade
+                    Upgrading Brooklyn
             
                 </a>
             
@@ -1628,6 +1642,37 @@
             
         </li>
     
+        <li class="chapter " data-level="1.7.13.2" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/#upgrading-blueprints-and-bundles">
+            
+                    
+                    Upgrading Blueprints
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7.13.3" 
data-path="../../ops/upgrades/">
+            
+                <a 
href="../../ops/upgrades/#upgrading-systems-under-management">
+            
+                    
+                    Upgrading Systems under Management
+            
+                </a>
+            
+
+            
+        </li>
+    
+
+            </ul>
+            
+        </li>
+    
         <li class="chapter " data-level="1.7.14" 
data-path="../../ops/security-guidelines.html">
             
                 <a href="../../ops/security-guidelines.html">
@@ -2094,8 +2139,9 @@
     
                                 <section class="normal markdown-section">
                                 
-                                <h1 
id="brooklyn-server-command-line-arguments">Brooklyn Server Command Line 
Arguments</h1>
-<h3 id="brooklyn-server-command-line-arguments">Brooklyn Server Command Line 
Arguments</h3>
+<h1>Brooklyn Server Command Line Arguments</h1>
+
+                                <h3 
id="brooklyn-server-command-line-arguments">Brooklyn Server Command Line 
Arguments</h3>
 <p>The command line arguments when launching <code>brooklyn</code> include 
several commands for working with the catalog.</p>
 <ul>
 <li><code>--catalogAdd &lt;file.bom&gt;</code> will add the catalog items in 
the <code>bom</code> file</li>
@@ -2117,6 +2163,7 @@ if persistence is enabled and persistent
 TODO: make test cases from the code snippets here, and when building the docs 
assert that they match test cases
 -->
                                 
+
                                 </section>
                             
     </div>
@@ -2148,7 +2195,7 @@ TODO: make test cases from the code snip
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"Brooklyn Server Command 
Line Arguments","level":"1.5.7.6","depth":3,"next":{"title":"Clusters, Specs, 
and 
Composition","level":"1.5.8","depth":2,"path":"blueprints/clusters.md","ref":"blueprints/clusters.md","articles":[]},"previous":{"title":"Bundling","level":"1.5.7.5","depth":3,"path":"blueprints/catalog/bundle.md","ref":"blueprints/catalog/bundle.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1509027295765.css","pdf":"pdf-1509027295792.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2},"high
 
light":{},"theme-api":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{"facebo
 
ok":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","brooklyn
 
_library_git":"https://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/cli.md","mtime":"2017-10-26T13:41:38.657Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-10-26T14:14:53.591Z"},"basePath":"../..","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"Brooklyn Server Command 
Line Arguments","level":"1.5.7.6","depth":3,"next":{"title":"Clusters, Specs, 
and 
Composition","level":"1.5.8","depth":2,"path":"blueprints/clusters.md","ref":"blueprints/clusters.md","articles":[]},"previous":{"title":"Bundling","level":"1.5.7.5","depth":3,"path":"blueprints/catalog/bundle.md","ref":"blueprints/catalog/bundle.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1523449269765.css","pdf":"pdf-1523449269817.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2},"high
 
light":{},"theme-api":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{"facebo
 
ok":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","brooklyn
 
_library_git":"https://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/cli.md","mtime":"2018-04-11T12:18:40.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-04-11T12:21:07.465Z"},"basePath":"../..","book":{"language":""}});
         });
     </script>
 </div>

Modified: brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/index.html
URL: 
http://svn.apache.org/viewvc/brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/index.html?rev=1828892&r1=1828891&r2=1828892&view=diff
==============================================================================
--- brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/index.html (original)
+++ brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/index.html Wed Apr 11 
12:24:01 2018
@@ -50,7 +50,7 @@
 
     
         
-        <link rel="stylesheet" href="../../website-1509027295765.css">
+        <link rel="stylesheet" href="../../website-1523449269765.css">
         
     
         
@@ -1043,7 +1043,7 @@
                 <a href="../../locations/">
             
                     
-                    Deploying Blueprint
+                    Deploying Blueprints
             
                 </a>
             
@@ -1615,12 +1615,26 @@
             
         </li>
     
-        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrade.html">
+        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/">
+            
+                    
+                    Upgrades
+            
+                </a>
+            
+
+            
+            <ul class="articles">
+                
+    
+        <li class="chapter " data-level="1.7.13.1" 
data-path="../../ops/upgrades/">
             
-                <a href="../../ops/upgrade.html">
+                <a href="../../ops/upgrades/#upgrading-brooklyn">
             
                     
-                    Upgrade
+                    Upgrading Brooklyn
             
                 </a>
             
@@ -1628,6 +1642,37 @@
             
         </li>
     
+        <li class="chapter " data-level="1.7.13.2" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/#upgrading-blueprints-and-bundles">
+            
+                    
+                    Upgrading Blueprints
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7.13.3" 
data-path="../../ops/upgrades/">
+            
+                <a 
href="../../ops/upgrades/#upgrading-systems-under-management">
+            
+                    
+                    Upgrading Systems under Management
+            
+                </a>
+            
+
+            
+        </li>
+    
+
+            </ul>
+            
+        </li>
+    
         <li class="chapter " data-level="1.7.14" 
data-path="../../ops/security-guidelines.html">
             
                 <a href="../../ops/security-guidelines.html">
@@ -2094,8 +2139,9 @@
     
                                 <section class="normal markdown-section">
                                 
-                                <h1 id="catalog">Catalog</h1>
-<p>Apache Brooklyn provides a <strong>catalog</strong>, which is a persisted 
collection of versioned blueprints 
+<h1>Catalog</h1>
+
+                                <p>Apache Brooklyn provides a 
<strong>catalog</strong>, which is a persisted collection of versioned 
blueprints 
 and other resources. A set of blueprints is loaded from the 
<code>default.catalog.bom</code> in the Brooklyn 
 folder by default and additional ones can be added through the web console or 
CLI.  Blueprints in 
 the catalog can be deployed directly, via the Brooklyn CLI or the web console, 
or referenced in 
@@ -2110,6 +2156,7 @@ other blueprints using their <code>id</c
 </ul>
 
                                 
+
                                 </section>
                             
     </div>
@@ -2141,7 +2188,7 @@ other blueprints using their <code>id</c
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            
gitbook.page.hasChanged({"page":{"title":"Catalog","partial-summary-depth":1,"level":"1.5.7","depth":2,"next":{"title":"Catalog
 Items YAML 
Syntax","level":"1.5.7.1","depth":3,"path":"blueprints/catalog/schema.md","ref":"blueprints/catalog/schema.md","articles":[]},"previous":{"title":"Custom
 
Entities","level":"1.5.6","depth":2,"path":"blueprints/custom-entities.md","ref":"blueprints/custom-entities.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1509027295765.css","pdf":"pdf-1509027295792.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2
 
},"highlight":{},"theme-api":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{
 
"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","b
 
rooklyn_library_git":"https://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/index.md","mtime":"2017-10-26T13:41:38.658Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-10-26T14:14:53.591Z"},"basePath":"../..","book":{"language":""}});
+            
gitbook.page.hasChanged({"page":{"title":"Catalog","partial-summary-depth":1,"level":"1.5.7","depth":2,"next":{"title":"Catalog
 Items YAML 
Syntax","level":"1.5.7.1","depth":3,"path":"blueprints/catalog/schema.md","ref":"blueprints/catalog/schema.md","articles":[]},"previous":{"title":"Custom
 
Entities","level":"1.5.6","depth":2,"path":"blueprints/custom-entities.md","ref":"blueprints/custom-entities.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1523449269765.css","pdf":"pdf-1523449269817.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2
 
},"highlight":{},"theme-api":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{
 
"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","b
 
rooklyn_library_git":"https://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/index.md","mtime":"2018-04-11T12:18:40.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-04-11T12:21:07.465Z"},"basePath":"../..","book":{"language":""}});
         });
     </script>
 </div>

Modified: brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/management.html
URL: 
http://svn.apache.org/viewvc/brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/management.html?rev=1828892&r1=1828891&r2=1828892&view=diff
==============================================================================
--- brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/management.html (original)
+++ brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/management.html Wed Apr 
11 12:24:01 2018
@@ -50,7 +50,7 @@
 
     
         
-        <link rel="stylesheet" href="../../website-1509027295765.css">
+        <link rel="stylesheet" href="../../website-1523449269765.css">
         
     
         
@@ -1043,7 +1043,7 @@
                 <a href="../../locations/">
             
                     
-                    Deploying Blueprint
+                    Deploying Blueprints
             
                 </a>
             
@@ -1615,12 +1615,26 @@
             
         </li>
     
-        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrade.html">
+        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/">
+            
+                    
+                    Upgrades
+            
+                </a>
+            
+
+            
+            <ul class="articles">
+                
+    
+        <li class="chapter " data-level="1.7.13.1" 
data-path="../../ops/upgrades/">
             
-                <a href="../../ops/upgrade.html">
+                <a href="../../ops/upgrades/#upgrading-brooklyn">
             
                     
-                    Upgrade
+                    Upgrading Brooklyn
             
                 </a>
             
@@ -1628,6 +1642,37 @@
             
         </li>
     
+        <li class="chapter " data-level="1.7.13.2" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/#upgrading-blueprints-and-bundles">
+            
+                    
+                    Upgrading Blueprints
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7.13.3" 
data-path="../../ops/upgrades/">
+            
+                <a 
href="../../ops/upgrades/#upgrading-systems-under-management">
+            
+                    
+                    Upgrading Systems under Management
+            
+                </a>
+            
+
+            
+        </li>
+    
+
+            </ul>
+            
+        </li>
+    
         <li class="chapter " data-level="1.7.14" 
data-path="../../ops/security-guidelines.html">
             
                 <a href="../../ops/security-guidelines.html">
@@ -2094,8 +2139,9 @@
     
                                 <section class="normal markdown-section">
                                 
-                                <h1 id="catalog-management">Catalog 
Management</h1>
-<h3 id="catalog-management">Catalog Management</h3>
+<h1>Catalog Management</h1>
+
+                                <h3 id="catalog-management">Catalog 
Management</h3>
 <p>The Catalog tab in the web console will show all versions of catalog items,
 and allow you to add new items.</p>
 <h4 id="adding-to-the-catalog">Adding to the Catalog</h4>
@@ -2129,6 +2175,7 @@ id including the version number is passe
 </code></pre>
 
                                 
+
                                 </section>
                             
     </div>
@@ -2160,7 +2207,7 @@ id including the version number is passe
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"Catalog 
Management","level":"1.5.7.4","depth":3,"next":{"title":"Bundling","level":"1.5.7.5","depth":3,"path":"blueprints/catalog/bundle.md","ref":"blueprints/catalog/bundle.md","articles":[]},"previous":{"title":"Versioning","level":"1.5.7.3","depth":3,"path":"blueprints/catalog/versioning.md","ref":"blueprints/catalog/versioning.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1509027295765.css","pdf":"pdf-1509027295792.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"theme-api
 
":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{"facebook":true,"twitter":t
 
rue,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","brooklyn_library_git":"https
 
://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/management.md","mtime":"2017-10-26T13:41:38.658Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-10-26T14:14:53.591Z"},"basePath":"../..","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"Catalog 
Management","level":"1.5.7.4","depth":3,"next":{"title":"Bundling","level":"1.5.7.5","depth":3,"path":"blueprints/catalog/bundle.md","ref":"blueprints/catalog/bundle.md","articles":[]},"previous":{"title":"Versioning","level":"1.5.7.3","depth":3,"path":"blueprints/catalog/versioning.md","ref":"blueprints/catalog/versioning.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1523449269765.css","pdf":"pdf-1523449269817.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"theme-api
 
":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{"facebook":true,"twitter":t
 
rue,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","brooklyn_library_git":"https
 
://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/management.md","mtime":"2018-04-11T12:18:40.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-04-11T12:21:07.465Z"},"basePath":"../..","book":{"language":""}});
         });
     </script>
 </div>

Modified: brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/schema.html
URL: 
http://svn.apache.org/viewvc/brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/schema.html?rev=1828892&r1=1828891&r2=1828892&view=diff
==============================================================================
--- brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/schema.html (original)
+++ brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/schema.html Wed Apr 11 
12:24:01 2018
@@ -50,7 +50,7 @@
 
     
         
-        <link rel="stylesheet" href="../../website-1509027295765.css">
+        <link rel="stylesheet" href="../../website-1523449269765.css">
         
     
         
@@ -1043,7 +1043,7 @@
                 <a href="../../locations/">
             
                     
-                    Deploying Blueprint
+                    Deploying Blueprints
             
                 </a>
             
@@ -1615,12 +1615,52 @@
             
         </li>
     
-        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrade.html">
+        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/">
+            
+                    
+                    Upgrades
+            
+                </a>
+            
+
+            
+            <ul class="articles">
+                
+    
+        <li class="chapter " data-level="1.7.13.1" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/#upgrading-brooklyn">
+            
+                    
+                    Upgrading Brooklyn
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7.13.2" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/#upgrading-blueprints-and-bundles">
+            
+                    
+                    Upgrading Blueprints
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7.13.3" 
data-path="../../ops/upgrades/">
             
-                <a href="../../ops/upgrade.html">
+                <a 
href="../../ops/upgrades/#upgrading-systems-under-management">
             
                     
-                    Upgrade
+                    Upgrading Systems under Management
             
                 </a>
             
@@ -1628,6 +1668,11 @@
             
         </li>
     
+
+            </ul>
+            
+        </li>
+    
         <li class="chapter " data-level="1.7.14" 
data-path="../../ops/security-guidelines.html">
             
                 <a href="../../ops/security-guidelines.html">
@@ -2094,8 +2139,9 @@
     
                                 <section class="normal markdown-section">
                                 
-                                <h1 id="catalog-items-yaml-syntax">Catalog 
Items YAML Syntax</h1>
-<h3 id="catalog-items-yaml-syntax">Catalog Items YAML Syntax</h3>
+<h1>Catalog Items YAML Syntax</h1>
+
+                                <h3 id="catalog-items-yaml-syntax">Catalog 
Items YAML Syntax</h3>
 <p>An item or items to be added to the catalog is defined by a <a 
href="../../GLOSSARY.html#yaml" class="glossary-term" title="A human-readable 
data format. See the Wikipedia article for more information.">YAML</a> file,
 specifying the catalog metadata for the items and the actual <a 
href="../../GLOSSARY.html#blueprint" class="glossary-term" title="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
@@ -2122,7 +2168,7 @@ be described in YAML or Java.">blueprint
 </span></code></pre>
 <p>For example, the <a href="../../GLOSSARY.html#yaml" class="glossary-term" 
title="A human-readable data format. See the Wikipedia article for more 
information.">YAML</a> below adds to the catalog a Tomcat <a 
href="../../GLOSSARY.html#entity" class="glossary-term" title="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 &quot;managed element&quot; in autonomic computing 
parlance.">entity</a> with some additional default 
+application/system. It is a &quot;managed element&quot; in autonomic computing 
parlance.">entity</a> with some additional default
 configuration:</p>
 <pre><code class="lang-yaml">brooklyn.catalog:
 <span class="hljs-attr"> items:</span>
@@ -2139,14 +2185,16 @@ configuration:</p>
 <span class="hljs-attr">         password:</span> mypass
 </code></pre>
 <h4 id="catalog-metadata">Catalog Metadata</h4>
-<p>Catalog metadata fields supply the additional information required in order 
to register an item in the catalog. 
-These fields can be supplied as <code>key: value</code> entries 
-where either the <code>&lt;catalog-metadata&gt;</code> or 
<code>&lt;additional-catalog-metadata&gt;</code> placeholders are,
+<p>Catalog metadata fields supply the additional information required in order 
to register an item in the catalog.
+These fields can be supplied as <code>key: value</code> entries
+where either the <code>&lt;catalog-metadata&gt;</code> or 
<code>&lt;additional-catalog-metadata&gt;</code> placeholders are in the 
examples above,
 with the latter overriding the former unless otherwise specified below.</p>
 <p>The following metadata is <em>required</em> for all items:</p>
-<ul>
-<li><code>id</code>: a human-friendly unique identifier for how this catalog 
item will be referenced from blueprints</li>
-<li><code>version</code>: multiple versions of a <a 
href="../../GLOSSARY.html#blueprint" class="glossary-term" title="A description 
of an application or system, which can be used for its automated
+<h6 id="required-metadata">Required Metadata</h6>
+<p><strong><code>id</code></strong>
+A human-friendly unique identifier for how this catalog item will be 
referenced from blueprints.</p>
+<p><strong><code>version</code></strong>
+Multiple versions of a <a href="../../GLOSSARY.html#blueprint" 
class="glossary-term" title="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
@@ -2157,57 +2205,51 @@ but rather the version of the <a href=".
 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 YAML or Java.">blueprint</a>. For more information on 
versioning, see below.
-(Also note <a href="../../GLOSSARY.html#yaml" class="glossary-term" title="A 
human-readable data format. See the Wikipedia article for more 
information.">YAML</a> treats numbers differently to Strings. Explicit quotes 
are recommended, to avoid 
-<code>1.10</code> being interpretted as the number <code>1.1</code>.)</li>
-<li><code>itemType</code>: the type of the item being defined. The supported 
item types are:<ul>
-<li><code>entity</code></li>
-<li><code>template</code></li>
-<li><code>policy</code></li>
-<li><code>location</code></li>
-</ul>
-</li>
-</ul>
+be described in YAML or Java.">blueprint</a>. For more information on 
versioning, see <a href="versioning.html">Versioning</a>.
+(Also note <a href="../../GLOSSARY.html#yaml" class="glossary-term" title="A 
human-readable data format. See the Wikipedia article for more 
information.">YAML</a> treats numbers differently to Strings. Explicit quotes 
are recommended, to avoid
+<code>1.10</code> being interpretted as the number <code>1.1</code>.)</p>
 <p>To reference a catalog item in another <a 
href="../../GLOSSARY.html#blueprint" class="glossary-term" title="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 YAML or Java.">blueprint</a>, simply reference its ID and 
optionally its version number.
-For instance, if we&apos;ve added an item with metadata <code>{ id: datastore, 
version: &quot;1.0&quot; }</code> (such as the example below),
+For instance, if the catalog contains an item with metadata <code>{ id: 
datastore, version: &quot;1.0&quot; }</code>
 we could refer to it in another <a href="../../GLOSSARY.html#blueprint" 
class="glossary-term" title="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 YAML or Java.">blueprint</a> with: </p>
+be described in YAML or Java.">blueprint</a> with:</p>
 <pre><code class="lang-yaml"><span class="hljs-attr">services:</span>
 <span class="hljs-attr">- type:</span> datastore:<span 
class="hljs-number">1.0</span>
 </code></pre>
-<p>In addition to the above fields, exactly <strong>one</strong> of the 
following is also required:</p>
-<ul>
-<li><code>item</code>: the <a href="../../GLOSSARY.html#yaml" 
class="glossary-term" title="A human-readable data format. See the Wikipedia 
article for more information.">YAML</a> for an <a 
href="../../GLOSSARY.html#entity" class="glossary-term" title="A component of 
an application or system. This could be a physical component, a
+<p><strong><code>itemType</code></strong>
+The type of the item being defined. The supported item types are: 
<code>entity</code>, <code>template</code>, <code>policy</code>, and 
<code>location</code>.</p>
+<p>In addition to <code>id</code>, <code>version</code>, and 
<code>itemType</code>, exactly <strong>one</strong> of <code>item</code> and 
<code>items</code> is also required:</p>
+<p><strong><code>item</code></strong>
+The <a href="../../GLOSSARY.html#yaml" class="glossary-term" title="A 
human-readable data format. See the Wikipedia article for more 
information.">YAML</a> for an <a href="../../GLOSSARY.html#entity" 
class="glossary-term" title="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 &quot;managed element&quot; in autonomic computing 
parlance.">entity</a>, or <a href="../../GLOSSARY.html#policy" 
class="glossary-term" title="Part of an autonomic management system, performing 
runtime management. A policy
 is associated with an entity; it normally manages the health of that entity
 or an associated group of entities (e.g. HA policies or auto-scaling policies).
-A policy performs actions on entities, based on their sensor values and policy 
configuration.">policy</a>, or <a href="../../GLOSSARY.html#location" 
class="glossary-term" title="A server or resource to which Apache Brooklyn can 
deploy applications">location</a> specification 
+A policy performs actions on entities, based on their sensor values and policy 
configuration.">policy</a>, or <a href="../../GLOSSARY.html#location" 
class="glossary-term" title="A server or resource to which Apache Brooklyn can 
deploy applications">location</a> specification
 (a map containing <code>type</code> and optional 
<code>brooklyn.config</code>). For a &quot;template&quot; item, it
 should be a map containing <code>services</code> (i.e. the usual <a 
href="../../GLOSSARY.html#yaml" class="glossary-term" title="A human-readable 
data format. See the Wikipedia article for more information.">YAML</a> format 
for a full application
 <a href="../../GLOSSARY.html#blueprint" class="glossary-term" title="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 YAML or Java.">blueprint</a>). <strong>Or</strong></li>
-<li><code>items</code>: a list of catalog items, where each entry in the map 
follows the same schema as
-the <code>brooklyn.catalog</code> value, and the keys in these map override 
any metadata specified as
+be described in YAML or Java.">blueprint</a>).</p>
+<p><strong><code>items</code></strong>
+A list of catalog items, where each entry in the map follows the same schema as
+the <code>brooklyn.catalog</code> value, and the keys in the map override any 
metadata specified as
 a sibling of this <code>items</code> key (or, in the case of 
<code>brooklyn.libraries</code> they add to the list);
 if there are references between items, then order is important:
 <code>items</code> are processed in order, depth-first, and forward references 
are not supported. Entries
-can be URL to another catalog file to include, inheriting the metadata from 
the current hierarchy.
-Libraries defined so far in the metadata will be used to load classpath 
entries. For example:</li>
-</ul>
+can be URLs to another catalog file to include, inheriting the metadata from 
the current hierarchy.
+Libraries defined so far in the metadata will be used to load classpath 
entries. For example:</p>
 <pre><code class="lang-yaml">brooklyn.catalog:
  brooklyn.libraries:
-<span class="hljs-attr"> - http:</span>//some.server.or.other/path/my.jar
+<span class="hljs-attr"> - http:</span>//example.com/path/my.jar
 <span class="hljs-attr"> items:</span>
 <span class="hljs-attr"> - classpath:</span>//my-catalog-entries-inside-jar.bom
 <span class="hljs-attr"> - some-property:</span> value
@@ -2220,44 +2262,65 @@ Libraries defined so far in the metadata
      brooklyn.config:
        some.config: <span class="hljs-string">&quot;some value&quot;</span>
 </code></pre>
+<h5 id="optional-metadata">Optional Metadata</h5>
 <p>The following optional catalog metadata is supported:</p>
-<ul>
-<li><code>name</code>: a nicely formatted display name for the item, used when 
presenting it in a GUI.</li>
-<li><code>description</code>: supplies an extended textual description for the 
item.</li>
-<li><code>iconUrl</code>: points to an icon for the item, used when presenting 
it in a GUI.
-The URL prefix <code>classpath</code> is supported but these URLs may 
<em>not</em> refer to resources in any OSGi 
-bundle in the <code>brooklyn.libraries</code> section (to prevent requiring 
all OSGi bundles to be loaded 
-at launch). Icons are instead typically installed either at the web server 
from which the OSGi 
-bundles or catalog items are supplied or in the <code>conf</code> folder of 
the Brooklyn distro.</li>
-<li><code>scanJavaAnnotations</code> [experimental; deprecated]: if provided 
(as <code>true</code>), this will scan any 
-locally provided library URLs for types annotated <code>@Catalog</code> and 
extract metadata to include 
-them as catalog items. If no libraries are specified this will scan the 
default classpath.
-This feature will likely be removed.
-Also note that external OSGi dependencies are not supported 
-and other metadata (such as versions, etc) may not be applied.</li>
-<li><code>brooklyn.libraries</code>: a list of pointers to OSGi bundles 
required for the catalog item.
+<p><strong><code>name</code></strong>
+A nicely formatted display name for the item, used when presenting it in a 
GUI.</p>
+<p><strong><code>description</code></strong>
+Supplies an extended textual description for the item.</p>
+<p><strong><code>iconUrl</code></strong>
+Points to an icon for the item, used when presenting it in a GUI.
+The URL prefix <code>classpath</code> is supported but these URLs may 
<em>not</em> refer to resources in any OSGi
+bundle in the <code>brooklyn.libraries</code> section (to prevent requiring 
all OSGi bundles to be loaded
+at launch). Icons are instead typically installed either at the web server 
from which the OSGi
+bundles and catalog items are supplied or in the <code>conf</code> directory 
of the Brooklyn distro.</p>
+<p><strong><code>brooklyn.libraries</code></strong>
+A list of pointers to OSGi bundles required for the catalog item.
 This can be omitted if blueprints are pure <a href="../../GLOSSARY.html#yaml" 
class="glossary-term" title="A human-readable data format. See the Wikipedia 
article for more information.">YAML</a> and everything required is included in 
the classpath and catalog.
 Where custom Java code or bundled resources is needed, however, OSGi JARs 
supply
-a convenient packaging format and a very powerful versioning format.
-Libraries should be supplied in the form 
-<code>brooklyn.libraries: [ &quot;http://...&quot;, &quot;http://...&quot; 
]</code>, 
-or as
-<code>brooklyn.libraries: [ { name: symbolic-name, version: &quot;1.0&quot;, 
url: http://... }, ... ]</code> if <code>symbolic-name:1.0</code> 
-might already be installed from a different URL and you want to skip the 
download.
-Note that these URLs should point at immutable OSGi bundles;
+a convenient packaging format and a very powerful versioning format.</p>
+<p>Libraries can be supplied in short form:</p>
+<pre><code class="lang-yaml">brooklyn.libraries:
+<span class="hljs-bullet">-</span> <span 
class="hljs-string">&quot;http://example.com/bundle-1.0.2.jar&quot;</span>
+<span class="hljs-bullet">-</span> <span 
class="hljs-string">&quot;http://example.com/another-bundle-3.3.0.jar&quot;</span>
+</code></pre>
+<p>Or in long form:</p>
+<pre><code class="lang-yaml">brooklyn.libraries:
+<span class="hljs-attr">- name:</span> <span 
class="hljs-string">&quot;symbolic-name&quot;</span>
+<span class="hljs-attr">  version:</span> <span 
class="hljs-string">&quot;1.0&quot;</span>
+<span class="hljs-attr">  url:</span> <span 
class="hljs-string">&quot;http://example.com/bundle-1.0.jar&quot;</span>
+<span class="hljs-attr">  auth:</span>
+<span class="hljs-attr">    username:</span> $brooklyn:external(<span 
class="hljs-string">&quot;myprovider&quot;</span>, <span 
class="hljs-string">&quot;username&quot;</span>)
+<span class="hljs-attr">    password:</span> $brooklyn:external(<span 
class="hljs-string">&quot;myprovider&quot;</span>, <span 
class="hljs-string">&quot;password&quot;</span>)
+</code></pre>
+<p>The only mandatory property in the long form is <code>url</code>. Brooklyn 
will skip the download when a bundle with matching <code>name</code> and 
<code>version</code> is already installed.</p>
+<p>URLs should point at immutable OSGi bundles;
 if the contents at any of these URLs changes, the behaviour of the <a 
href="../../GLOSSARY.html#blueprint" class="glossary-term" title="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 YAML or Java.">blueprint</a> may change 
+be described in YAML or Java.">blueprint</a> may change
 whenever a bundle is reloaded in a Brooklyn server,
 and if entities have been deployed against that version, their behavior may 
change in subtle or potentially incompatible ways.
-To avoid this situation, it is highly recommended to use OSGi version stamps 
as part of the URL.</li>
-<li><code>include</code>: A URL to another catalog file to include, inheriting 
the meta from the current hierarchy.
+To avoid this situation, it is highly recommended to use OSGi version stamps 
as part of the URL.</p>
+<p>Specify <code>auth</code> if the resource at <code>url</code> requires 
authentication to access.
+Do not write the username and password directly into the file; instead
+use <a href="../../ops/externalized-configuration.html">external 
configuration</a>
+to reference the values.</p>
+<p><strong><code>include</code></strong>
+A URL to another catalog file to include, inheriting the meta from the current 
hierarchy.
 Libraries defined so far in the meta will be used to load classpath entries. 
<code>include</code> must be used
 when you have sibling properties. If it&apos;s the only property it may be 
skipped by having the URL as the
-value - see <code>items</code> example above.</li>
-</ul>
+value - see <code>items</code> example above.</p>
+<h5 id="deprecated-metadata">Deprecated Metadata</h5>
+<p>The following metadata is no longer supported and will be ignored in a 
future release:</p>
+<p><strong><code>scanJavaAnnotations</code></strong>
+If provided (as <code>true</code>), this will scan any
+locally provided library URLs for types annotated <code>@Catalog</code> and 
extract metadata to include
+them as catalog items. If no libraries are specified this will scan the 
default classpath.
+This feature will likely be removed.
+Also note that external OSGi dependencies are not supported
+and other metadata (such as versions, etc) may not be applied.</p>
 <h4 id="catalog-yaml-examples">Catalog YAML Examples</h4>
 <h5 id="a-simple-example">A Simple Example</h5>
 <p>The following example installs the <code>RiakNode</code> <a 
href="../../GLOSSARY.html#entity" class="glossary-term" title="A component of 
an application or system. This could be a physical component, a
@@ -2316,9 +2379,9 @@ and its implementation will be the Java
 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 YAML or Java.">blueprint</a>, in SoftLayer and with the given 
size and machine spec, 
+be described in YAML or Java.">blueprint</a>, in SoftLayer and with the given 
size and machine spec,
 as the default implementation for anyone
-requesting a <code>datastore</code> (and if installed atop the previous 
example, new references to <code>datastore</code> 
+requesting a <code>datastore</code> (and if installed atop the previous 
example, new references to <code>datastore</code>
 will access this version because it is a higher number);
 because it is a template, users will have the opportunity to edit the <a 
href="../../GLOSSARY.html#yaml" class="glossary-term" title="A human-readable 
data format. See the Wikipedia article for more information.">YAML</a> (see 
below).
 (This must be supplied after <code>riak-cluster</code>, because it refers to 
<code>riak-cluster</code>.)</li>
@@ -2351,7 +2414,7 @@ brooklyn.catalog:
  &lt;catalog-metadata&gt;
 </span></code></pre>
 <p>In this format, the <code>brooklyn.catalog</code> block is optional;
-and an <code>id</code> in the <code>&lt;blueprint-definition&gt;</code> will 
be used to determine the catalog ID. 
+and an <code>id</code> in the <code>&lt;blueprint-definition&gt;</code> will 
be used to determine the catalog ID.
 This is primarily supplied for OASIS CAMP 1.1 compatibility,
 where the same <a href="../../GLOSSARY.html#yaml" class="glossary-term" 
title="A human-readable data format. See the Wikipedia article for more 
information.">YAML</a> <a href="../../GLOSSARY.html#blueprint" 
class="glossary-term" title="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
@@ -2359,13 +2422,14 @@ application (i.e. its components, their
 relationships), along with policies for runtime management. The blueprint can
 be described in YAML or Java.">blueprint</a> can be POSTed to the catalog 
endpoint to add to a catalog
 or POSTed to the applications endpoint to deploy an instance.
-(This syntax is discouraged as the latter usage, 
+(This syntax is discouraged as the latter usage,
 POSTing to the applications endpoint,
 will ignored the <code>brooklyn.catalog</code> information;
 this means references to any <code>item</code> blocks in the 
<code>&lt;catalog-metadata&gt;</code> will not be resolved,
 and any OSGi <code>brooklyn.libraries</code> defined there will not be 
loaded.)</p>
 
                                 
+
                                 </section>
                             
     </div>
@@ -2397,7 +2461,7 @@ and any OSGi <code>brooklyn.libraries</c
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"Catalog Items YAML 
Syntax","level":"1.5.7.1","depth":3,"next":{"title":"Templates and the 
Add-Application 
Wizard","level":"1.5.7.2","depth":3,"path":"blueprints/catalog/templates.md","ref":"blueprints/catalog/templates.md","articles":[]},"previous":{"title":"Catalog","level":"1.5.7","depth":2,"path":"blueprints/catalog/index.md","ref":"blueprints/catalog/index.md","articles":[{"title":"Catalog
 Items YAML 
Syntax","level":"1.5.7.1","depth":3,"path":"blueprints/catalog/schema.md","ref":"blueprints/catalog/schema.md","articles":[]},{"title":"Templates
 and the Add-Application 
Wizard","level":"1.5.7.2","depth":3,"path":"blueprints/catalog/templates.md","ref":"blueprints/catalog/templates.md","articles":[]},{"title":"Versioning","level":"1.5.7.3","depth":3,"path":"blueprints/catalog/versioning.md","ref":"blueprints/catalog/versioning.md","articles":[]},{"title":"Catalog
 Management","level":"1.5.7.4","depth":3,"path":"blueprints/catalog/
 
management.md","ref":"blueprints/catalog/management.md","articles":[]},{"title":"Bundling","level":"1.5.7.5","depth":3,"path":"blueprints/catalog/bundle.md","ref":"blueprints/catalog/bundle.md","articles":[]},{"title":"Brooklyn
 Server Command Line 
Arguments","level":"1.5.7.6","depth":3,"path":"blueprints/catalog/cli.md","ref":"blueprints/catalog/cli.md","articles":[]}]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1509027295765.css","pdf":"pdf-1509027295792.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"theme-api":{"languages":[{"lang":"vagrant"
 ,"name":"Vagrant","default":true},{"lang":"centos","name":"CentOS / RHEL 
7"},{"lang":"ubuntu","name":"Ubuntu / Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,
 
"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","brooklyn_library_git":"https://github.com/apache/brooklyn-lib
 
rary/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/schema.md","mtime":"2017-10-26T13:41:38.659Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-10-26T14:14:53.591Z"},"basePath":"../..","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"Catalog Items YAML 
Syntax","level":"1.5.7.1","depth":3,"next":{"title":"Templates and the 
Add-Application 
Wizard","level":"1.5.7.2","depth":3,"path":"blueprints/catalog/templates.md","ref":"blueprints/catalog/templates.md","articles":[]},"previous":{"title":"Catalog","level":"1.5.7","depth":2,"path":"blueprints/catalog/index.md","ref":"blueprints/catalog/index.md","articles":[{"title":"Catalog
 Items YAML 
Syntax","level":"1.5.7.1","depth":3,"path":"blueprints/catalog/schema.md","ref":"blueprints/catalog/schema.md","articles":[]},{"title":"Templates
 and the Add-Application 
Wizard","level":"1.5.7.2","depth":3,"path":"blueprints/catalog/templates.md","ref":"blueprints/catalog/templates.md","articles":[]},{"title":"Versioning","level":"1.5.7.3","depth":3,"path":"blueprints/catalog/versioning.md","ref":"blueprints/catalog/versioning.md","articles":[]},{"title":"Catalog
 Management","level":"1.5.7.4","depth":3,"path":"blueprints/catalog/
 
management.md","ref":"blueprints/catalog/management.md","articles":[]},{"title":"Bundling","level":"1.5.7.5","depth":3,"path":"blueprints/catalog/bundle.md","ref":"blueprints/catalog/bundle.md","articles":[]},{"title":"Brooklyn
 Server Command Line 
Arguments","level":"1.5.7.6","depth":3,"path":"blueprints/catalog/cli.md","ref":"blueprints/catalog/cli.md","articles":[]}]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1523449269765.css","pdf":"pdf-1523449269817.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"theme-api":{"languages":[{"lang":"vagrant"
 ,"name":"Vagrant","default":true},{"lang":"centos","name":"CentOS / RHEL 
7"},{"lang":"ubuntu","name":"Ubuntu / Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,
 
"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-server/tree","brooklyn_library_git":"https://github.com/apache/brooklyn-lib
 
rary/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/schema.md","mtime":"2018-04-11T12:18:40.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-04-11T12:21:07.465Z"},"basePath":"../..","book":{"language":""}});
         });
     </script>
 </div>

Modified: brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/templates.html
URL: 
http://svn.apache.org/viewvc/brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/templates.html?rev=1828892&r1=1828891&r2=1828892&view=diff
==============================================================================
--- brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/templates.html (original)
+++ brooklyn/site/v/1.0.0-SNAPSHOT/blueprints/catalog/templates.html Wed Apr 11 
12:24:01 2018
@@ -50,7 +50,7 @@
 
     
         
-        <link rel="stylesheet" href="../../website-1509027295765.css">
+        <link rel="stylesheet" href="../../website-1523449269765.css">
         
     
         
@@ -1043,7 +1043,7 @@
                 <a href="../../locations/">
             
                     
-                    Deploying Blueprint
+                    Deploying Blueprints
             
                 </a>
             
@@ -1615,12 +1615,26 @@
             
         </li>
     
-        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrade.html">
+        <li class="chapter " data-level="1.7.13" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/">
+            
+                    
+                    Upgrades
+            
+                </a>
+            
+
+            
+            <ul class="articles">
+                
+    
+        <li class="chapter " data-level="1.7.13.1" 
data-path="../../ops/upgrades/">
             
-                <a href="../../ops/upgrade.html">
+                <a href="../../ops/upgrades/#upgrading-brooklyn">
             
                     
-                    Upgrade
+                    Upgrading Brooklyn
             
                 </a>
             
@@ -1628,6 +1642,37 @@
             
         </li>
     
+        <li class="chapter " data-level="1.7.13.2" 
data-path="../../ops/upgrades/">
+            
+                <a href="../../ops/upgrades/#upgrading-blueprints-and-bundles">
+            
+                    
+                    Upgrading Blueprints
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7.13.3" 
data-path="../../ops/upgrades/">
+            
+                <a 
href="../../ops/upgrades/#upgrading-systems-under-management">
+            
+                    
+                    Upgrading Systems under Management
+            
+                </a>
+            
+
+            
+        </li>
+    
+
+            </ul>
+            
+        </li>
+    
         <li class="chapter " data-level="1.7.14" 
data-path="../../ops/security-guidelines.html">
             
                 <a href="../../ops/security-guidelines.html">
@@ -2094,8 +2139,9 @@
     
                                 <section class="normal markdown-section">
                                 
-                                <h1 
id="templates-and-the-add-application-wizard">Templates and the Add-Application 
Wizard</h1>
-<h3 id="templates-and-the-add-application-wizard">Templates and the 
Add-Application Wizard</h3>
+<h1>Templates and the Add-Application Wizard</h1>
+
+                                <h3 
id="templates-and-the-add-application-wizard">Templates and the Add-Application 
Wizard</h3>
 <p>A <code>template</code> is a full application. It consists of one or more 
entities inside an application 
 (though this is also composable: it can be used as part of another 
application).
 When a <code>template</code> is added to the catalog, the <a 
href="../../GLOSSARY.html#blueprint" class="glossary-term" title="A description 
of an application or system, which can be used for its automated
@@ -2107,6 +2153,7 @@ as shown here:</p>
 <p><a href="mysql-in-catalog.png"><img src="mysql-in-catalog-w700.png" 
alt="MySQL in Brooklyn Catalog" title="MySQL in Brooklyn Catalog"></a> </p>
 
                                 
+
                                 </section>
                             
     </div>
@@ -2138,7 +2185,7 @@ as shown here:</p>
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"Templates and the 
Add-Application 
Wizard","level":"1.5.7.2","depth":3,"next":{"title":"Versioning","level":"1.5.7.3","depth":3,"path":"blueprints/catalog/versioning.md","ref":"blueprints/catalog/versioning.md","articles":[]},"previous":{"title":"Catalog
 Items YAML 
Syntax","level":"1.5.7.1","depth":3,"path":"blueprints/catalog/schema.md","ref":"blueprints/catalog/schema.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1509027295765.css","pdf":"pdf-1509027295792.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sa
 
ns","size":2},"highlight":{},"theme-api":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]}
 
,"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-ser
 
ver/tree","brooklyn_library_git":"https://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/templates.md","mtime":"2017-10-26T13:41:38.659Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-10-26T14:14:53.591Z"},"basePath":"../..","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"Templates and the 
Add-Application 
Wizard","level":"1.5.7.2","depth":3,"next":{"title":"Versioning","level":"1.5.7.3","depth":3,"path":"blueprints/catalog/versioning.md","ref":"blueprints/catalog/versioning.md","articles":[]},"previous":{"title":"Catalog
 Items YAML 
Syntax","level":"1.5.7.1","depth":3,"path":"blueprints/catalog/schema.md","ref":"blueprints/catalog/schema.md","articles":[]},"dir":"ltr"},"config":{"plugins":["include-highlight","theme-api","collapsible-chapters","bootstrap-callout","styles-less","versions","partial-summary"],"root":"./guide","styles":{"website":"website-1523449269765.css","pdf":"pdf-1523449269817.css"},"pluginsConfig":{"styles-less":{},"search":{},"collapsible-chapters":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"include-highlight":{"extensionToLanguage":{"yml":"yaml","yaml":"yaml","bom":"yaml","java":"java"}},"bootstrap-callout":{},"fontsettings":{"theme":"white","family":"sa
 
ns","size":2},"highlight":{},"theme-api":{"languages":[{"lang":"vagrant","name":"Vagrant","default":true},{"lang":"centos","name":"CentOS
 / RHEL 7"},{"lang":"ubuntu","name":"Ubuntu / 
Debian"},{"lang":"osx","name":"OSX / 
Linux"},{"lang":"windows","name":"Windows"},{"lang":"clouds","name":"Clouds"},{"lang":"byon","name":"BYON"},{"lang":"package","name":"RPM
 / DEB 
packages"},{"lang":"tarball","name":"Tarball"}],"split":false,"theme":"light"},"partial-summary":{"depth":0},"versions":{"type":"branches","gitbookConfigURL":"https://raw.githubusercontent.com/tbouron/brooklyn-docs/experiment/gitbook/book.json","options":[{"value":"https://brooklyn.apache.org/v/latest/","text":"Latest","selected":true},{"value":"https://brooklyn.apache.org/v/0.12.0/","text":"Version
 0.12.0"},{"value":"https://brooklyn.apache.org/v/0.11.0/","text":"Version 
0.11.0"},{"value":"https://brooklyn.apache.org/v/0.10.0/","text":"Version 
0.10.0"},{"value":"https://brooklyn.apache.org/v/0.9.0/","text":"Version 
0.9.0"}]}
 
,"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{"brooklyn_version":"1.0.0-SNAPSHOT","brooklyn_version_stable":"0.12.0","url":{"brooklyn_website":"https://brooklyn.apache.org","brooklyn_javadoc":"https://brooklyn.apache.org/v/latest/misc/javadoc","brooklyn_git":"https://github.com/apache/brooklyn/tree","brooklyn_sever_git":"https://github.com/apache/brooklyn-ser
 
ver/tree","brooklyn_library_git":"https://github.com/apache/brooklyn-library/tree"},"path":{"docs":""}},"gitbook":"^3.2.3"},"file":{"path":"blueprints/catalog/templates.md","mtime":"2018-04-11T12:18:40.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-04-11T12:21:07.465Z"},"basePath":"../..","book":{"language":""}});
         });
     </script>
 </div>


Reply via email to