Merge "fixed several prompts inside screen environments"

This commit is contained in:
Jenkins 2014-05-07 06:39:45 +00:00 committed by Gerrit Code Review
commit b035be8cc1
4 changed files with 14 additions and 14 deletions

View File

@ -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>

View File

@ -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">

View File

@ -156,17 +156,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>

View File

@ -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>