From 4fc67c01f2afa892ae919871d78c64a1e3af738b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sun, 3 Aug 2014 09:26:54 +0200
Subject: [PATCH] Install Guide: PDF display fixes

Fix overlong graph and lines that show up wrongly in the PDF.

Change-Id: I0a168e21ad12b66474d1fa4f708055569d30cea2
Closes-Bug: #1351615
Closes-Bug: #1351601
---
 doc/install-guide/section_neutron-initial-networks.xml   | 2 +-
 .../section_neutron-ml2-controller-node.xml              | 9 ++++++---
 doc/install-guide/section_neutron-ml2-network-node.xml   | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/install-guide/section_neutron-initial-networks.xml b/doc/install-guide/section_neutron-initial-networks.xml
index ba0031bc45..9b12fd255c 100644
--- a/doc/install-guide/section_neutron-initial-networks.xml
+++ b/doc/install-guide/section_neutron-initial-networks.xml
@@ -20,7 +20,7 @@
     <title>Initial networks</title>
     <mediaobject>
       <imageobject>
-        <imagedata contentwidth="6in"
+        <imagedata scale="50"
           fileref="figures/installguide_neutron-initial-networks.png"/>
       </imageobject>
     </mediaobject>
diff --git a/doc/install-guide/section_neutron-ml2-controller-node.xml b/doc/install-guide/section_neutron-ml2-controller-node.xml
index f6a562d838..c741c3987f 100644
--- a/doc/install-guide/section_neutron-ml2-controller-node.xml
+++ b/doc/install-guide/section_neutron-ml2-controller-node.xml
@@ -31,7 +31,8 @@ IDENTIFIED BY '<replaceable>NEUTRON_DBPASS</replaceable>';</userinput></screen>
           <para>Replace <replaceable>NEUTRON_PASS</replaceable> with a suitable
             password and <replaceable>neutron@example.com</replaceable> with
             a suitable e-mail address.</para>
-          <screen><prompt>$</prompt> <userinput>keystone user-create --name neutron --pass <replaceable>NEUTRON_PASS</replaceable> --email <replaceable>neutron@example.com</replaceable></userinput></screen>
+          <screen><prompt>$</prompt> <userinput>keystone user-create --name neutron --pass <replaceable>NEUTRON_PASS</replaceable> \
+  --email <replaceable>neutron@example.com</replaceable></userinput></screen>
         </step>
         <step>
           <para>Link the <literal>neutron</literal> user to the
@@ -41,12 +42,14 @@ IDENTIFIED BY '<replaceable>NEUTRON_DBPASS</replaceable>';</userinput></screen>
         </step>
         <step>
           <para>Create the <literal>neutron</literal> service:</para>
-          <screen><prompt>$</prompt> <userinput>keystone service-create --name neutron --type network --description "OpenStack Networking"</userinput></screen>
+          <screen><prompt>$</prompt> <userinput>keystone service-create --name neutron --type network \
+  --description "OpenStack Networking"</userinput></screen>
         </step>
         <step>
           <para>Create the service endpoint:</para>
           <screen><prompt>$</prompt> <userinput>keystone endpoint-create \
-  --service-id $(keystone service-list | awk '/ network / {print $2}') \
+  --service-id \
+    $(keystone service-list | awk '/ network / {print $2}') \
   --publicurl http://<replaceable>controller</replaceable>:9696 \
   --adminurl http://<replaceable>controller</replaceable>:9696 \
   --internalurl http://<replaceable>controller</replaceable>:9696</userinput></screen>
diff --git a/doc/install-guide/section_neutron-ml2-network-node.xml b/doc/install-guide/section_neutron-ml2-network-node.xml
index 84df468a39..af1419e4c4 100644
--- a/doc/install-guide/section_neutron-ml2-network-node.xml
+++ b/doc/install-guide/section_neutron-ml2-network-node.xml
@@ -24,7 +24,8 @@ net.ipv4.conf.default.rp_filter=0</programlisting>
   <procedure>
     <title>To install the Networking components</title>
     <step>
-      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install neutron-plugin-ml2 neutron-plugin-openvswitch-agent openvswitch-datapath-dkms \
+      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install neutron-plugin-ml2 \
+  neutron-plugin-openvswitch-agent openvswitch-datapath-dkms \
   neutron-l3-agent neutron-dhcp-agent</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-neutron openstack-neutron-ml2 \
   openstack-neutron-openvswitch</userinput></screen>