Cleaning up the code, adding in new section ids,feature_CPDX-3353

syncing formating across the books.

Change-Id: I1c0b70d498b744c0c9997538c7ce4a5402749792
Signed-off-by: mrpa <miruna.paun@enea.com>

4 files changed, 578 insertions, 464 deletions

diff --git a/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
index 7722715..bc974cc 100644
--- a/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
@@ -6,7 +6,9 @@
     <title>File Structure</title>
 
     <para>Enea Edge Automation is an open-source product,
-    with the following directory structure:<itemizedlist spacing="compact">
+    with the following directory structure:</para>
+        
+        <itemizedlist spacing="compact">
         <listitem>
           <para>ansible.cfg</para>
         </listitem>
@@ -46,22 +48,23 @@
         <listitem>
           <para>VERSION</para>
         </listitem>
-      </itemizedlist></para>
+      </itemizedlist>
 
     <para>Each file/directory is described in more details in the following
     sections.</para>
 
-    <section>
-      <title>setup_env.sh, setup_env_requirements.txt and
-      environment_variables.sh</title>
+    <section id="create_virt_test_env">
+      <title>Creating the Virtual Environment for Testing</title>
 
-      <para>The <literal>setup_env.sh</literal>,
-      <literal>setup_env_requirements.txt</literal> and
-      <literal>environment_variables.sh</literal> files are used to create the
-      testing virtual environment with the folowing
-      prerequisites:<itemizedlist security="" spacing="compact">
+      <para>The <filename>setup_env.sh</filename>,
+      <filename>setup_env_requirements.txt</filename> and
+      <filename>environment_variables.sh</filename> files are used to create the
+      testing virtual environment, using the following
+      prerequisites:</para>
+          
+          <itemizedlist spacing="compact">
           <listitem>
-            <para>environment variable</para>
+            <para>The environment variable</para>
           </listitem>
 
           <listitem>
@@ -69,65 +72,65 @@
           </listitem>
 
           <listitem>
-            <para>Ansible package</para>
+            <para>Ansible package(s)</para>
           </listitem>
-        </itemizedlist></para>
-
-      <para>The <literal>environment_variables.sh</literal> script sets the
-      environment variables.</para>
-
-      <para>The <literal>setup_env_requirements.txt</literal> contains the
-      mapping between the package name and its version.</para>
+        </itemizedlist>
 
-      <para>The <literal>setup_env.sh</literal> script creates a testing
-      virtual environment.</para>
+      <para>Where the <filename>environment_variables.sh</filename> script sets the
+      environment variables. The <filename>setup_env_requirements.txt</filename> contains the
+      mapping between the package name and its version, and the <filename>setup_env.sh</filename> 
+          script creates a testing virtual environment.</para>
 
-      <para>The <literal>setup_env.sh</literal> does the
-      following:<itemizedlist spacing="compact">
+      <para>The <filename>setup_env.sh</filename> does the
+      following:</para>
+          
+          <itemizedlist spacing="compact">
           <listitem>
-            <para>checks if the <literal>Python 3</literal> and
+            <para>Checks if the <literal>Python 3</literal> and
             <literal>pip</literal> packages are installed on the host. If at
             least one package is not installed on the host, then an error is
-            displayed and the scripts stops.</para>
+            displayed and the script stops.</para>
           </listitem>
 
           <listitem>
-            <para>creates and activates <literal>testHarness-venv</literal>
-            virtual environment</para>
+            <para>Creates and activates the <literal>testHarness-venv</literal>
+            virtual environment.</para>
           </listitem>
 
           <listitem>
-            <para>upgrades <literal>pip</literal> package to the newest
-            version</para>
+            <para>Upgrades the <literal>pip</literal> package to the newest
+            version.</para>
           </listitem>
 
           <listitem>
-            <para>installs the packages defined in
-            <literal>setup_env_requirements.txt</literal> on the virtual
-            environment</para>
+            <para>Installs the packages defined in
+            <filename>setup_env_requirements.txt</filename> on the virtual
+            environment.</para>
           </listitem>
 
           <listitem>
-            <para>sets the environment variables defined in
-            <literal>environment_variables.sh</literal> on the virtual
-            environment</para>
+            <para>Sets the environment variables defined in
+            <filename>environment_variables.sh</filename> on the virtual
+            environment.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
     </section>
 
-    <section>
+    <section id ="version_changelog">
       <title>VERSION and CHANGELOG</title>
 
-      <para><literal>VERSION</literal> and <literal>CHANGELOG</literal> files
+      <para>The <filename>VERSION</filename> and <filename>CHANGELOG</filename> files
       contain information about the version, build number, and all the notable
       changes added in the Enea Edge Automation.</para>
     </section>
 
-    <section>
-      <title>modules/enea</title>
+    <section id="module_enea_dir">
+      <title>The modules/enea directory</title>
 
       <para>The <literal>modules/enea</literal> directory contains the
-      following:<itemizedlist spacing="compact">
+      following:</para>
+          
+          <itemizedlist spacing="compact">
           <listitem>
             <para><literal>config</literal> - contains the configuration files
             that need to be updated in order to successfully run the
@@ -145,70 +148,73 @@
             <para><literal>VNF_images</literal> - contains the VNF images that
             are used in test scenarios.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
     </section>
 
-    <section>
-      <title>automation_framework</title>
+    <section id="automation_framework_dir">
+      <title>The automation_framework directory</title>
 
       <para>The <literal>automation_framework</literal> directory includes all
       the Python scripts used by the Automation Framework. Each Python script
-      implements a class that defines a functionality of the Enea Edge Management.</para>
+      implements a class that defines a functionality of the Enea Edge Management application.</para>
 
-      <para>The Python scripts can be split in:<itemizedlist>
+      <para>The Python scripts can be split into the following:</para>
+          
+          <itemizedlist>
           <listitem>
-            <para><literal>uCPEMgrHTTPClientRestAPIv2.py</literal> script,
-            where <literal>uCPEMgrHTTPClient</literal> class is defined. This
-            class communicates with the Enea Edge Management via REST API.</para>
+            <para>The <filename>uCPEMgrHTTPClientRestAPIv2.py</filename> script,
+            where the <literal>uCPEMgrHTTPClient</literal> class is defined. This
+            class communicates with the Enea Edge Management application via REST API.</para>
           </listitem>
 
           <listitem>
-            <para>other Python scripts, where the classes for the Enea Edge Management
-            module are defined. Each class inherits
+            <para>Other Python scripts, where the classes for the Enea Edge Management
+            module are defined. Each class inherits the 
             <literal>uCPEMgrHTTPClientRestAPIv2</literal> class and uses its
-            methods to communicate with Enea Edge Management via REST API. Each class
-            corresponds to a Enea Edge Management module.</para>
+            methods to communicate with the Enea Edge Management application via the REST API. Each class
+            corresponds to an Enea Edge Management module.</para>
 
-            <para><emphasis role="bold">Example</emphasis>:
-            <literal>OfflineConfigHandler.py</literal> script, where
+            <para><emphasis role="bold">Example</emphasis>: the 
+            <filename>OfflineConfigHandler.py</filename> script, where the 
             <literal>OfflineConfigHandler</literal> class is defined. Inside
             this class, the methods for offline configuration functionality
             are implemented: <literal>addOfflineConfig</literal>,
             <literal>removeOfflineConfig</literal>,
             <literal>uploaOfflineConfig</literal> and so on.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
     </section>
 
-    <section>
-      <title>unit_test</title>
+    <section id="unit_test_dir">
+      <title>The unit_test directory</title>
 
-      <para>The <literal>unit_test</literal> directory contains:<itemizedlist
-          spacing="compact">
+      <para>The <literal>unit_test</literal> directory contains:</para>
+          
+          <itemizedlist spacing="compact">
           <listitem>
             <para>JSON files for complex scenarios with multiple
-            operations</para>
+            operations.</para>
           </listitem>
 
           <listitem>
-            <para>Python <literal>unit-test</literal> class</para>
+            <para>The Python <literal>unit-test</literal> class.</para>
           </listitem>
 
           <listitem>
-            <para>loader scripts for generating specific test cases for the
-            available Python script</para>
+            <para>Loader scripts for generating specific test cases for the
+            available Python script.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
       <para>The generated test cases are injected into the Python
       <literal>unit-test</literal> suite class to run using the Python
       <literal>unit-test</literal> framework.</para>
     </section>
 
-    <section>
-      <title>test_harness and ansible.cfg</title>
+    <section id="test_harn_ansible">
+      <title>The test_harness directory and ansible.cfg</title>
 
-      <para>The <literal>ansible.cfg</literal> file represents the
+      <para>The <filename>ansible.cfg</filename> file represents the
       configuration file for Test Harness. The Ansible configurations have
       default values delivered in the archive, but they can be changed.
       <emphasis role="bold">Example</emphasis>: for a more extended output,
@@ -216,37 +222,38 @@
 
       <para>The <literal>test_harness</literal> directory contains all the
       implemented playbooks. This directory is structured in multiple
-      subdirectories, each subdirectory represents a functionality of the Enea Edge Management.
-      Each implemented playbook from this directory runs a method
-      from a Python class from <literal>automation_framework</literal>
+      subdirectories, each subdirectory represents a functionality of the Enea Edge Management application. Each implemented playbook from this directory runs a method
+      from a Python class from the <literal>automation_framework</literal>
       directory. Each playbook is an atomic operation, a basic operation that
       need to be tested. These playbooks are used in complex test
-      scenario.</para>
+      scenarios.</para>
     </section>
 
-    <section>
-      <title>log</title>
+    <section id="log_dir">
+      <title>The log directory</title>
 
       <para>The <literal>log</literal> directory is added in the directory
-      structure by <literal>setup_env.sh</literal> script. The
-      <literal>setup_env.sh</literal> stores the output logs in
-      <literal>setup_env.log</literal>. The Ansible playbooks stores the logs
-      in <literal>ansible.log</literal>. The Python scripts stores the logs in
-      <literal>debug.log</literal>.</para>
+      structure by the <filename>setup_env.sh</filename> script. The
+      <filename>setup_env.sh</filename> script stores the output logs in the 
+      <filename>setup_env.log</filename> file. The Ansible playbooks store the logs
+      in the <filename>ansible.log</filename> file. The Python scripts store the logs in
+      the <filename>debug.log</filename> file.</para>
     </section>
   </section>
 
   <section id="AFTH_cofig">
     <title>Configuring the System</title>
 
-    <para>The configuration files must be updated before using the Enea Edge Automation. 
-    They are stored in <literal>modules/enea/config</literal>
+    <para>The configuration files must be updated before using Enea Edge Automation. 
+    They are stored in the <literal>modules/enea/config</literal>
     directory.</para>
 
     <para>The configuration files are split according to the component that is
-    used in the testing process:<itemizedlist spacing="compact">
+    used in the testing process:</para>
+        
+        <itemizedlist spacing="compact">
         <listitem>
-          <para>Enea Edge Management</para>
+          <para>The Enea Edge Management application</para>
         </listitem>
 
         <listitem>
@@ -256,13 +263,15 @@
         <listitem>
           <para>VNFs</para>
         </listitem>
-      </itemizedlist></para>
+      </itemizedlist>
 
-    <section>
-      <title>Configuration Files for Enea Edge Management</title>
+    <section id="config_files_mg">
+      <title>Configuration Files for the Enea Edge Management application</title>
 
-      <para>In order to create a connection with the Enea Edge Management, the
-      following parameters have to be updated:<itemizedlist spacing="compact">
+      <para>In order to create a connection with the Enea Edge Management application, the
+      following parameters have to be updated:</para>
+          
+          <itemizedlist spacing="compact">
           <listitem>
             <para>Enea Edge Management username</para>
           </listitem>
@@ -274,19 +283,19 @@
           <listitem>
             <para>Enea Edge Management IP address</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
-      <para><emphasis role="bold">To update the configuration
-      file</emphasis></para>
+      <para><emphasis role="bold">Updating the configuration file</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Open
-          <literal>modules/enea/config/uCPEManager/ucpem01.json</literal><programlisting>{
+          <para>Open <filename>modules/enea/config/uCPEManager/ucpem01.json</filename></para>
+                  
+                  <programlisting>{
   "ucpe_usr":"admin",
   "ucpe_pass":"admin",
   "ucpe_host":"172.24.3.92"
-}</programlisting></para>
+}</programlisting>
         </listitem>
 
         <listitem>
@@ -295,92 +304,96 @@
       </orderedlist>
 
       <para>It is possible to use another JSON file for the connection with
-      the Enea Edge Management.</para>
+      the Enea Edge Management application.</para>
 
-      <para><emphasis role="bold">To change the path for Enea Edge Management JSON
-      file</emphasis><orderedlist>
+      <para><emphasis role="bold">Changing the path for the Enea Edge Management JSON
+      file</emphasis></para>
+          
+          <orderedlist>
           <listitem>
-            <para>Open
-            <literal>automation_framework/uCPEMgrHTTPClientRestAPIv2.py</literal>
-            file</para>
+            <para>Open the <filename>automation_framework/uCPEMgrHTTPClientRestAPIv2.py</filename> file.</para>
           </listitem>
 
           <listitem>
-            <para>Go to <literal>create_json_file</literal> method from
-            <literal>eneaUcpeMgrConfig</literal> class</para>
+            <para>Go to the <literal>create_json_file</literal> method from the
+            <literal>eneaUcpeMgrConfig</literal> class.</para>
           </listitem>
 
           <listitem>
-            <para>Change the path of Enea Edge Management JSON file in
-            <literal>self.ucpe_json_file</literal> variable</para>
+            <para>Change the path of the Enea Edge Management JSON file in the
+            <literal>self.ucpe_json_file</literal> variable.</para>
           </listitem>
-        </orderedlist></para>
+        </orderedlist>
     </section>
 
-    <section>
+    <section id="config_files_ucpe_devices">
       <title>Configuration Files for uCPE Devices</title>
 
       <para>The <literal>modules/enea/config/uCPEDevices</literal> directory
-      contains the following:<itemizedlist spacing="compact">
+      contains the following:</para>
+          
+          <itemizedlist spacing="compact">
           <listitem>
-            <para>examples of the configuration files for different uCPE
+            <para>Examples of the configuration files for different uCPE
             Devices:
             <literal>inteld1521-16</literal>,<literal>inteld1521-17</literal>,
-            and so on</para>
+            and so on.</para>
           </listitem>
 
           <listitem>
-            <para>the scripts for generating all the configuration files in
-            <literal>scripts</literal> folder</para>
+            <para>The scripts for generating all configuration files in
+            <literal>scripts</literal> folder.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
       <para>The following scripts are implemented to generate the
-      configuration files:<itemizedlist spacing="compact">
+      configuration files:</para>
+          
+          <itemizedlist spacing="compact">
           <listitem>
-            <para><literal>generate_device_config.py</literal> - generates the
-            JSON configuration file for uCPE Device.</para>
+            <para><filename>generate_device_config.py</filename> - generates the
+            JSON configuration file for the uCPE Device.</para>
           </listitem>
 
           <listitem>
-            <para><literal>generate_bridges_config_files.py</literal> -
+            <para><filename>generate_bridges_config_files.py</filename> -
             generates configuration files for all possible OVS bridges created
             on the uCPE Device.</para>
           </listitem>
 
           <listitem>
-            <para><literal>generate_nics_config_files.py</literal> - generates
+            <para><filename>generate_nics_config_files.py</filename> - generates
             the configuration files for all possible NICs created on the uCPE
             Device.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
-      <section>
-        <title>Generating device config</title>
+      <section id="generate_config">
+        <title>Generating Device config</title>
 
-        <para>Before running the script, check:</para>
+        <para>Before running the script, check the following:</para>
 
         <itemizedlist spacing="compact">
           <listitem>
-            <para>the available NICs on the target</para>
+            <para>The available NICs on the target.</para>
           </listitem>
 
           <listitem>
-            <para>the device ID</para>
+            <para>The device ID.</para>
           </listitem>
 
           <listitem>
-            <para>the IP address of the uCPE Device</para>
+            <para>The IP address of the uCPE Device.</para>
           </listitem>
         </itemizedlist>
 
-        <para><emphasis role="bold">To generate device
-        config</emphasis></para>
+        <para><emphasis role="bold">Generating the device config</emphasis></para>
 
         <orderedlist>
           <listitem>
-            <para>Run
-            <literal>generate_device_config.py</literal><programlisting>testHarness-venv)&gt; python generate_device_config.py
+            <para>Run <filename>generate_device_config.py</filename>:</para>
+                        
+                        <programlisting>testHarness-venv)&gt; python generate_device_config.py
 Device name: test
 Device ID: test_id
 Device groupings tags [ ]: test_id
@@ -396,18 +409,17 @@ The following JSON config file was successfully created (uCPE Device config file
 test.json
 
 The following JSON config file was successfully created (config store file):
-store.json</programlisting></para>
+store.json</programlisting>
           </listitem>
 
           <listitem>
-            <para>Check the configuration files in
-            <literal>modules/enea/config/uCPEDevices/test</literal>
+            <para>Check the configuration files in the <literal>modules/enea/config/uCPEDevices/test</literal>
             directory:</para>
 
             <itemizedlist>
               <listitem>
-                <para><literal>test.json</literal> file - contains all the
-                input parameters for <literal>test</literal> device</para>
+                <para><filename>test.json</filename> file - contains all the
+                input parameters for the <literal>test</literal> device:</para>
 
                 <programlisting>{
     "deviceId": "test_id",
@@ -433,9 +445,9 @@ store.json</programlisting></para>
               </listitem>
 
               <listitem>
-                <para><literal>store.json</literal> file - contains the input
+                <para><filename>store.json</filename> file - contains the input
                 parameters used for creating an offline config for the uCPE
-                Device</para>
+                Device:</para>
 
                 <programlisting>{
     "version": "2.4.0",
@@ -448,11 +460,13 @@ store.json</programlisting></para>
           </listitem>
         </orderedlist>
 
-        <para>The <literal>generate_device_config.py</literal> script can be
-        executed in a non-interactive way, as follows:<programlisting>testHarness-venv)&gt;python generate_device_config.py --device_name=test --
-device_id=test_id --device_grouping_tags=test_id --version 2.4.0 --
-device_ip_addr=10.0.0.1 --call_home=false --mgmt_nic=eth0 --wan_nic=eth1 --
-lan_nic=eth2 --wap_nic=wlan0</programlisting></para>
+        <para>The <filename>generate_device_config.py</filename> script can be
+        executed in a non-interactive way, as follows:</para>
+                
+<programlisting>testHarness-venv)&gt;python generate_device_config.py --device_name=test 
+  --device_id=test_id --device_grouping_tags=test_id --version 2.4.0 
+  --device_ip_addr=10.0.0.1 --call_home=false --mgmt_nic=eth0 --wan_nic=eth1 
+  --lan_nic=eth2 --wap_nic=wlan0</programlisting>
 
         <para>The names of the interfaces (<literal>mgmt_*, wan_*,
         lan_*</literal> and <literal>wap_*</literal>) are used to generate the
@@ -460,38 +474,39 @@ lan_nic=eth2 --wap_nic=wlan0</programlisting></para>
         scenario.</para>
 
         <para>When the script is interactively run, the parameter's value
-        between square brackets is the default one. It can be omitted when the
+        between the square brackets is the default one. It can be omitted when the
         script is non-interactively run.</para>
       </section>
 
-      <section>
+      <section id="nic_config_files">
         <title>Generating NIC config files</title>
 
-        <para><emphasis role="bold">To generate NIC config
+        <para><emphasis role="bold">Generating NIC config
         files</emphasis></para>
 
         <orderedlist>
           <listitem>
-            <para>Run
-            <literal>generate_nics_config_files.py</literal><programlisting>(testHarness-venv)&gt; python generate_nics_config_files.py
+            <para>Run <filename>generate_nics_config_files.py</filename>:</para>
+                        
+                        <programlisting>(testHarness-venv)&gt; python generate_nics_config_files.py
 Device name: test
-Check 'test' directory for JSON configuration files</programlisting></para>
+Check 'test' directory for JSON configuration files</programlisting>
           </listitem>
 
           <listitem>
-            <para>Check the configuration files for all interface types in
+            <para>Check the configuration files for all interface types in the 
             <literal>modules/enea/config/uCPEDevices/test</literal> directory.
-            The interface name is defined in <literal>test.json</literal>
+            The interface name is defined in the <filename>test.json</filename>
             file. The NIC config files have the following structure:
             <literal>&lt;interface_name&gt;_&lt;interface_type&gt;_nic.json</literal>.
-            For <literal>eth2</literal> lan interface, the following JSON
+            For the <literal>eth2</literal> lan interface, the following JSON
             files are created:</para>
 
             <itemizedlist>
               <listitem>
-                <para><literal>lan_dpdk_nic.json</literal> - contains:
+                <para><filename>lan_dpdk_nic.json</filename> - contains:
                 Interface type: <literal>DPDK</literal>; Sub-type:
-                <literal>vfio-pci</literal></para>
+                <literal>vfio-pci</literal>.</para>
 
                 <programlisting> {
     "name": "eth2",
@@ -500,10 +515,10 @@ Check 'test' directory for JSON configuration files</programlisting></para>
               </listitem>
 
               <listitem>
-                <para><literal>lan_sriov_nic.json</literal> - contains
+                <para><filename>lan_sriov_nic.json</filename> - contains
                 Interface type: <literal>SR-IOV, SR-IOV</literal>; Mode:
                 <literal>adapter-pool</literal>; Num VFS:
-                <literal>2</literal></para>
+                <literal>2</literal>.</para>
 
                 <programlisting>{
     "name": "eth2",
@@ -513,9 +528,9 @@ Check 'test' directory for JSON configuration files</programlisting></para>
               </listitem>
 
               <listitem>
-                <para><literal>lan_wan_nic.json</literal> - contains Interface
+                <para><filename>lan_wan_nic.json</filename> - contains Interface
                 type: <literal>WAN</literal>; Address assignment:
-                <literal>DHCP</literal></para>
+                <literal>DHCP</literal>.</para>
 
                 <programlisting>{
     "name": "eth2",
@@ -527,12 +542,12 @@ Check 'test' directory for JSON configuration files</programlisting></para>
               </listitem>
 
               <listitem>
-                <para><literal>wap_wap_nic.json</literal> - contains Interface
+                <para><filename>wap_wap_nic.json</filename> - contains Interface
                 type: <literal>WAP</literal>; Country Code:
                 <literal>SE</literal>; Wireless band:
                 <literal>band5GHz</literal>; Wireless Mode: <literal>802.11
                 g/n</literal>; Radio Channel: <literal>42 (80 MHz
-                wide)</literal></para>
+                wide)</literal>.</para>
 
                 <programlisting>{
     "name": "wlan0",
@@ -546,37 +561,42 @@ Check 'test' directory for JSON configuration files</programlisting></para>
           </listitem>
         </orderedlist>
 
-        <para>The <literal>generate_nics_config_files.py</literal> script can
-        be executed in a non-interactive way, as follows:<programlisting>(testHarness-venv)&gt; python generate_nics_config_files.py  --device_name=test
-Check 'test' directory for JSON configuration files</programlisting></para>
+        <para>The <filename>generate_nics_config_files.py</filename> script can
+        be executed in a non-interactive way, as follows:</para>
+                
+                <programlisting>(testHarness-venv)&gt; python generate_nics_config_files.py  --device_name=test
+Check 'test' directory for JSON configuration files</programlisting>
 
         <para>The values from the JSON files depend on the input
         scenario.</para>
       </section>
 
-      <section>
+      <section id="generate_ovs_config">
         <title>Generating OVS config files</title>
 
-        <para><emphasis role="bold">To generate OVS config
+        <para><emphasis role="bold">Generating OVS config
         files</emphasis></para>
 
         <orderedlist>
           <listitem>
-            <para>Run
-            <literal>generate_bridges_config_files.py</literal><programlisting>(testHarness-venv)&gt; python generate_bridges_config_files.py
+            <para>Run <filename>generate_bridges_config_files.py</filename>:</para>
+                        
+                        <programlisting>(testHarness-venv)&gt; python generate_bridges_config_files.py
 Device name: test
-Check 'test' directory for JSON configuration files</programlisting></para>
+Check 'test' directory for JSON configuration files</programlisting>
           </listitem>
 
           <listitem>
-            <para>Check the configuration files in
+            <para>Check the configuration files in the 
             <literal>modules/enea/config/uCPEDevices/test</literal> directory.
             The name of OVS bridges type has the following structure:
             <literal>&lt;bridge_type&gt;_br.json</literal>. The following JSON
-            files are created:<itemizedlist>
+            files are created:</para>
+                        
+                        <itemizedlist>
                 <listitem>
-                  <para><literal>ibm_br.json</literal> - contains
-                  <literal>Inband management OVS bridge</literal></para>
+                  <para><filename>ibm_br.json</filename> - contains information about the
+                  <literal>Inband management OVS bridge</literal>:</para>
 
                   <programlisting>{
     "name": "ibm_br",
@@ -585,9 +605,9 @@ Check 'test' directory for JSON configuration files</programlisting></para>
                 </listitem>
 
                 <listitem>
-                  <para><literal>sfc_br.json</literal> - contains
+                  <para><filename>sfc_br.json</filename> - contains:
                   <literal>Dataplane OVS bridge</literal>; Type:
-                  <literal>integration</literal></para>
+                  <literal>integration</literal>:</para>
 
                   <programlisting>{
     "name": "sfc_br",
@@ -598,8 +618,8 @@ Check 'test' directory for JSON configuration files</programlisting></para>
                 </listitem>
 
                 <listitem>
-                  <para><literal>vnfmgmt_ipv4_br.json</literal> - contains
-                  <literal>VNF Management OVS bridge, IPv4</literal></para>
+                  <para><filename>vnfmgmt_ipv4_br.json</filename> - contains
+                  <literal>VNF Management OVS bridge, IPv4</literal>:</para>
 
                   <programlisting>{
     "name": "vnfmgmt_ipv4_br",
@@ -609,8 +629,8 @@ Check 'test' directory for JSON configuration files</programlisting></para>
                 </listitem>
 
                 <listitem>
-                  <para><literal>vnfmgmt_ipv6_br.json</literal> - contains
-                  <literal>VNF Management OVS bridge, IPv6</literal></para>
+                  <para><filename>vnfmgmt_ipv6_br.json</filename> - contains
+                  <literal>VNF Management OVS bridge, IPv6</literal>:</para>
 
                   <programlisting>
 {
@@ -621,10 +641,10 @@ Check 'test' directory for JSON configuration files</programlisting></para>
                 </listitem>
 
                 <listitem>
-                  <para><literal>lan_br.json</literal> - contains
+                  <para><filename>lan_br.json</filename> - contains
                   <literal>Dataplane OVS bridge</literal>; Type:
                   <literal>communication</literal>; Interface:
-                  <literal>eth2</literal></para>
+                  <literal>eth2</literal>:</para>
 
                   <programlisting>lan_br.json
 {
@@ -638,9 +658,9 @@ Check 'test' directory for JSON configuration files</programlisting></para>
                 </listitem>
 
                 <listitem>
-                  <para><literal>wap_br.json</literal> - contains
+                  <para><filename>wap_br.json</filename> - contains
                   <literal>Dataplane OVS bridge</literal>; Type:
-                  <literal>communication</literal></para>
+                  <literal>communication</literal>:</para>
 
                   <programlisting>{
     "name": "wap_br",
@@ -649,29 +669,31 @@ Check 'test' directory for JSON configuration files</programlisting></para>
     "interfaces": []
 }</programlisting>
                 </listitem>
-              </itemizedlist></para>
+              </itemizedlist>
           </listitem>
         </orderedlist>
 
-        <para>The <literal>generate_bridges_config_files.py</literal> script
-        can be executed in a non-interactive way, as follows:<programlisting>(testHarness-venv)&gt; python generate_bridges_config_files.py --device-name=test
-Check 'test' directory for JSON configuration files</programlisting></para>
+        <para>The <filename>generate_bridges_config_files.py</filename> script
+        can be executed in a non-interactive way, as follows:</para>
+                
+                <programlisting>(testHarness-venv)&gt; python generate_bridges_config_files.py --device-name=test
+Check 'test' directory for JSON configuration files</programlisting>
 
         <para>The values from the JSON files depend on the input
         scenario.</para>
       </section>
     </section>
 
-    <section>
-      <title>Configuration Files for VNF</title>
+    <section id="config_file_vnf">
+      <title>Configuration Files for the VNF</title>
 
-      <para>The VNF directory, <literal>modules/enea/config/VNF,
-      </literal>contains subdirectories for each defined VNF:
+      <para>The VNF directory <literal>modules/enea/config/VNF</literal>, 
+          contains subdirectories for each defined VNF:
       <literal>fortigateFWImage</literal>, <literal>junipervSRXImae</literal>
       and so on.</para>
 
-      <para>Each VNF subdirectory contains configuration files for: cloud
-      init, VNF Descriptors, VNF instances. These configuration files are
+      <para>Each VNF subdirectory contains configuration files for: cloud-init, 
+          VNF Descriptors, VNF instances. These configuration files are
       examples used in test scenarios from Enea Edge Automation.</para>
 
       <para>For more details about the test scenarios from
@@ -681,48 +703,50 @@ Check 'test' directory for JSON configuration files</programlisting></para>
   </section>
 
   <section id="AFTH_automation">
-    <title>Automation Framework</title>
+    <title>The Automation Framework</title>
 
-    <para>The Automation Framework scripts described in the following section are in
-    <literal>&lt;AF-installdir&gt;/automation_framework</literal> directory.</para>
+    <para>The Automation Framework scripts described in the following section 
+        are located in the <literal>&lt;AF-installdir&gt;/automation_framework</literal> directory.</para>
 
-    <section>
-      <title>uCPEMgrHTTPClient</title>
+    <section id="httpclient_class">
+      <title>The uCPEMgrHTTPClient class</title>
 
-      <para>The <literal>uCPEMgrHTTPClient</literal> class is implemented in
-      <literal>uCPEMgrHTTPClientRestAPIv2.py</literal> script.</para>
+      <para>The <literal>uCPEMgrHTTPClient</literal> class is implemented in the 
+          <filename>uCPEMgrHTTPClientRestAPIv2.py</filename> script.</para>
 
-      <para>The scope of this class is to send REST API requests to Enea Edge Management.
-      The methods of <literal>uCPEMgrHTTPClient</literal> class
-      represent REST API calls to Enea Edge Management or ways for creating the
+      <para>The scope of this class is to send REST API requests to the Enea Edge Management application.
+      The methods of the <literal>uCPEMgrHTTPClient</literal> class
+      represent REST API calls to the Enea Edge Management application or ways for creating the
       objects that are used as input for sending the request.</para>
 
-      <para>The dictionaries used as payload in REST API requests are created
+      <para>The dictionaries used as the payload in the REST API requests are created
       in methods from this class. The output of these methods is used as input
-      for REST API request payload.</para>
+      for the REST API request payload.</para>
 
       <para>Each method has a short description in the header, as
-      follows:<itemizedlist spacing="compact">
+      follows:</para>
+          
+          <itemizedlist spacing="compact">
           <listitem>
-            <para>the scope of the method</para>
+            <para>The scope of the method</para>
           </listitem>
 
           <listitem>
-            <para>the input parameters</para>
+            <para>The input parameters</para>
           </listitem>
 
           <listitem>
-            <para>the return value from the source code</para>
+            <para>The return value from the source code</para>
           </listitem>
 
           <listitem>
-            <para>the URL for REST API call</para>
+            <para>The URL for the REST API call</para>
           </listitem>
 
           <listitem>
-            <para>the payload dictionary for REST API call</para>
+            <para>The payload dictionary for the REST API call</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
       <para>Other classes from the <literal>automation_framework</literal>
       directory inherit this class, and call its methods.</para>
@@ -731,46 +755,46 @@ Check 'test' directory for JSON configuration files</programlisting></para>
 
       <orderedlist spacing="compact">
         <listitem>
-          <para>uCPE Device functionalities are defined in
-          <literal>uCPEDeviceHandler</literal> class.</para>
+          <para>uCPE Device functionalities are defined in the <literal>uCPEDeviceHandler</literal> class.</para>
         </listitem>
 
         <listitem>
-          <para><literal>uCPEDeviceHandler</literal> class inherites
-          <literal>uCPEMgrHTTPClient</literal> class.</para>
+          <para>The <literal>uCPEDeviceHandler</literal> class inherites the <literal>uCPEMgrHTTPClient</literal> class.</para>
         </listitem>
 
         <listitem>
-          <para><literal>uCPEDeviceHandler</literal> method calls methods from
-          <literal>uCPEMgrHTTPClient</literal> to send requests to Enea Edge Management.</para>
+          <para>The <literal>uCPEDeviceHandler</literal> method calls methods from 
+                  <literal>uCPEMgrHTTPClient</literal> to send requests to the Enea Edge Management application.</para>
         </listitem>
 
         <listitem>
           <para>Methods from <literal>uCPEMgrHTTPClient</literal> create the
-          payload dictionary starting from input parameters and send REST API
+          payload dictionary starting from the input parameters and send the REST API
           request.</para>
         </listitem>
 
         <listitem>
           <para>The output of the methods are parsed and analyzed by methods
-          from <literal>uCPEDeviceHandler</literal> class.</para>
+          from the <literal>uCPEDeviceHandler</literal> class.</para>
         </listitem>
       </orderedlist>
     </section>
 
-    <section>
+    <section id="mg_functionalities">
       <title>Handlers for Enea Edge Management Functionalities</title>
 
-      <para>In Enea Edge Automation the modules of Enea Edge Management are
+      <para>In Enea Edge Automation the modules of the Enea Edge Management application are
       represented by Python classes called <literal>Handlers</literal>. Each
-      Python class represents a functionality of Enea Edge Management.</para>
+      Python class represents a functionality of the Enea Edge Management application.</para>
 
-      <para>These classes are implemented in the Python scripts that have
-      <literal>Handler</literal> string included in name. The name of the
-      classes is the same with the name of Python script.</para>
+      <para>These classes are implemented in the Python scripts that have a 
+          <literal>Handler</literal> string included in the name. The name of the
+      classes is the same as the name of Python script.</para>
 
-      <para>For the usage of any class, run the Python script with <emphasis
-      role="bold">--help</emphasis> option:<programlisting>python automation_framework/uCPEDeviceHandler.py --help
+      <para>For the usage of any class, run the Python script with the <emphasis
+      role="bold">--help</emphasis> option:</para>
+          
+          <programlisting>python automation_framework/uCPEDeviceHandler.py --help
 Usage: uCPEDeviceHandler.py [OPTIONS] [PARAMETERS]...
 
 Options:
@@ -781,16 +805,16 @@ Options:
                           argument)
 
   -o, --display_output    Display output of the method
-  --help                  Show this message and exit.</programlisting></para>
+  --help                  Show this message and exit.</programlisting>
 
-      <para>In <literal>test_harness/&lt;module name&gt;</literal> directory,
+      <para>In the <literal>test_harness/&lt;module name&gt;</literal> directory,
       the Ansible Playbooks are implemented for running the Python scripts
       from Enea Edge Automation. The name of the Ansible Playbooks is the same
-      with the name of the Python method. The Python command is between
+      as the name of the Python method. The Python command is between the 
       <literal>&lt;command&gt; ... &lt;/command&gt;</literal> tags from the
       <literal>*.yml</literal> files.</para>
 
-      <section>
+      <section id="mg_functionalities_ucpe">
         <title>uCPE Device</title>
 
         <para>The Enea Edge Management functionalities for the uCPE Device are
@@ -798,18 +822,18 @@ Options:
 
         <itemizedlist spacing="compact">
           <listitem>
-            <para><literal>automation_framework/uCPEDeviceHandler.py</literal>
+            <para><filename>automation_framework/uCPEDeviceHandler.py</filename>
             - <literal>uCPEDeviceHandler</literal> class with methods for
-            adding a device, removing a device, waiting device to be up,
-            getting the uCPE Device status, and so on</para>
+            adding a device, removing a device, waiting a device to be up,
+            getting the uCPE Device status, and so on.</para>
           </listitem>
 
           <listitem>
-            <para><literal>automation_framework/Configuration.py</literal> -
+            <para><filename>automation_framework/Configuration.py</filename> -
             <literal>Configuration</literal> class with methods for
             configuring the uCPE Device: DPDK, external interface, and OVS
             bridges. The methods of the <literal>Configuration</literal> class
-            are used in <literal>uCPEDeviceHandler</literal> and
+            are used in the <literal>uCPEDeviceHandler</literal> and
             <literal>OfflineConfigHandler</literal> classes.</para>
           </listitem>
         </itemizedlist>
@@ -819,24 +843,24 @@ Options:
 
         <para>The functionalities for <literal>configure external
         interfaces</literal>, <literal>configure OVS bridges</literal> can be
-        run:</para>
+        run using the:</para>
 
         <itemizedlist spacing="compact">
           <listitem>
-            <para>using the configuration file from
-            <literal>modules/enea/config/uCPEDevices</literal>, with the
-            <emphasis role="bold">-f</emphasis> option</para>
+            <para>Configuration file located in 
+                        <literal>modules/enea/config/uCPEDevices</literal>, with the
+            <emphasis role="bold">-f</emphasis> option.</para>
           </listitem>
 
           <listitem>
-            <para>using input parameters</para>
+            <para>Input parameters.</para>
           </listitem>
         </itemizedlist>
 
         <para>The <literal>addDevice</literal> and
         <literal>removeDevice</literal> functionalities use the
-        <literal>modules/enea/config/uCPEDevice/&lt;device_name&gt;/&lt;device_name&gt;.json</literal>
-        config file, as default.</para>
+        <filename>modules/enea/config/uCPEDevice/&lt;device_name&gt;/&lt;device_name&gt;.json</filename>
+        config file, as the default.</para>
 
         <para>The other functionalities can be run using only input
         parameters.</para>
@@ -860,115 +884,136 @@ Parameters: name, dpdkType
 addDpdkExternalInterface -f 
 modules/enea/config/uCPEDevices/&lt;device_name&gt;/&lt;interface_name&gt;_dpdk_nic.json </programlisting>
 
-        <para><emphasis role="bold">Example:</emphasis><programlisting>python automation_framework/uCPEDeviceHandler.py -d vep1445-8 -m 
-addDpdkExternalInterface -f modules/enea/config/uCPEDevices/vep1445-8/lan_dpdk_nic.json</programlisting></para>
+        <para><emphasis role="bold">Example:</emphasis></para>
+                
+                <programlisting>python automation_framework/uCPEDeviceHandler.py -d vep1445-8 -m 
+addDpdkExternalInterface -f modules/enea/config/uCPEDevices/vep1445-8/lan_dpdk_nic.json</programlisting>
 
         <para>The syntax for running the
-        <literal>addDpdkExternalInterface</literal> functionality:
+        <literal>addDpdkExternalInterface</literal> functionality:</para>
+                
         <programlisting>python automation_framework/uCPEDeviceHandler.py -d &lt;device_name&gt; -m 
-addDpdkExternalInterface &lt;interface_name&gt; &lt;dpdk_type&gt;</programlisting></para>
+addDpdkExternalInterface &lt;interface_name&gt; &lt;dpdk_type&gt;</programlisting>
 
-        <para><emphasis role="bold">Example:</emphasis><programlisting>python automation_framework/uCPEDeviceHandler.py -d vep1445-8 -m 
-addDpdkExternalInterface eno4 vfio-pci</programlisting></para>
+        <para><emphasis role="bold">Example:</emphasis></para>
+                
+                <programlisting>python automation_framework/uCPEDeviceHandler.py -d vep1445-8 -m 
+addDpdkExternalInterface eno4 vfio-pci</programlisting>
       </section>
 
-      <section>
+      <section id="offline_config_mg_func">
         <title>Offline config</title>
 
         <para>The Enea Edge Management functionalities regarding the offline
-        configuration are implemented as follows:<itemizedlist>
+        configuration are implemented as follows:</para>
+
+<itemizedlist>
             <listitem>
-              <para><literal>automation_framework/OfflineConfigHandler.py</literal>
+              <para><filename>automation_framework/OfflineConfigHandler.py</filename>
               - <literal>OfflineConfigHandler</literal> class has methods for
               adding an offline config, removing an offline config, uploading
-              an offline config on uCPEDevice, and so on.</para>
+              an offline config on a uCPE Device, and so on.</para>
             </listitem>
 
             <listitem>
-              <para><literal>automation_framework/Configuration.py</literal> -
+              <para><filename>automation_framework/Configuration.py</filename> -
               <literal>Configuration</literal> class has methods for
               configuring the uCPE Device: DPDK, external interface, and OVS
               bridges. The methods of the <literal>Configuration</literal>
-              class are used in <literal>uCPEDeviceHandler</literal> and
+              class are used in the <literal>uCPEDeviceHandler</literal> and
               <literal>OfflineConfigHandler</literal> classes.</para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
 
         <para>The <literal>OfflineConfigHandler</literal> class inherites the
         <literal>Configuration</literal> class with all its methods.</para>
 
-        <para>The functionalities for <literal>adding offline config
+        <para>The functionalities for the <literal>adding offline config
         store</literal>, <literal>removing offline config store</literal>,
         <literal>configuring external interfaces</literal>,
-        <literal>configuring OVS bridges</literal> can be run:<itemizedlist
+        <literal>configuring OVS bridges</literal> can be run using the:</para>
+
+<itemizedlist
             spacing="compact">
             <listitem>
-              <para>using the configuration file from
-              <literal>modules/enea/config/uCPEDevices</literal></para>
+              <para>Configuration file located in <literal>modules/enea/config/uCPEDevices</literal>.</para>
             </listitem>
 
             <listitem>
-              <para>using input parameters</para>
+              <para>Input parameters.</para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
 
         <para>The other functionalities can be run using only input
         parameters.</para>
 
         <para>To list the implemented methods (functionalities), run the
-        script with <emphasis role="bold">-v/--verbose</emphasis>
-        option:<programlisting>python automation_framework/OfflineConfigHandler.py -v
+        script with the <emphasis role="bold">-v/--verbose</emphasis>
+        option:</para>
+
+<programlisting>python automation_framework/OfflineConfigHandler.py -v
 Info about OfflineConfigHandler methods
 ...
 Method: addOfflineConfigStore
 Parameters: version, deviceId, deviceGroupingTags, descr=''
-...</programlisting></para>
+...</programlisting>
 
         <para>The syntax for running the
         <literal>addOfflineConfigStore</literal> using the configuration
-        file:<programlisting>python automation_framework/OfflineConfigHandler.py -s &lt;store_name&gt; -m 
-addOfflineConfigStore -f &lt;path_to_store_configuration_file&gt;</programlisting></para>
+        file:</para>
+
+<programlisting>python automation_framework/OfflineConfigHandler.py -s &lt;store_name&gt; -m 
+addOfflineConfigStore -f &lt;path_to_store_configuration_file&gt;</programlisting>
+
+        <para><emphasis role="bold">Example:</emphasis></para>
 
-        <para><emphasis role="bold">Example:</emphasis><programlisting>python automation_framework/OfflineConfigHandler.py -s testOfflienConfig -m 
-addOfflineConfigStore -f modules/enea/config/uCPEDevices/test/store.json</programlisting></para>
+<programlisting>python automation_framework/OfflineConfigHandler.py -s testOfflienConfig -m 
+addOfflineConfigStore -f modules/enea/config/uCPEDevices/test/store.json</programlisting>
 
-        <para>The syntax for running <literal>addOfflineConfigStore</literal>
+        <para>The syntax for running the <literal>addOfflineConfigStore</literal>
         functionality using input parameters: <literal>version</literal>,
         <literal>deviceId</literal>, <literal>deviceGroupingTags</literal>,
-        <literal>desc</literal>:<programlisting>python automation_framework/OfflineConfigHandler.py -s &lt;store_name&gt; -m 
-addOfflineConfigStore &lt;version&gt; &lt;deviceId&gt; &lt;deviceGroupingTags&gt;</programlisting></para>
+        <literal>desc</literal>:</para>
 
-        <para><emphasis role="bold">Example:</emphasis><programlisting>python automation_framework/OfflineConfigHandler.py -s testStoreName -m  
-addOfflineConfigStore 2.4.0 deviceId customerTag</programlisting></para>
+<programlisting>python automation_framework/OfflineConfigHandler.py -s &lt;store_name&gt; -m 
+addOfflineConfigStore &lt;version&gt; &lt;deviceId&gt; &lt;deviceGroupingTags&gt;</programlisting>
+
+        <para><emphasis role="bold">Example:</emphasis></para>
+
+<programlisting>python automation_framework/OfflineConfigHandler.py -s testStoreName -m  
+addOfflineConfigStore 2.4.0 deviceId customerTag</programlisting>
       </section>
 
-      <section>
+      <section id="custom_scripts_mg_func">
         <title>Custom scripts</title>
 
-        <para>All the Enea Edge Management functionalities regarding to the custom
-        scripts are implemented in <literal>CustomScriptsHandler.py</literal>
+        <para>All the Enea Edge Management functionalities regarding the custom
+        scripts are implemented in the <filename>CustomScriptsHandler.py</filename>
         script.</para>
 
         <para>The <literal>CustomScriptsHandler</literal> class is implemented
-        in <literal>CustomScriptsHandler.py</literal> script.</para>
+        in <filename>CustomScriptsHandler.py</filename> script.</para>
 
-        <para>Examples of custom scripts are in
-        <literal>modules/enea/config/customScripts/ </literal>directory. They
-        can be used when running a Python method from
-        <literal>CustomScriptsHandler</literal> class.</para>
+        <para>Examples of custom scripts are in the 
+<literal>modules/enea/config/customScripts/</literal> directory. They
+        can be used when running a Python method from the <literal>CustomScriptsHandler</literal> class.</para>
 
         <para>To list the implemented methods (functionalities), run the
-        script with <emphasis role="bold">-v/--verbose</emphasis>
-        option:<programlisting>python automation_framework/CustomScriptsHandler.py -v
+        script with the <emphasis role="bold">-v/--verbose</emphasis>
+        option:</para>
+
+<programlisting>python automation_framework/CustomScriptsHandler.py -v
 Info about CustomScriptHandler methods
 ...
 Method: uploadCustomScript
 Parameters: customScript, phase
-...</programlisting></para>
+...</programlisting>
+
+        <para>The syntax for running the <literal>uploadCustomScript</literal>
+        functionality starting from the input parameters:</para>
 
-        <para>The syntax for running <literal>uploadCustomScript</literal>
-        functionality starting from the input parameters: <programlisting>python automation_framework/CustomScriptsHandler.py -m 
-uploadCustomScript &lt;customScript&gt; &lt;phase&gt;</programlisting></para>
+<programlisting>python automation_framework/CustomScriptsHandler.py -m 
+uploadCustomScript &lt;customScript&gt; &lt;phase&gt;</programlisting>
 
         <para><emphasis role="bold">Example</emphasis>:</para>
 
@@ -978,30 +1023,34 @@ modules/enea/config/customScripts/test_fail_after_once once-after-startup</progr
         <para>All the other methods run in a similar way.</para>
       </section>
 
-      <section>
+      <section id="device_upgrade_mg_func">
         <title>Device upgrade</title>
 
-        <para>The Enea Edge Management functionalities regarding to the uCPE Device
-        upgrade are implemented in <literal>DeviceUpgradeHandler.py</literal>
+        <para>The Enea Edge Management functionalities regarding the uCPE Device
+        upgrade are implemented in the <filename>DeviceUpgradeHandler.py</filename>
         script.</para>
 
         <para>The <literal>DeviceUpgradeHandler</literal> class is implemented
-        in <literal>DeviceUpgradeHandler.py</literal> script.</para>
+        in the <filename>DeviceUpgradeHandler.py</filename> script.</para>
 
         <para>To list the implemented methods (functionalities), run the
-        script with <emphasis role="bold">-v/--verbose</emphasis>
-        option:<programlisting>python automation_framework/DeviceUpgradeHandler.py -v
+        script with the <emphasis role="bold">-v/--verbose</emphasis>
+        option:</para>
+
+<programlisting>python automation_framework/DeviceUpgradeHandler.py -v
 Info about DeviceUpgradeHandler methods
 ...
 Method: uploadImage
 Parameters: imagePath, type, module='VcpeAgent'
-...</programlisting></para>
+...</programlisting>
 
-        <para>The syntax for running <literal>uploadImage</literal>
-        functionality starting from the input parameters: <programlisting>python automation_framework/DeviceUpgradeHandler.py -m 
-uploadImage &lt;imagePath&gt; &lt;type&gt;</programlisting></para>
+        <para>The syntax for running the <literal>uploadImage</literal>
+        functionality starting from the input parameters:</para>
 
-        <para>The default value for <literal>module</literal> is
+<programlisting>python automation_framework/DeviceUpgradeHandler.py -m 
+uploadImage &lt;imagePath&gt; &lt;type&gt;</programlisting>
+
+        <para>The default value for the <literal>module</literal> is
         <literal>VcepAgent</literal>, cannot be changed and it is
         ommited.</para>
 
@@ -1013,29 +1062,35 @@ uploadImage &lt;imagePath&gt; &lt;type&gt;</programlisting></para>
         <para>All the other methods run in a similar way.</para>
       </section>
 
-      <section>
+      <section id="vnf_mg_func">
         <title>VNF</title>
 
-        <para>The Enea Edge Management functionalities regarding to the VNF are
-        implemented in <literal>VNFHandler.py</literal> script.</para>
+        <para>The Enea Edge Management functionalities regarding the VNF are
+        implemented in the <filename>VNFHandler.py</filename> script.</para>
 
         <para>The <literal>VNFHandler</literal> class is implemented in
-        <literal>VNFHandler.py</literal> script.</para>
+        the <filename>VNFHandler.py</filename> script.</para>
 
         <para>To list the implemented methods (functionalities), run the
-        script with <emphasis role="bold">-v/--verbose</emphasis>
-        option:<programlisting>python automation_framework/VNFHandler.py -v
+        script with the <emphasis role="bold">-v/--verbose</emphasis>
+        option:</para>
+
+<programlisting>python automation_framework/VNFHandler.py -v
 Info about VNFHandler methods
 ...
 Method: getVNFDescriptorByName
 Parameters: vnfDescriptorName
-...</programlisting></para>
+...</programlisting>
+
+        <para>The syntax for running the <literal>getVNFDescriptorByName</literal>
+        functionality starting from the input parameters:</para>
 
-        <para>The syntax for running <literal>getVNFDescriptorByName</literal>
-        functionality starting from the input parameters: <programlisting>python automation_framework/VNFHandler.py 
-[-m getVNFDescriptorByName &lt;vnfDescriptorName&gt; [-o]] [-v]</programlisting></para>
+<programlisting>python automation_framework/VNFHandler.py 
+[-m getVNFDescriptorByName &lt;vnfDescriptorName&gt; [-o]] [-v]</programlisting>
 
-        <para>where: <itemizedlist spacing="compact">
+        <para>Where the following are included:</para>
+
+<itemizedlist spacing="compact">
             <listitem>
               <para><emphasis role="bold">vnfDescriptorName</emphasis> - name
               of the VNF Descriptor</para>
@@ -1049,7 +1104,7 @@ Parameters: vnfDescriptorName
               <para><emphasis role="bold">o</emphasis> - displays the full
               output</para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
 
         <para><emphasis>Example:</emphasis></para>
 
@@ -1058,29 +1113,35 @@ Parameters: vnfDescriptorName
         <para>All the other methods run in a similar way.</para>
       </section>
 
-      <section>
+      <section id="mg_funcs">
         <title>Enea Edge Management</title>
 
-        <para>The functionalities regarding to the Enea Edge Management configuration
-        are implemented in <literal>uCPEManagerHandler.py</literal>
+        <para>The functionalities regarding the Enea Edge Management configuration
+        are implemented in the <filename>uCPEManagerHandler.py</filename>
         script.</para>
 
         <para>The <literal>uCPEManagerHandler</literal> class is implemented
-        in <literal>uCPEManagerHandler.py</literal> script.</para>
+        in the <filename>uCPEManagerHandler.py</filename> script.</para>
 
         <para>To list the implemented methods (functionalities), run the
-        script with <emphasis role="bold">-v/--verbose</emphasis>
-        option:<programlisting>python automation_framework/uCPEManagerHandler.py -v
+        script with the <emphasis role="bold">-v/--verbose</emphasis>
+        option:</para>
+
+<programlisting>python automation_framework/uCPEManagerHandler.py -v
 Info about uCPEManagerHandler methods
 ...
 Method: getuCPEManagerVersion
 Parameters(not needed): --
-...</programlisting></para>
+...</programlisting>
+
+        <para>The syntax for running the <literal>getuCPEManagerVersion</literal>
+        functionaltity is:</para>
 
-        <para>The syntax for running <literal>getuCPEManagerVersion</literal>
-        functionaltity is:<programlisting>python automation_framework/uCPEManagerHandler.py [-m getuCPEManagerVersion [-o]][-v]</programlisting></para>
+<programlisting>python automation_framework/uCPEManagerHandler.py [-m getuCPEManagerVersion [-o]][-v]</programlisting>
 
-        <para>where: <itemizedlist spacing="compact">
+        <para>Where the following are included:</para>
+
+<itemizedlist spacing="compact">
             <listitem>
               <para><emphasis role="bold">v</emphasis> - verbose option</para>
             </listitem>
@@ -1089,41 +1150,42 @@ Parameters(not needed): --
               <para><emphasis role="bold">o</emphasis> - displays the full
               output</para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
 
         <para>All the other methods run in a similar way.</para>
       </section>
     </section>
 
-    <section>
+    <section id="auxiliar_classes">
       <title>Auxiliar classes</title>
 
-      <section>
-        <title>Configuration</title>
+      <section id="config_class">
+        <title>The Configuration class</title>
 
         <para>The <literal>Configuration</literal> class is implemented in
-        <literal>Configuration.py</literal> script. The
+        the <filename>Configuration.py</filename> script. The
         <literal>Configuration</literal> class cannot be independently
         used.</para>
 
         <para>The <literal>uCPEDeviceHandler</literal> and
-        <literal>OfflineConfigHandler</literal> classes inherits
-        <literal>Configuration</literal> class. The methods should be
+        <literal>OfflineConfigHandler</literal> classes inherit the <literal>Configuration</literal> class. The methods should be
         implemented for both functionalities: uCPE Device and Offline
         config.</para>
       </section>
 
-      <section>
-        <title>Logger</title>
+      <section id="logger_class">
+        <title>The Logger Class</title>
 
         <para>The <literal>Logger</literal> class is implemented in
-        <literal>Logger.py</literal> script. It is inherited in all the
+        the <filename>Logger.py</filename> script. It is inherited in all the
         classes defined in <literal>automation_framework</literal>.</para>
 
         <para>This class defines a logger for displaying the logs from Python
         scripts, in console log and file log.</para>
 
-        <para>For console log, the logger has:<itemizedlist spacing="compact">
+        <para>For console log, the logger has:</para>
+        
+        <itemizedlist spacing="compact">
             <listitem>
               <para>Default severity: <literal>INFO</literal></para>
             </listitem>
@@ -1132,9 +1194,11 @@ Parameters(not needed): --
               <para>Format of the logs: <literal>[datetime] [severity]
               message</literal></para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
 
-        <para>For file log, the logger has:<itemizedlist spacing="compact">
+        <para>For file log, the logger has:</para>
+        
+        <itemizedlist spacing="compact">
             <listitem>
               <para>Logs path: <literal>log/debug.log</literal></para>
             </listitem>
@@ -1147,23 +1211,25 @@ Parameters(not needed): --
               <para>Format of the logs: <literal>[severity]
               [name_of_Python_script] message</literal></para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
       </section>
     </section>
   </section>
 
   <section id="AFTH_test">
     <title>Test Harness</title>
+    
       <para>The Test Harness sources are in the
       <literal>&lt;AF-installdir&gt;/test_harness</literal> directory.</para>
-    <section>
+ 
+    <section id="indiv_ansible_playbooks">
       <title>Individual Ansible Playbooks</title>
 
       <para>The Ansible based Test Harness represents an example of
       structuring the files needed for creating automated test cases using the
       Enea Edge Automation, and provides a way to implement them.</para>
 
-      <para>The <literal>ansible.cfg</literal> file contains an example of the
+      <para>The <filename>ansible.cfg</filename> file contains an example of the
       Ansible default configuration. The default value for
       <literal>stdout_callback</literal> is set to
       <literal>selective</literal>, to print only certain tasks. It is
@@ -1172,54 +1238,58 @@ Parameters(not needed): --
       <literal>True</literal>, task failures are considered fatal errors and
       the play execution stops.</para>
 
-      <para>All the Playbooks that execute Automation Framework Python modules run on localhost.
+      <para>All the Playbooks that execute Automation Framework Python modules run on <literal>localhost</literal>.
       New entries have to be created for direct communication over SSH with
       the boards.</para>
 
-      <para>The <literal>setup_env.sh</literal> script sets up the
+      <para>The <filename>setup_env.sh</filename> script sets up the
       <literal>testHarness</literal> test environment by creating
-      <literal>testHarness-venv</literal> Python virtual environment,
+      the <literal>testHarness-venv</literal> Python virtual environment,
       executing requests needed by Automation Framework Python modules, and
       installing Ansible. The Ansible package version is 2.9.6.</para>
 
       <para>The <literal>test_harness</literal> directory contains all the
       implemented Ansible Playbooks. This directory contains
-      <literal>check_errror.yml</literal> Playbook and many subdirectories,
+      the <filename>check_errror.yml</filename> Playbook and many subdirectories,
       each subdirectory representing an Enea Edge Management module.</para>
 
-      <para>The <literal>check_errors.yml</literal> Playbook checks the Python
+      <para>The <filename>check_errors.yml</filename> Playbook checks the Python
       output and returns success or fail results. This file is imported in all
-      playbooks from <literal>test_harness</literal> directory and it can not
+      playbooks from the <literal>test_harness</literal> directory and it cannot
       be run standalone.</para>
 
       <para>According to their functionality, the Ansible Playbooks that
-      refers to offline configuration are in <literal>OfflineConfig</literal>
+      refer to offline configuration are in the <literal>OfflineConfig</literal>
       directory, the ones that refers to <literal>CustomScript</literal> are
-      in <literal>CustomScripts</literal>, and so on.</para>
+      in the <literal>CustomScripts</literal>, and so on.</para>
 
-      <para>Each Ansible Playbook has a help menu:<itemizedlist
+      <para>Each Ansible Playbook has a help menu for:</para>
+      
+      <itemizedlist
           spacing="compact">
           <listitem>
-            <para>for returning the syntax, and examples for running the
-            Playbook</para>
+            <para>Returning the syntax, and examples for running the
+            Playbook.</para>
           </listitem>
 
           <listitem>
-            <para>for warning, if the input parameters are wrong or not
-            enough. The input parameters are called extra-vars in Ansible
+            <para>Warning if the input parameters are wrong or not
+            enough. The input parameters are called <literal>extra-vars</literal> in Ansible
             playbooks.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
       <para>The help menu is activated when the Playbook is run without any
-      parameter.</para>
+      parameters.</para>
 
       <para><emphasis role="bold">Example</emphasis>:</para>
 
       <orderedlist>
         <listitem>
           <para>Display the help menu for
-          <literal>addDataPlaneOvsBridge.yml</literal><programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml
+          <filename>addDataPlaneOvsBridge.yml</filename>:</para>
+
+<programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml
 
 This playbook runs 'addDataPlaneOvsBridge' method from uCPEDeviceHandler module
 
@@ -1246,12 +1316,14 @@ Usage:
     "device=&lt;device_name&gt; bridge_name=&lt;bridge_name&gt; bridge_type=communication"
     ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
     "device=&lt;device_name&gt; bridge_name=&lt;bridge_name&gt; bridge_type=communication 
-    interfaces=&lt;interfaces&gt;"</programlisting></para>
+    interfaces=&lt;interfaces&gt;"</programlisting>
         </listitem>
 
         <listitem>
-          <para>Run the <literal>addDataPlaneOvsBridge.yml</literal>
-          playbook<programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
+          <para>Run the <filename>addDataPlaneOvsBridge.yml</filename>
+          playbook:</para>
+          
+<programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
 "device=inteld1521-17 bridge_config_file=sfc_br.json"
 ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
 "device=inteld1521-17 bridge_config_file=lan_br.json"
@@ -1264,102 +1336,105 @@ ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e
 interfaces=eno4"
 ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
 "device=inteld1521-17 bridge_name=lan_br bridge_type=communication 
-interfaces=eno4,eno5"</programlisting></para>
+interfaces=eno4,eno5"</programlisting>
         </listitem>
       </orderedlist>
 
-      <para>Each Ansible Playbook from <literal>test_harness</literal>
+      <para>Each Ansible Playbook from the <literal>test_harness</literal>
       directory represents an atomic operation, a basic functionality that is
-      performed on the Enea Edge Management at a specific period of the time. They can
-      be sequentially run or they can be imported in other playbooks for
-      creating complex scenario.</para>
+      performed on the Enea Edge Management application at a specific period of the time. They can
+      be sequentially run or they can be imported into other playbooks for
+      creating complex scenarios.</para>
 
       <para><emphasis role="bold">Example:</emphasis></para>
 
-      <para>For instantiating a VNF, the following operations has to be
-      performed: to connect to the uCPE Device, to bind NICs, to create OVS
-      bridge, to create VNF descriptor, and to instantiate the VNF on the
+      <para>To instantiate a VNF, the following operations have to be
+      performed: connect to the uCPE Device, bind NICs, create an OVS
+      bridge, create a VNF descriptor, and instantiate the VNF on the
       device. All these operations can be run Playbook after Playbook using
-      <literal>*.yml</literal> files from <literal>test_harness</literal>
+      the <literal>*.yml</literal> files from the <literal>test_harness</literal>
       directory.</para>
     </section>
 
-    <section>
+    <section id="test_scenario">
       <title>Test Scenario</title>
 
       <para>All the individual Playbooks can be used as imported Playbooks in
-      complex test scenario.</para>
+      complex test scenarios.</para>
 
-      <para>The complex scenarios are defined in:
-      <literal>modules/enea/scenario</literal>.</para>
+      <para>The complex scenarios are defined in: <literal>modules/enea/scenario</literal>.</para>
 
-      <para>The test scenarios are split in:<itemizedlist spacing="compact">
+      <para>The test scenarios are split into the following:</para>
+      
+      <itemizedlist spacing="compact">
           <listitem>
-            <para>Functionalities to be tested and used:
+            <para>Functionalities to be tested and used: the 
             <literal>CustomScripts, OfflineConfig, ovsTests</literal>
-            directories</para>
+            directories.</para>
           </listitem>
 
           <listitem>
             <para>Service Creation and Lifecycle:
-            <literal>chainedVNFsService</literal> directory</para>
+            the <literal>chainedVNFsService</literal> directory.</para>
           </listitem>
 
           <listitem>
             <para>VNF Deployment and Lifecycle:
-            <literal>fortigateFWService</literal> directory</para>
+            the <literal>fortigateFWService</literal> directory.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
       <para>For each test scenario, the <literal>README</literal> file
-      contains:<itemizedlist>
+      contains:</para>
+      
+      <itemizedlist>
           <listitem>
-            <para>Preconditions: <itemizedlist spacing="compact">
-                <listitem>
-                  <para>the configuration files to be updated</para>
-                </listitem>
-
+            <para>Preconditions:</para>
+            
+            <itemizedlist spacing="compact">
                 <listitem>
-                  <para>the VNF images to be copied</para>
+                  <para>The configuration files to be updated</para>
                 </listitem>
 
                 <listitem>
-                  <para>the license needed from the provider and added to a
-                  specific path</para>
+                  <para>The VNF images to be copied</para>
                 </listitem>
 
                 <listitem>
-                  <para>and so on</para>
+                  <para>The license file needed from the provider and added to a
+                  specific path, etc.</para>
                 </listitem>
-              </itemizedlist></para>
+              </itemizedlist>
           </listitem>
 
           <listitem>
-            <para>Running procedures:<itemizedlist spacing="compact">
+            <para>Running procedures:</para>
+            
+            <itemizedlist spacing="compact">
                 <listitem>
-                  <para>the <literal>ansible-playbook</literal> commands for
+                  <para>The <literal>ansible-playbook</literal> commands for
                   setup the configuration</para>
                 </listitem>
 
                 <listitem>
-                  <para>testing the configuration</para>
+                  <para>Testing the configuration</para>
                 </listitem>
 
                 <listitem>
-                  <para>cleaning up the configuration</para>
+                  <para>Cleaning up the configuration</para>
                 </listitem>
-              </itemizedlist></para>
+              </itemizedlist>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
-      <para>The test scenarios have <literal>variable.yml</literal> file that
+      <para>The test scenarios have the <filename>variable.yml</filename> file that
       contains the input parameters for the Playbooks. These variables can be
       reused when the same setup is run on another device.</para>
 
       <para><emphasis role="bold">Example:</emphasis></para>
 
       <para>For the <literal>fortigateFWService</literal> scenario, the
-      <literal>variable.yml</literal> has the following content:</para>
+      <filename>variable.yml</filename> file has the following content:</para>
 
       <programlisting>vnf_image_path: "modules/enea/VNF_images/fortios.qcow2"
 vnfd_config_file: "modules/enea/config/VNF/fortigateImage/fortigateImage.json"
@@ -1372,65 +1447,66 @@ vnfi_name: "fortigateFWInstance"</programlisting>
   <section id="AFTH_pyton">
     <title>Python Unit-Test Suite</title>
 
-    <para>The <literal>unit-test</literal> suite is implemented in
+    <para>The <literal>unit-test</literal> suite is implemented in the
     <literal>unit_tests</literal> directory.</para>
 
-    <para>The <literal>unit-test</literal> suite contains
-    <literal>unit-test</literal> class defined in the
-    <literal>unittestSuite.py </literal>, and examples of JSON configuration
-    files that can be used for the execution of AF Python classes from
-    automation_framework.</para>
+    <para>The <literal>unit-test</literal> suite contains the 
+    <literal>unit-test</literal> class defined in <filename>unittestSuite.py</filename>, and examples of JSON configuration
+    files that can be used for the execution of AF Python classes from the 
+    <literal>automation_framework</literal> directory.</para>
 
     <para>The Python <literal>unit-test</literal> class defined in the
-    <literal>unittestSuite.py</literal> script provides a way to automate the
-    execution of specific test cases for each supported Python script.</para>
+    <filename>unittestSuite.py</filename> script provides a way to automate the execution of 
+      specific test cases for each supported Python script.</para>
 
     <para>This class requires a test suite configuration JSON file that
-    contains a dictionary list of the Python scripts to be processed. Each
-    dictionary contains the path of the Python script to be loaded and the
-    path to the file describing the test cases to be performed against the
-    designated script.</para>
+    contains a dictionary list of the Python scripts to be processed. Each dictionary contains the
+      path of the Python script to be loaded and the path to the file describing the test cases to
+      be performed against the designated script.</para>
 
     <para>Python <literal>unit-test</literal> suite examples are in the
     <literal>unit_tests/scenario</literal> directory.</para>
 
-    <para>Each scenario has 3 parts:<itemizedlist spacing="compact">
+    <para>Each scenario has 3 parts:</para>
+    
+    <itemizedlist spacing="compact">
         <listitem>
-          <para><literal>README</literal> - explains the needed prerequisites
-          before running Python <literal>unit-test</literal> suite</para>
+          <para><literal>README</literal> - explains the prerequisites needed before running the
+            Python <literal>unit-test</literal> suite.</para>
         </listitem>
 
         <listitem>
           <para><literal>config</literal> - contains a JSON file for each
-          functionality that is used in scenario. The JSON files have two
-          keys:<itemizedlist spacing="compact">
+          functionality that is used in the specified scenario. The JSON files have two keys:</para>
+          
+          <itemizedlist spacing="compact">
               <listitem>
-                <para>name: The description of the functionality</para>
+                <para>name: The description of the functionality.</para>
               </listitem>
 
               <listitem>
-                <para>args: The arguments of the Python module</para>
+                <para>args: The arguments of the Python module.</para>
               </listitem>
-            </itemizedlist></para>
+            </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><literal>JSON</literal> - used for running the scenario. Each
-          JSON file contains the calls to the JSON files from config
-          directory, and has two keys:<itemizedlist spacing="compact">
+          <para><literal>JSON</literal> - used for running the scenario. Each JSON file contains 
+            the calls to the JSON files from the <literal>config</literal> directory, and has two keys:</para>
+          
+          <itemizedlist spacing="compact">
               <listitem>
-                <para>config: The JSON file from config directory that is
-                used</para>
+                <para>config: The JSON file from the <literal>config</literal> directory that is used.</para>
               </listitem>
 
               <listitem>
-                <para>module: The Python module that is run</para>
+                <para>module: The Python module that is run.</para>
               </listitem>
-            </itemizedlist></para>
+            </itemizedlist>
         </listitem>
-      </itemizedlist></para>
+      </itemizedlist>
 
-    <para>Steps for running the Python unit-test suite on the Enea Edge Management are
-    provided in the <literal>README</literal> from scenario.</para>
+    <para>Steps for running the Python unit-test suite on the Enea Edge Management application are
+    provided in the <literal>README</literal> file from scenario in use.</para>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-automation-user-guide/doc/components.xml b/doc/book-enea-edge-automation-user-guide/doc/components.xml
index d2538b8..613644a 100644
--- a/doc/book-enea-edge-automation-user-guide/doc/components.xml
+++ b/doc/book-enea-edge-automation-user-guide/doc/components.xml
@@ -24,7 +24,7 @@
 
       <para>For more details about Enea Edge Management installation, see <olink
       targetdoc="book_enea_edge_getting_started"
-      targetptr="install_ucpe_mg">Installing the Enea Edge Management in the
+      targetptr="install_ucpe_mg">Installing the Enea Edge Management application in the
       <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       xpointer="element(book_enea_edge_getting_started/1)" /></olink>
@@ -36,10 +36,10 @@
 
       <para>One or more uCPE devices running the Enea Edge Runtime
       are required as hosts, to run the VNFs. The uCPE device is
-      known to the Enea Edge Management as the <literal>VcpeAgent</literal> device
+      known to the Enea Edge Management application as the <literal>VcpeAgent</literal> device
       module.</para>
 
-      <para>Before running any use case with the Enea Edge Automation, the uCPE devices have to be added to the Enea Edge Management.</para>
+      <para>Before running any use case with the Enea Edge Automation, the uCPE devices have to be added to the Enea Edge Management application.</para>
 
       <para>Adding a <literal>VcpeAgent</literal> device can be done:</para>
 
@@ -62,15 +62,18 @@
       xpointer="element(book_enea_edge_getting_started/1)" /></olink>
       Manual.</para>
     </section>
+        
     <section id="automation">
       <title>Enea Edge Automation</title>
+          
       <para>Enea Edge Automation has two compoments: Automation Framework and Test Harness.
       It provides Python scripts using Enea Edge Management REST API and Ansible Playbooks.</para>
+          
       <para>The Automation Framework component provides a Python unit-test suite that runs automatically the
       test-cases defined for each Python script.</para>
 
       <para>It is recommended to use a different host for running the tests, in
-      order to allow external users to access and use the Enea Edge Management
+      order to allow external users to access and use the Enea Edge Management application
       effectively.</para>
   
       <para>The Test Harness component provides a way for driving configuration with
diff --git a/doc/book-enea-edge-automation-user-guide/doc/getting_started.xml b/doc/book-enea-edge-automation-user-guide/doc/getting_started.xml
index 9ac6829..27979cc 100644
--- a/doc/book-enea-edge-automation-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-edge-automation-user-guide/doc/getting_started.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="getting_started">
-  <title>Getting Started with the Enea Edge Automation</title>
+  <title>Getting Started with Enea Edge Automation</title>
 
   <section id="envrion">
     <title>Environment</title>
 
-    <para>There are two scenarios for the setup:</para>
+    <para>There are two scenarios for a proper setup:</para>
 
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Basic Setup<figure>
+        <para>Basic Setup</para>
+                
+                <figure>
             <title>Lab setup overview for Basic Setup</title>
 
             <mediaobject>
@@ -18,11 +20,13 @@
                            fileref="images/environment_basicsetup.png" />
               </imageobject>
             </mediaobject>
-          </figure></para>
+          </figure>
       </listitem>
 
       <listitem>
-        <para>Chained VNFs Service <figure>
+        <para>Chained VNFs Service</para>
+                
+                <figure>
             <title>Lab Setup Overview for Chained VNFs Service</title>
 
             <mediaobject>
@@ -31,7 +35,7 @@
                            fileref="images/ChainedVNFsService_setup.png" />
               </imageobject>
             </mediaobject>
-          </figure></para>
+          </figure>
       </listitem>
     </itemizedlist>
 
@@ -40,7 +44,9 @@
 
     <itemizedlist>
       <listitem>
-        <para>Lab Network Requirements<itemizedlist spacing="compact">
+        <para>Lab Network Requirements:</para>
+                
+                <itemizedlist spacing="compact">
             <listitem>
               <para>DHCP enabled</para>
             </listitem>
@@ -48,34 +54,37 @@
             <listitem>
               <para>Internet connectivity</para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
       </listitem>
 
       <listitem>
-        <para>Enea Edge Management Host Requirements<itemizedlist spacing="compact">
+        <para>Enea Edge Management Host Requirements:</para>
+                
+                <itemizedlist spacing="compact">
             <listitem>
               <para>CentOS 7 installed</para>
             </listitem>
 
             <listitem>
-              <para>Connection to the Lab Network</para>
+              <para>A connection to the Lab Network</para>
             </listitem>
 
             <listitem>
-              <para>Enea Edge Management installed. For details, see <olink
+              <para>The Enea Edge Management application installed. For details, see <olink
               targetdoc="book_enea_edge_getting_started"
-              targetptr="install_ucpe_mg">Installing the Enea Edge Management in the
+              targetptr="install_ucpe_mg">Installing the Enea Edge Management application in the
               <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xpointer="element(book_enea_edge_getting_started/1)" /></olink>
               Manual.</para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
       </listitem>
 
       <listitem>
-        <para>uCPE device Requirements for Basic Setup<itemizedlist
-            spacing="compact">
+        <para>uCPE device Requirements for Basic Setup:</para>
+                
+                <itemizedlist spacing="compact">
             <listitem>
               <para>Minimum of 4 Physical Network Devices</para>
             </listitem>
@@ -99,12 +108,14 @@
               xpointer="element(book_enea_edge_getting_started/1)" /></olink>
               Manual.</para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
       </listitem>
 
       <listitem>
         <para>uCPE device 1 and 2 Requirements for Chained VNFs
-        Service<itemizedlist spacing="compact">
+        Service:</para>
+                
+                <itemizedlist spacing="compact">
             <listitem>
               <para>Minimum of 4 Physical Network Devices</para>
             </listitem>
@@ -125,7 +136,7 @@
             <listitem>
               <para>Enea Edge Runtime installed</para>
             </listitem>
-          </itemizedlist></para>
+          </itemizedlist>
       </listitem>
     </itemizedlist>
   </section>
@@ -142,20 +153,26 @@
       </listitem>
 
       <listitem>
-        <para>EPEL Repository<programlisting>sudo yum install epel-release</programlisting></para>
+        <para>EPEL Repository</para>
+                
+                <programlisting>sudo yum install epel-release</programlisting>
       </listitem>
 
       <listitem>
-        <para>PIP package manager<programlisting>sudo yum -y install python-pip</programlisting></para>
+        <para>PIP package manager</para>
+                
+                <programlisting>sudo yum -y install python-pip</programlisting>
       </listitem>
 
       <listitem>
-        <para>Virtualenv tool<programlisting>sudo pip install virtualenv</programlisting></para>
+        <para>Virtualenv tool</para>
+                
+                <programlisting>sudo pip install virtualenv</programlisting>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>It is recommended to install Enea Edge Automation and Enea Edge Management
+      <para>It is recommended to install Enea Edge Automation and the Enea Edge Management application
       on different machines.</para>
     </note>
   </section>
@@ -163,10 +180,12 @@
   <section id="initial_setup">
     <title>Installing the Enea Edge Automation</title>
 
-    <para id="install_procedure"><emphasis role="bold">To install the
-    Enea Edge Automation</emphasis><orderedlist>
+    <para id="install_procedure"><emphasis role="bold">Installing the
+    Enea Edge Automation</emphasis></para>
+        
+        <orderedlist>
         <listitem>
-          <para>Log on the host machine</para>
+          <para>Log into the host machine</para>
         </listitem>
 
         <listitem>
@@ -174,23 +193,31 @@
         </listitem>
 
         <listitem>
-          <para>Extract the archive file<programlisting>unzip Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</programlisting></para>
+          <para>Extract the archive file</para>
+                  
+                  <programlisting>unzip Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</programlisting>
         </listitem>
 
         <listitem>
-          <para>Run the <filename>setup_env.sh</filename><programlisting>source setup_env.sh</programlisting></para>
+          <para>Run the setup of virtual environment script:</para>
+                  
+                  <programlisting>source setup_env.sh</programlisting>
         </listitem>
 
         <listitem>
           <para>Configure the system. For more details, see <xref
           linkend="AFTH_cofig" />.</para>
         </listitem>
-      </orderedlist><note>
+      </orderedlist>
+          
+          <note>
         <para>The steps are executed only once, for the initial setup of the
         environment.</para>
-      </note></para>
+      </note>
 
-    <para><emphasis role="bold">To setup the enviroment for the Enea Edge Automation</emphasis><orderedlist>
+    <para><emphasis role="bold">Setting up the enviroment for the Enea Edge Automation</emphasis></para>
+        
+        <orderedlist>
         <listitem>
           <para>Activate the Python virtual enviroment</para>
 
@@ -198,7 +225,7 @@
         </listitem>
 
         <listitem>
-          <para>Optional, check the History Information</para>
+          <para>Optionally, check the History Information</para>
 
           <programlisting>vi &lt;AF-installdir&gt;/CHANGELOG</programlisting>
         </listitem>
@@ -208,15 +235,17 @@
 
           <programlisting>deactivate</programlisting>
         </listitem>
-      </orderedlist></para>
+      </orderedlist>
   </section>
 
   <section id="upgrade_AF">
     <title>Upgrading the Enea Edge Automation</title>
 
-    <para><emphasis role="bold">To upgrade the Enea Edge Automation</emphasis><orderedlist>
+    <para><emphasis role="bold">Upgrading the Enea Edge Automation</emphasis></para>
+        
+        <orderedlist>
         <listitem>
-          <para>Log on the host machine</para>
+          <para>Log into the host machine</para>
         </listitem>
 
         <listitem>
@@ -225,21 +254,25 @@
 
         <listitem>
           <para>Back up the configuration files from
-          <literal>modules/enea/config</literal></para>
+          <literal>modules/enea/config</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Extract the archive file<programlisting>unzip Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</programlisting></para>
+          <para>Extract the archive file:</para>
+                  
+                  <programlisting>unzip Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</programlisting>
         </listitem>
 
         <listitem>
           <para>Restore the configuration files from step 2 into
-          <literal>modules/enea/config </literal></para>
+          <literal>modules/enea/config </literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Run the <filename>setup_env.sh</filename><programlisting>source setup_env.sh</programlisting></para>
+          <para>Run the setup of virtual environment script:</para>
+                  
+                  <programlisting>source setup_env.sh</programlisting>
         </listitem>
-      </orderedlist></para>
+      </orderedlist>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-automation-user-guide/doc/overview.xml b/doc/book-enea-edge-automation-user-guide/doc/overview.xml
index 3419337..30cc91f 100644
--- a/doc/book-enea-edge-automation-user-guide/doc/overview.xml
+++ b/doc/book-enea-edge-automation-user-guide/doc/overview.xml
@@ -12,9 +12,11 @@
      <para>The Enea Edge Automation complements the Enea Edge Management
     GUI and uses the northbound REST APIs, given to provide full usability of
     the Enea Edge Management features.</para>
+        
      <para>The Enea Edge Automation includes an Automation Framework (AF) component, providing a way for driving
     configuration with Python scripting, and a Test Harness (TH) component, based on Ansible Playbooks to complete different test
     cases.</para>
+        
      <para>The Test Harness makes use of the Automation Framework Python modules and/or
     direct commands on the uCPE devices running the Enea Edge Runtime.</para>
   </section>