From 35918c4d6d5c9d8fae518f33e63f6ff3adea9e07 Mon Sep 17 00:00:00 2001 From: Shilla Saebi Date: Mon, 27 Apr 2015 14:26:43 -0400 Subject: [PATCH] change to environment.rst heat doc corrected typo for signalling (signaling) changed to behavior for consistency fixed capitalization to comply with doc conventions https://wiki.openstack.org/wiki/Documentation/Conventions Change-Id: I21788bb16877d5034e2e2c5e6905229f43342efb --- doc/source/template_guide/environment.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/template_guide/environment.rst b/doc/source/template_guide/environment.rst index baf4096db7..3e011e418f 100644 --- a/doc/source/template_guide/environment.rst +++ b/doc/source/template_guide/environment.rst @@ -17,7 +17,7 @@ Environments ============ -The environment is used to affect the runtime behaviour of the +The environment is used to affect the runtime behavior of the template. It provides a way to override the resource implementations and provide a mechanism to place parameters that the service needs. @@ -72,7 +72,7 @@ If the "my_env.yaml" file from the example above had been put in the Usage examples -------------- -1) Pass parameters into Heat +1) Pass parameters into heat ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ :: @@ -159,7 +159,7 @@ Example: another_resource: hooks: [pre-create, pre-update] -When Heat encounters a resource that has a hook, it will pause the resource +When heat encounters a resource that has a hook, it will pause the resource action until the hook is cleared. Any resources that depend on it will wait as well. Any resources that don't will be created in parallel (unless they have hooks, too). @@ -179,5 +179,5 @@ This example: will pause while creating `app_server` and `database_server` but not `server` or `app_network`. -Hook is cleared by signalling the resource with `{unset_hook: pre-create}` (or +Hook is cleared by signaling the resource with `{unset_hook: pre-create}` (or `pre-update`).