From 776e5c46bf97a5b5647a8b50c416f11085ee5007 Mon Sep 17 00:00:00 2001
From: Matthew Kassawara <mkassawara@gmail.com>
Date: Wed, 4 Feb 2015 09:38:24 -0600
Subject: [PATCH] Improve ceilometer content

Address comments from the backport of patch #152626.

Change-Id: Ie37a18e500e17b6cf0f6dc7fdcc5a6630b4be341
Closes-Bug: #1405252
backport: juno
---
 doc/install-guide/section_ceilometer-controller.xml | 6 +++---
 doc/install-guide/section_ceilometer-verify.xml     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/install-guide/section_ceilometer-controller.xml b/doc/install-guide/section_ceilometer-controller.xml
index 9fcacfbc99..96875fd208 100644
--- a/doc/install-guide/section_ceilometer-controller.xml
+++ b/doc/install-guide/section_ceilometer-controller.xml
@@ -218,9 +218,9 @@ connecting to: controller:27017/test
 ...
 connection = mongodb://ceilometer:<replaceable>CEILOMETER_DBPASS</replaceable>@<replaceable>controller</replaceable>:27017/ceilometer</programlisting>
           <para>Replace <replaceable>CEILOMETER_DBPASS</replaceable> with
-            the password you chose for the Telemetry module database. MongoDB
-            connection string requires escaping special characters as per
-            RFC2396.</para>
+            the password you chose for the Telemetry module database. You
+            must escape special characters such as ':', '/', '+', and '@'
+            in the connection string in accordance with RFC2396.</para>
         </step>
         <step>
           <para>In the <literal>[DEFAULT]</literal> section, configure
diff --git a/doc/install-guide/section_ceilometer-verify.xml b/doc/install-guide/section_ceilometer-verify.xml
index b896a003f4..fb8a49f34c 100644
--- a/doc/install-guide/section_ceilometer-verify.xml
+++ b/doc/install-guide/section_ceilometer-verify.xml
@@ -9,7 +9,7 @@
     module.</para>
   <procedure>
     <note>
-      <para>Perform these commands on the controller node.</para>
+      <para>Perform these steps on the controller node.</para>
     </note>
     <step>
       <para>Source the <literal>admin</literal> credentials to gain access to