6 files changed, 363 insertions, 282 deletions

diff --git a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
index b82d48b..9f0aa37 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
@@ -17,9 +17,69 @@
       <listitem>
         <para>One server running the CentOS 7 distribution</para>
 
-        <para>Minimal Requirement: 4 Cores, 16 GB RAM and 300 GB single disk
-        storage. Make sure the CentOS 7 server is updated to the latest
-        revision before installing Enea NFV Access.</para>
+        <note>
+          <para>The CentOS 7 server must be updated to the latest revision
+          before installing Enea NFV Access.</para>
+        </note>
+
+        <para>The following will detail CPU, RAM and storage requirements for
+        the uCPE Manager.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>For small-sized deployments (tens of devices):</para>
+
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para>4 cores</para>
+              </listitem>
+
+              <listitem>
+                <para>16 GB RAM</para>
+              </listitem>
+
+              <listitem>
+                <para>300 GB single disk storage</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+
+          <listitem>
+            <para>For mid-sized deployments (hundreds of devices):</para>
+
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para>8 cores</para>
+              </listitem>
+
+              <listitem>
+                <para>32 GB RAM</para>
+              </listitem>
+
+              <listitem>
+                <para>300 GB single disk storage</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+
+          <listitem>
+            <para>For large deployments (thousands of devices):</para>
+
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para>16 cores</para>
+              </listitem>
+
+              <listitem>
+                <para>64-256 GB RAM</para>
+              </listitem>
+
+              <listitem>
+                <para>1-2 TB single disk storage</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </itemizedlist>
 
         <para>The purpose of the CentOS 7 server is to host the Enea uCPE
         Manager. Network access between the CentOS 7 server and the uCPE
@@ -30,8 +90,8 @@
       <listitem>
         <para>One or more uCPE devices.</para>
 
-        <para>Whitebox devices where the Enea NFV Access Runtime Platform
-        will be installed, containing a minimum of 2 cores and 4 GB RAM and at
+        <para>Whitebox devices where the Enea NFV Access Runtime Platform will
+        be installed, containing a minimum of 2 cores and 4 GB RAM and at
         least two ethernet ports that will be configured as WAN and LAN during
         deployment.</para>
 
@@ -251,14 +311,14 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</p
 
         <listitem>
           <para>Execute the following command to check if you have a currently
-          running the PostgreSQL database server:</para>
+          running PostgreSQL database server:</para>
 
           <programlisting>ps -ef | grep post</programlisting>
         </listitem>
 
         <listitem>
-          <para>Remove the currently installed PostgreSQL server (including
-          the existing postgres user):</para>
+          <para>Remove the installed PostgreSQL server (including the existing
+          postgres user):</para>
 
           <programlisting>yum remove postgres\*
 rm -rf /var/lib/pgsql
@@ -327,7 +387,7 @@ userdel postgres</programlisting>
       <para>Each uCPE device needs a unique identifier. This identifier is
       used to match the registration in the Enea uCPE Manager and the offline
       configuration of the uCPE device during ZTP (Zero Touch
-      Provisioning)</para>
+      Provisioning).</para>
 
       <para>Select a text string to represent the uCPE device, e.g.
       <literal>uCPE-1</literal> or
@@ -395,7 +455,7 @@ userdel postgres</programlisting>
     <section id="install_ucpe_mg">
       <title>Installing the Enea uCPE Manager</title>
 
-      <para>The Enea uCPE Manager can be installed using as a fresh/first-time
+      <para>The Enea uCPE Manager can be installed using a fresh (first-time)
       configuration or using a backup file of a previous installation, created
       within the Enea uCPE Manager GUI.</para>
 
@@ -569,7 +629,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <note>
           <para>The IPv4 address of the CentOS 7 Server, connected to the same
           network as the uCPE Devices, will be used as a configuration
-          parameter both when setting up the uCPE devices.</para>
+          parameter when setting up the uCPE devices.</para>
         </note>
       </section>
 
@@ -577,14 +637,15 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <title>Installation of the Enea uCPE Manager using a System
         Back-up</title>
 
-        <para>The Enea uCPE Manager can be restored if a back-up file has been
+        <para>The Enea uCPE Manager can be restored if a backup file has been
         previously created.</para>
 
-        <para>A backup file can be created by accessing:
-        <literal>System</literal> -&gt; <literal>System Backup</literal> from
-        the Enea uCPE Manager GUI. The resulting zip archive will be located
-        in the <filename>/opt/ems/ucpemanager/application/backup</filename>
-        folder and will be named
+        <para>A backup file can be created by accessing the <emphasis
+        role="bold">System</emphasis> menu, and clicking <emphasis
+        role="bold">System Backup</emphasis>, from the Enea uCPE Manager GUI.
+        The resulting zip archive will be located in the
+        <filename>/opt/ems/ucpemanager/application/backup</filename> folder
+        and will be named
         <literal>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</literal> (e.g
         System-Backup_Feb19_2013_2257_42.zip). Save the archive to another
         location outside the Enea uCPE Manager installation folder for future
@@ -593,11 +654,11 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <note>
           <para>The System Back-up file obtained from the Enea uCPE Manager
           GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
-          different from the Enea uCPE Manager snapshot obtained during a Enea
-          uCPE Manager Upgrade or Uninstall operation
+          different from the snapshot obtained during a Enea uCPE Manager
+          Upgrade or Uninstall operation
           (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
-          for recovery of the Enea uCPE Manager. For more details please see
-          <olink targetdoc="book_enea_nfv_access_getting_started"
+          for recovery of the Enea uCPE Manager. For more details, see <olink
+          targetdoc="book_enea_nfv_access_getting_started"
           targetptr="restore_prev_ucpe_install">Restoring a previous uCPE
           Manager installation in the <xi:include
           href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -619,15 +680,15 @@ SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
       <title>Preparing the USB stick for installation of the Enea NFV Access
       Runtime Platform</title>
 
-      <para>To install the Enea NFV Access Runtime Platform, create a
-      bootable USB stick with the image you intend to install.</para>
+      <para>To install the Enea NFV Access Runtime Platform, create a bootable
+      USB stick with the image you intend to install.</para>
 
       <para>In the example below, step by step instructions are provided for
       the CentOS 7 distribution. It's possible with the appropriate tools to
       also use Windows OS or MacOS.</para>
 
       <note>
-        <para>The .hddimg image is available in the
+        <para>The <filename>.hddimg</filename> image is available in the
         <filename>Enea_NFV_Access_Run_Time_Platform_
         &lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         file you downloaded with your release.</para>
@@ -682,9 +743,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       </figure>
 
       <para>While the uCPE device is powered off, in order to install and
-      configure the Enea NFV Access Runtime using the prepared USB stick,
-      connect the laptop to a uCPE device LAN port. For this purpose, a Layer
-      2 switch or direct cable connection can be used.</para>
+      configure the Enea NFV Access Runtime Platform (using the prepared USB
+      stick), connect the laptop to a uCPE device LAN port. For this purpose,
+      a Layer 2 switch or direct cable connection can be used.</para>
     </section>
 
     <section id="install_ena_device">
@@ -723,7 +784,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
             </listitem>
 
             <listitem>
-              <para>Customer Tags. They are used for Zero Touch Provisining
+              <para>Customer Tags. They are used for Zero Touch Provisioning
               (ZTP) and can be left empty for a base configuration. What can
               be entered here (if needed), are the tag(s) specified when
               creating an offline configuration in the Enea uCPE Manager. A
@@ -760,9 +821,10 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <para>When the user has completed the configuration steps in the
       Web-installer, Enea NFV Access is installed on the hard drive. At this
-      stage, user should remove the USB stick and LAN cable and shutdown the
-      uCPE device. It will be started after necessary configurations are done
-      on the Enea uCPE Manager, as described below.</para>
+      stage, the user should remove the USB stick and the LAN cable, and
+      shutdown the uCPE device. It will be started after necessary
+      configurations are done on the Enea uCPE Manager, as described
+      below.</para>
 
       <note>
         <para>If the USB stick was booted in UEFI mode, an UEFI boot entry is
@@ -817,11 +879,11 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <note>
         <para>Day-0 configuration is a software lifecycle term referring to
-        early configurations to put the uCPE device in an active state. Day-1
-        Configurations are applied after Day-0 and set the uCPE device and its
-        service in an active state. Day-2 Configurations are live
-        configurations on the uCPE and its service, applied after the uCPE
-        device and its service have been activated.</para>
+        early configurations used to put the uCPE device in an active state.
+        Day-1 Configurations are applied after Day-0 and set the uCPE device
+        and its service in an active state. Day-2 Configurations are live
+        configurations on the uCPE device and its service, applied after they
+        have been activated.</para>
       </note>
 
       <para>The offline configuration consists of data and parameters that are
@@ -834,27 +896,28 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       <para>For this base configuration, the offline configuration will be
       left blank. The blank offline configuration can be filled with
       user-specific values and data once the service is created, which is done
-      after installation is complete.</para>
+      after the installation is complete.</para>
 
       <note>
         <para>If the offline configuration is not configured, an alarm will be
         raised: <literal>Day-0 Config:ZTP:Major</literal> when the uCPE device
-        tries to connect to Enea uCPE Manager, informing the user that the ZTP
-        setup failed for the uCPE device.</para>
+        tries to connect to the Enea uCPE Manager, informing the user that the
+        ZTP setup failed for the uCPE device.</para>
       </note>
 
       <para><emphasis role="bold">To create an offline
-      configuration</emphasis> <orderedlist>
+      configuration</emphasis><orderedlist>
           <listitem>
-            <para>In a browser access the Enea uCPE Manager, then
-            <literal>Applications</literal>-&gt;<literal>Offline
-            Config</literal>.</para>
+            <para>In a browser access the Enea uCPE Manager, open <emphasis
+            role="bold">Applications</emphasis> and select <emphasis
+            role="bold">Offline Config</emphasis>.</para>
           </listitem>
 
           <listitem>
-            <para>Create a new offline configuration in the GUI by clicking
-            <literal>Add</literal> and filling in the mandatory fields:
-            <literal>name</literal>, <literal>deviceVersion</literal> and
+            <para>Create a new offline configuration in the GUI by selecting
+            the <emphasis role="bold">Add</emphasis> button and filling in the
+            mandatory fields: <literal>name</literal>,
+            <literal>deviceVersion</literal> and
             <literal>deviceId</literal>.</para>
 
             <para>The name is user defined and can be set to any unique text
@@ -872,9 +935,10 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <para>In order to enroll a uCPE device in the management system and
       establish a management connection, the user will add uCPE device
-      information in the Enea uCPE Manager. This is accomplished by selecting
-      <literal>Devices</literal> -&gt; <literal>Manage</literal> -&gt;
-      <literal>Add</literal>.</para>
+      information in the Enea uCPE Manager. This is accomplished by going to
+      <emphasis role="bold">Devices</emphasis>, selecting <emphasis
+      role="bold">Manage</emphasis> and then clicking the <emphasis
+      role="bold">Add</emphasis> button.</para>
 
       <para>The relevant parameters are:</para>
 
@@ -927,8 +991,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       established.</para>
 
       <para>When a uCPE device is registered it can be manually added to the
-      map for overview. Right-click on the map and select <literal>Place
-      Device</literal> to put the uCPE device on the map.</para>
+      map for overview. <emphasis role="bold">Right-click</emphasis> on the
+      map and select <emphasis role="bold">Place Device</emphasis> to put the
+      uCPE device on the map.</para>
 
       <para>In case of management connection failure (e.g. due to a
       misconfiguration), the uCPE device status will be seen as RED
@@ -976,9 +1041,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       of interest to check the amount of hardware resources in use.</para>
 
       <para>To check CPU, RAM and disk utilization simply select the uCPE
-      device and click the <literal>Virtual Machines</literal> tab in the map
-      view. The same view will show active VNFs running on the uCPE device
-      once instantiated.</para>
+      device and go to the <emphasis role="bold">Virtual Machines</emphasis>
+      tab in the map view. The same view will show active VNFs running on the
+      uCPE device once instantiated.</para>
     </section>
 
     <section id="access_device_cli">
@@ -986,18 +1051,19 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <para>As a final check to make sure the uCPE device was installed and
       configured correctly, access the uCPE device Linux CLI by selecting the
-      uCPE device on the map and using the SSH button from the panel. A new
-      window will appear for CLI access. The default user and password are
-      <literal>root</literal> and blank, respectively.</para>
+      uCPE device on the map and using the <emphasis role="bold">SSH
+      button</emphasis> from the panel. A new window will appear for CLI
+      access. The default user and password are <literal>root</literal> and
+      blank, respectively.</para>
 
       <para>The Enea NFV Access CLI is a pure Linux CLI providing access to
       standard Linux CLI commands. The CLI is a central feature for running
       custom scripting.</para>
 
       <note>
-        <para>In case the uCPE was installed behind a NAT device, reverse SSH
-        connection will be used. For more details, please see <olink
-        targetdoc="book_enea_nfv_access_getting_started"
+        <para>In case the uCPE device was installed behind a NAT device, the
+        reverse SSH connection will be used. For more details, please see
+        <olink targetdoc="book_enea_nfv_access_getting_started"
         targetptr="device_callhome_nat">Device Call Home Connection for
         deployment behind NAT in the <xi:include
         href="../../s_docbuild/olinkdb/pardoc-names.xml"
diff --git a/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml b/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml
index 8b8be31..1b415a2 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml
@@ -3,9 +3,9 @@
   <title>Using the Log Collector</title>
 
   <para>Troubleshooting problems on the uCPE device require an analysis of a
-  set of information i.e. logs collected from the uCPE device and/or Enea uCPE
-  Manager. The following describe how the log collection mechanism
-  works.</para>
+  set of information i.e. logs collected from the uCPE device and/or the Enea
+  uCPE Manager. The following information describes how the log collection
+  mechanism works.</para>
 
   <section id="log_collect_ucpem">
     <title>Log collecting using the Enea uCPE Manager</title>
@@ -22,8 +22,8 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Operations</literal> -&gt; <literal>Collect
-          Debug Logs</literal>.</para>
+          <para>Access <emphasis role="bold">Operations</emphasis> and then
+          select <emphasis role="bold">Collect Debug Logs</emphasis>.</para>
         </listitem>
 
         <listitem>
@@ -31,7 +31,7 @@
         </listitem>
 
         <listitem>
-          <para>Press the <literal>Execute</literal> button.</para>
+          <para>Press the <emphasis role="bold">Execute</emphasis> button.</para>
 
           <para>A success message is shown in the same window as shown below.
           At this moment, the process of collecting logs on the uCPE device
@@ -54,8 +54,8 @@
         <para>It might take some time for the archive to be created. When the
         operation completes, a "CollectLogsComplete" notification is sent from
         the uCPE device to the Enea uCPE Manager. This can be viewed in the
-        GUI under the <literal>Faults</literal> -&gt;
-        <literal>Events</literal> toolbar menu.</para>
+        GUI in the <emphasis role="bold">Faults</emphasis> menu, after selecting 
+<emphasis role="bold">Events</emphasis>.</para>
 
         <figure>
           <title>Collecting Debug Logs</title>
@@ -74,16 +74,16 @@
       <title>View collected Logs</title>
 
       <para>A list with the archives containing already collected logs will be
-      shown in the <literal>Device File Listing</literal> table:</para>
+      shown in the <emphasis role="bold">Device File Listing</emphasis> table:</para>
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Files</literal> -&gt;
-          <literal>Download</literal>.</para>
+          <para>Access <emphasis role="bold">Files</emphasis> and then the 
+<emphasis role="bold">Download</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>List</literal> button.</para>
+          <para>Press the <emphasis role="bold">List</emphasis> button.</para>
 
           <figure>
             <title>Device File Listing Table</title>
@@ -100,7 +100,7 @@
 
       <note>
         <para>If the filename you specified does not appear, it might still be
-        in the process of creation. Click on the <literal>Refresh</literal>
+        in the process of creation. Click on the <emphasis role="bold">Refresh</emphasis> 
         icon at the bottom of the table until you can see the desired file
         listing.</para>
       </note>
@@ -114,22 +114,22 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Files</literal> -&gt;
-          <literal>Download</literal>.</para>
+          <para>Access <emphasis role="bold">Files</emphasis> and choose the 
+          <emphasis role="bold">Download</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>List</literal> button.</para>
+          <para>Press the <emphasis role="bold">List</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>In the <literal>Device File Listing</literal> table, select
+          <para>In the <emphasis role="bold">Device File Listing</emphasis> table, select
           the archive you want to download from the uCPE device to Enea uCPE
           Manager.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>Download from Device</literal>
+          <para>Press the <emphasis role="bold">Download from Device</emphasis> 
           button.</para>
 
           <para>The archive will be downloaded from the uCPE device and stored
@@ -152,21 +152,21 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Devices</literal> -&gt;
-          <literal>Files</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu and select 
+<emphasis role="bold">Files</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the <literal>Downloaded Files</literal> tab.</para>
+          <para>Select the <emphasis role="bold">Downloaded Files</emphasis> tab.</para>
         </listitem>
 
         <listitem>
-          <para>Select an archive from <literal>Downloaded Files</literal>
+          <para>Select an archive from the <emphasis role="bold">Downloaded Files</emphasis> 
           table.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Download</literal> button.</para>
+          <para>Click the <emphasis role="bold">Download</emphasis> button.</para>
 
           <para>The file will be downloaded in browser's download
           folder.</para>
@@ -193,21 +193,21 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Files</literal> -&gt;
-          <literal>Download</literal>.</para>
+          <para>Access <emphasis role="bold">Files</emphasis> and then click the 
+          <emphasis role="bold">Download</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>List</literal> button.</para>
+          <para>Press the <emphasis role="bold">List</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>In the <literal>Device File Listing</literal> table, select
+          <para>In the <emphasis role="bold">Device File Listing</emphasis> table, select
           the archive you want to delete from the uCPE device.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>Delete</literal> button.</para>
+          <para>Press the <emphasis role="bold">Delete</emphasis> button.</para>
 
           <para>The archive will be deleted from the uCPE device and the table
           will be updated.</para>
@@ -218,8 +218,8 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Operations</literal> -&gt; <literal>Delete
-          Debug Log Archive</literal>.</para>
+          <para>Access the <emphasis role="bold">Operations</emphasis> menu and 
+select <emphasis role="bold">Delete Debug Log Archive</emphasis>.</para>
         </listitem>
 
         <listitem>
@@ -227,7 +227,7 @@
         </listitem>
 
         <listitem>
-          <para>Press the <literal>Execute</literal> button.</para>
+          <para>Press the <emphasis role="bold">Execute</emphasis> button.</para>
 
           <para>A success message is displayed if the file is deleted from the
           uCPE device correctly.</para>
@@ -243,21 +243,21 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Devices</literal> -&gt;
-          <literal>Files</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, then select 
+          <emphasis role="bold">Files</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the <literal>Downloaded Files</literal> tab.</para>
+          <para>Select the <emphasis role="bold">Downloaded Files</emphasis> tab.</para>
         </listitem>
 
         <listitem>
-          <para>Select an archive from the <literal>Downloaded Files</literal>
-          table.</para>
+          <para>Select an archive from the <emphasis role="bold">Downloaded Files</emphasis> 
+table.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Delete</literal> button.</para>
+          <para>Click the <emphasis role="bold">Delete</emphasis> button.</para>
 
           <para>The file will be deleted from the Enea uCPE Manager and the
           table will be updated.</para>
@@ -279,12 +279,12 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Security</literal> -&gt;
-          <literal>Configuration</literal>.</para>
+          <para>Access the <emphasis role="bold">Security</emphasis> menu, 
+then select <emphasis role="bold">Configuration</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Security Groups</literal> tab.</para>
+          <para>Click the <emphasis role="bold">Security Groups</emphasis> tab.</para>
         </listitem>
 
         <listitem>
@@ -292,18 +292,18 @@
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Permissions</literal> tab on the right
+          <para>Click the <emphasis role="bold">Permissions</emphasis> tab on the right
           side.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Devices</literal> tab like in the image
+          <para>Click the <emphasis role="bold">Devices</emphasis> tab like in the image
           below.</para>
         </listitem>
 
         <listitem>
-          <para>Change the <literal>Device File Management</literal> option to
-          <literal>none</literal> to disable the feature.</para>
+          <para>Change the <emphasis role="bold">Device File Management</emphasis> option to
+          <emphasis role="bold">none</emphasis> to disable the feature.</para>
         </listitem>
       </orderedlist>
 
@@ -336,16 +336,15 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Test</literal> -&gt; <literal>Debug
-          Settings</literal> and select the <literal>Log Files</literal>
-          tab.</para>
+          <para>Access <emphasis role="bold">Test</emphasis>, then <emphasis role="bold">Debug
+          Settings</emphasis> and select the <emphasis role="bold">Log Files</emphasis> tab.</para>
         </listitem>
 
         <listitem>
           <para>Select the desired log file
           (<filename>ucpemanager.log</filename> or
           <filename>watchdog.log</filename>) and press the
-          <literal>Download</literal> button.</para>
+          <emphasis role="bold">Download</emphasis> button.</para>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml b/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
index 1d51537..034908a 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
@@ -43,16 +43,16 @@
 
       <para>In use cases where CPU capacity is very limited, disabling DPDK
       can free up CPU capacity and overall performance can improve. Navigate
-      to <literal>Configuration</literal> -&gt; <literal>DPDK</literal> and
-      deselect <literal>Enable DPDK</literal> to disable the DPDK.</para>
+      to <emphasis role="bold">Configuration</emphasis>, then <emphasis role="bold">DPDK</emphasis> and
+      deselect <emphasis role="bold">Enable DPDK</emphasis> to disable the DPDK.</para>
 
       <note>
         <para>Disabling the DPDK cannot be done after other network
         configurations have been made.</para>
       </note>
 
-      <para>In <literal>Configuration</literal> -&gt; <literal>DPDK</literal>
-      it is also possible to configure DPDK resources such as:</para>
+      <para>In <emphasis role="bold">Configuration</emphasis>, select <emphasis role="bold">DPDK</emphasis>
+      where DPDK resources can also be configured such as:</para>
 
       <itemizedlist>
         <listitem>
@@ -89,9 +89,9 @@
       management system.</para>
 
       <para>To add an interface into the Enea 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>
+      device, then from the top toolbar select <emphasis role="bold">Configuration</emphasis>, then 
+      <emphasis role="bold">External Interfaces</emphasis>, <emphasis role="bold">Configuration</emphasis>, 
+and click the <emphasis role="bold">Add</emphasis> button. The available Interface types are detailed below.</para>
 
       <section id="dpdk_interface_type">
         <title>DPDK Interface Type</title>
@@ -102,10 +102,10 @@
         bridge.</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 as
-          DPDK.</para>
+          <para>Make sure the <emphasis role="bold">Enable DPDK</emphasis> checkbox is
+          selected by accessing <emphasis role="bold">Device</emphasis>, 
+<emphasis role="bold">Configuration</emphasis> and choosing 
+<emphasis role="bold">DPDK</emphasis>, otherwise no interface can be assigned as DPDK.</para>
         </note>
 
         <para>To add a DPDK interface under the management system, set
@@ -202,17 +202,16 @@
           <listitem>
             <para>To edit an interface configuration type from the Enea uCPE
             Manager, select the uCPE device, then from the top toolbar select
-            the <literal>Configuration</literal> menu then <literal>External
-            Interfaces -&gt; Configuration</literal>. The already configured
-            interfaces are displayed here, as can be seen in the figure
-            above.</para>
+            the <emphasis role="bold">Configuration</emphasis> menu, then <emphasis role="bold">External
+            Interfaces</emphasis> and <emphasis role="bold">Configuration</emphasis>. 
+                        The already configured interfaces are displayed here, as seen in the figure above.</para>
           </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 <literal>Host Interface</literal>
+            each type of interface. From the <emphasis role="bold">Host Interface</emphasis>
             window, a user can change the networking type and the IP address
             assignment:</para>
 
@@ -243,9 +242,9 @@
         <title>Manual Configuration</title>
 
         <para>For Manual Configuration of uCPE networking, select the uCPE
-        device first and then <literal>Configuration</literal> -&gt;
-        <literal>External Interfaces</literal>, where one can find a list of
-        available network interfaces and their capabilities.</para>
+        device first, then access the <emphasis role="bold">Configuration</emphasis> menu, 
+                and choose <emphasis role="bold">External Interfaces</emphasis>, where a list of
+        available network interfaces and their capabilities can be found.</para>
 
         <para>After networking interfaces have been added to the Enea uCPE
         Manager, the user can change the interface type (DPDK, SR-IOV,
@@ -290,22 +289,23 @@
         </listitem>
 
         <listitem>
-          <para>Select <literal>Configuration</literal>.</para>
+          <para>Select <emphasis role="bold">Configuration</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Click <literal>OpenvSwitch</literal>.</para>
+          <para>Click <emphasis role="bold">OpenvSwitch</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the <literal>Bridges</literal> option, then click
-          <literal>Add</literal>.</para>
+          <para>Select the <emphasis role="bold">Bridges</emphasis> option, then click
+          <emphasis role="bold">Add</emphasis>.</para>
         </listitem>
       </orderedlist>
 
       <note>
-        <para>Depending on the settings in <literal>Configuration -&gt;
-        OpenVSwitch -&gt; DPDK</literal>, OVS bridges with or without DPDK
+        <para>Depending on the settings found when accessing <emphasis role="bold">Configuration</emphasis>, 
+        <emphasis role="bold">OpenVSwitch</emphasis> and selecting 
+                <emphasis role="bold">DPDK</emphasis>, OVS bridges with or without DPDK
         support will be used on the uCPE device.</para>
       </note>
 
@@ -473,9 +473,9 @@
       which occurs when the uCPE device connects to the Enea uCPE Manager
       informing that the ZTP setup failed for the specific uCPE device.</para>
 
-      <para>To create an offline configuration, from the top toolbar menu
-      select <literal>Applications</literal> -&gt; <literal>Offline
-      Config</literal> -&gt; <literal>Add</literal>. The following fields
+      <para>To create an offline configuration, select from the top toolbar 
+          the <emphasis role="bold">Applications</emphasis> menu, then <emphasis role="bold">Offline
+      Config</emphasis> and choose <emphasis role="bold">Add</emphasis>. The following fields
       should be filled:</para>
 
       <itemizedlist>
@@ -536,9 +536,9 @@
       <para>If a match is found, the offline configuration is sent to the
       device as part of Zero-Touch-Provisioning.</para>
 
-      <para>After creating the Offline Config Store, access the device through
-      <literal>Applications</literal> -&gt; <literal>offline config</literal>
-      -&gt; <literal>Config App</literal> and provision it with the required
+      <para>After creating the Offline Config Store, access the device by selecting 
+          <emphasis role="bold">Applications</emphasis>, then <emphasis role="bold">offline config</emphasis>
+      and clicking <emphasis role="bold">Config App</emphasis>, to provision it with the required
       initial configuration. This operation mirrors what happens during manual
       configuration described previously.</para>
 
@@ -547,9 +547,9 @@
         connects to the Enea uCPE Manager. Just changing an offline
         configuration will not push the new changes to the device. If an
         offline configuration is changed after uCPE device registration, a
-        factory reset can be executed to force a new ZTP to execute by
-        selecting the device, then <literal>Operations</literal> -&gt;
-        <literal>factory reset</literal>.</para>
+        factory reset can be executed to force a new ZTP to execute. 
+Select the device, then access the <emphasis role="bold">Operations</emphasis> menu
+and select <emphasis role="bold">factory reset</emphasis>.</para>
       </note>
     </section>
   </section>
@@ -597,22 +597,22 @@
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, then <emphasis role="bold">Custom
+          Scripts</emphasis> and choose <emphasis role="bold">Configure</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select <literal>Upload to EMS</literal>.</para>
+          <para>Select <emphasis role="bold">Upload to EMS</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>In the <literal>Script Type</literal> menu, select the type
+          <para>In the <emphasis role="bold">Script Type</emphasis> menu, select the type
           the uploaded script should have.</para>
         </listitem>
 
         <listitem>
-          <para>Press <literal>Choose File</literal> to select the scripts
-          needed, and then press <literal>Send</literal>.</para>
+          <para>Press <emphasis role="bold">Choose File</emphasis> to select the scripts
+          needed, and then click <emphasis role="bold">Send</emphasis>.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -624,14 +624,14 @@
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, then <emphasis role="bold">Custom
+          Scripts</emphasis> and select <emphasis role="bold">Configure</emphasis>.</para>
         </listitem>
 
         <listitem>
           <para>Select the script you want to delete from the
-          <literal>Uploaded Scripts</literal> tab and then click
-          <literal>Delete</literal>, which will remove the script immediately
+          <emphasis role="bold">Uploaded Scripts</emphasis> tab and then click
+          <emphasis role="bold">Delete</emphasis>, which will remove the script immediately
           from the Enea uCPE Manager.</para>
         </listitem>
       </orderedlist>
@@ -645,12 +645,12 @@
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, choose <emphasis role="bold">Custom
+          Scripts</emphasis> and select <emphasis role="bold">Configure</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the <literal>Configuration</literal> tab and specify a
+          <para>Select the <emphasis role="bold">Configuration</emphasis> tab and specify a
           new loacation to store the scripts.</para>
 
           <note>
@@ -669,21 +669,21 @@
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-          Scripts</literal> -&gt; <literal>Apply Scripts</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, choose <emphasis role="bold">Custom
+          Scripts</emphasis> and select <emphasis role="bold">Apply Scripts</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>In the <literal>Script Config Screen</literal> pop up, select
+          <para>In the <emphasis role="bold">Script Config Screen</emphasis> pop up, select
           the devices from the device(s) chooser list on which to run the
-          scripts. Press the <literal>&gt;</literal> button to move the
+          scripts. Press the <emphasis role="bold">&gt;</emphasis> button to move the
           devices to the right side of the chooser, which is the list of
           devices that will execute the selected scripts.</para>
         </listitem>
 
         <listitem>
           <para>Select the scripts from the list under the device(s) chooser
-          by pressing the <literal>+</literal> button.</para>
+          by pressing the <emphasis role="bold">+</emphasis> button.</para>
         </listitem>
 
         <listitem>
@@ -694,14 +694,14 @@
         </listitem>
 
         <listitem>
-          <para>Check the checkbox <literal>Reboot devices</literal> if you
-          want to reboot and execute the scripts at once and then press
-          <literal>ok</literal>.</para>
+          <para>Check the <emphasis role="bold">Reboot devices</emphasis> checkbox if you
+          want to reboot and execute the scripts at once and then select 
+<emphasis role="bold">ok</emphasis>.</para>
 
           <note>
             <para>The status of execution for the scripts can be seen by
-            opening the <literal>Fault</literal> -&gt;
-            <literal>Events</literal> screen and filtering by device and/or
+            accessing <emphasis role="bold">Fault</emphasis>, opening the 
+<emphasis role="bold">Events</emphasis> screen and filtering by device and/or
             the event name <filename>CustomScriptExecuted</filename>.</para>
           </note>
         </listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml b/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
index e176cec..f416f8f 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
@@ -2,20 +2,20 @@
 <chapter id="troubleshooting">
   <title>Troubleshooting and Recovery</title>
 
-  <para>The following is a small list of possible Enea NFV Access problems,
-  and their solutions. <emphasis role="bold">In all scenarios collect the logs
-  if possible for debugging.</emphasis> More information on log collecting can
-  be found in <olink targetdoc="book_enea_nfv_access_getting_started"
+  <para>In all scenarios where possible, collect the logs for
+    debugging. More information on log collecting can be found in
+  <olink targetdoc="book_enea_nfv_access_getting_started"
   targetptr="log_collector">Using the Log Collector in the <xi:include
   href="../../s_docbuild/olinkdb/pardoc-names.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
   Manual.</para>
 
-  <para>If you encounter other issues or can't get Enea NFV Access to work
+  <para>The following is a small list of possible Enea NFV Access problems,
+  and their solutions. If you encounter other issues or can't get Enea NFV Access to work
   successfully after consulting the information below, please use the <olink
   targetdoc="book_enea_nfv_access_release_info"
-  targetptr="contacting_enea_support">Enea Support team Form, available in the
+  targetptr="contacting_enea_support">Enea Support Team Form, available in the
   <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xpointer="element(book_enea_nfv_access_release_info/1)" /></olink> Manual
@@ -154,8 +154,8 @@
               </listitem>
 
               <listitem>
-                <para>Use the <literal>Reconnect</literal> button from the
-                Enea uCPE Manager's GUI.</para>
+                <para>Use the <emphasis role="bold">Reconnect</emphasis>
+                button from the Enea uCPE Manager's GUI.</para>
               </listitem>
 
               <listitem>
@@ -205,17 +205,18 @@
               </listitem>
 
               <listitem>
-                <para>Reboot the device using <literal>Operations</literal>
-                -&gt; <literal>Reboot</literal> menu options from within the
-                Enea uCPE Manager.</para>
+                <para>Reboot the device by accessing <emphasis
+                role="bold">Operations</emphasis> and then selecting <emphasis
+                role="bold">Reboot</emphasis> from within the Enea uCPE
+                Manager.</para>
               </listitem>
 
               <listitem>
                 <para>If the above actions do not work, redeploy all services.
-                This is done by cleaning up the existing configuration using:
-                <literal>Operations</literal> -&gt; <literal>Factory
-                Reset</literal> for a specific device and redeploying the VNF
-                services.</para>
+                This is done by cleaning up the existing configuration by 
+accessing <emphasis role="bold">Operations</emphasis>, then selecting 
+<emphasis role="bold">Factory Reset</emphasis> for a specific device and 
+redeploying the VNF services.</para>
               </listitem>
             </orderedlist></entry>
         </row>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml b/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
index 01fd8ec..2f5801c 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
@@ -4,16 +4,17 @@
 
   <para>Enea provides regular releases that will require the upgrading of Enea
   NFV Access components. The Enea uCPE Manager must be upgraded first,
-  followed by upgrading Enea NFV Access Runtime on the uCPE devices.</para>
+  followed by upgrading the Enea NFV Access Runtime Platform on the uCPE
+  devices.</para>
 
   <section id="upgrade_mg">
     <title>Upgrading the Enea uCPE Manager</title>
 
     <note>
-      <para>It is recommended to create a system backup by accessing:
-      <literal>System</literal> -&gt; <literal>System Backup</literal> from
-      the Enea uCPE Manager GUI, for recovery in case of an upgrade
-      failure.</para>
+      <para>It is recommended to create a system backup by accessing <emphasis
+      role="bold">System</emphasis> and selecting <emphasis role="bold">System
+      Backup</emphasis> from the Enea uCPE Manager GUI, for recovery in case
+      of an upgrade failure.</para>
     </note>
 
     <orderedlist>
@@ -171,7 +172,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <listitem>
           <para>Uninstall the <literal>ucpemanager</literal> service, so that
-          it will not startup on reboot.</para>
+          it will not start up on reboot.</para>
         </listitem>
 
         <listitem>
@@ -220,38 +221,42 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
     </section>
 
     <section id="mg_upgrade">
-      <title>Managing the device Upgrade</title>
+      <title>Managing the uCPE device Upgrade</title>
 
       <para>Before an installation or upgrade can be completed, certain
       configuration data must be set. Files also need to be uploaded to the
-      Device Upgrade image repository to be uploaded to the device.</para>
+      Device Upgrade image repository in order to be uploaded to the
+      device.</para>
 
       <para>Launch the Device Upgrade management console by selecting
-      <literal>Devices</literal> -&gt; <literal>Upgrade</literal> from the top
-      tool-bar. The console will contain the following tabs:</para>
+      <emphasis role="bold">Devices</emphasis> and then the <emphasis
+      role="bold">Upgrade</emphasis> button from the top tool-bar. The console
+      will contain the following tabs:</para>
 
       <itemizedlist>
         <listitem>
-          <para><literal>Image Library</literal>. To add/delete an
-          image.</para>
+          <para><emphasis role="bold">Image Library</emphasis>. To add/delete
+          an image.</para>
         </listitem>
 
         <listitem>
-          <para><literal>Upgrade Operations</literal>. See running upgrades,
-          cancel any upgrades in progress, start a uCPE device upgrade.</para>
+          <para><emphasis role="bold">Upgrade Operations</emphasis>. See
+          upgrades that are currently running, cancel any upgrades in
+          progress, or start a uCPE device upgrade.</para>
         </listitem>
 
         <listitem>
-          <para><literal>Configuration</literal>. Upgrade configuration
-          parameters.</para>
+          <para><emphasis role="bold">Configuration</emphasis>. Upgrade
+          configuration parameters.</para>
         </listitem>
       </itemizedlist>
 
-      <para>Press Close when the message <literal>File Uploaded
-      Successfully</literal> appears on the File Upload Screen.</para>
+      <para>Press <emphasis role="bold">Close</emphasis> when the message
+      <literal>File Uploaded Successfully</literal> appears on the <emphasis
+      role="bold">File Upload</emphasis> screen.</para>
 
       <note>
-        <para>The uCPE Device upgrade is done with image files of type
+        <para>The uCPE Device upgrade is done with image files of the type
         <literal>rootfs.ostree.tar.bz2</literal>, which are available in the
         <filename>Enea_NFV_Access_Run_Time_Platform_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         file you downloaded with your release.</para>
@@ -263,18 +268,19 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <para><emphasis role="bold">Adding an image to the image
         repository/library</emphasis><orderedlist>
             <listitem>
-              <para>Select <literal>Devices</literal> -&gt;
-              <literal>Upgrade</literal>.</para>
+              <para>Select <emphasis role="bold">Devices</emphasis> and then
+              the <emphasis role="bold">Upgrade</emphasis> button.</para>
             </listitem>
 
             <listitem>
-              <para>Select <literal>Add</literal> from the <literal>Image
-              Library</literal> tab to add a new image file.</para>
+              <para>Select <emphasis role="bold">Add</emphasis> from the
+              <emphasis role="bold">Image Library</emphasis> tab to add a new
+              image file.</para>
             </listitem>
 
             <listitem>
-              <para>Click on <literal>Choose File</literal> to provide the
-              path to the image file (must be of type
+              <para>Select <emphasis role="bold">Choose File</emphasis> to
+              provide the path to the image file (must be of type
               <literal>rootfs.os-tree.tar.bz2</literal>).</para>
             </listitem>
 
@@ -285,8 +291,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
             </listitem>
 
             <listitem>
-              <para>Click <literal>Send</literal> to upload the image to the
-              image repository.</para>
+              <para>Click <emphasis role="bold">Send</emphasis> to upload the
+              image to the image repository.</para>
             </listitem>
           </orderedlist></para>
 
@@ -295,14 +301,14 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <orderedlist>
           <listitem>
-            <para>Select <literal>Devices</literal> -&gt;
-            <literal>Upgrade</literal>.</para>
+            <para>Select <emphasis role="bold">Devices</emphasis> and then the
+            <emphasis role="bold">Upgrade</emphasis> button.</para>
           </listitem>
 
           <listitem>
-            <para>Select the image you want to delete from the <literal>Image
-            Library</literal> tab and then click
-            <literal>Delete</literal>.</para>
+            <para>Select the image you want to delete from the <emphasis
+            role="bold">Image Library</emphasis> tab and then click <emphasis
+            role="bold">Delete</emphasis>.</para>
           </listitem>
         </orderedlist>
       </section>
@@ -310,12 +316,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
       <section id="upgrade_options">
         <title>Upgrade Operations</title>
 
-        <para>The <literal>Upgrade Operations</literal> tab allows a user to
-        manage uCPE device upgrades in the system. It allows the user to see
-        all the upgrades that are currently in progress, as well as listing
-        the completed ones. If an upgrade succeeds or fails, then a row will
-        be added to the completed upgrades table. If one fails, the failure
-        message will be visible in the table.</para>
+        <para>The <emphasis role="bold">Upgrade Operations</emphasis> tab
+        allows a user to manage uCPE device upgrades in the system. It allows
+        the user to see all the upgrades that are currently in progress, as
+        well as listing the completed ones. If an upgrade succeeds or fails,
+        then a row will be added to the completed upgrades table. If one
+        fails, the failure message will be visible in the table.</para>
 
         <note>
           <para>The list of completed upgrade tasks resides in the cache
@@ -325,16 +331,17 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <para><emphasis role="bold">How to Install/Upgrade a device
         immediately or schedule the process for later</emphasis><orderedlist>
             <listitem>
-              <para>Select <literal>Devices</literal> -&gt;
-              <literal>Upgrade</literal>.</para>
+              <para>Select <emphasis role="bold">Devices</emphasis> and then
+              the <emphasis role="bold">Upgrade</emphasis> button.</para>
             </listitem>
 
             <listitem>
-              <para>Select <literal>Upgrade Devices</literal> from the
-              <literal>Upgrade Operations</literal> tab. This will launch a
-              <literal>Multi Device Install Image</literal> screen that will
-              allow the user to install and upgrade more than one uCPE device
-              at a time or upgrade later.</para>
+              <para>Select <emphasis role="bold">Upgrade Devices</emphasis>
+              from the <emphasis role="bold">Upgrade Operations</emphasis>
+              tab. This will launch a <literal>Multi Device Install
+              Image</literal> screen that will allow the user to install and
+              upgrade more than one uCPE device at a time or upgrade
+              later.</para>
             </listitem>
           </orderedlist></para>
 
@@ -360,8 +367,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           </listitem>
 
           <listitem>
-            <para><literal>Image File</literal>. Click on <literal>Choose
-            Image File</literal> to select the image file.</para>
+            <para><literal>Image File</literal>. Click on <emphasis
+            role="bold">Choose Image File</emphasis> to select the image
+            file.</para>
           </listitem>
 
           <listitem>
@@ -369,13 +377,14 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
             can accept an image file is populated when the image file is
             chosen.</para>
 
-            <para>Press the <literal>&gt;</literal> button to move the uCPE
-            devices to the right side of the selector. Those chosen form the
-            list of uCPE devices that will be upgraded.</para>
+            <para>Press the <emphasis role="bold">&gt;</emphasis> button to
+            move the uCPE devices to the right side of the selector. Those
+            chosen form the list of uCPE devices that will be upgraded.</para>
           </listitem>
 
           <listitem>
-            <para>Upgrade Operation. The available options are:</para>
+            <para><literal>Upgrade Operation</literal>. The available options
+            are:</para>
 
             <itemizedlist>
               <listitem>
@@ -410,8 +419,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <para>The installed releases on a uCPE device can be viewed by
         selecting the uCPE device first, then from the top toolbar selecting
-        <literal>Configuration</literal> -&gt;
-        <literal>Upgrade</literal>.</para>
+        <emphasis role="bold">Configuration</emphasis> and then the <emphasis
+        role="bold">Upgrade</emphasis> button.</para>
 
         <para>The installed releases on the uCPE device, the release status,
         release state, <literal>commit-id</literal> and release version will
@@ -422,30 +431,31 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <title>uCPE device Upgrade Status</title>
 
         <para>The status of the installation and upgrade can be viewed in the
-        <literal>Upgrade Operations</literal> tab. Ongoing or scheduled
-        upgrade operations can be viewed or cancelled.</para>
+        <emphasis role="bold">Upgrade Operations</emphasis> tab. Ongoing or
+        scheduled upgrade operations can be viewed or cancelled.</para>
 
         <para><emphasis role="bold">To view the status of an installation or
         upgrade operations</emphasis></para>
 
         <orderedlist>
           <listitem>
-            <para>Select <literal>Devices</literal> -&gt;
-            <literal>Upgrade</literal>.</para>
+            <para>Select <emphasis role="bold">Devices</emphasis> and then the
+            <emphasis role="bold">Upgrade</emphasis> button.</para>
           </listitem>
 
           <listitem>
-            <para>Select <literal>Upgrade Operations</literal>. The ongoing
-            operations are listed at the top and a history of failed or
-            successful operations are listed at the bottom.</para>
+            <para>Select <emphasis role="bold">Upgrade Operations</emphasis>.
+            The ongoing operations are listed at the top and a history of
+            failed or successful operations are listed at the bottom.</para>
           </listitem>
 
           <listitem>
-            <para>Select an <literal>Active</literal> or <literal>Completed
-            Upgrade Operation</literal> and click the <literal>Device
-            Status</literal> button to see detailed information regarding the
-            upgrade operation, including the uCPE devices involved and
-            information per uCPE device.</para>
+            <para>Select an <emphasis role="bold">Active</emphasis> or
+            <emphasis role="bold">Completed Upgrade Operation</emphasis> and
+            then the <emphasis role="bold">Device Status</emphasis> button to
+            see detailed information regarding the upgrade operation,
+            including the uCPE devices involved and information per uCPE
+            device.</para>
           </listitem>
         </orderedlist>
 
@@ -454,15 +464,16 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <orderedlist>
           <listitem>
-            <para>Select <literal>Devices</literal> -&gt;
-            <literal>Upgrade</literal> -&gt; <literal>Upgrade
-            Operations</literal>.</para>
+            <para>Select <emphasis role="bold">Devices</emphasis>, then the
+            <emphasis role="bold">Upgrade</emphasis> button and choose
+            <emphasis role="bold">Upgrade Operations</emphasis>.</para>
           </listitem>
 
           <listitem>
-            <para>Select an operation from the list and press <literal>Cancel
-            Upgrade</literal> and <literal>Confirm</literal>. The operation
-            will then be deleted from the list.</para>
+            <para>Select an operation from the list and choose <emphasis
+            role="bold">Cancel Upgrade</emphasis> and <emphasis
+            role="bold">Confirm</emphasis>. The operation will then be deleted
+            from the list.</para>
           </listitem>
         </orderedlist>
       </section>
@@ -472,19 +483,20 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <note>
           <para>The default values present in the configuration of each uCPE
-          device are recommended for use. Modifying them is for an Advanced
-          User only.</para>
+          device are recommended for use. Modifying them is for an <emphasis
+          role="bold">Advanced User</emphasis> only.</para>
         </note>
 
         <para><emphasis role="bold">How to Configure the uCPE device
         Upgrade</emphasis><orderedlist>
             <listitem>
-              <para>Select <literal>Devices</literal> -&gt;
-              <literal>Upgrade</literal>.</para>
+              <para>Select <emphasis role="bold">Devices</emphasis> and then
+              the <emphasis role="bold">Upgrade</emphasis> button.</para>
             </listitem>
 
             <listitem>
-              <para>Select <literal>Configuration</literal>.</para>
+              <para>Select <emphasis
+              role="bold">Configuration</emphasis>.</para>
             </listitem>
 
             <listitem>
@@ -528,17 +540,18 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <para>Each uCPE device can receive image files and use them to
         upgrade. This can be done by selecting the uCPE device in the
-        <literal>System</literal> view and clicking the
-        <literal>Upgrade</literal> button. In the new window, an upgrade image
-        can be chosen from the <literal>Image Files</literal> tab by selecting
-        the image file from the list and clicking the <literal>Install on
-        Device</literal> button.</para>
+        <emphasis role="bold">System</emphasis> view and clicking the
+        <emphasis role="bold">Upgrade</emphasis> button. In the new window, an
+        upgrade image can be chosen from the <emphasis role="bold">Image
+        Files</emphasis> tab by selecting the image file from the list and
+        clicking the <emphasis role="bold">Install on Device</emphasis>
+        button.</para>
 
         <para>Once an image is installed on the uCPE device, the image will be
-        available on the uCPE device and be visible in the
-        <literal>Releases</literal> tab. It can then be selected from the list
-        and the upgrade started by clicking the <literal>Upgrade</literal>
-        button.</para>
+        available on the uCPE device and be visible in the <emphasis
+        role="bold">Releases</emphasis> tab. It can then be selected from the
+        list and the upgrade started by clicking the <emphasis
+        role="bold">Upgrade</emphasis> button.</para>
       </section>
     </section>
   </section>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml b/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
index 2dfe248..e8c65eb 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
@@ -116,17 +116,17 @@
 
       <orderedlist>
         <listitem>
-          <para>Select from the top toolbar <literal>VNF</literal> -&gt;
-          <literal>Descriptors</literal></para>
+          <para>Select from the top toolbar <emphasis role="bold">VNF</emphasis> 
+                  and then <emphasis role="bold">Descriptors</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>On-board</literal> button.</para>
+          <para>Click the <emphasis role="bold">On-board</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>When prompted by the UI, make sure the <literal>VM
-          Image</literal> radio button at the top of the onboarding screen is
+          <para>When prompted by the UI, make sure the <emphasis role="bold">VM
+          Image</emphasis> radio button at the top of the onboarding screen is
           selected, it will trigger a popup menu window.</para>
         </listitem>
       </orderedlist>
@@ -153,7 +153,7 @@
         <listitem>
           <para><emphasis role="bold">VM Image File</emphasis>. This is the
           Virtual Machine image file for the VNF. Typically, it is a QCOW
-          image. Press <literal>Choose File</literal> and select the image you
+          image. Press <emphasis role="bold">Choose File</emphasis> and select the image you
           wish to upload.</para>
         </listitem>
 
@@ -203,7 +203,7 @@
 
       <para><emphasis role="bold">Interfaces Tab</emphasis></para>
 
-      <para>Click on the <literal>Interfaces</literal> tab to show the
+      <para>Click on the <emphasis role="bold">Interfaces</emphasis> tab to show the
       Interfaces table.</para>
 
       <para>This table will contain the interfaces required by this VNF to be
@@ -219,7 +219,7 @@
 
       <para><emphasis role="bold">Cloud Init Tab</emphasis></para>
 
-      <para>Click the <literal>Cloud Init</literal> tab to provide the
+      <para>Click the <emphasis role="bold">Cloud Init</emphasis> tab to provide the
       Cloud-Init configuration. There are three fields that need to be
       populated:</para>
 
@@ -349,12 +349,12 @@
 
     <orderedlist>
       <listitem>
-        <para>Select from the top toolbar <literal>VNF</literal> -&gt;
-        <literal>Instances</literal></para>
+        <para>Select from the top toolbar <emphasis role="bold">VNF</emphasis> and 
+        choose <emphasis role="bold">Instances</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Click the <literal>Add</literal> button.</para>
+        <para>Click the <emphasis role="bold">Add</emphasis> button.</para>
       </listitem>
 
       <listitem>
@@ -406,13 +406,13 @@
       </listitem>
 
       <listitem>
-        <para>Hit the <literal>Create</literal> button to deploy the VNF and
+        <para>Hit the <emphasis role="bold">Create</emphasis> button to deploy the VNF and
         run it on the specified uCPE device.</para>
       </listitem>
     </orderedlist>
 
-    <para>Selecting the<literal> VNF -&gt; Events</literal> menu will show
-    that the VNF was created and a connection was established.</para>
+    <para>Selecting the <emphasis role="bold">VNF</emphasis> menu then choosing <emphasis role="bold">Events</emphasis> 
+        will show that the VNF was created and a connection was established.</para>
   </section>
 
   <section id="enter_console">
@@ -426,7 +426,7 @@
     <orderedlist>
       <listitem>
         <para>SSH to the uCPE device from the Enea uCPE Manager
-        (<literal>Device-&gt;SSH</literal>) using:</para>
+        (Access the <emphasis role="bold">Device</emphasis> menu and select <emphasis role="bold">SSH</emphasis>) using:</para>
 
         <itemizedlist>
           <listitem>
@@ -441,8 +441,10 @@
             NAT): the <literal>Username</literal> (default: root) and the
             <literal>Reverse ssh</literal> checkbox checked. The port will be
             automatically choosen by the Enea uCPE Manager in the range
-            defined in the <literal>System -&gt; Configuration -&gt; Reverse
-            SSH</literal> configuration panel. By default, the start port will
+            defined in the <emphasis role="bold">SSH</emphasis> configuration panel, 
+                        available when accessing <emphasis role="bold">System</emphasis>, then 
+                        <emphasis role="bold">Configuration</emphasis> and choosing <emphasis role="bold">Reverse
+            SSH</emphasis> . By default, the start port will
             be <literal>7000</literal> and the maximum number of ports
             allocated to all devices is 10. Only one port per device is
             allowed.</para>