[brooklyn-docs] 25/34: Merge apache-brooklyn/master as at commit f38fb8bb

[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 1e0f1bea680cd0e94eaf1b47578816037ec11656
Merge: dae7d77 f38fb8b
Author: Richard Downer <ri...@cloudsoft.io>
AuthorDate: Thu Feb 25 11:51:46 2021 +0000

    Merge apache-brooklyn/master as at commit f38fb8bb

 guide/blueprints/advanced-example.md             | 6 +++---
 guide/blueprints/clusters.md                     | 4 ++--
 guide/blueprints/configuring-vms.md              | 4 ++--
 guide/blueprints/custom-entities.md              | 4 ++--
 guide/blueprints/test/index.md                   | 2 +-
 guide/blueprints/yaml-reference.md               | 4 ++--
 guide/concepts/configuration-sensor-effectors.md | 2 +-
 guide/ops/configuration/index.md                 | 2 +-
 guide/start/managing.md                          | 4 ++--
 guide/start/policies.md                          | 2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --cc guide/blueprints/configuring-vms.md
index e7e7f47,43a9d89..9cdb408
--- a/guide/blueprints/configuring-vms.md
+++ b/guide/blueprints/configuring-vms.md
@@@ -7,18 -4,16 +7,18 @@@ categories: [use, guide, defining-appli
  
  Another simple blueprint will just create a VM which you can use, without any software installed upon it:
  
 -!CODEFILE "example_yaml/simple-vm.yaml"
 +{% highlight yaml %}
 +{% readj example_yaml/simple-vm.yaml %}
 +{% endhighlight %}
  
  
- *We've omitted the `location` section here and in many of the examples below;
+ *We've omitted the `location` section here and in many of the examples elsewhere;
  add the appropriate choice when you paste your YAML. Note that the `provisioning.properties` will be
  ignored if deploying to `localhost` or `byon` fixed-IP machines.* 
  
  This will create a VM with the specified parameters in your choice of cloud.
  In the GUI (and in the REST API), the entity is called "VM",
- and the hostname and IP address(es) are reported as [sensors]({{ site.path.guide }}/concepts/entities.html).
 -and the hostname and IP address(es) are reported as [sensors]({{book.path.docs}}/concepts/configuration-sensor-effectors.md).
++and the hostname and IP address(es) are reported as [sensors]({{ site.path.guide }}/concepts/configuration-sensor-effectors.html).
  There are many more `provisioning.properties` supported here,
  including:
  
diff --cc guide/blueprints/custom-entities.md
index efd03ba,dfd3d94..1bbe059
--- a/guide/blueprints/custom-entities.md
+++ b/guide/blueprints/custom-entities.md
@@@ -204,11 -182,9 +204,11 @@@ and if you haven't yet experimented wit
  ### Attaching Policies
  
  Besides detecting this failure, Brooklyn policies can be added to the YAML to take appropriate 
- action. A simple recovery here might just to automatically restart the process:
+ action. A simple recovery here might be just to restart the process automatically:
  
 -!CODEFILE "example_yaml/vanilla-bash-netcat-restarter.yaml"
 +{% highlight yaml %}
 +{% readj example_yaml/vanilla-bash-netcat-restarter.yaml %}
 +{% endhighlight %}
  
  Autonomic management in Brooklyn often follows the principle that complex behaviours emerge
  from composing simple policies.
diff --cc guide/start/managing.md
index c1f432e,a9438b5..11a5e98
--- a/guide/start/managing.md
+++ b/guide/start/managing.md
@@@ -261,17 -186,15 +261,17 @@@ restart                           Resta
  start                             Start the process/service represented by an entity                                        locations   
  stop                              Stop the process/service represented by an entity                                         stopProcessMode,stopMachineMode   
  undeploy                          Undeploys the given context/artifact                                                      targetName   
 -```
 +</pre>
  
- To view the details for a specific effector, append it's name to the command:
+ To view the details for a specific effector, append its name to the command:
  
 -```
 +{% highlight bash %}
  $ br application Tomcat entity tomcatServer effector deploy
 +{% endhighlight %}
 +<pre>
  Name     Description                                                                             Parameters   
  deploy   Deploys the given artifact, from a source URL, to a given deployment filename/context   url,targetName   
 -```
 +</pre>
  
  These effectors can also be invoked by appending ```invoke``` to this command. Some effectors require parameters for their invocation. For example, if we look at the details for ```deploy``` above we can see it requires a url and targetName.