Fixes bug 899186, problems with markup meant lines went off the page …

…in PDF Change-Id: If62a2092dad51bc0094915dc050ffffa35ff4311
openstack · Feb 29, 2012 · 25e8c5d · 25e8c5d
1 parent 0223287
commit 25e8c5d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/doc/src/docbkx/openstack-compute-admin/computeadmin.xml b/doc/src/docbkx/openstack-compute-admin/computeadmin.xml
@@ -931,20 +931,22 @@ vgcreate nova-volumes /dev/sda5 </literallayout>
                         going further that your nodes can communicate with you nova-volumes server.
                         If you have a firewall running on it, make sure that the port 3260 (tcp)
                         accepts incoming connections. </para>
-                    <para>First install the open-iscsi package on the initiators, so the
-                        compute-nodes <emphasis role="bold">only</emphasis> : <code>apt-get install
-                            open-iscsi </code>
-                        <literallayout>Then on the target, which is in our case the cloud-controller, the iscsitarget package :                        </literallayout>
-                        <code>apt-get install iscsitarget </code>
-                        <literallayout>This package could refuse to start with a "FATAL: Module iscsi_trgt not found" error. </literallayout><literallayout>This error is caused by the kernel which does not contain the iscsi module's source into it ; you can install the kernel modules by installing an extra package : </literallayout>
-                        <code> apt-get install iscsitarget-dkms</code>
-                        <literallayout>(the Dynamic Kernel Module Support is a framework used for created modules with non-existent sources into the current kernel)</literallayout></para>
-                    <para>You have to enable it so the startut script (/etc/init.d/iscsitarget) can
-                        start the daemon :
+                    <para>First install the open-iscsi package on the initiators, so on the
+                        compute-nodes <emphasis role="bold">only</emphasis></para>
+                    <literallayout class="monospaced">apt-get install open-iscsi </literallayout>
+                        <para>Then on the target, which is in our case the cloud-controller, the iscsitarget package :</para>
+                        <literallayout class="monospaced">apt-get install iscsitarget </literallayout>
+                        <para>This package could refuse to start with a "FATAL: Module iscsi_trgt not found" error. </para>
+                        <para>This error is caused by the kernel which does not contain the iscsi module's source into it ; 
+                            you can install the kernel modules by installing an extra package : </para>
+                        <literallayout class="monospaced"> apt-get install iscsitarget-dkms</literallayout>
+                        <para>(the Dynamic Kernel Module Support is a framework used for created modules with non-existent sources into the current kernel)</para>
+                        <para>You have to enable it so the startut script (/etc/init.d/iscsitarget) can start the daemon:</para>
                         <literallayout class="monospaced">sed -i 's/false/true/g' /etc/default/iscsitarget</literallayout>
-                        Then run on the nova-controller (iscsi target) :
-                            <literallayout class="monospaced">service iscsitarget start</literallayout><literallayout>And on the compute-nodes (iscsi initiators) :</literallayout>service
-                            open-iscsi start</para>
+                        <para>Then run on the nova-controller (iscsi target) :</para>
+                            <literallayout class="monospaced">service iscsitarget start</literallayout>
+                            <para>And on the compute-nodes (iscsi initiators) :</para>
+                            <literallayout class="monospaced">service open-iscsi start</literallayout>
                 </listitem>
                 <listitem>
                     <para><emphasis role="bold">Configure nova.conf flag file</emphasis></para>

diff --git a/doc/src/docbkx/openstack-compute-admin/computenetworking.xml b/doc/src/docbkx/openstack-compute-admin/computenetworking.xml
@@ -615,7 +615,7 @@ valid_lft forever preferred_lft forever
             <title>High Availability Networking Option</title>
             <mediaobject>
                 <imageobject>
-                            <imagedata scale="80" fileref="figures/ha-net.jpg"/>
+                            <imagedata scale="50" fileref="figures/ha-net.jpg"/>
                         </imageobject>
             </mediaobject>
         </figure></para>

diff --git a/doc/src/docbkx/openstack-compute-admin/pom.xml b/doc/src/docbkx/openstack-compute-admin/pom.xml
@@ -96,7 +96,7 @@
                             <postProcess>
                                 <!-- Copies the figures to the correct location for webhelp -->
 
-                                <copy todir="${basedir}/target/docbkx/webhelp/openstack-compute-admin/os-compute-adminguide/content/figures">
+                                <copy todir="${basedir}/target/docbkx/webhelp/trunk/openstack-compute/admin/content/figures">
                                     <fileset dir="${basedir}/figures">
                                         <include name="**/*.*" />
                                     </fileset>
@@ -120,7 +120,7 @@
 
                                 <!--Deletes leftover uneeded directories -->
 
-                                <delete dir="${basedir}/target/docbkx/webhelp/openstack-compute-admin/os-compute-adminguide"/>
+                                <delete dir="${basedir}/target/docbkx/webhelp/os-compute-adminguide"/>
 
                             </postProcess>
                         </configuration>