[22/28] brooklyn-docs git commit: Brooklyn is not AMP

[dr...@apache.org]

Brooklyn is not AMP

(cherry picked from commit 7337fa58df5b89e34376f0f666be07b984c748d2)


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/122fe408
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/122fe408
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/122fe408

Branch: refs/heads/0.11.x
Commit: 122fe408d1f840aac21459f74c33ebe958974593
Parents: 12231b5
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri May 5 23:36:41 2017 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Wed May 31 15:32:33 2017 +0100

----------------------------------------------------------------------
 guide/blueprints/entity-configuration.md       | 2 +-
 guide/blueprints/java/archetype.md             | 2 +-
 guide/ops/troubleshooting/deployment.md        | 2 +-
 guide/ops/troubleshooting/slow-unresponsive.md | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/122fe408/guide/blueprints/entity-configuration.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/entity-configuration.md b/guide/blueprints/entity-configuration.md
index 14561ac..25827ad 100644
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@ -455,7 +455,7 @@ The possible modes are:
 #### Explicit Inheritance Modes
 
 _The YAML support for explicitly defining the inheritance mode is still work-in-progress. The options
-documented below will be enhanced in a future version of AMP, to better support the modes described
+documented below will be enhanced in a future version of Brooklyn, to better support the modes described
 above._
 
 In a YAML blueprint, within the `brooklyn.parameters` section for declaring new config keys, one can

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/122fe408/guide/blueprints/java/archetype.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/java/archetype.md b/guide/blueprints/java/archetype.md
index 176e662..f9acac8 100644
--- a/guide/blueprints/java/archetype.md
+++ b/guide/blueprints/java/archetype.md
@@ -91,7 +91,7 @@ The command below will use the CLI to add this to the catalog of a running Brook
 {% endhighlight %}
 
 After running that command, the OSGi bundle will have been added to the OSGi container, and the
-entity will have been added to your catalog. It can then be used in the same way as regular AMP 
+entity will have been added to your catalog. It can then be used in the same way as regular Brooklyn 
 entities.
 
 For example, you can use the blueprint:

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/122fe408/guide/ops/troubleshooting/deployment.md
----------------------------------------------------------------------
diff --git a/guide/ops/troubleshooting/deployment.md b/guide/ops/troubleshooting/deployment.md
index 653909b..67d28c8 100644
--- a/guide/ops/troubleshooting/deployment.md
+++ b/guide/ops/troubleshooting/deployment.md
@@ -160,7 +160,7 @@ See the [overview](overview.html) for where to find additional information, espe
 
 If you receive an error message similar to the one below when provisioning a VM, it means that the wrong username is being used for ssh'ing to the machine. The "invalid packet" is because a response such as "Please login as the ubuntu user rather than root user." is being sent back.
 
-You can workaround the issue by explicitly setting the user that AMP should use to login to the VM  (typically the OS default user).
+You can workaround the issue by explicitly setting the user that Brooklyn should use to login to the VM  (typically the OS default user).
 
 {% highlight bash %}
 error acquiring SFTPClient() (out of retries - max 50)

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/122fe408/guide/ops/troubleshooting/slow-unresponsive.md
----------------------------------------------------------------------
diff --git a/guide/ops/troubleshooting/slow-unresponsive.md b/guide/ops/troubleshooting/slow-unresponsive.md
index 2168859..90ea94f 100644
--- a/guide/ops/troubleshooting/slow-unresponsive.md
+++ b/guide/ops/troubleshooting/slow-unresponsive.md
@@ -20,7 +20,7 @@ requirements.
 
 ## Machine Diagnostics
 
-The following commands will collect OS-level diagnostics about the machine, and about the AMP 
+The following commands will collect OS-level diagnostics about the machine, and about the Brooklyn 
 process. The commands below assume use of CentOS 6.x. Minor adjustments may be required for
 other platforms.
 
@@ -65,7 +65,7 @@ for more information.
 #### Disk Space
 
 The command below will list the disk size for each partition, including the amount used and 
-available. If the AMP base directory, persistence directory or logging directory are close 
+available. If the Brooklyn base directory, persistence directory or logging directory are close 
 to 0% available, this can cause serious problems:
 
 {% highlight bash %}