1 files changed, 124 insertions, 120 deletions

diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
index fc349ac..85ee5a3 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
@@ -217,7 +217,7 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
             </listitem>
 
             <listitem>
-              <para><filename>ReleaseNotes</filename></para>
+              <para><filename>doc/ReleaseNotes</filename></para>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -302,7 +302,7 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
       additional argument as shown below:</para>
 
       <programlisting>./install.sh \
-      /opt/ems ucpemanager-1.0-Build8-Linux.tar.gz  \
+      /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz  \
       SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
 
       <para>The other steps are exactly the same as specified in the
@@ -339,7 +339,7 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
         <listitem>
           <para>Run the following command:</para>
 
-          <programlisting>./upgrade.sh /opt/ems ucpemanager-1.0-Build8-Linux.tar.gz</programlisting>
+          <programlisting>./upgrade.sh /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz</programlisting>
         </listitem>
       </orderedlist>
 
@@ -535,12 +535,12 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
             <para>Type. The type of device to be added, i.e <literal>Enea
             universal CPE</literal>.</para>
           </listitem>
- 
-           <listitem>
+
+          <listitem>
             <para>Name. The name by which the device is referred to in the
             uCPE Manager.</para>
           </listitem>
- 
+
           <listitem>
             <para>SSH Port. The NETCONF Port used for communications. Default
             is set to 830.</para>
@@ -592,120 +592,120 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
 
       <para>Available network interfaces can be added to the management
       system, for use by the networking virtualization infrastructure.</para>
-      
-          <para>In order to make physical network interfaces available to the
-          virtualization infrastructure and VNFs, they must be configured into
-          the management system.</para>
 
-          <para>To add an interface into the uCPE Manager, select the uCPE
-          device, then from the top toolbar select <literal>Configuration
-          -&gt; External Interfaces -&gt; Configuration -&gt; Add</literal>. The available
-          Interface types are detailed below.</para>
+      <para>In order to make physical network interfaces available to the
+      virtualization infrastructure and VNFs, they must be configured into the
+      management system.</para>
 
-          <section id="dpdk_interface_type">
-            <title>DPDK Interface Type</title>
+      <para>To add an interface into the uCPE Manager, select the uCPE device,
+      then from the top toolbar select <literal>Configuration -&gt; External
+      Interfaces -&gt; Configuration -&gt; Add</literal>. The available
+      Interface types are detailed below.</para>
 
-            <para>Configuring a physical interface in DPDK mode will require a
-            DPDK-based application (e.g. OVS-DPDK) in order to access and use
-            the interface. An interface set as the DPDK can be attached to an
-            OVS-DPDK bridge.</para>
+      <section id="dpdk_interface_type">
+        <title>DPDK Interface Type</title>
 
-            <note>
-              <para>Make sure the <literal>Enable DPDK</literal> checkbox is
-              selected in <literal>Device -&gt; Configuration -&gt;
-              DPDK</literal>, otherwise no interface can be assigned to the
-              DPDK.</para>
-            </note>
+        <para>Configuring a physical interface in DPDK mode will require a
+        DPDK-based application (e.g. OVS-DPDK) in order to access and use the
+        interface. An interface set as the DPDK can be attached to an OVS-DPDK
+        bridge.</para>
 
-            <para>To add a DPDK interface under the management system, set
-            appropriate values for the following fields:</para>
+        <note>
+          <para>Make sure the <literal>Enable DPDK</literal> checkbox is
+          selected in <literal>Device -&gt; Configuration -&gt;
+          DPDK</literal>, otherwise no interface can be assigned to the
+          DPDK.</para>
+        </note>
 
-            <itemizedlist>
-              <listitem>
-                <para>Source: name of the physical interface.</para>
-              </listitem>
+        <para>To add a DPDK interface under the management system, set
+        appropriate values for the following fields:</para>
 
-              <listitem>
-                <para>Type: dpdk</para>
-              </listitem>
+        <itemizedlist>
+          <listitem>
+            <para>Source: name of the physical interface.</para>
+          </listitem>
 
-              <listitem>
-                <para>Networking-type: dpdk</para>
-              </listitem>
+          <listitem>
+            <para>Type: dpdk</para>
+          </listitem>
 
-              <listitem>
-                <para>Dpdk-type: the kernel module that allows user space
-                access to the physical interface. The <literal>vfio-pci</literal> 
-                  driver is used.</para>
-              </listitem>
-            </itemizedlist>
-          </section>
+          <listitem>
+            <para>Networking-type: dpdk</para>
+          </listitem>
 
-          <section id="sriov_interface_type">
-            <title>SR-IOV Interface Type</title>
+          <listitem>
+            <para>Dpdk-type: the kernel module that allows user space access
+            to the physical interface. The <literal>vfio-pci</literal> driver
+            is used.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
 
-            <para>SR-IOV technology allows for the creation of a number of
-            virtual functions on the host interface, which can be used by VNFs
-            running on the uCPE device.</para>
+      <section id="sriov_interface_type">
+        <title>SR-IOV Interface Type</title>
 
-            <para>For SR-IOV mode configuration, the user must set values for
-            the following fields:</para>
+        <para>SR-IOV technology allows for the creation of a number of virtual
+        functions on the host interface, which can be used by VNFs running on
+        the uCPE device.</para>
 
-            <itemizedlist>
-              <listitem>
-                <para>Source: name of the physical interface.</para>
-              </listitem>
+        <para>For SR-IOV mode configuration, the user must set values for the
+        following fields:</para>
 
-              <listitem>
-                <para>Type: sr-iov</para>
-              </listitem>
+        <itemizedlist>
+          <listitem>
+            <para>Source: name of the physical interface.</para>
+          </listitem>
 
-              <listitem>
-                <para>Networking-type: srIov</para>
-              </listitem>
+          <listitem>
+            <para>Type: sr-iov</para>
+          </listitem>
 
-              <listitem>
-                <para>sriov-mode: adapter-pool</para>
-              </listitem>
+          <listitem>
+            <para>Networking-type: srIov</para>
+          </listitem>
 
-              <listitem>
-                <para>sriov-num-vfs: the number of virtual functions to
-                create.</para>
-              </listitem>
-            </itemizedlist>
-          </section>
+          <listitem>
+            <para>sriov-mode: adapter-pool</para>
+          </listitem>
 
-          <section id="standard_interface_type">
-            <title>Standard Interface Type</title>
+          <listitem>
+            <para>sriov-num-vfs: the number of virtual functions to
+            create.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
 
-            <para>Some of the physical network interfaces available on a uCPE
-            device, including Ethernet interfaces, do not have DPDK or SR-IOV
-            support. Instead, the Linux kernel driver has to be used. Wi-Fi
-            and 4G/LTE modems can also be configured and used for
-            virtualization infrastructure and VNFs.</para>
+      <section id="standard_interface_type">
+        <title>Standard Interface Type</title>
 
-            <para>To add Standard interfaces under the management system, the
-            user must set values for the following fields:</para>
+        <para>Some of the physical network interfaces available on a uCPE
+        device, including Ethernet interfaces, do not have DPDK or SR-IOV
+        support. Instead, the Linux kernel driver has to be used. Wi-Fi and
+        4G/LTE modems can also be configured and used for virtualization
+        infrastructure and VNFs.</para>
 
-            <itemizedlist>
-              <listitem>
-                <para>Source: the name of physical interface.</para>
-              </listitem>
+        <para>To add Standard interfaces under the management system, the user
+        must set values for the following fields:</para>
 
-              <listitem>
-                <para>Networking-type: standard</para>
-              </listitem>
-            </itemizedlist>
-          </section>
+        <itemizedlist>
+          <listitem>
+            <para>Source: the name of physical interface.</para>
+          </listitem>
 
-          <section condition="hidden" id="pci_passthrough_interface_type">
-            <title>PCI Passthrough Interface Type</title>
+          <listitem>
+            <para>Networking-type: standard</para>
+          </listitem>
+        </itemizedlist>
+      </section>
 
-            <para>For the PCI Passthrough a user does not have to configure a
-            physical interface, instead simply select the PCI address and
-            connect it to a virtual port when the VNF instantiation step is
-            reached.</para>
-          </section>
+      <section condition="hidden" id="pci_passthrough_interface_type">
+        <title>PCI Passthrough Interface Type</title>
+
+        <para>For the PCI Passthrough a user does not have to configure a
+        physical interface, instead simply select the PCI address and connect
+        it to a virtual port when the VNF instantiation step is
+        reached.</para>
+      </section>
 
       <section id="man_configuration">
         <title>Manual Configuration</title>
@@ -721,22 +721,24 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
           <para>After networking interfaces have been added to the uCPE
           Manager, the user can change the interface type (DPDK, SR-IOV,
           Standard, WAN).</para>
-            
-            <note><para>WAN interfaces, which are configured during the 
-            installation of the device, do not need to be added, they will 
-              be automatically listed as such in the uCPE manager when the 
-              device connects.</para></note>
-          
+
+          <note>
+            <para>WAN interfaces, which are configured during the installation
+            of the device, do not need to be added, they will be automatically
+            listed as such in the uCPE manager when the device
+            connects.</para>
+          </note>
+
           <figure>
-                <title>Configuration of External Interfaces</title>
+            <title>Configuration of External Interfaces</title>
 
-                <mediaobject>
-                  <imageobject>
-                    <imagedata align="center" contentwidth="600"
-                               fileref="images/edit_inter_config.png" />
-                  </imageobject>
-                </mediaobject>
-              </figure>
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center" contentwidth="600"
+                           fileref="images/edit_inter_config.png" />
+              </imageobject>
+            </mediaobject>
+          </figure>
 
           <para><emphasis role="bold">How to Edit the Configuration of an
           Interface</emphasis></para>
@@ -752,11 +754,12 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
             </listitem>
 
             <listitem>
-              <para>In order to edit an already configured interface, (as in 
-                the example popup shown below, a WAN interface) double click 
-                on the desired one and a popup will appear. A different popup
-                appears for each type of interface. From the Host Interface window, a user can 
-                change the networking type and the IP address assignment:</para>
+              <para>In order to edit an already configured interface, (as in
+              the example popup shown below, a WAN interface) double click on
+              the desired one and a popup will appear. A different popup
+              appears for each type of interface. From the Host Interface
+              window, a user can change the networking type and the IP address
+              assignment:</para>
 
               <figure>
                 <title>Editing an Interface</title>
@@ -836,9 +839,9 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
 
             <para>The solution provided by Enea for in-band management is
             based upon an OpenvSwitch bridge fielding all traffic passing
-            through the WAN physical port. Any standard
-            or DPDK-assigned network interface can be used for the In-Band
-            management bridge.</para>
+            through the WAN physical port. Any standard or DPDK-assigned
+            network interface can be used for the In-Band management
+            bridge.</para>
 
             <note>
               <para>The In-Band Management bridge must be recreated each time
@@ -1018,8 +1021,9 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar
             </listitem>
 
             <listitem>
-              <para>Device Grouping Tags: a tag to group devices. These tags match 
-                the customer tags provided during the installation of the device.</para>
+              <para>Device Grouping Tags: a tag to group devices. These tags
+              match the customer tags provided during the installation of the
+              device.</para>
             </listitem>
           </itemizedlist>