From 6d17f8e0335f8bf04fa2011dd3d2ffbfc224da89 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Tue, 6 May 2014 23:18:13 +0200
Subject: [PATCH] fixed several prompts inside screen environments

Change-Id: Ide1e0d529014363474c1026c1d11cb169074734f
---
 .../block-storage/drivers/coraid-driver.xml   |  2 +-
 .../drivers/ibm-gpfs-volume-driver.xml        |  2 +-
 doc/training-guides/lab001-control-node.xml   | 22 +++++++++----------
 .../training-cluster-by-script.xml            |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/config-reference/block-storage/drivers/coraid-driver.xml b/doc/config-reference/block-storage/drivers/coraid-driver.xml
index a31bb71dd2..01f75d8258 100644
--- a/doc/config-reference/block-storage/drivers/coraid-driver.xml
+++ b/doc/config-reference/block-storage/drivers/coraid-driver.xml
@@ -349,7 +349,7 @@ coraid_repository_key = <replaceable>coraid_repository_key</replaceable></progra
         <para>Associate the volume type with the Storage
           Repository.</para>
         <para>
-          <screen><prompt>#</prompt><userinput>cinder type-key <replaceable>UUID</replaceable> set <replaceable>coraid_repository_key</replaceable>=’<replaceable>FQRN</replaceable>’</userinput></screen>
+          <screen><prompt>#</prompt> <userinput>cinder type-key <replaceable>UUID</replaceable> set <replaceable>coraid_repository_key</replaceable>=’<replaceable>FQRN</replaceable>’</userinput></screen>
         </para>
         <informaltable rules="all">
           <thead>
diff --git a/doc/config-reference/block-storage/drivers/ibm-gpfs-volume-driver.xml b/doc/config-reference/block-storage/drivers/ibm-gpfs-volume-driver.xml
index 913bd4ecfc..a38679c7b7 100644
--- a/doc/config-reference/block-storage/drivers/ibm-gpfs-volume-driver.xml
+++ b/doc/config-reference/block-storage/drivers/ibm-gpfs-volume-driver.xml
@@ -162,7 +162,7 @@
     <title>Example: Volume creation options</title>
     <para>This example shows the creation of a 50GB volume with an <systemitem>ext4</systemitem>
                 file system labeled <literal>newfs</literal> and direct IO enabled:</para>
-    <screen><prompt>$</prompt><userinput>cinder create --metadata fstype=ext4 fslabel=newfs dio=yes --display-name volume_1 50</userinput> </screen>
+    <screen><prompt>$</prompt> <userinput>cinder create --metadata fstype=ext4 fslabel=newfs dio=yes --display-name volume_1 50</userinput> </screen>
 </simplesect>
 </section>
 <section xml:id="GPFS-operational-notes">
diff --git a/doc/training-guides/lab001-control-node.xml b/doc/training-guides/lab001-control-node.xml
index d994f16fb6..c9754b20ef 100644
--- a/doc/training-guides/lab001-control-node.xml
+++ b/doc/training-guides/lab001-control-node.xml
@@ -155,17 +155,17 @@ iface eth2 inet dhcp</programlisting>
     <listitem>
       <para>Create these databases:</para>
       <screen><prompt>$</prompt> <userinput>mysql -u root -p</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE keystone;</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON keystone.* TO 'keystoneUser'@'%' IDENTIFIED BY 'keystonePass';</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE glance;</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON glance.* TO 'glanceUser'@'%' IDENTIFIED BY 'glancePass';</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE neutron;</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON neutron.* TO 'neutronUser'@'%' IDENTIFIED BY 'neutronPass';</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE nova;</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON nova.* TO 'novaUser'@'%' IDENTIFIED BY 'novaPass';</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE cinder;</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON cinder.* TO 'cinderUser'@'%' IDENTIFIED BY 'cinderPass';</userinput></screen>
-      <screen><prompt>mysql> </prompt><userinput>quit;</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>CREATE DATABASE keystone;</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>GRANT ALL ON keystone.* TO 'keystoneUser'@'%' IDENTIFIED BY 'keystonePass';</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>CREATE DATABASE glance;</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>GRANT ALL ON glance.* TO 'glanceUser'@'%' IDENTIFIED BY 'glancePass';</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>CREATE DATABASE neutron;</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>GRANT ALL ON neutron.* TO 'neutronUser'@'%' IDENTIFIED BY 'neutronPass';</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>CREATE DATABASE nova;</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>GRANT ALL ON nova.* TO 'novaUser'@'%' IDENTIFIED BY 'novaPass';</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>CREATE DATABASE cinder;</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>GRANT ALL ON cinder.* TO 'cinderUser'@'%' IDENTIFIED BY 'cinderPass';</userinput></screen>
+      <screen><prompt>mysql></prompt> <userinput>quit;</userinput></screen>
     </listitem>
   </itemizedlist>
   <para><emphasis role="bold">Other</emphasis></para>
diff --git a/doc/training-guides/training-cluster-by-script.xml b/doc/training-guides/training-cluster-by-script.xml
index c30c6908ab..1a3422fe6a 100644
--- a/doc/training-guides/training-cluster-by-script.xml
+++ b/doc/training-guides/training-cluster-by-script.xml
@@ -58,7 +58,7 @@
             ISO:</para>
           <screen><prompt>#</prompt> <userinput>apt-get install linux-headers-generic</userinput></screen>
           <screen><prompt>#</prompt> <userinput>mount /dev/cdrom0/ /tmp/cdrom</userinput> </screen>
-          <screen><prompt>#</prompt><userinput>cd /tmp/cdrom/</userinput></screen>
+          <screen><prompt>#</prompt> <userinput>cd /tmp/cdrom/</userinput></screen>
           <screen><prompt>#</prompt> <userinput>./virtualbox</userinput></screen>
         </listitem>
         <listitem>