Merge remote-tracking branch 'origin/latest-upstream' into release-5.…

…0-reverted-222

fix various places where this conflicted with reversion of 222 or caused errors

guide/blueprints/ansible/creating-ansible-blueprints.md

@@ -212,4 +212,6 @@ services:
             https_port: 8443
             admin_username: admin
             admin_password: secret
- ```
+```
+
+

guide/blueprints/creating-yaml.md

@@ -32,9 +32,10 @@ Here's a very simple YAML blueprint plan, to explain the structure:
   This is the meat of the blueprint plan, as you'll see below.
 
 Finally, the clipboard in the top-right corner of the example plan box above (hover your cursor over the box)  lets you easily copy-and-paste into the web-console:
-simply [download and launch]({{ site.path.guide }}/start/running.html) Brooklyn,
-then in the "Create Application" dialog at the web console
-(usually [http://127.0.0.1:8081/](http://127.0.0.1:8081/), paste the copied YAML into the "Yaml" tab of the dialog and press "Finish". 
+simply [download and launch]({{book.path.docs}}/start/running.md) Brooklyn, 
+open a new browser window (usually) at [http://127.0.0.1:8081/](http://127.0.0.1:8081/).
+Click on the tile "Blueprint Composer", then on the double-arrow located on the top right of the screen (to switch to the YAML mode),
+paste the copied YAML into the editor and press "Deploy". 
 There are several other ways to deploy, including `curl` and via the command-line,
 and you can configure users, https, persistence, and more, 
 as described [in the ops guide]({{ site.path.guide }}/ops/).

guide/blueprints/entity-configuration.md

@@ -44,39 +44,16 @@ blueprint (i.e. inside the `brooklyn.config` block).
 It can also explicitly declare config keys, using the `brooklyn.parameters` block. The example 
 below illustrates the principle:
 
-{% highlight yaml %}
-brooklyn.catalog:
-  items:
-  - id: entity-config-example
-    itemType: entity
-    name: Entity Config Example
-    item:
-      type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
-      brooklyn.parameters:
-      - name: custom.message
-        type: string
-        description: Message to be displayed
-        default: Hello
-      brooklyn.config:
-        shell.env:
-          MESSAGE: $brooklyn:config("custom.message")
-        launch.command: |
-          echo "My example launch command: $MESSAGE"
-        checkRunning.command: |
-          echo "My example checkRunning command: $MESSAGE"
-{% endhighlight %}
+!CODEFILE "example_yaml/entity-config-catalog.yaml"
 
 Once added to the catalog, it can be used with the simple blueprint below (substituting the location
 of your choice). Because no configuration has been overridden, this will use the default value
 for `custom.message`, and will use the given values for `launch.command` and `checkRunning.command`:
 
-{% highlight yaml %}
-location: aws-ec2:us-east-1
-services:
-- type: entity-config-example
-{% endhighlight %}
+!CODEFILE "example_yaml/entity-config-app.yaml"
 
-For details of how to write and add catalog items, see [Catalog]({{ site.path.guide }}/blueprints/catalog/). 
+For details of how to write and add catalog items, see [Catalog]({{book.path.docs}}/blueprints/catalog/index.md), 
+and for a complete reference on the syntax of `brooklyn.parameters` see that section of the [YAML Reference]({{book.path.docs}}/blueprints/yaml-reference.md). 
 
 
 #### Config Key Constraints
@@ -91,48 +68,11 @@ can be any of:
 
 This is illustrated in the example below:
 
-{% highlight yaml %}
-brooklyn.catalog:
-  items:
-  - id: entity-constraint-example
-    itemType: entity
-    name: Entity Config Example
-    item:
-      type: org.apache.brooklyn.entity.stock.BasicEntity
-      brooklyn.parameters:
-      - name: compulsoryExample
-        type: string
-        constraints:
-        - required
-      - name: addressExample
-        type: string
-        constraints:
-        - regex: ^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$
-      - name: numberExample
-        type: double
-        constraints:
-        - $brooklyn:object:
-            type: org.apache.brooklyn.util.math.MathPredicates
-            factoryMethod.name: greaterThan
-            factoryMethod.args:
-            - 0.0
-        - $brooklyn:object:
-            type: org.apache.brooklyn.util.math.MathPredicates
-            factoryMethod.name: lessThan
-            factoryMethod.args:
-            - 256.0
-{% endhighlight %}
+!CODEFILE "example_yaml/entity-constraint-catalog.yaml"
 
 An example usage of this toy example, once added to the catalog, is shown below:
 
-{% highlight yaml %}
-services:
-- type: entity-constraint-example
-  brooklyn.config:
-    compulsoryExample: foo
-    addressExample: 1.1.1.1
-    numberExample: 2.0
-{% endhighlight %}
+!CODEFILE "example_yaml/entity-constraint-app.yaml"
 
 
 ### Inheriting Configuration
@@ -167,16 +107,7 @@ consider the `entity-config-example` added to the catalog in the section
 [Configuration in a Catalog Item](#configuration-in-a-catalog-item).
 We can override these values. If not overridden, then the existing values from the super-type will be used:
 
-{% highlight yaml %}
-location: aws-ec2:us-east-1
-services:
-- type: entity-config-example
-  brooklyn.config:
-    custom.message: Goodbye
-    launch.command: |
-      echo "Sub-type launch command: $MESSAGE"
-{% endhighlight %}
-
+!CODEFILE "example_yaml/entity-config-override-app.yaml"
 
 
 In this example, the `custom.message` overrides the default defined on the config key.

guide/locations/_azure-ARM.md

@@ -81,7 +81,11 @@ We can now verify this information that this information can be used to log in t
 
     az login --service-principal -u <Application-ID> --password abcd --tenant <Tenant-ID>
 
-##### Azure CLI 1.0
+Should you need to change the password, you can use the following command:
+
+    az ad app update --id <Application-ID> --password MyNewPassword
+
+#### Azure CLI 1.0
 
 Firstly, install and configure Azure CLI following [these steps](https://docs.microsoft.com/en-us/azure/cli-install-nodejs).
 
@@ -102,7 +106,7 @@ Using the Azure CLI, run the following commands to create a service principal
     # For example: azure ad app create --name "myappname"  --password abcd --home-page "https://myappwebsite" --identifier-uris "https://myappwebsite"
 
     # Output will include a value for `Application Id`, which will be used for the live tests
-    
+
     # Create a Service Principal
     azure ad sp create --applicationId <Application-id>
 

guide/ops/cli/cli-usage-guide.md

@@ -135,14 +135,14 @@ The value of a single configuration item can be displayed by using the configura
 as a parameter for the `config` command:
 
 {% highlight text %}
-$ br app WebCluster entity thHnLFkP config datastore.creation.script.url
+$ br app WebCluster entity thHnLFkP config datastore.creation.script.template.url
 https://bit.ly/brooklyn-visitors-creation-script
 {% endhighlight %}
 
 The value of a configuration item can be changed by using the `set` command:
 
 {% highlight text %}
-$ br app WebCluster entity thHnLFkP config datastore.creation.script.url set \"https://bit.ly/new-script\"
+$ br app WebCluster entity thHnLFkP config datastore.creation.script.template.url set \"https://bit.ly/new-script\"
 {% endhighlight %}
 
 ## Sensors

guide/ops/configuration/brooklyn_cfg.md

@@ -91,7 +91,7 @@ The `users` line should contain a comma-separated list. The special value `*` is
 To generate this, there is a script shipped with Brooklyn:
 
 {% highlight bash %}
-brooklyn generate-password --user admin
+./bin/generate-password.sh --user admin
 
 Enter password: 
 Re-enter password: 

guide/ops/troubleshooting/connectivity.md

@@ -5,3 +5,4 @@ toc: /guide/toc.json
 ---
 
 {% readj _connectivity.md %}
+