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:24:17 UTC
[43/50] [abbrv] incubator-brooklyn git commit: replace references to
brooklyncentral repo and examples and other old things
replace references to brooklyncentral repo and examples and other old things
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ef594479
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ef594479
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ef594479
Branch: refs/heads/master
Commit: ef5944790a87c157d9aff9e684ee9af77ba82353
Parents: 767d3d1
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 17 12:12:32 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 17 12:12:32 2014 +0000
----------------------------------------------------------------------
docs/_includes/fields.md | 4 +
docs/_layouts/guide-normal.html | 2 +-
docs/_plugins/brooklyn_metadata.rb | 6 +-
docs/guide/dev/code/index.include.md | 8 +-
docs/guide/dev/code/toc.json | 2 +-
docs/guide/dev/links.md | 14 +-
docs/guide/dev/tips/release.md | 2 +
docs/guide/dev/toc.json | 8 +-
docs/guide/meta/versions.md | 3 +
docs/guide/start/docs-summary.include.md | 2 +-
docs/guide/start/index.include.md | 2 +-
docs/guide/start/walkthrough/index.md | 2 +-
docs/guide/use/examples/before-begin.include.md | 7 +-
docs/guide/use/examples/messaging/index.md | 4 +-
.../defining-applications/creating-yaml.md | 2 +-
.../appserver-clustered-w-db-concise.yaml | 2 +-
.../example_yaml/appserver-clustered-w-db.yaml | 2 +-
.../appserver-w-db-other-flavor.yaml | 2 +-
.../example_yaml/appserver-w-db.yaml | 2 +-
.../example_yaml/appserver-w-policy.yaml | 2 +-
.../use/guide/defining-applications/examples.md | 5 +-
docs/guide/use/guide/management/index.md | 2 +-
.../use/guide/quickstart/brooklyn.properties | 4 +-
docs/guide/use/guide/quickstart/index.md | 4 +-
.../guide/quickstart/policies-and-catalogs.md | 2 +-
docs/website/documentation/install-on-server.md | 7 +-
docs/website/download.md | 2 +-
docs/website/quickstart/brooklyn.properties | 266 -------------------
docs/website/quickstart/index.md | 8 +-
.../website/quickstart/policies-and-catalogs.md | 8 +-
30 files changed, 67 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/_includes/fields.md
----------------------------------------------------------------------
diff --git a/docs/_includes/fields.md b/docs/_includes/fields.md
index aec33e5..5089b74 100644
--- a/docs/_includes/fields.md
+++ b/docs/_includes/fields.md
@@ -1,5 +1,9 @@
+
{% if site.brooklyn-version contains 'SNAPSHOT' %}{% capture SNAPSHOT %}true{% endcapture %}{% endif %}
+{% capture brooklyn_properties_url_path %}{{ site.path.guide }}/use/guide/quickstart/brooklyn.properties{% endcapture %}
+{% capture brooklyn_properties_url_live %}{{ site.url_root }}{{ brooklyn_properties_url_path }}{% endcapture %}
+
{% capture brooklyn_group_id %}org.apache.brooklyn{% endcapture %}
{% capture brooklyn_group_id_path %}org/apache/brooklyn{% endcapture %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/_layouts/guide-normal.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-normal.html b/docs/_layouts/guide-normal.html
index e04c674..d0310ed 100644
--- a/docs/_layouts/guide-normal.html
+++ b/docs/_layouts/guide-normal.html
@@ -193,7 +193,7 @@ console.log("setting text to "+txt);
<ul id="quicklinks">
<li><a href="{{site.path.guide}}/meta/versions.html">{{ site.brooklyn-version }}</a></li>
<li><a href="{{site.path.guide}}/start/download.html">Download</a></li>
- <li><a href="https://github.com/brooklyncentral">GitHub</a></li>
+ <li><a href="https://github.com/apache/incubator-brooklyn">GitHub</a></li>
<li><a href="https://twitter.com/#!/search?q=brooklyncentral">Twitter</a></li>
<li><a href="{{site.path.guide}}/meta/contact.html">Contact</a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/_plugins/brooklyn_metadata.rb
----------------------------------------------------------------------
diff --git a/docs/_plugins/brooklyn_metadata.rb b/docs/_plugins/brooklyn_metadata.rb
index c0dcc3d..c3b5483 100644
--- a/docs/_plugins/brooklyn_metadata.rb
+++ b/docs/_plugins/brooklyn_metadata.rb
@@ -1,8 +1,10 @@
# Inserts several useful fields that can be referenced using {{ name }} syntax
#
+# TODO: remove, no need for a plugin i think, this is already set in fields.md
+# (although doing it in ruby might be better!)
+#
# site.data.brooklyn.version: brooklyn version, such as 0.7.0-M1
# site.data.brooklyn.is_snapshot: true if this is a snapshot version, otherwise false
-# site.data.brooklyn.url.userguide: URL of the user guide for this version
#
module BrooklynMetadata
@@ -48,8 +50,6 @@ module BrooklynMetadata
}
end
- url_set['userguide'] = "#{site.config['url']}/v/#{BrooklynMetadata::BROOKLYN_VERSION}"
-
site.data['brooklyn'] = {
"version" => BrooklynMetadata::BROOKLYN_VERSION,
"is_snapshot" => is_snapshot,
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/dev/code/index.include.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/code/index.include.md b/docs/guide/dev/code/index.include.md
index ab7f7ec..41ebe07 100644
--- a/docs/guide/dev/code/index.include.md
+++ b/docs/guide/dev/code/index.include.md
@@ -1,9 +1,9 @@
## The Basics
-Brooklyn is available at [GitHub brooklyncentral/brooklyn](http://github.com/brooklyncentral/brooklyn). Check it out using:
+Brooklyn is available at [GitHub apache/incubator-brooklyn](http://github.com/apache/incubator-brooklyn). Check it out using:
{% highlight bash %}
-git clone git@github.com:brooklyncentral/brooklyn.git
+git clone git@github.com:apache/incubator-brooklyn.git
cd brooklyn
{% endhighlight %}
@@ -21,9 +21,7 @@ bin/brooklyn launch
{% endhighlight %}
Plenty of examples are in the **examples** sub-dir,
-described [here]({{site.path.guide}}/use/examples),
-and pushed to the [brooklyn-examples](http://github.com/brooklyncentral/brooklyn-examples)
-GitHub project when a version is released.
+described [here]({{site.path.guide}}/use/examples).
Information on using Brooklyn -- configuring locations (in `brooklyn.properties`)
and adding new projects to a catalog -- can be found in the [User's Guide]({{site.path.guide}}/use/guide/quickstart/index.html).
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/dev/code/toc.json
----------------------------------------------------------------------
diff --git a/docs/guide/dev/code/toc.json b/docs/guide/dev/code/toc.json
index 144ea26..6bb112b 100644
--- a/docs/guide/dev/code/toc.json
+++ b/docs/guide/dev/code/toc.json
@@ -6,5 +6,5 @@
{ "title": "Writing a Policy",
"file": "{{ site.path.guide }}/dev/code/policy.html" },
{ "title": "brooklyn.git (github)",
- "file": "http://github.com/brooklyncentral/brooklyn" }
+ "file": "http://github.com/apache/incubator-brooklyn" }
]
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/dev/links.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/links.md b/docs/guide/dev/links.md
index 4be8f30..6fd12e2 100644
--- a/docs/guide/dev/links.md
+++ b/docs/guide/dev/links.md
@@ -4,15 +4,19 @@ title: Development Bookmarks
toc: ../toc.json
---
+{% include fields.md %}
Handy places:
-* **Code** is in Github at [https://github.com/brooklyncentral/brooklyn](https://github.com/brooklyncentral/brooklyn)
+* **Code** is in Github at [https://github.com/apache/incubator-brooklyn/](https://github.com/apache/incubator-brooklyn/)
-* **Issues** are also on Github at [https://github.com/brooklyncentral/brooklyn/issues](https://github.com/brooklyncentral/brooklyn/issues)
+* **Issues** are in Jira at [https://issues.apache.org/jira/browse/BROOKLYN/](https://issues.apache.org/jira/browse/BROOKLYN/)
-* **Maven repositories** are at [http://developers.cloudsoftcorp.com/download/maven2/](http://developers.cloudsoftcorp.com/download/maven2/) for releases
+* **Maven repositories** are:
+ * [Apache releases]({{ apache_releases_repo_groupid_url }})
+ * [Apache snapshots]({{ apache_snapshots_repo_groupid_url }})
+ * Other repositories are at [http://developers.cloudsoftcorp.com/download/maven2/](http://developers.cloudsoftcorp.com/download/maven2/) for releases
and [http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/](http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/) for snapshots
- (under ``io/brooklyn``)
-* **CI server** is currently a private server managed by Cloudsoft. There is a proposal to move to CloudBees.
+* **CI server** is a jenkins server at: [https://builds.apache.org/job/incubator-brooklyn-master-build/](https://builds.apache.org/job/incubator-brooklyn-master-build/)
+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/dev/tips/release.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/tips/release.md b/docs/guide/dev/tips/release.md
index f56f81e..66f730b 100644
--- a/docs/guide/dev/tips/release.md
+++ b/docs/guide/dev/tips/release.md
@@ -4,6 +4,8 @@ title: Release Process
toc: /guide/toc.json
---
+**This needs substantial updating in light of the Apache move.**
+
<!--
TODO
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/dev/toc.json
----------------------------------------------------------------------
diff --git a/docs/guide/dev/toc.json b/docs/guide/dev/toc.json
index 53c9612..2123cb0 100644
--- a/docs/guide/dev/toc.json
+++ b/docs/guide/dev/toc.json
@@ -15,11 +15,11 @@
"file": "{{ site.path.guide }}/dev/links.html",
"children": [
{ "title": "Github repo",
- "file": "https://github.com/brooklyncentral/" },
- { "title": "Github issues",
- "file": "https://github.com/brooklyncentral/brooklyn/issues" },
+ "file": "https://github.com/apache/incubator-brooklyn/" },
+ { "title": "Jira issues",
+ "file": "https://issues.apache.org/jira/browse/BROOKLYN/" },
{ "title": "Maven snapshots",
- "file": "http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/io/brooklyn/" }
+ "file": "https://repository.apache.org/content/repositories/snapshots/org/apache/brooklyn" }
] },
{ "title": "How to Contribute",
"file": "{{ site.path.guide }}/dev/how-to-contrib.html" }
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/meta/versions.md
----------------------------------------------------------------------
diff --git a/docs/guide/meta/versions.md b/docs/guide/meta/versions.md
index 9466473..4ce1256 100644
--- a/docs/guide/meta/versions.md
+++ b/docs/guide/meta/versions.md
@@ -4,6 +4,9 @@ title: Versions
toc: /guide/toc.json
---
+**TODO: page needs overhaul with separate new main site**
+
+
<!--- display which version we are using, based on where it is written -->
### Brooklyn v{{ site.brooklyn-version }}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/start/docs-summary.include.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/docs-summary.include.md b/docs/guide/start/docs-summary.include.md
index 9dac44d..a6a176c 100644
--- a/docs/guide/start/docs-summary.include.md
+++ b/docs/guide/start/docs-summary.include.md
@@ -4,4 +4,4 @@ To learn about Brooklyn, here are some recommended starting points:
* [Examples]({{site.path.guide}}/use/examples/)
* [User Guide]({{site.path.guide}}/use/guide/)
* [Code Overview]({{site.path.guide}}/dev/code/)
-* [Code on Github](http://github.com/brooklyncentral/brooklyn/)
+* [Code on Github](http://github.com/apache/incubator-brooklyn/)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/start/index.include.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/index.include.md b/docs/guide/start/index.include.md
index 0412ec9..3dfafb4 100644
--- a/docs/guide/start/index.include.md
+++ b/docs/guide/start/index.include.md
@@ -44,7 +44,7 @@ We're still near the beginning of figuring this out:
[concepts]({{site.path.guide}}/use/guide/defining-applications/basic-concepts.html)
and including a [tutorial]({{site.path.guide}}/use/guide/quickstart/)
* Or dive straight in to the code, either [reading]({{site.path.guide}}/dev/code/) about it
- or [gitting](http://github.com/brooklyncentral/brooklyn/) it
+ or [gitting](http://github.com/apache/incubator-brooklyn/) it
If you like it, or if you have ideas how it could be better,
[join the discussion]({{site.path.guide}}/meta/contact.html).
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/start/walkthrough/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/walkthrough/index.md b/docs/guide/start/walkthrough/index.md
index d68aad4..eaabd14 100644
--- a/docs/guide/start/walkthrough/index.md
+++ b/docs/guide/start/walkthrough/index.md
@@ -228,7 +228,7 @@ Alternatively you can just add a ``main`` method to the application class as fol
Compile and run this with the [``brooklyn-all`` jar]({{site.path.guide}}/start/download.html) on the classpath,
pointing at your favourite WAR on your filesystem.
(If the ``import`` packages aren't picked up correctly,
-you can cheat by looking at [the file in Github](https://github.com/brooklyncentral/brooklyn/blob/master/examples/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExample.java);
+you can cheat by looking at [the file in Github](https://github.com/apache/incubator-brooklyn/blob/master/examples/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExample.java);
and you'll find a sample WAR which uses the database as configured above
[here](https://http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/io/brooklyn/).)
TODO example webapp url
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/examples/before-begin.include.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/examples/before-begin.include.md b/docs/guide/use/examples/before-begin.include.md
index 2f71166..e05f9f1 100644
--- a/docs/guide/use/examples/before-begin.include.md
+++ b/docs/guide/use/examples/before-begin.include.md
@@ -39,10 +39,9 @@ Grab a copy of the Brooklyn distribution and set up `BROOKLYN_HOME`:
Grab a copy of the brooklyn-examples source code and build it with Maven:
{% highlight bash %}
-% git clone https://github.com/brooklyncentral/brooklyn-examples.git
-% cd brooklyn-examples
-{% if brooklyn_examples_branch == 'master' %}{% else %}% git checkout {{ brooklyn_examples_branch }}
-{% endif %}% mvn clean install
+% git clone https://github.com/apache/incubator-brooklyn.git
+% cd incubator-brooklyn/examples
+% mvn clean install
{% endhighlight %}
{% if SNAPSHOT %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/examples/messaging/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/examples/messaging/index.md b/docs/guide/use/examples/messaging/index.md
index 0e38101..c3c2254 100644
--- a/docs/guide/use/examples/messaging/index.md
+++ b/docs/guide/use/examples/messaging/index.md
@@ -98,9 +98,7 @@ on startup.
### Running the Example
-You can build and run the example (on *nix or Mac) after checking
-out the Brooklyn [repository](https://www.github.com/brooklyncentral/brooklyn)
-as follows:
+You can run the example as follows:
{% highlight bash %}
% ${BROOKLYN_HOME}/bin/brooklyn -v launch --app brooklyn.demo.StandaloneQpidBrokerExample --location localhost
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/defining-applications/creating-yaml.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/defining-applications/creating-yaml.md b/docs/guide/use/guide/defining-applications/creating-yaml.md
index 7be1419..3cbd532 100644
--- a/docs/guide/use/guide/defining-applications/creating-yaml.md
+++ b/docs/guide/use/guide/defining-applications/creating-yaml.md
@@ -409,7 +409,7 @@ to make a declarative front-end, so you can do pretty much anything you want to
by dropping to the JVM. Information on that is available:
* in the [user guide]({{site.path.guide}}/use/guide/entities/index.html),
* through a [Maven archetype]({{site.path.guide}}/use/guide/defining-applications/archetype.html),
-* in the [codebase](https://github.com/brooklyncentral/brooklyn),
+* in the [codebase](https://github.com/apache/incubator-brooklyn),
* and in plenty of [examples]({{site.path.guide}}/use/examples/index.html).
You can also come talk to us, on IRC (#brooklyncentral on Freenode) or
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db-concise.yaml
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db-concise.yaml b/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db-concise.yaml
index 062c09f..518f65a 100644
--- a/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db-concise.yaml
+++ b/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db-concise.yaml
@@ -12,4 +12,4 @@ services:
id: db
name: DB HelloWorld Visitors
brooklyn.config:
- datastore.creation.script.url: https://github.com/brooklyncentral/brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
+ datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db.yaml
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db.yaml b/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db.yaml
index a7b3c57..10592d8 100644
--- a/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db.yaml
+++ b/docs/guide/use/guide/defining-applications/example_yaml/appserver-clustered-w-db.yaml
@@ -15,4 +15,4 @@ services:
id: db
name: DB HelloWorld Visitors
brooklyn.config:
- datastore.creation.script.url: https://github.com/brooklyncentral/brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
+ datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db-other-flavor.yaml
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db-other-flavor.yaml b/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db-other-flavor.yaml
index 784f7fd..6a4a81d 100644
--- a/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db-other-flavor.yaml
+++ b/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db-other-flavor.yaml
@@ -12,6 +12,6 @@ services:
id: db
name: DB HelloWorld Visitors
brooklyn.config:
- datastore.creation.script.url: https://github.com/brooklyncentral/brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
+ datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
provisioning.properties:
minRam: 8192
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db.yaml
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db.yaml b/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db.yaml
index 5a16c0d..a043f1a 100644
--- a/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db.yaml
+++ b/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-db.yaml
@@ -12,4 +12,4 @@ services:
id: db
name: DB HelloWorld Visitors
brooklyn.config:
- datastore.creation.script.url: https://github.com/brooklyncentral/brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
+ datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-policy.yaml
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-policy.yaml b/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-policy.yaml
index 757157e..cada61f 100644
--- a/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-policy.yaml
+++ b/docs/guide/use/guide/defining-applications/example_yaml/appserver-w-policy.yaml
@@ -23,4 +23,4 @@ services:
id: db
name: DB HelloWorld Visitors
brooklyn.config:
- datastore.creation.script.url: https://github.com/brooklyncentral/brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
+ datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/defining-applications/examples.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/defining-applications/examples.md b/docs/guide/use/guide/defining-applications/examples.md
index a208bd7..330b6d3 100644
--- a/docs/guide/use/guide/defining-applications/examples.md
+++ b/docs/guide/use/guide/defining-applications/examples.md
@@ -115,6 +115,7 @@ Examples Source
Source code for (more up-to-date!) examples is available for download from GitHub. To retrieve the source, execute the following command:
- git clone git@github.com:brooklyncentral/brooklyn-examples.git
+ git clone git@github.com:apache/incubator-brooklyn.git
+ cd incubator-brooklyn/examples
-You can also [browse the code](https://github.com/brooklyncentral/brooklyn-examples) on the web.
+You can also [browse the code](https://github.com/apache/incubator-brooklyn/tree/examples) on the web.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/management/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/management/index.md b/docs/guide/use/guide/management/index.md
index 6f65c81..c2ef830 100644
--- a/docs/guide/use/guide/management/index.md
+++ b/docs/guide/use/guide/management/index.md
@@ -86,7 +86,7 @@ See 'brooklyn help <command>' for more information on a specific command.
Here is an example of the commands you might run to get the Brooklyn code, compile it and launch an application:
{% highlight bash %}
-git clone https://github.com/brooklyncentral/brooklyn.git
+git clone https://github.com/apache/incubator-brooklyn.git
cd brooklyn
mvn clean install -DskipTests
BROOKLYN_HOME=$(pwd)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/guide/use/guide/quickstart/brooklyn.properties
----------------------------------------------------------------------
diff --git a/docs/guide/use/guide/quickstart/brooklyn.properties b/docs/guide/use/guide/quickstart/brooklyn.properties
index 59a6f06..08bb4a3 100644
--- a/docs/guide/use/guide/quickstart/brooklyn.properties
+++ b/docs/guide/use/guide/quickstart/brooklyn.properties
@@ -67,7 +67,7 @@ brooklyn.location.jclouds.aws-ec2.credential = <access-key-hex-digits>
## Deploying to Localhost
-## see: brooklyncentral.github.io/use/guide/locations/
+## see: info on locations at brooklyn.io
#
## ~/.ssh/id_rsa is Brooklyn's default location
# brooklyn.location.localhost.privateKeyFile = ~/.ssh/id_rsa
@@ -75,7 +75,7 @@ brooklyn.location.jclouds.aws-ec2.credential = <access-key-hex-digits>
# brooklyn.location.localhost.privateKeyPassphrase = s3cr3tpassphrase
## Geoscaling Service - used for the Global Web Fabric demo
-## see: brooklyncentral.github.io/use/examples/global-web-fabric/ and
+## see: the global web example at brooklyn.io
## https://www.geoscaling.com/dns2/
## other services may take similar configuration similarly; or can usually be set in YAML
# brooklyn.geoscaling.username = USERNAME
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/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 515a9d2..181779f 100644
--- a/docs/guide/use/guide/quickstart/index.md
+++ b/docs/guide/use/guide/quickstart/index.md
@@ -79,13 +79,13 @@ Stop Brooklyn with ctrl-c, or in the web-browser (under "Help"), or with `kill`.
## Configuring Brooklyn with brooklyn.properties
Brooklyn reads startup configuration from a file `~/.brooklyn/brooklyn.properties`, by default.
-You can create this from a template [brooklyn.properties](brooklyn.properties) file which you edit;
+You can create this from a template [brooklyn.properties]({{brooklyn_properties_url_path}}) file which you edit;
this file can be installed with:
{% highlight bash %}
$ mkdir ~/.brooklyn
$ cd ~/.brooklyn
-$ wget {{site.url_root}}{{site.path.guide}}/use/guide/quickstart/brooklyn.properties
+$ wget {{brooklyn_properties_url_live}}
{% endhighlight %}
Open this file in a text editor and follow the instructions there. The main settings are summarized below:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/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 3d8a6a2..3412333 100644
--- a/docs/guide/use/guide/quickstart/policies-and-catalogs.md
+++ b/docs/guide/use/guide/quickstart/policies-and-catalogs.md
@@ -52,7 +52,7 @@ This policy automatically scales the cluster up or down to be the right size for
The loadbalancer's `targets` policy ensures that the loadbalancer is updated as the cluster size changes.
-Sitting idle, this cluster will only contain one server, but you can use a tool like [jmeter](http://jmeter.apache.org/) pointed at the nginx endpoint to create load on the cluster. (Download a [jmeter test plan](https://github.com/brooklyncentral/brooklyn/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx).)
+Sitting idle, this cluster will only contain one server, but you can use a tool like [jmeter](http://jmeter.apache.org/) pointed at the nginx endpoint to create load on the cluster. (Download a [jmeter test plan](https://github.com/apache/incubator-brooklyn/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx).)
As load is added, Brooklyn requests a new cloud machine, creates a new app server, and adds it to the cluster. As load is removed, servers are removed from the cluster, and the infrastructure is handed back to the cloud.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/website/documentation/install-on-server.md
----------------------------------------------------------------------
diff --git a/docs/website/documentation/install-on-server.md b/docs/website/documentation/install-on-server.md
index 4251434..c3da352 100644
--- a/docs/website/documentation/install-on-server.md
+++ b/docs/website/documentation/install-on-server.md
@@ -2,6 +2,9 @@
layout: website-normal
title: Installing on a Server
---
+
+{% include fields.md %}
+
Here we present two *alternatives* to install Brooklyn:
- [Running the *installation script*](#script)
@@ -82,11 +85,11 @@ By default Brooklyn loads configuration parameters (including credentials for an
The `brooklyn.properties` is the main configuration file for deployment locations. Contains the connection details and credentials for all public or on-premises cloud providers, as well as controlling some application startup and security options.
-Create a `.brooklyn` folder in your home directory and download the template [brooklyn.properties](../quickstart/brooklyn.properties) to that folder.
+Create a `.brooklyn` folder in your home directory and download the template [brooklyn.properties]({{brooklyn_properties_url_path}}) to that folder.
{% highlight bash %}
$ mkdir -p ~/.brooklyn
-$ wget -O ~/.brooklyn/brooklyn.properties {{site.url_root}}{{site.path.website}}/quickstart/brooklyn.properties
+$ wget -O ~/.brooklyn/brooklyn.properties {{brooklyn_properties_url_live}}
$ chmod 600 ~/.brooklyn/brooklyn.properties
{% endhighlight %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/website/download.md
----------------------------------------------------------------------
diff --git a/docs/website/download.md b/docs/website/download.md
index c4a3da1..1d048e9 100644
--- a/docs/website/download.md
+++ b/docs/website/download.md
@@ -13,7 +13,7 @@ but as a result it has been a long time since the last milestone release.
as it now has many many features not in 0.7.0-M1!**
{% if site.brooklyn-version contains 'SNAPSHOT' %}{% else %}
- {% FAIL_needs_updating_for_release %}
+ {% read FAIL_needs_updating_for_release %}
The alert above should be removed when we make the next release build!
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/website/quickstart/brooklyn.properties
----------------------------------------------------------------------
diff --git a/docs/website/quickstart/brooklyn.properties b/docs/website/quickstart/brooklyn.properties
deleted file mode 100644
index 08a9d7c..0000000
--- a/docs/website/quickstart/brooklyn.properties
+++ /dev/null
@@ -1,266 +0,0 @@
-# This is Brooklyn's dot-properties file.
-# It should be located at "~/.brooklyn/brooklyn.properties" for automatic loading,
-# or can be specified as a CLI option with --localProperties /path/to/these.properties.
-
-################################## Welcome! ############################################
-
-# It's great to have you here.
-
-# Getting Started options have been pulled to the top. There's a formatting guide at the
-# very bottom.
-
-############################ Getting Started Options ####################################
-
-# By default we have AWS set up (but with invalid credentials!). Many, many other
-# providers are supported.
-
-## Amazon EC2 Credentials
-# These should be an "Access Key ID" and "Secret Access Key" for your account.
-# This is configured at https://console.aws.amazon.com/iam/home?#security_credential .
-
-brooklyn.location.jclouds.aws-ec2.identity = AKA_YOUR_ACCESS_KEY_ID
-brooklyn.location.jclouds.aws-ec2.credential = <access-key-hex-digits>
-
-# Beware of trailing spaces in your cloud credentials. This will cause unexpected
-# 401: unauthorized responses.
-
-## Using Other Clouds
-# 1. Cast your eyes down this document to find your preferred cloud in the Named Locations
-# section, and the examples.
-# 2. Uncomment the relevant line(s) for your provider.
-# 3. ADD -.identity and -.credential lines for your provider, similar to the AWS ones above,
-# replacing 'aws-ec2' with jcloud's id for your cloud.
-
-
-## Deploying to Localhost
-## see: brooklyncentral.github.io/use/guide/locations/
-#
-## ~/.ssh/id_rsa is Brooklyn's default location
-# brooklyn.location.localhost.privateKeyFile = ~/.ssh/id_rsa
-## Passphrases are supported, but not required
-# brooklyn.location.localhost.privateKeyPassphrase = s3cr3tpassphrase
-
-## Geoscaling Service - used for the Global Web Fabric demo
-## see: brooklyncentral.github.io/use/examples/global-web-fabric/ and
-## https://www.geoscaling.com/dns2/
-## other services may take similar configuration similarly; or can usually be set in YAML
-# brooklyn.geoscaling.username = USERNAME
-# brooklyn.geoscaling.password = PASSWORD
-# brooklyn.geoscaling.primaryDomain = DOMAIN
-
-
-########################## Getting Started Complete! ###################################
-
-# That's it, although you may want to read through these options...
-
-################################ Brooklyn Options ########################################
-
-## Brooklyn Management Base Directory: specify where management data should be stored on this server;
-## ~/.brooklyn/ is the default but you could use something like /opt/brooklyn/state/
-## (provided this process has write permissions)
-# brooklyn.base.dir=~/.brooklyn/
-
-## Brooklyn On-Box Directory: specify where data should be stored on managed hosts;
-## for most locations a directory off home is the default (but using /tmp/brooklyn-user/ on localhost),
-## however you could specify something like /opt/brooklyn-managed-process/ (creation and permissions are handled)
-# onbox.base.dir=~/brooklyn-managed-process/
-
-
-## GUI Security
-## NOTE: in production it is highly recommended to set this, as otherwise it will not require login,
-## not will it be encrypted (though for safety if security is not set it will only bind to loopback)
-# brooklyn.webconsole.security.https.required=true
-# brooklyn.webconsole.security.users=admin,bob
-# brooklyn.webconsole.security.user.admin.password=password
-# brooklyn.webconsole.security.user.bob.password=bobsword
-
-## GUI Security: Allow all - if you know what you are doing! (You can also plug in e.g. LDAP security.)
-# brooklyn.webconsole.security.provider = brooklyn.rest.security.provider.AnyoneSecurityProvider
-
-## Optionally disallow deployment to localhost (or any other location)
-# brooklyn.location.localhost.enabled=false
-
-## Scripting Behaviour
-
-## keep scripts around after running them (usually in /tmp)
-# brooklyn.ssh.config.noDeleteAfterExec = true
-
-## Misc Cloud Settings
-## brooklyn will fail a node if the cloud machine doesn't come up, but you can tell it to retry:
-# brooklyn.location.jclouds.machineCreateAttempts = 3
-## many cloud machines don't have sufficient entropy for lots of encrypted networking, so fake it:
-# brooklyn.location.jclouds.installDevUrandom=true
-
-## Sets a minimium ram property for all jclouds locations. Recommended to avoid getting m1.micros on AWS!
-brooklyn.location.jclouds.minRam = 2048
-
-## When setting up a new cloud machine Brooklyn creates a user with the same name as the user running
-## Brooklyn on the management server, but you can force a different user here:
-# brooklyn.location.jclouds.user=brooklyn
-## And you can force a password or key (by default it will use the keys in ~/.ssh/id_rsa{,.pub}
-# brooklyn.location.jclouds.password=s3cr3t
-
-################################ Named Locations ########################################
-
-# Named locations appear in the web console. If using the command line or YAML it may be
-# just as easy to use the jclouds:<provider> locations and specify additional properties there.
-
-## Example: AWS Virginia using Rightscale 6.3 64bit Centos AMI and Large Instances
-# brooklyn.location.named.aws-va-centos-large = jclouds:aws-ec2:us-east-1
-# brooklyn.location.named.aws-va-centos-large.imageId=us-east-1/ami-7d7bfc14
-# brooklyn.location.named.aws-va-centos-large.user=brooklyn
-# brooklyn.location.named.aws-va-centos-large.minRam=4096
-
-## You can also nest these:
-# brooklyn.location.named.aws-acct-two = jclouds:aws-ec2
-# brooklyn.location.named.aws-acct-two.identity = AKA_ACCT_TWO
-# brooklyn.location.named.aws-acct-two.credential = <access-key-hex-digits>
-# brooklyn.location.named.aws-acct-two-singapore = named:aws-acct-two
-# brooklyn.location.named.aws-acct-two-singapore.region = ap-southeast-1
-# brooklyn.location.named.aws-acct-two-singapore.displayName = AWS Singapore (Acct Two)
-
-# For convenience some common defaults:
-brooklyn.location.named.aws-california = jclouds:aws-ec2:us-west-1
-brooklyn.location.named.aws-oregon = jclouds:aws-ec2:us-west-2
-brooklyn.location.named.aws-ireland = jclouds:aws-ec2:eu-west-1
-brooklyn.location.named.aws-tokyo = jclouds:aws-ec2:ap-northeast-1
-
-## Google Compute
-## Note at present you have to create and download the P12 key from the Google "APIs & auth -> Registered Apps" interface,
-## then convert to PEM private key format using `openssl pkcs12 -in Certificates.p12 -out Certificates.pem -nodes`
-## then embed that on one line as the 'credential, replacing new lines with \n as below
-## (hopefully this will be improved in jclouds in the future)
-# brooklyn.location.jclouds.google-compute-engine.identity=1234567890-somet1mesArand0mU1Dhere@developer.gserviceaccount.com
-# brooklyn.location.jclouds.google-compute-engine.credential=-----BEGIN PRIVATE KEY----- \nMIIblahablahblah \nblahblahblah \n-----END PRIVATE KEY-----
-# brooklyn.location.named.Google\ US = jclouds:google-compute-engine
-# brooklyn.location.named.Google\ US.region=us-central1-a
-# brooklyn.location.named.Google\ EU = jclouds:google-compute-engine
-# brooklyn.location.named.Google\ EU.region=europe-west1-a
-## the following flags for GCE are recommended
-## specify the network to use - otherwise it creates new networks each time and you hit quotas pretty quickly
-## you may have to manually create this network AND enable a firewall rule EG tcp:1-65535;udp:1-65535;icmp
-## (fix for this is in progress)
-# brooklyn.location.jclouds.google-compute-engine.networkName=brooklyn-default-network
-## gce images have bad entropy, this ensures they have noisy /dev/random (even if the "randomness" is not quite as random)
-# brooklyn.location.jclouds.google-compute-engine.installDevUrandom=true
-## gce images often start with iptables turned on; turn it off
-# brooklyn.location.jclouds.google-compute-engine.stopIptables=true
-
-## HP Cloud - also Ubuntu 12.04 LTS
-## You specify your HP Credentials like this:
-# brooklyn.location.jclouds.hpcloud-compute.identity = projectname:username
-# brooklyn.location.jclouds.hpcloud-compute.credential = password
-## where username and password are the same as logging in to the web console, and
-## projectname can be found here: https://account.hpcloud.com/projects
-#�brooklyn.location.named.HP\ Cloud\ Arizona-1 = jclouds:hpcloud-compute:az-1.region-a.geo-1
-# brooklyn.location.named.HP\ Cloud\ Arizona-1.imageId = az-1.region-a.geo-1/75845
-# brooklyn.location.named.HP\ Cloud\ Arizona-1.user = ubuntu
-
-## Softlayer - need a key from the gui, under "administrative -> user administration -> api-access
-# brooklyn.location.jclouds.softlayer.identity=username
-# brooklyn.location.jclouds.softlayer.credential=<private-key-hex-digits>
-## A sample good image, available in all regions
-# brooklyn.location.jclouds.softlayer.imageId=13945
-## locations
-# brooklyn.location.named.Softlayer\ Seattle=jclouds:softlayer:sea01
-# brooklyn.location.named.Softlayer\ Dallas=jclouds:softlayer:dal05
-# brooklyn.location.named.Softlayer\ Washington\ DC=jclouds:softlayer:wdc01
-# brooklyn.location.named.Softlayer\ Singapore\ 1=jclouds:softlayer:sng01
-# brooklyn.location.named.Softlayer\ Amsterdam\ 1=jclouds:softlayer:ams01
-
-
-## Brooklyn uses the jclouds multi-cloud library to access many clouds.
-## http://www.jclouds.org/documentation/reference/supported-providers/
-
-## Templates for many other clouds, but remember to add identity and credentials:
-
-# brooklyn.location.named.Bluelock = jclouds:bluelock-vcloud-zone01
-
-# brooklyn.location.named.CloudSigma\ Nevada = jclouds:cloudsigma-lvs
-# brooklyn.location.named.CloudSigma\ Zurich = jclouds:cloudsigma-zrh
-
-# brooklyn.location.named.ElasticHosts\ London = jclouds:elastichosts-lon-p
-# brooklyn.location.named.ElasticHosts\ Texas = jclouds:elastichosts-sat-p
-
-# brooklyn.location.named.GleSYS = jclouds:glesys
-
-# brooklyn.location.named.Go2Cloud = jclouds:go2cloud-jhb1
-
-# brooklyn.location.named.GoGrid = jclouds:gogrid
-
-# brooklyn.location.named.Green\ House\ Data = jclouds:greenhousedata-element-vcloud
-
-# brooklyn.location.named.Ninefold = jclouds:ninefold-compute
-
-# brooklyn.location.named.OpenHosting = jclouds:openhosting-east1
-
-# brooklyn.location.named.Rackspace\ Chicago\ (ord) = jclouds:rackspace-cloudservers-us:ORD
-# brooklyn.location.named.Rackspace\ Dallas\ (dfw) = jclouds:rackspace-cloudservers-us:DFW
-# brooklyn.location.named.Rackspace\ Hong\ Kong\ (hkg) = jclouds:rackspace-cloudservers-us:HKG
-# brooklyn.location.named.Rackspace\ Northern\ Virginia\ (iad) = jclouds:rackspace-cloudservers-us:IAD
-# brooklyn.location.named.Rackspace\ Sydney\ (syd) = jclouds:rackspace-cloudservers-us:SYD
-## for UK you will need a separate account with rackspace.co.uk
-# brooklyn.location.named.Rackspace\ London\ (lon) = jclouds:rackspace-cloudservers-uk
-
-## if you need to use Rackspace "first gen" API
-## (note the "next gen" api configured above seems to be faster)
-# brooklyn.location.jclouds.cloudservers-us.identity = YOURAPIKEY
-# brooklyn.location.jclouds.cloudservers-us.credential = YOURSECRETKEY
-# brooklyn.location.named.Rackspace\ US\ (First Gen) = jclouds:cloudservers-us
-## and as with next gen, first gen requires a separate acct for the UK:
-# brooklyn.location.jclouds.cloudservers-uk.identity = YOURAPIKEY
-# brooklyn.location.jclouds.cloudservers-uk.credential = YOURSECRETKEY
-# brooklyn.location.named.Rackspace\ UK\ (First Gen) = jclouds:cloudservers-uk
-
-# brooklyn.location.named.SeverLove = jclouds:serverlove-z1-man
-
-# brooklyn.location.named.SkaliCloud = jclouds:skalicloud-sdg-my
-
-# brooklyn.location.named.Stratogen = jclouds:stratogen-vcloud-mycloud
-
-# brooklyn.location.named.TryStack\ (Openstack) = jclouds:trystack-nova
-
-
-## Production pool of machines for my application (deploy to named:On-Prem\ Iron\ Example)
-# brooklyn.location.named.On-Prem\ Iron\ Example=byon:(hosts="10.9.1.1,10.9.1.2,produser2@10.9.2.{10,11,20-29}")
-# brooklyn.location.named.On-Prem\ Iron\ Example.user=produser1
-# brooklyn.location.named.On-Prem\ Iron\ Example.privateKeyFile=~/.ssh/produser_id_rsa
-# brooklyn.location.named.On-Prem\ Iron\ Example.privateKeyPassphrase=s3cr3tpassphrase
-
-## Various Private Clouds
-
-## openstack identity and credential are random strings of letters and numbers (TBC - still the case?)
-# brooklyn.location.named.My\ Openstack=jclouds:openstack-nova:https://9.9.9.9:9999/v2.0/
-
-## cloudstack identity and credential are rather long random strings of letters and numbers
-## you generate this in the cloudstack gui, under accounts, then "view users", then "generate key"
-## use the "api key" as the identity and "secret key" as the credential
-# brooklyn.location.named.My\ Cloudstack=jclouds:cloudstack:http://9.9.9.9:9999/client/api/
-
-## abiquo identity and credential are your login username/passed
-# brooklyn.location.named.My\ Abiquo=jclouds:abiquo:http://demonstration.abiquo.com/api/
-
-############################### Formatting Guide #######################################
-
-! Both # and ! mark lines as comments
-# The follow syntax are ALL valid.
-# example_key example_value
-# example_key : example_value
-# example_key = example_value
-# example_key=example_value
-
-# The backslash below tells Brooklyn to continue reading the value onto the next line.
-# example_key = A very \
-# long string!
-# Note all white space before 'long...' is ignored. Also '!' is kept as part of the string
-
-
-# Keys with spaces should be escaped with backslashes.
-# This is useful for named locations, as the name displayed in Brooklyn's web
-# interface is derived from the key name.
-# key\ with\ spaces = some\ value
-
-# Encoding for .properties must be ISO-8859-1, aka Latin-1.
-# All non-latin1 characters must be entered using unicode escape characters
-# polish_pangram = P\u00F3jd\u017A\u017Ce, ki\u0144 \
-# t\u0119 chmurno\u015B\u0107 w g\u0142\u0105b flaszy!
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/website/quickstart/index.md
----------------------------------------------------------------------
diff --git a/docs/website/quickstart/index.md b/docs/website/quickstart/index.md
index 0c6cc3e..40a80b8 100644
--- a/docs/website/quickstart/index.md
+++ b/docs/website/quickstart/index.md
@@ -5,6 +5,8 @@ children:
- { path: policies-and-catalogs.md }
---
+{% include fields.md %}
+
This guide will walk you through deploying an application to a public cloud.
We will be deploying an example 3-tier web application, described using this blueprint:
@@ -52,7 +54,7 @@ then answer 'yes', and then repeat the command run again.
If the response is `hello world`, with no other output or prompts, then your SSH setup is good and Brooklyn should be
able to use it without a problem.
-If these steps are not working, [these instructions]({{ site.data.brooklyn.url.userguide }}/use/guide/locations/) may be
+If these steps are not working, [these instructions]({{ site.path.guide }}/use/guide/locations/) may be
useful.
@@ -117,12 +119,12 @@ Locations can be clouds, machines with fixed IPs or localhost (for testing).
Brooklyn loads Location configuration from `~/.brooklyn/brooklyn.properties`.
-Create a `.brooklyn` folder in your home directory and download the template [brooklyn.properties](brooklyn.properties) to that folder.
+Create a `.brooklyn` folder in your home directory and download the template [brooklyn.properties]({{brooklyn_properties_url_path}}) to that folder.
{% highlight bash %}
$ mkdir ~/.brooklyn
$ cd ~/.brooklyn
-$ wget {{site.url_root}}{{site.path.website}}/quickstart/brooklyn.properties
+$ wget {{brooklyn_properties_url_live}}
{% endhighlight %}
Open brooklyn.properties in a text editor and add your cloud credentials.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ef594479/docs/website/quickstart/policies-and-catalogs.md
----------------------------------------------------------------------
diff --git a/docs/website/quickstart/policies-and-catalogs.md b/docs/website/quickstart/policies-and-catalogs.md
index d1dbd55..021c0cd 100644
--- a/docs/website/quickstart/policies-and-catalogs.md
+++ b/docs/website/quickstart/policies-and-catalogs.md
@@ -18,7 +18,7 @@ Download the template [catalog.xml](catalog.xml) to your `~/.brooklyn/` folder,
{% highlight bash %}
$ cd ~/.brooklyn
-$ wget {{site.data.brooklyn.url.userguide}}/use/guide/quickstart/catalog.xml
+$ wget {{site.url_root}}{{site.path.guide}}/use/guide/quickstart/catalog.xml
$ brooklyn launch
{% endhighlight %}
@@ -27,7 +27,7 @@ Now when we open the web console, two applications are displayed from the catalo
Select the 'Demo Web Cluster with DB' and click 'Next'.
-[](add-application-catalog-web-cluster-with-db-largea.png)
+[](add-application-catalog-web-cluster-with-db-large.png)
Select the Location that Brooklyn should deploy to, and name your application:
@@ -53,13 +53,13 @@ This policy automatically scales the cluster up or down to be the right size for
The loadbalancer's `targets` policy ensures that the loadbalancer is updated as the cluster size changes.
-Sitting idle, this cluster will only contain one server, but you can use a tool like [jmeter](http://jmeter.apache.org/) pointed at the nginx endpoint to create load on the cluster. (Download a [jmeter test plan](https://github.com/brooklyncentral/brooklyn/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx).)
+Sitting idle, this cluster will only contain one server, but you can use a tool like [jmeter](http://jmeter.apache.org/) pointed at the nginx endpoint to create load on the cluster. (Download a [jmeter test plan](https://github.com/apache/incubator-brooklyn/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx).)
As load is added, Brooklyn requests a new cloud machine, creates a new app server, and adds it to the cluster. As load is removed, servers are removed from the cluster, and the infrastructure is handed back to the cloud.
### Next
-The [Elastic Web Cluster Example]({{site.data.brooklyn.url.userguide}}/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.