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

[16/50] [abbrv] incubator-brooklyn git commit: fix paths and links so that guide/ subdir build works nicely

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/guide/persistence/toc.json
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/persistence/toc.json b/docs/guide/use/guide/persistence/toc.json
index b49602e..6cf8767 100644
--- a/docs/guide/use/guide/persistence/toc.json
+++ b/docs/guide/use/guide/persistence/toc.json
@@ -1,16 +1,16 @@
 [{ "title": "Introduction",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html#introduction" }, 
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html#introduction" }, 
 { "title": "Command Line Options",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html#command-line-options" },
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html#command-line-options" },
 { "title": "File-based Persistence",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html#file-based-persistence" },
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html#file-based-persistence" },
 { "title": "Object Store Persistence",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html#object-store-persistence" }, 
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html#object-store-persistence" }, 
 { "title": "Rebind",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html#rebind" }, 
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html#rebind" }, 
 { "title": "Handling Rebind Failures",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html#handling-rebind-failures" }, 
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html#handling-rebind-failures" }, 
 { "title": "High Availability",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html#high-availability" }, 
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html#high-availability" }, 
 { "title": "Writing Persistable Code",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html#writing-persistable-code" }]
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html#writing-persistable-code" }]

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/guide/policies/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/policies/index.md b/docs/guide/use/guide/policies/index.md
index 9dea286..c1be5cb 100644
--- a/docs/guide/use/guide/policies/index.md
+++ b/docs/guide/use/guide/policies/index.md
@@ -34,7 +34,7 @@ Writing Policies
 TODO
 -->
 
-*This section is not complete. Feel free to [fork]({{site.url}}/dev/code) the docs and lend a hand.*
+*This section is not complete. Feel free to [fork]({{site.path.guide}}/dev/code) the docs and lend a hand.*
 
 ### Best Practice
 
@@ -66,7 +66,7 @@ For this release, some of the mechanisms for implementing the above practices ar
 
 ### Implementation Classes
 
-*This section is not complete. Feel free to [fork]({{site.url}}/dev/code) the docs and lend a hand.*
+*This section is not complete. Feel free to [fork]({{site.path.guide}}/dev/code) the docs and lend a hand.*
 
 - extend ``AbstractPolicy``, or override an existing policy
 
@@ -123,7 +123,7 @@ Implementing Policies
 TODO
 -->
 
-*This section is not yet complete. Feel free to [fork]({{site.url}}/dev/code) the docs and lend a hand.*
+*This section is not yet complete. Feel free to [fork]({{site.path.guide}}/dev/code) the docs and lend a hand.*
 
 Please see the class* ``brooklyn.policy.Policy`` *and implementations.
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/guide/policies/toc.json
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/policies/toc.json b/docs/guide/use/guide/policies/toc.json
index 7257dd7..1de7334 100644
--- a/docs/guide/use/guide/policies/toc.json
+++ b/docs/guide/use/guide/policies/toc.json
@@ -1,8 +1,8 @@
 [{ "title": "Introduction",
-  "file":  "{{ site.url }}/use/guide/policies/index.html#introduction" }, 
+  "file":  "{{ site.path.guide }}/use/guide/policies/index.html#introduction" }, 
 { "title": "Writing Policies",
-  "file":  "{{ site.url }}/use/guide/policies/index.html#writing-policies" },
+  "file":  "{{ site.path.guide }}/use/guide/policies/index.html#writing-policies" },
 { "title": "Off-the-Shelf Policies",
-  "file":  "{{ site.url }}/use/guide/policies/index.html#off-the-shelf-policies" },
+  "file":  "{{ site.path.guide }}/use/guide/policies/index.html#off-the-shelf-policies" },
 { "title": "Implementing Policies",
-  "file":  "{{ site.url }}/use/guide/policies/index.html#implementing-policies" }]
\ No newline at end of file
+  "file":  "{{ site.path.guide }}/use/guide/policies/index.html#implementing-policies" }]

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/guide/quickstart/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/quickstart/index.md b/docs/guide/use/guide/quickstart/index.md
index 150a163..d12d6c0 100644
--- a/docs/guide/use/guide/quickstart/index.md
+++ b/docs/guide/use/guide/quickstart/index.md
@@ -20,7 +20,7 @@ We will be deploying an example 3-tier web application, described using this blu
 
 ## Install Brooklyn
 
-Download the [Brooklyn distribution]({{ this_dist_url_tgz }}) and expand it to your home directory ( `~/` ), or in a location of your choice. (Other [download options]({{site.url}}/start/download.html) are available.)
+Download the [Brooklyn distribution]({{ this_dist_url_tgz }}) and expand it to your home directory ( `~/` ), or in a location of your choice. (Other [download options]({{site.path.guide}}/start/download.html) are available.)
 
 {% if site.brooklyn-version contains 'SNAPSHOT' %}
 Expand the `tar.gz` archive (note: as this is a -SNAPSHOT version, your filename will be slightly different):
@@ -85,7 +85,7 @@ this file can be installed with:
 {% highlight bash %}
 $ mkdir ~/.brooklyn
 $ cd ~/.brooklyn
-$ wget {{site.url}}/use/guide/quickstart/brooklyn.properties
+$ wget {{site.path.guide}}/use/guide/quickstart/brooklyn.properties
 {% endhighlight %}
 
 Open this file in a text editor and follow the instructions there. The main settings are summarized below:
@@ -131,7 +131,7 @@ Some sample settings for this are:
     brooklyn.location.named.softlayer-dal05 = jclouds:softlayer:dal05
     brooklyn.location.named.softlayer-dal05.displayName = Softlayer Dallas
 
-If you want to test Brooklyn on localhost, follow [these instructions]({{site.url}}/use/guide/locations/) 
+If you want to test Brooklyn on localhost, follow [these instructions]({{site.path.guide}}/use/guide/locations/) 
 to ensure that your Brooklyn can access your machine.
 
 Once updated, restart Brooklyn (or reload the properties within the web GUI).

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/guide/quickstart/policies-and-catalogs.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/quickstart/policies-and-catalogs.md b/docs/guide/use/guide/quickstart/policies-and-catalogs.md
index 2df32e4..d52b8f8 100644
--- a/docs/guide/use/guide/quickstart/policies-and-catalogs.md
+++ b/docs/guide/use/guide/quickstart/policies-and-catalogs.md
@@ -17,7 +17,7 @@ Download the template [catalog.xml](catalog.xml) to your `~/.brooklyn/` folder,
 
 {% highlight bash %}
 $ cd ~/.brooklyn
-$ wget {{site.url}}/use/guide/quickstart/catalog.xml
+$ wget {{site.path.guide}}/use/guide/quickstart/catalog.xml
 
 $ brooklyn launch
 {% endhighlight %}
@@ -58,7 +58,7 @@ As load is added, Brooklyn requests a new cloud machine, creates a new app serve
 
 ### Next
 
-The [Elastic Web Cluster Example]({{site.url}}use/examples/webcluster/index.html) page
+The [Elastic Web Cluster Example]({{site.path.guide}}use/examples/webcluster/index.html) 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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/guide/quickstart/toc.json
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/quickstart/toc.json b/docs/guide/use/guide/quickstart/toc.json
index d65eddb..eee07d6 100644
--- a/docs/guide/use/guide/quickstart/toc.json
+++ b/docs/guide/use/guide/quickstart/toc.json
@@ -1,4 +1,4 @@
 [{ "title": "Download & Deploy",
-  "file":  "{{ site.url }}/use/guide/quickstart/index.html" },
+  "file":  "{{ site.path.guide }}/use/guide/quickstart/index.html" },
 { "title": "Policies & Catalogs",
-  "file":  "{{ site.url }}/use/guide/quickstart/policies-and-catalogs.html" }]
+  "file":  "{{ site.path.guide }}/use/guide/quickstart/policies-and-catalogs.html" }]

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/guide/toc.json
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/toc.json b/docs/guide/use/guide/toc.json
index 9a59b2a..93dc132 100644
--- a/docs/guide/use/guide/toc.json
+++ b/docs/guide/use/guide/toc.json
@@ -1,25 +1,25 @@
 [
 { "title": "Quick Start",
-  "file":  "{{ site.url }}/use/guide/quickstart/index.html",
-   "children": {% readj ./quickstart/toc.json %} },
+  "file":  "{{ site.path.guide }}/use/guide/quickstart/index.html",
+   "children": {% readj quickstart/toc.json %} },
 { "title": "Defining Applications",
-  "file":  "{{ site.url }}/use/guide/defining-applications/basic-concepts.html", 
-  "children": {% readj ./defining-applications/toc.json %} },
+  "file":  "{{ site.path.guide }}/use/guide/defining-applications/basic-concepts.html", 
+  "children": {% readj defining-applications/toc.json %} },
 { "title": "Management",
-  "file":  "{{ site.url }}/use/guide/management/index.html" ,
-  "children": {% readj ./management/toc.json %} },
+  "file":  "{{ site.path.guide }}/use/guide/management/index.html" ,
+  "children": {% readj management/toc.json %} },
 { "title": "Persistence",
-  "file":  "{{ site.url }}/use/guide/persistence/index.html" ,
-  "children": {% readj ./persistence/toc.json %} },
+  "file":  "{{ site.path.guide }}/use/guide/persistence/index.html" ,
+  "children": {% readj persistence/toc.json %} },
 { "title": "Locations",
-  "file":  "{{ site.url }}/use/guide/locations/index.html" },
+  "file":  "{{ site.path.guide }}/use/guide/locations/index.html" },
 { "title": "Policies",
-  "file":  "{{ site.url }}/use/guide/policies/index.html",
-  "children": {% readj ./policies/toc.json %} },
+  "file":  "{{ site.path.guide }}/use/guide/policies/index.html",
+  "children": {% readj policies/toc.json %} },
 { "title": "Custom Entities",
-  "file":  "{{ site.url }}/use/guide/entities/index.html",
-  "children": {% readj ./entities/toc.json %} },
+  "file":  "{{ site.path.guide }}/use/guide/entities/index.html",
+  "children": {% readj entities/toc.json %} },
 { "title": "Extras",
-  "file":  "{{ site.url }}/use/guide/extras/index.html",
-  "children": {% readj ./extras/toc.json %}  }
-]
\ No newline at end of file
+  "file":  "{{ site.path.guide }}/use/guide/extras/index.html",
+  "children": {% readj extras/toc.json %}  }
+]

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/index.md b/docs/guide/use/index.md
index 143ef80..df13613 100644
--- a/docs/guide/use/index.md
+++ b/docs/guide/use/index.md
@@ -4,6 +4,6 @@ title: Using Brooklyn
 toc: ../toc.json
 ---
 
-{% readj /start/docs-summary.include.md %}
+{% readj /guide/start/docs-summary.include.md %}
 
 Beyond this, [just come chat to us](contact.html).

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ac0c6d6/docs/guide/use/toc.json
----------------------------------------------------------------------
diff --git a/docs/guide/use/toc.json b/docs/guide/use/toc.json
index 1a5e3c9..3bc76f8 100644
--- a/docs/guide/use/toc.json
+++ b/docs/guide/use/toc.json
@@ -1,12 +1,12 @@
 [
 { "title": "User Guide",
-  "file":  "{{ site.url }}/use/guide/index.html",
-  "children": {% readj ./guide/toc.json %} },
+  "file":  "{{ site.path.guide }}/use/guide/index.html",
+  "children": {% readj guide/toc.json %} },
 { "title": "Examples",
-  "file":  "{{ site.url }}/use/examples/index.html", 
-  "children": {% readj ./examples/toc.json %} },
+  "file":  "{{ site.path.guide }}/use/examples/index.html", 
+  "children": {% readj examples/toc.json %} },
 { "title": "API Reference (javadoc)",
-  "file": "{{ site.url }}/use/api/index.html" },
+  "file": "{{ site.path.guide }}/use/api/index.html" },
 { "title": "Discuss",
-  "file": "{{ site.url }}/use/contact.html" }
+  "file": "{{ site.path.guide }}/use/contact.html" }
 ]