1 files changed, 79 insertions, 60 deletions

diff --git a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
index a56fc0a..b5e7803 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
@@ -27,7 +27,7 @@
 
       <para>System requirements for the uCPE device:</para>
 
-      <itemizedlist>
+      <itemizedlist spacing="compact">
         <listitem>
           <para>4 x Network Interfaces</para>
         </listitem>
@@ -43,16 +43,17 @@
 
       <para>The following file(s) are needed for this example use-case:</para>
 
-      <itemizedlist>
+      <itemizedlist spacing="compact">
         <listitem>
-          <para>FortiGate VNF image. Please contact Fortinet to get a VNF image and
-          its license file.</para>
+          <para>FortiGate VNF image. Please contact Fortinet to get a VNF
+          image and its license file.</para>
         </listitem>
 
-        <listitem><para>VNF Configuration file(s), provided with your Enea NFV Access
-        release: <filename>fortigate-basic-fw.conf</filename>.</para>
+        <listitem>
+          <para>VNF Configuration file(s), provided with your Enea NFV Access
+          release: <filename>fortigate-basic-fw.conf</filename>.</para>
         </listitem>
-        </itemizedlist>
+      </itemizedlist>
     </section>
 
     <section id="exam_setup_fortifirewall">
@@ -72,9 +73,11 @@
       <para><emphasis role="bold">Network Configuration</emphasis>:</para>
 
       <para>Since the firewall uses three External Network Interfaces, three
-      bridges need to be configured. Each bridge provides the ability to connect a physical network interface to the virtual network interface of a VM.</para>
+      bridges need to be configured. Each bridge provides the ability to
+      connect a physical network interface to the virtual network interface of
+      a VM.</para>
 
-        <para><emphasis role="bold">Setup of the uCPE device:</emphasis></para>
+      <para><emphasis role="bold">Setup of the uCPE device:</emphasis></para>
 
       <orderedlist>
         <listitem>
@@ -90,7 +93,8 @@
         </listitem>
 
         <listitem>
-          <para>Connect ETH0 to the Lab Network (for Enea uCPE Manager communications).</para>
+          <para>Connect ETH0 to the Lab Network (for Enea uCPE Manager
+          communications).</para>
         </listitem>
 
         <listitem>
@@ -103,23 +107,22 @@
           <para>Create three OVS bridges, one for each DPDK network interface
           (WAN, LAN1 and LAN2).</para>
 
-      <para>Alternatively, the firewall can be setup to use bridges as
-      connection points for the FortiGate VNF, by replacing the OVS-DPDK
-      bridges with SR-IOV connection points.</para>
-
-      <para>Please note that while previously three physical interfaces were
-      presumed necessary for VNF connection, in the case of a firewall setup
-      only two physical interfaces are required for the data path (one for WAN
-      and one for LAN).</para>
+          <para>Alternatively, the firewall can be setup to use bridges as
+          connection points for the FortiGate VNF, by replacing the OVS-DPDK
+          bridges with SR-IOV connection points.</para>
 
-      <para>Only two interfaces will be configured as DPDK, with two bridges
-      created, one for each type of connection.</para>
+          <para>Please note that while previously three physical interfaces
+          were presumed necessary for VNF connection, in the case of a
+          firewall setup only two physical interfaces are required for the
+          data path (one for WAN and one for LAN). Only two interfaces will be
+          configured as DPDK, with two bridges created, one for each type of
+          connection.</para>
 
-      <note>
-        <para>At VNF instantiation instead of assigning distinct bridges for
-        each LAN interface, only one will be used for both LAN1 and LAN2, with
-        no changes in WAN interface configuration.</para>
-      </note>
+          <note>
+            <para>At VNF instantiation instead of assigning distinct bridges
+            for each LAN interface, only one will be used for both LAN1 and
+            LAN2, with no changes in WAN interface configuration.</para>
+          </note>
         </listitem>
       </orderedlist>
 
@@ -147,8 +150,8 @@
         </listitem>
 
         <listitem>
-          <para><emphasis role="bold">Interfaces</emphasis>: Add 3
-          interfaces (wan, lan1 and lan2).</para>
+          <para><emphasis role="bold">Interfaces</emphasis>: Add 3 interfaces
+          (wan, lan1 and lan2).</para>
         </listitem>
 
         <listitem>
@@ -221,9 +224,9 @@
 
           <note>
             <para>The names of the ports used during instantiation need to be
-            the same as the ones described above, as the same names will be used in
-            the configuration files provided for this example use-case.
-            </para>
+            the same as the ones described above, as the same names will be
+            used in the configuration files provided for this example
+            use-case.</para>
           </note>
         </listitem>
       </itemizedlist>
@@ -276,7 +279,7 @@
       <para>Two uCPE devices will be needed for this setup. The system
       requirements for each uCPE device are:</para>
 
-      <itemizedlist>
+      <itemizedlist spacing="compact">
         <listitem>
           <para>4 x Network Interfaces</para>
         </listitem>
@@ -292,15 +295,17 @@
 
       <para>The following files are needed for this example use-case:</para>
 
-      <itemizedlist>
+      <itemizedlist spacing="compact">
         <listitem>
-          <para>FortiGate VNF image. Please contact Fortinet to get a VNF image and
-          its license file.</para>
+          <para>FortiGate VNF image. Please contact Fortinet to get a VNF
+          image and its license file.</para>
         </listitem>
 
-        <listitem><para>VNF Configuration file(s), provided with your Enea NFV Access
-        release: <filename>fortigate-sdwan&lt;x&gt;.conf</filename>.</para></listitem>
-        </itemizedlist>
+        <listitem>
+          <para>VNF Configuration file(s), provided with your Enea NFV Access
+          release: <filename>fortigate-sdwan&lt;x&gt;.conf</filename>.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section id="forti_examsetup_uc2">
@@ -316,12 +321,12 @@
           </imageobject>
         </mediaobject>
       </figure>
-      
-       <note>
-         <para>When connecting, the uCPE devices can use a back-to-back or a VPN connection. 
-           An appropriate interface with the required capabilities needs to be chosen for 
-           this purpose.</para>
-          </note>
+
+      <note>
+        <para>When connecting, the uCPE devices can use a back-to-back or a
+        VPN connection. An appropriate interface with the required
+        capabilities needs to be chosen for this purpose.</para>
+      </note>
 
       <para><emphasis role="bold">Network Configuration:</emphasis></para>
 
@@ -333,23 +338,28 @@
       <para>Each VNF instance will have a virtual interface for VNF
       management, for the WAN network and for LAN communication.</para>
 
-      <para><emphasis role="bold">Setup of an Intel Whitebox uCPE device</emphasis>:</para>
+      <para><emphasis role="bold">Setup of an Intel Whitebox uCPE
+      device</emphasis>:</para>
 
       <orderedlist>
-           <listitem>
-          <para>Connect the <literal>VNFMgr</literal> interfaces to the Lab Network for VNF management access.</para>
+        <listitem>
+          <para>Connect the <literal>VNFMgr</literal> interfaces to the Lab
+          Network for VNF management access.</para>
         </listitem>
 
         <listitem>
-          <para>Directly connect the <literal>WAN</literal> interfaces back to back (using a cable) or connected via VPN.</para>
+          <para>Directly connect the <literal>WAN</literal> interfaces back to
+          back (using a cable) or connected via VPN.</para>
         </listitem>
 
         <listitem>
-          <para>Connect the <literal>LAN</literal> interfaces to the Test Machine.</para>
+          <para>Connect the <literal>LAN</literal> interfaces to the Test
+          Machine.</para>
         </listitem>
 
         <listitem>
-          <para>Connect the <literal>ETH0</literal> interfaces to the Lab Network (for Enea uCPE Manager communications).</para>
+          <para>Connect the <literal>ETH0</literal> interfaces to the Lab
+          Network (for Enea uCPE Manager communications).</para>
         </listitem>
 
         <listitem>
@@ -434,9 +444,11 @@
         will fail.</para>
       </note>
 
-      <para><emphasis role="bold">Instantiating the FortiGate VNF</emphasis>:</para>
+      <para><emphasis role="bold">Instantiating the FortiGate
+      VNF</emphasis>:</para>
 
-      <para>Instantiate the FortiGate VNF by filling the required fields with the following values:</para>
+      <para>Instantiate the FortiGate VNF by filling the required fields with
+      the following values:</para>
 
       <itemizedlist spacing="compact">
         <listitem>
@@ -462,8 +474,9 @@
         <listitem>
           <para><emphasis role="bold">Configuration file</emphasis>: The
           SD-WAN example configuration files provided by Enea:
-          <literal>fortigate-sdwan1.conf</literal> for the FortiGate VNF on uCPE device 1 and
-          <literal>fortigate-sdwan2.conf</literal> for the FortiGate VNF on uCPE device 2.</para>
+          <literal>fortigate-sdwan1.conf</literal> for the FortiGate VNF on
+          uCPE device 1 and <literal>fortigate-sdwan2.conf</literal> for the
+          FortiGate VNF on uCPE device 2.</para>
         </listitem>
 
         <listitem>
@@ -494,10 +507,10 @@
       the second VNF instantiation.</para>
 
       <note>
-        <para>The names of the ports used during instantiation need to be the 
-          same as the ones described above, as the same names will be used in 
-          the configuration files provided for this example use-case.</para>
-          </note>
+        <para>The names of the ports used during instantiation need to be the
+        same as the ones described above, as the same names will be used in
+        the configuration files provided for this example use-case.</para>
+      </note>
     </section>
 
     <section id="forti_test_uc2">
@@ -518,8 +531,11 @@
         Machine-2.</para>
       </note>
 
-      <para>The Test Machine connected to <literal>uCPE device 1</literal> should be able to ping the Test Machine connected to <literal>uCPE device 2</literal> in this setup, over the WAN connection.  The FortiGate VNF management interface can be accessed from a web
-      browser on the Lab Machine. For more details please see <olink
+      <para>The Test Machine connected to <literal>uCPE device 1</literal>
+      should be able to ping the Test Machine connected to <literal>uCPE
+      device 2</literal> in this setup, over the WAN connection. The FortiGate
+      VNF management interface can be accessed from a web browser on the Lab
+      Machine. For more details please see <olink
       targetdoc="book_enea_nfv_access_example_usecases"
       targetptr="fortigate_webmg">FortiGate VNF Web Management, <xi:include
       href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -587,7 +603,10 @@ virsh console &lt;id of FortiGate VNF&gt;</programlisting>
         <orderedlist>
           <listitem>
             <para>Deploy the FortiGate Firewall in its default
-            settings.</para><remark>Maybe more info about how to do it should be added here.</remark>
+            settings.</para>
+
+            <remark>Maybe more info about how to do it should be added
+            here.</remark>
           </listitem>
 
           <listitem>