From 3138f6fc0ae27fe88348688df24728d7a7432881 Mon Sep 17 00:00:00 2001
From: Chandan kumar <chandankumar.093047@gmail.com>
Date: Thu, 28 Nov 2013 17:00:20 +0530
Subject: [PATCH] Rename Metering to Telemetry in common guide.

backport: havana

Renamed section_getstart_metering.xml to section_getstart_telemetry.xml

Change-Id: I583524b7e5cbea48579482cca02753166c186622
---
 doc/common/app_support.xml                                  | 2 +-
 doc/common/ch_getstart.xml                                  | 4 ++--
 doc/common/section_ceilometer_cli_commands.xml              | 2 +-
 doc/common/section_cli_install.xml                          | 2 +-
 doc/common/section_cli_overview.xml                         | 2 +-
 doc/common/section_cli_version.xml                          | 2 +-
 ...getstart_metering.xml => section_getstart_telemetry.xml} | 6 +++---
 doc/install-guide/ch_ceilometer.xml                         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename doc/common/{section_getstart_metering.xml => section_getstart_telemetry.xml} (95%)

diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 8a32a6978e..03bdb5415b 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -283,7 +283,7 @@ xlink:href="https://bugs.launchpad.net/heat"
 <listitem>
     <para><link
 xlink:href="https://bugs.launchpad.net/ceilometer"
-        >Bugs : OpenStack Metering (ceilometer)</link></para>
+        >Bugs : OpenStack Telemetry (ceilometer)</link></para>
 </listitem>
         </itemizedlist>
     </section>
diff --git a/doc/common/ch_getstart.xml b/doc/common/ch_getstart.xml
index 931430decb..2f851ec085 100644
--- a/doc/common/ch_getstart.xml
+++ b/doc/common/ch_getstart.xml
@@ -112,7 +112,7 @@
             <tr>
                 <td><link
                         xlink:href="http://www.openstack.org/software/openstack-shared-services/"
-                        >Metering/Monitoring Service</link></td>
+                        >Telemetry Service</link></td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/ceilometer/"
                         >Ceilometer</link></td>
@@ -155,7 +155,7 @@
         <xi:include href="section_keystone-concepts.xml"/>
         <?hard-pagebreak?>
         <xi:include href="section_getstart_image.xml"/>
-        <xi:include href="section_getstart_metering.xml"/>
+        <xi:include href="section_getstart_telemetry.xml"/>
         <xi:include href="section_getstart_orchestration.xml"/>
     </section>
     <section xml:id="feedback">
diff --git a/doc/common/section_ceilometer_cli_commands.xml b/doc/common/section_ceilometer_cli_commands.xml
index 435211f261..1c0cecabe5 100644
--- a/doc/common/section_ceilometer_cli_commands.xml
+++ b/doc/common/section_ceilometer_cli_commands.xml
@@ -5,7 +5,7 @@
   xml:id="ceilometer_client_commands">
   <title>ceilometer commands</title>
   <para>The ceilometer client is the command-line interface for the
-    OpenStack Metering API.</para>
+    OpenStack Telemetry API.</para>
   <para>For help on a specific ceilometer command, enter:</para>
   <screen><prompt>$</prompt> <userinput><command>ceilometer</command> <option>help</option> <replaceable>COMMAND</replaceable></userinput></screen>
   <example>
diff --git a/doc/common/section_cli_install.xml b/doc/common/section_cli_install.xml
index befdd92341..f2340859a0 100644
--- a/doc/common/section_cli_install.xml
+++ b/doc/common/section_cli_install.xml
@@ -181,7 +181,7 @@
                     </listitem>
                     <listitem>
                         <para><literal>ceilometer</literal>.
-                            Monitoring/Metering API.</para>
+                            Telemetry API.</para>
                     </listitem>
                 </itemizedlist>
                 <para>For example, to install the nova client, run
diff --git a/doc/common/section_cli_overview.xml b/doc/common/section_cli_overview.xml
index 4c461d19bb..fa5240420c 100644
--- a/doc/common/section_cli_overview.xml
+++ b/doc/common/section_cli_overview.xml
@@ -35,7 +35,7 @@
         <listitem>
             <para><command>ceilometer</command>
                     (<package>python-ceilometerclient</package>).
-                Client for the Metering API that lets you create and
+                Client for the Telemetry API that lets you create and
                 collect measurements across OpenStack.</para>
         </listitem>
         <listitem>
diff --git a/doc/common/section_cli_version.xml b/doc/common/section_cli_version.xml
index 767a266c92..01e39ece8f 100644
--- a/doc/common/section_cli_version.xml
+++ b/doc/common/section_cli_version.xml
@@ -45,7 +45,7 @@
                                 </listitem>
                                 <listitem>
                                    <para><literal>ceilometer</literal>.
-                                   Metering/Monitoring API.</para>
+                                   Telemetry API.</para>
                                 </listitem>
                         </itemizedlist>
                         <para>For example, to see the version of the
diff --git a/doc/common/section_getstart_metering.xml b/doc/common/section_getstart_telemetry.xml
similarity index 95%
rename from doc/common/section_getstart_metering.xml
rename to doc/common/section_getstart_telemetry.xml
index 387ef7f875..4adbedaaf1 100644
--- a/doc/common/section_getstart_metering.xml
+++ b/doc/common/section_getstart_telemetry.xml
@@ -2,8 +2,8 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="metering-service">
-      <title>The Metering service</title>
-      <para>The Metering service:</para>
+      <title>The Telemetry Service</title>
+      <para>The OpenStack Telemetry service:</para>
       <para>
         <itemizedlist>
           <listitem>
@@ -55,7 +55,7 @@
             and for metering data coming from the agent). Notification
             messages are processed and turned into metering messages
             and sent back out onto the message bus using the
-            appropriate topic. Metering messages are written to the
+            appropriate topic. Telemetry messages are written to the
             data store without modification.</para>
         </listitem>
         <listitem>
diff --git a/doc/install-guide/ch_ceilometer.xml b/doc/install-guide/ch_ceilometer.xml
index d340794568..7130f76741 100644
--- a/doc/install-guide/ch_ceilometer.xml
+++ b/doc/install-guide/ch_ceilometer.xml
@@ -8,7 +8,7 @@
   <para>The OpenStack Metering service provides a framework for
   monitoring and metering the OpenStack cloud. It is also known
   as the Ceilometer project.</para>
-       <xi:include href="../common/section_getstart_metering.xml"/>
+       <xi:include href="../common/section_getstart_telemetry.xml"/>
        <xi:include href="section_ceilometer-install.xml"/>
        <xi:include href="section_ceilometer-nova.xml"/>
        <xi:include href="section_ceilometer-glance.xml"/>