From efaae9779198de6c88bb93550e6e1707595a22d5 Mon Sep 17 00:00:00 2001
From: Anne Gentle <anne@openstack.org>
Date: Thu, 6 Feb 2014 12:03:54 -0600
Subject: [PATCH] Update OpenStack Orchestration to Orchestration module

Change-Id: Iabcb6dc3e6d3869dd6c8eed8da1af588e75ce5f8
backport: havana
Closes-bug: 1277105
---
 doc/common/app_support.xml                          |  2 +-
 doc/common/ch_cli_heat_commands.xml                 |  2 +-
 .../compute/section_hypervisor_baremetal.xml        |  2 +-
 doc/glossary/glossary-terms.xml                     | 13 ++++++-------
 doc/install-guide/ch_heat.xml                       |  2 +-
 doc/install-guide/section_heat-install.xml          |  4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 73ae0e6bf5..9618b71f58 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -281,7 +281,7 @@ and so on.</para>
             </listitem>
             <listitem>
                 <para><link xlink:href="https://bugs.launchpad.net/heat">Bugs:
-                        OpenStack Orchestration (heat)</link></para>
+                        Orchestration (heat)</link></para>
             </listitem>
             <listitem>
                 <para><link xlink:href="https://bugs.launchpad.net/ceilometer"
diff --git a/doc/common/ch_cli_heat_commands.xml b/doc/common/ch_cli_heat_commands.xml
index 8b8e307993..0bd03cc694 100644
--- a/doc/common/ch_cli_heat_commands.xml
+++ b/doc/common/ch_cli_heat_commands.xml
@@ -10,7 +10,7 @@
 
     <title>heat commands</title>
     <para>The heat client is the command-line interface (CLI) for the
-         OpenStack Orchestration API and its extensions.</para>
+         Orchestration API and its extensions.</para>
     <para>For help on a specific <command>heat</command>
        command, enter:
     </para>
diff --git a/doc/config-reference/compute/section_hypervisor_baremetal.xml b/doc/config-reference/compute/section_hypervisor_baremetal.xml
index 9b0d3773ca..920ace9745 100644
--- a/doc/config-reference/compute/section_hypervisor_baremetal.xml
+++ b/doc/config-reference/compute/section_hypervisor_baremetal.xml
@@ -12,7 +12,7 @@ xml:id="baremetal">
         hardware through the OpenStack APIs, using pluggable sub-drivers to deliver
         machine imaging (PXE) and power control (IPMI). With this, provisioning
         and management of physical hardware is accomplished by using common cloud
-        APIs and tools, such as OpenStack Orchestration or salt-cloud.
+        APIs and tools, such as the Orchestration module (heat) or salt-cloud.
         However, due to this unique
         situation, using the baremetal driver requires some additional
         preparation of its environment, the details of which are beyond the
diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index 2b0610e289..80e7ded8a2 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -1171,13 +1171,12 @@ daemon that provides
         <glossentry>
             <glossterm>core project</glossterm>
             <glossdef>
-                <para>An official OpenStack project. Currently
-                    consists of Compute (nova), Object Storage
-                    (swift), Image Service (glance), Identity
-                    (keystone), Dashboard (horizon), Networking
-                    (neutron), Block Storage (cinder), Telemetry
-                    Service (ceilometer) and Orchestration Service
-                    (heat).</para>
+                <para>An official OpenStack project. Currently consists of Compute (nova), Object
+                    Storage (swift), Image Service (glance), Identity (keystone), Dashboard
+                    (horizon), Networking (neutron), and Block Storage (cinder). The Telemetry
+                    module (ceilometer) and Orchestration module (heat) are integrated projects as
+                    of the Havana release. In the Icehouse release, the Database module (trove)
+                    gains integrated project status.</para>
             </glossdef>
         </glossentry>
         <glossentry>
diff --git a/doc/install-guide/ch_heat.xml b/doc/install-guide/ch_heat.xml
index 96e05c5735..8289f17bd0 100644
--- a/doc/install-guide/ch_heat.xml
+++ b/doc/install-guide/ch_heat.xml
@@ -4,7 +4,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
          xml:id="ch_heat">
   <title>Add the Orchestration service</title>
-       <para>Use the OpenStack Orchestration service to create cloud
+       <para>Use the Orchestration module to create cloud
           resources using a template language called HOT. The
           integrated project name is Heat.</para>
        <xi:include href="../common/section_getstart_orchestration.xml"/>
diff --git a/doc/install-guide/section_heat-install.xml b/doc/install-guide/section_heat-install.xml
index a836ab0f9b..940c7a853e 100644
--- a/doc/install-guide/section_heat-install.xml
+++ b/doc/install-guide/section_heat-install.xml
@@ -5,7 +5,7 @@
   <title>Install the Orchestration service</title>
   <procedure os="debian">
     <step>
-      <para>Install the OpenStack Orchestration service on the controller
+      <para>Install the Orchestration module on the controller
         node:</para>
       <screen os="debian"><prompt>#</prompt> <userinput>apt-get install heat-api heat-api-cfn heat-engine</userinput></screen>
     </step>
@@ -21,7 +21,7 @@
   </procedure>
   <procedure>
     <step>
-      <para>Install the OpenStack Orchestration service on the controller
+      <para>Install the Orchestration module on the controller
         node:</para>
       <screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install heat-api heat-api-cfn heat-engine</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-heat-api openstack-heat-engine \