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:49 UTC

[15/50] [abbrv] incubator-brooklyn git commit: ensure host is included when needed

ensure host is included when needed


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4824a945
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4824a945
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4824a945

Branch: refs/heads/master
Commit: 4824a945d978e72d6977a295263638d9c7e4c598
Parents: 2ac0c6d
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 15 21:50:41 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 17 02:02:55 2014 +0000

----------------------------------------------------------------------
 docs/_config.yml                                         | 2 +-
 docs/guide/dev/build/index.md                            | 2 +-
 docs/guide/use/guide/quickstart/index.md                 | 2 +-
 docs/guide/use/guide/quickstart/policies-and-catalogs.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4824a945/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 6d18842..bc0ac52 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -27,7 +27,7 @@ brooklyn-snapshot-git-branch: master   # if line above is SNAPSHOT this should p
 # url: /v/0.7.0-SNAPSHOT  # BROOKLYN_VERSION
 # url: 
 
-url_root: http://0.0.0.0:4000/
+url_root: http://0.0.0.0:4000
 
 path:
   style: /style

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4824a945/docs/guide/dev/build/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/build/index.md b/docs/guide/dev/build/index.md
index 53b95f6..90aa6fa 100644
--- a/docs/guide/dev/build/index.md
+++ b/docs/guide/dev/build/index.md
@@ -74,7 +74,7 @@ If there is a good reason that a file, pattern, or directory should be permanent
 
 * The **developers catalog** ([developers-catalog.xml](developers-catalog.xml)) uses artifacts from your local `~/.m2/repository/...` (after building from source). This avoids unnecessary web requests to Maven Central or Sonatype, and will allow you to work off-line.
   
-  ``wget {{site.path.guide}}/dev/build/developers-catalog.xml > ~/.brooklyn/catalog.xml`` 
+  ``wget {{site.url_root}}{{site.path.guide}}/dev/build/developers-catalog.xml > ~/.brooklyn/catalog.xml`` 
 
 ## Appendix: Sample Output
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4824a945/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 d12d6c0..515a9d2 100644
--- a/docs/guide/use/guide/quickstart/index.md
+++ b/docs/guide/use/guide/quickstart/index.md
@@ -85,7 +85,7 @@ this file can be installed with:
 {% highlight bash %}
 $ mkdir ~/.brooklyn
 $ cd ~/.brooklyn
-$ wget {{site.path.guide}}/use/guide/quickstart/brooklyn.properties
+$ wget {{site.url_root}}{{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:

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4824a945/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 d52b8f8..3d8a6a2 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.path.guide}}/use/guide/quickstart/catalog.xml
+$ wget {{site.url_root}}{{site.path.guide}}/use/guide/quickstart/catalog.xml
 
 $ brooklyn launch
 {% endhighlight %}