From 209f5bb54dd5af79151f338f7dd0e7b7a449a16d Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Fri, 11 Oct 2013 10:56:47 +0200
Subject: [PATCH] Mention ceilometer in Guides

The Admin User and End User guides include cli references for
ceilometer but ceilometer was not mentioned in the introductory section.

Also, improve markup of the package names.

Change-Id: Id48ed11ed3b0caefb97f97b69018570ad5540973
---
 doc/common/section_cli_install.xml  |  6 +++++-
 doc/common/section_cli_overview.xml | 30 +++++++++++++++++++++--------
 doc/common/section_cli_version.xml  |  4 ++++
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/doc/common/section_cli_install.xml b/doc/common/section_cli_install.xml
index 5450b3d140..928d5a3ad1 100644
--- a/doc/common/section_cli_install.xml
+++ b/doc/common/section_cli_install.xml
@@ -117,7 +117,7 @@
                         manage client installation:
                         <screen><prompt>#</prompt> <userinput>zypper install python-pip</userinput></screen></para>
                     <formalpara>
-                        <title>openSUSE 12.3</title>
+                        <title>openSUSE 12.3 and newer</title>
                         <para>A packaged version enables you to use
                                 <command>rpm</command> or
                                 <command>zypper</command> to install
@@ -179,6 +179,10 @@
                         <para><literal>heat</literal>. Orchestration
                             API.</para>
                     </listitem>
+                    <listitem>
+                        <para><literal>ceilometer</literal>. Monitoring/Metering
+                            API.</para>
+                    </listitem>
                 </itemizedlist>
                 <para>For example, to install the nova client, run the
                     following command:</para>
diff --git a/doc/common/section_cli_overview.xml b/doc/common/section_cli_overview.xml
index 543e3033fc..76e8245d0b 100644
--- a/doc/common/section_cli_overview.xml
+++ b/doc/common/section_cli_overview.xml
@@ -32,46 +32,60 @@
     <para>The following command-line clients are available for the
         respective services' APIs:</para>
     <itemizedlist>
+        <listitem>
+            <para><emphasis role="bold">ceilometer</emphasis>
+                (<application>python-ceilometerclient</application>).
+                Client for Monitoring/Metering
+                API that lets you create and collect measurements
+                across all OpenStack components.</para>
+        </listitem>
         <listitem>
             <para><emphasis role="bold">cinder</emphasis>
-                (python-cinderclient). Client for the Block Storage
+                (<application>python-cinderclient</application>).
+                Client for the Block Storage
                 Service API that lets you create and manage
                 volumes.</para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">glance</emphasis>
-                (python-glanceclient). Client for the Image Service
+                (<application>python-glanceclient</application>).
+                Client for the Image Service
                 API that lets you create and manage images.</para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">heat</emphasis>
-                (python-heatclient). Client for the Orchestration API
+                (<application>python-heatclient</application>).
+                Client for the Orchestration API
                 that lets you launch stacks from templates, view
                 details of running stacks including events and
                 resources, and update and delete stacks.</para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">keystone</emphasis>
-                (python-keystoneclient). Client for the Identity
+                (<application>python-keystoneclient</application>).
+                Client for the Identity
                 Service API that lets you create and manage users,
                 tenants, roles, endpoints, and credentials.</para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">neutron</emphasis>
-                (python-neutronclient). Client for the Networking API
+                (<application>python-neutronclient</application>).
+                Client for the Networking API
                 that lets you configure networks for guest servers.
                 This client was previously known as <emphasis
-                    role="bold">quantum</emphasis>.</para>
+                role="bold">quantum</emphasis>.</para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">nova</emphasis>
-                (python-novaclient). Client for the Compute API and
+                (<application>python-novaclient</application>).
+                Client for the Compute API and
                 its extensions. Use to create and manage images,
                 instances, and flavors.</para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">swift</emphasis>
-                (python-swiftclient). Client for the Object Storage
+                (<application>python-swiftclient</application>).
+                Client for the Object Storage
                 API that lets you gather statistics, list items,
                 update metadata, upload, download and delete files
                 stored by the Object Storage service. Provides access
diff --git a/doc/common/section_cli_version.xml b/doc/common/section_cli_version.xml
index 91b84c2a51..767a266c92 100644
--- a/doc/common/section_cli_version.xml
+++ b/doc/common/section_cli_version.xml
@@ -43,6 +43,10 @@
                                    <para><literal>heat</literal>.
                                    Orchestration API.</para>
                                 </listitem>
+                                <listitem>
+                                   <para><literal>ceilometer</literal>.
+                                   Metering/Monitoring API.</para>
+                                </listitem>
                         </itemizedlist>
                         <para>For example, to see the version of the
                                 nova client, run the following