From 53eb381eaab51192f8ff77d5b57d575ddd88d3ac Mon Sep 17 00:00:00 2001
From: Anne Gentle <anne@openstack.org>
Date: Mon, 24 Mar 2014 16:54:26 -0500
Subject: [PATCH] Revises text to explain that multiple passwords are needed

Change-Id: I502c3b9f5789eb5452b486407cc362c6ff95a29b
Closes-bug: 1296213
---
 doc/install-guide/ch_basics.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basics.xml
index 2d5767fdab..53f6309ec8 100644
--- a/doc/install-guide/ch_basics.xml
+++ b/doc/install-guide/ch_basics.xml
@@ -257,16 +257,15 @@ iface eth1 inet static
 
   <section xml:id="basics-passwords" os="ubuntu;rhel;fedora;centos;opensuse;sles">
     <title>Passwords</title>
-
-    <para>The various OpenStack services and the required software
-    like the database and the Messaging server have to be password
-    protected. These passwords are needed when configuring a service
-    and then again to access the service. You have to choose a random
-    password while configuring the service and later remember to use
-    the same password when accessing it. To generate a list of passwords, you
-    can use the <application>pwgen</application> program
-    to generate a list of passwords or take the output of:
-    <screen><prompt>$</prompt> <userinput>openssl rand -hex 10</userinput></screen>
+    <para>The various OpenStack services and the required software like the
+      database and the messaging server have to be password protected. You use
+      these passwords when configuring a service and then again to access the
+      service. You have to choose a password while configuring the
+      service and later remember to use the same password when accessing it.
+      Optionally, you can generate random passwords with the
+        <application>pwgen</application> program. Or, to create passwords one at a
+      time, use the output of this command repeatedly:
+      <screen><prompt>$</prompt> <userinput>openssl rand -hex 10</userinput></screen>
     </para>
 
     <para>This guide uses the convention that