[brooklyn-docs] 10/34: Merge commit '40c59c6c' into release-5.0-reverted-222

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

duncangrant pushed a commit to branch ruby-3
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git

commit 7d808f6219b493c609e0247eb0b356fe5ff892fe
Merge: 2698dbc 40c59c6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Sep 4 14:29:41 2018 +0100

    Merge commit '40c59c6c' into release-5.0-reverted-222

 guide/blueprints/entity-configuration.md                          | 4 ++--
 guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc guide/blueprints/entity-configuration.md
index 25827ad,c2d5794..97b6824
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@@ -25,8 -22,8 +25,8 @@@ services
    brooklyn.config:
      webapp.enabledProtocols: http
      http.port: 9080
-     wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-webapp/0.9.0/brooklyn-example-hello-world-webapp-0.9.0.war
+     wars.root: https://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-webapp/0.12.0/brooklyn-example-hello-world-webapp-0.12.0.war # BROOKLYN_VERSION
 -```
 +{% endhighlight %}
  
  If no config value is supplied, the default for that config key will be used. For example, 
  `http.port` would default to 8080 if not explicitly supplied.