Install Guide: Trove edits

Follow our conventions:
* Wrap long lines in screens.
* Use all-caps for variables.
* Use # su instead of $ sudo su like in other chapters

Change-Id: Iab395ada34583d24bc68db9c297a36b4432fbf20

doc/install-guide/section_trove-install.xml

@@ -39,7 +39,8 @@
           <literal>service</literal> tenant and give the user the
           <literal>admin</literal> role:
           </para>
-          <screen><prompt>$</prompt> <userinput>keystone user-create --name=trove --pass=<replaceable>TROVE_PASS</replaceable> --email=<replaceable>trove@example.com</replaceable></userinput>
+          <screen><prompt>$</prompt> <userinput>keystone user-create --name=trove --pass=<replaceable>TROVE_PASS</replaceable> \
+  --email=<replaceable>trove@example.com</replaceable></userinput>
 <prompt>$</prompt> <userinput>keystone user-role-add --user=trove --tenant=service --role=admin</userinput></screen>
         </step>
 
@@ -79,10 +80,12 @@ notifier_queue_hostname = <replaceable>controller</replaceable></programlisting>
   DEFAULT rpc_backend rabbit</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf \
   DEFAULT rpc_backend rabbit</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput>
-          </screen>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf DEFAULT \
+  qpid_hostname <replaceable>controller</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT \
+  qpid_hostname <replaceable>controller</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf DEFAULT \
+  qpid_hostname <replaceable>controller</replaceable></userinput></screen>
         </step>
 
         <step os="ubuntu">
@@ -104,12 +107,18 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable>
   DEFAULT rpc_backend rabbit</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf \
   DEFAULT rpc_backend rabbit</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf DEFAULT \
+  rabbit_host <replaceable>controller</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT \
+  rabbit_host <replaceable>controller</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf DEFAULT \
+  rabbit_host <replaceable>controller</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf DEFAULT \
+  rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT \
+  rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf DEFAULT \
+  rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
         </step>
       </substeps>
     </step>
@@ -170,13 +179,13 @@ nova_proxy_admin_tenant_name = service
       <substeps>
         <step>
           <para>Initialize the database:</para>
-          <screen><prompt>$</prompt> <userinput>sudo su -s /bin/sh -c "trove-manage db_sync" trove</userinput></screen>
+          <screen><prompt>#</prompt> <userinput>su -s /bin/sh -c "trove-manage db_sync" trove</userinput></screen>
         </step>
         <step>
           <para>Create a datastore. You need to create a separate datastore for
           each type of database you want to use, for example, MySQL, MongoDB, Cassandra.
           This example shows you how to create a datastore for a MySQL database:</para>
-          <screen><prompt>$</prompt> <userinput>sudo su -s /bin/sh -c "trove-manage datastore_update mysql ''" trove</userinput></screen>
+          <screen><prompt>#</prompt> <userinput>su -s /bin/sh -c "trove-manage datastore_update mysql ''" trove</userinput></screen>
         </step>
       </substeps>
     </step>

doc/install-guide/section_trove-verify.xml

@@ -3,8 +3,9 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <title>Verify the Database service installation</title>
-  <para>To verify that the Database service is installed and configured correctly, try executing a Trove command:</para>
-<procedure>
+  <para>To verify that the Database service is installed and
+    configured correctly, try executing a Trove command:</para>
+    <procedure>
       <step>
       <para>Source the <filename>demo-openrc.sh</filename> file.</para>
       <screen><prompt>$</prompt> <userinput>source ~/demo-openrc.sh</userinput></screen>
@@ -19,11 +20,18 @@
 +----+------+-----------+-------------------+--------+-----------+------+</computeroutput></screen>
           </step>
            <step>
-        <para>Assuming you have created an image for the type of database you want, and have updated the datastore to use that image, you can now create a Trove instance (database). To do this, use the trove <command>create</command> command.</para>
-        <para>This example shows you how to create a MySQL 5.5 database:</para>
-          <screen><prompt>$</prompt> <userinput>trove create <replaceable>name</replaceable> 2 --size=2 --databases=<replaceable>dbname</replaceable> \
-  --users <replaceable>user</replaceable>:<replaceable>pass</replaceable> --datastore_version mysql-5.5 \
+             <para>
+               Assuming you have created an image for the type of
+               database you want, and have updated the datastore to
+               use that image, you can now create a Trove instance
+               (database). To do this, use the trove
+               <command>create</command> command.
+             </para>
+             <para>This example shows you how to create a MySQL 5.5
+             database:</para>
+             <screen><prompt>$</prompt> <userinput>trove create <replaceable>name</replaceable> 2 --size=2 --databases=<replaceable>DBNAME</replaceable> \
+  --users <replaceable>USER</replaceable>:<replaceable>PASSWORD</replaceable> --datastore_version mysql-5.5 \
   --datastore mysql</userinput></screen>
-</step>
-  </procedure>
+           </step>
+</procedure>
 </section>