Removed references to Portal and Solution in ENA docs where appropriate.

Change-Id: Idcc466e9c2f4faaeaa5696cb4c24f595b87cab98

17 files changed, 274 insertions, 283 deletions

diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
index c2b86f4..58b4650 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
@@ -26,7 +26,7 @@
 
   <xi:include href="automation_framework_test_harness.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
+
   <xi:include href="troubleshooting_guide.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
index bbfccd7..2fecf5b 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
@@ -2,9 +2,9 @@
 <chapter id="components">
   <title>Components</title>
 
-  <para>An overview of the Enea NFV Access Run Time Platform and the uCPE Manager in
-  cooperation with the Automation Framework and Test Harness, will be
-  presented in detail.</para>
+  <para>An overview of the Enea NFV Access Run Time Platform and the uCPE
+  Manager in cooperation with the Automation Framework and Test Harness, will
+  be presented in detail.</para>
 
   <figure>
     <title>Component Overview</title>
@@ -20,8 +20,8 @@
   <section id="enfva_runtime_plt">
     <title>Enea NFV Access</title>
 
-    <para>The Enea NFV Access is comprised of the Enea NFV Access
-    Run time Platform and the Enea uCPE Manager.</para>
+    <para>The Enea NFV Access is comprised of the Enea NFV Access Run time
+    Platform and the Enea uCPE Manager.</para>
 
     <section id="eucpe_manager">
       <title>Enea uCPE Manager</title>
@@ -39,9 +39,9 @@
     <section id="ena_plat">
       <title>Enea NFV Access Run time Platform</title>
 
-      <para>One or more uCPE devices running the NFV Access Run Time Platform  are 
-      required as hosts running the VNF(s). The uCPE device is known to the uCPE Manager
-      as the "VcpeAgent" device module.</para>
+      <para>One or more uCPE devices running the NFV Access Run Time Platform
+      are required as hosts running the VNF(s). The uCPE device is known to
+      the uCPE Manager as the "VcpeAgent" device module.</para>
 
       <para>Adding a VcpeAgent device can be done via one of two
       methods:</para>
@@ -86,7 +86,7 @@
     <para>The Test Harness (TH) provides a way for driving configuration with
     Ansible Playbooks, by running the python modules from the Automation
     Framework (AF) and by direct connection over SSH to the boards that run
-    the Enea NFV Access solution.</para>
+    Enea NFV Access.</para>
 
     <para>The Test Harness includes an automated test suite that
     contains:</para>
@@ -94,8 +94,8 @@
     <itemizedlist>
       <listitem>
         <para>VNF, Device and Network Smoke Test Cases. A sample test suite
-        that acts as basic smoke tests for the Enea NFV Access and
-        also as a sanity-check test suite for the AF and TH.</para>
+        that acts as basic smoke tests for the Enea NFV Access and also as a
+        sanity-check test suite for the AF and TH.</para>
       </listitem>
 
       <listitem>
@@ -115,4 +115,4 @@
     chapter "Sample Test Cases" from the Enea NFV Access System Test
     Specification document.</para>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
index b3386b8..34c9308 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
@@ -101,9 +101,12 @@
           <para>Enea NFV Access Run Time Platform installed.</para>
 
           <note>
-            <para>For information on how to install Enea NFV Access
-            refer to "Getting Started with Enea NFV Access" from the
-            Enea NFV Access Getting Started manual.</para>
+            <para>For information on how to install Enea NFV Access refer to
+            <olink targetdoc="book_enea_nfv_access_getting_started"
+    targetptr="plat-release-content">Getting Started with Enea NFV Access
+    in <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
           </note>
         </listitem>
       </itemizedlist><figure>
@@ -118,8 +121,8 @@
         </mediaobject>
       </figure></para>
 
-    <para><emphasis role="bold">Changes to 1<superscript>st</superscript>
-    uCPE device</emphasis></para>
+    <para><emphasis role="bold">Changes to 1<superscript>st</superscript> uCPE
+    device</emphasis></para>
 
     <itemizedlist>
       <listitem>
@@ -127,8 +130,8 @@
       </listitem>
 
       <listitem>
-        <para>1 Physical connection back to back with the 
-         2<superscript>nd</superscript> uCPE device.</para>
+        <para>1 Physical connection back to back with the
+        2<superscript>nd</superscript> uCPE device.</para>
       </listitem>
     </itemizedlist>
 
@@ -155,10 +158,12 @@
           <para>Enea NFV Access installed.</para>
 
           <note>
-            <para>For information on how to install Enea NFV Access<remark>the
-            solution or the platform?</remark>, refer to "Getting Started with
-            Enea NFV Access" from the Enea NFV Access Getting Started
-            manual.</para>
+            <para>For information on how to install Enea NFV Access, refer to
+            <olink targetdoc="book_enea_nfv_access_getting_started"
+            targetptr="plat-release-content">Getting Started with Enea NFV
+            Access<xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
           </note>
         </listitem>
       </itemizedlist></para>
@@ -167,9 +172,9 @@
   <section id="initial_setup">
     <title>Installation and Initial Setup</title>
 
-    <para>Download <filename>nfvaccess22_af-th.zip</filename> from the Enea
-    Portal and unzip it on the a supported host machine. Henceforth, the
-    directory in which the ZIP archive has been unpacked will be denoted as
+    <para>Unzip the <filename>nfvaccess22_af-th.zip</filename> archive file,
+    provided by Enea, on a supported host machine. The directory in which the
+    archive has been unpacked will be denoted as
     <literal>&lt;AF-TH-installdir&gt;</literal>.</para>
 
     <para>Enter the <literal>&lt;AF-TH-install-dir&gt;</literal> directory and
@@ -197,10 +202,10 @@
 
       <listitem>
         <para>Run the <filename>setupuCPEManager.yml</filename> Ansible
-        Playbook with the JSON config path as parameter: <programlisting>ansible-playbook playbooks/setupuCPEManager.yml -e\ 
+        Playbook with the JSON config path as parameter: <programlisting>ansible-playbook playbooks/setupuCPEManager.yml -e\
 "@uCPEM_config/&lt;config_name&gt;.json"</programlisting></para>
 
-        <para><emphasis role="bold">Example</emphasis> <programlisting>ansible-playbook playbooks/setupuCPEManager.yml -e\ 
+        <para><emphasis role="bold">Example</emphasis> <programlisting>ansible-playbook playbooks/setupuCPEManager.yml -e\
 "@uCPEM_config/ucpem01.json"</programlisting></para>
       </listitem>
     </orderedlist>
@@ -219,4 +224,4 @@
     <filename>setupuCPEManager.yml</filename> playbook with the corresponding
     JSON config for the new uCPE Manager instance.</para>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
index 045ceef..1c85cfc 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
@@ -44,13 +44,6 @@
             <entry>Enea NFV Access (with ODM) Runtime Platform and Enea uCPE
             Manager.</entry>
           </row>
-
-          <row>
-            <entry>Enea Portal</entry>
-
-            <entry><ulink
-            url="https://portal.enea.com">https://portal.enea.com</ulink></entry>
-          </row>
         </tbody>
       </tgroup>
     </table>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/book.xml b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
index 0f69570..5071e01 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/book.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
@@ -17,19 +17,19 @@
 
   <xi:include href="introduction.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
+
   <xi:include href="clav_vnf_examples.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
+
   <xi:include href="enea_vnf_examples.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
+
   <xi:include href="forti_vnf_examples.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
+
   <xi:include href="inband_management.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
+
   <xi:include href="vnf_chaining.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
index a73c5e8..570ea7a 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
@@ -19,8 +19,9 @@
       </listitem>
 
       <listitem>
-        <para>License for the Clavister VNF (needed as Cloud-Init content in the Cloud-Init tab). 
-          This file is available through the VNF provider.</para>
+        <para>License for the Clavister VNF (needed as Cloud-Init content in
+        the Cloud-Init tab). This file is available through the VNF
+        provider.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -45,19 +46,22 @@
     <section id="clav_vnf_setup_1">
       <title>uCPE device Setup</title>
 
-      <para><emphasis role="bold">Configure Network interfaces on the uCPE devices:</emphasis></para>
+      <para><emphasis role="bold">Configure Network interfaces on the uCPE
+      devices:</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>From the uCPE Manager select uCPE device 1, then access <literal>Configuration</literal> 
-            -&gt; <literal>OpenVSwitch</literal> -&gt; <literal>Host Interfaces</literal> -&gt; 
-            <literal>Add.</literal></para>
+          <para>From the uCPE Manager select uCPE device 1, then access
+          <literal>Configuration</literal> -&gt;
+          <literal>OpenVSwitch</literal> -&gt; <literal>Host
+          Interfaces</literal> -&gt; <literal>Add.</literal></para>
         </listitem>
 
         <listitem>
-          <para>Select the network interface that will be used to connect to uCPE device 2. 
-            Configure it for DPDK, and click <literal>Create</literal> to send the configuration 
-            to that uCPE device.</para>
+          <para>Select the network interface that will be used to connect to
+          uCPE device 2. Configure it for DPDK, and click
+          <literal>Create</literal> to send the configuration to that uCPE
+          device.</para>
         </listitem>
 
         <listitem>
@@ -67,13 +71,13 @@
         </listitem>
 
         <listitem>
-          <para>Once the bridge creation popup appears, fill-in the required fields and add the 
-            physical interface.</para>
+          <para>Once the bridge creation popup appears, fill-in the required
+          fields and add the physical interface.</para>
         </listitem>
 
         <listitem>
-          <para>Repeat the steps above on uCPE device 2, using one DPDK interface and creating 
-            another OVS bridge.</para>
+          <para>Repeat the steps above on uCPE device 2, using one DPDK
+          interface and creating another OVS bridge.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -83,8 +87,9 @@
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>VNF</literal> -&gt; <literal>Descriptor</literal> -&gt; 
-            <literal>On-board</literal>.</para>
+          <para>Select <literal>VNF</literal> -&gt;
+          <literal>Descriptor</literal> -&gt;
+          <literal>On-board</literal>.</para>
         </listitem>
 
         <listitem>
@@ -92,12 +97,14 @@
         </listitem>
 
         <listitem>
-          <para>Provide the path to the qcow image by selecting <literal>Browse</literal>
-          from <literal>VM image file</literal> option.</para>
+          <para>Provide the path to the qcow image by selecting
+          <literal>Browse</literal> from <literal>VM image file</literal>
+          option.</para>
         </listitem>
 
         <listitem>
-          <para>Fill the required fields below and press <literal>Onboard</literal>:</para>
+          <para>Fill the required fields below and press
+          <literal>Onboard</literal>:</para>
 
           <itemizedlist spacing="compact">
             <listitem>
@@ -119,56 +126,61 @@
     <section id="instance_vnfs_clav">
       <title>Instantiate the VNFs</title>
 
-      <para><emphasis role="bold">A) Instantiate the Clavister VNF on uCPE device 1:</emphasis></para>
+      <para><emphasis role="bold">A) Instantiate the Clavister VNF on uCPE
+      device 1:</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Select uCPE device 1, then from the top toolbar: <literal>VNF</literal> -&gt; 
-            <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+          <para>Select uCPE device 1, then from the top toolbar:
+          <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
+          <literal>Add</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Fill in the required information about the Clavister VNF, (the default network 
-            configuration can be used) and select <literal>Create</literal>.</para>
+          <para>Fill in the required information about the Clavister VNF, (the
+          default network configuration can be used) and select
+          <literal>Create</literal>.</para>
         </listitem>
       </orderedlist>
-      
-      <para><emphasis role="bold">B) Instantiate two Enea VNFs (one as the client and one as the 
-        server) on uCPE device 2:</emphasis></para>
-      
+
+      <para><emphasis role="bold">B) Instantiate two Enea VNFs (one as the
+      client and one as the server) on uCPE device 2:</emphasis></para>
+
       <orderedlist>
         <listitem>
-          <para>Select uCPE device 2, then from the top toolbar: <literal>VNF</literal> -&gt; 
-            <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+          <para>Select uCPE device 2, then from the top toolbar:
+          <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
+          <literal>Add</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>In the new <literal>VNF Instance</literal> window, select the Enea VNF from the 
-            dropdown menu, configure it to act as a server by unchecking the <literal>Client mode 
-            IPerf</literal> box, and then click <literal>Create</literal>.</para>
+          <para>In the new <literal>VNF Instance</literal> window, select the
+          Enea VNF from the dropdown menu, configure it to act as a server by
+          unchecking the <literal>Client mode IPerf</literal> box, and then
+          click <literal>Create</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Select <literal>Add</literal> once more, enable the <literal>Client mode 
-            IPerf</literal> checkbox this time, and click <literal>Create</literal> to instantiate 
-            the second <literal>iPerf VNF</literal> as a client, and to run it in client mode.</para>
+          <para>Select <literal>Add</literal> once more, enable the
+          <literal>Client mode IPerf</literal> checkbox this time, and click
+          <literal>Create</literal> to instantiate the second <literal>iPerf
+          VNF</literal> as a client, and to run it in client mode.</para>
         </listitem>
 
         <listitem>
-          <para>In order to check that traffic is forwarded between the two VNFs, connect to the 
-            iPerf VNF client console: <literal>SSH</literal> -&gt; <literal>user</literal> (root) 
-            -&gt; <literal>Connect</literal> and run the following:</para>
-
-          <programlisting>
-            virsh list
-            virsh console
-            root@qemux86-64:~# iperf3 -c 192.168.10.10
-          </programlisting>
+          <para>In order to check that traffic is forwarded between the two
+          VNFs, connect to the iPerf VNF client console:
+          <literal>SSH</literal> -&gt; <literal>user</literal> (root) -&gt;
+          <literal>Connect</literal> and run the following:</para>
+
+          <programlisting>virsh list
+virsh console
+root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
         </listitem>
       </orderedlist>
     </section>
   </section>
-  
+
   <section id="clav_example_sriov">
     <title>Clavister VNF using SR-IOV</title>
 
@@ -210,8 +222,9 @@
         </listitem>
 
         <listitem>
-          <para>Instantiate the Clavister VNF on uCPE device 2: <literal>VNF</literal> 
-            -&gt; <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+          <para>Instantiate the Clavister VNF on uCPE device 2:
+          <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
+          <literal>Add</literal>.</para>
         </listitem>
 
         <listitem>
@@ -251,16 +264,12 @@
           <para>In order to check that traffic is forwarded between the VNFs,
           connect to the iPerf VNF client console by using:
           <literal>SSH</literal> -&gt; <literal>user</literal> (root)
-          -&gt;<literal>Connect</literal> and run the following
-          commands:
-            <programlisting>
-              virsh list
-              virsh console 
-              root@qemux86-64:~# iperf3 -c 192.168.10.10
-            </programlisting>
-          </para>
+          -&gt;<literal>Connect</literal> and run the following commands:
+          <programlisting>virsh list
+virsh console
+root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting></para>
         </listitem>
       </orderedlist>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
index f2d7910..ac4347c 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
@@ -5,19 +5,19 @@
   <section id="prere_enea_vnf">
     <title>Prerequisites</title>
 
-   <para>The following file(s) are needed for this example use-case: 
-     <literal>enea-nfv-access-vnf-qemux86-64.qcow2</literal>. This image is 
-     provided with your release.</para>
+    <para>The following file(s) are needed for this example use-case:
+    <literal>enea-nfv-access-vnf-qemux86-64.qcow2</literal>. This image is
+    provided with your release.</para>
   </section>
 
   <section id="enea_vnf">
     <title>TestPMD VNF</title>
 
-    <para>In this use-case, <literal>uCPE device 1</literal> will run pktgen 
-      (the DPDK application) and <literal>uCPE device 2</literal> will onboard 
-      and instantiate two VNFs. One VNF will run <literal>testpmd_fwd</literal>, 
-      forwarding traffic, and the other will run <literal>testpmd_term</literal> 
-      which will terminate traffic.</para>
+    <para>In this use-case, <literal>uCPE device 1</literal> will run pktgen
+    (the DPDK application) and <literal>uCPE device 2</literal> will onboard
+    and instantiate two VNFs. One VNF will run <literal>testpmd_fwd</literal>,
+    forwarding traffic, and the other will run <literal>testpmd_term</literal>
+    which will terminate traffic.</para>
 
     <figure>
       <title>Enea VNF Example Overview</title>
@@ -33,13 +33,13 @@
     <section id="enea_vnf_setup">
       <title>Example Setup</title>
 
-      <para><emphasis role="bold">Configure the Network interface on uCPE 
-        devices 1 and 2:</emphasis></para>
+      <para><emphasis role="bold">Configure the Network interface on uCPE
+      devices 1 and 2:</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Bind the host interfaces to the DPDK by selecting uCPE device 1 
-            first, then accessing <literal>Configuration</literal> -&gt;
+          <para>Bind the host interfaces to the DPDK by selecting uCPE device
+          1 first, then accessing <literal>Configuration</literal> -&gt;
           <literal>OpenVSwitch</literal> -&gt; <literal>Host
           Interfaces</literal> -&gt; <literal>Add</literal>.</para>
         </listitem>
@@ -62,26 +62,29 @@
       <para><emphasis role="bold">Create an Open vSwitch bridge on uCPE device
       1:</emphasis></para>
 
-      <para>Create an Open vSwitch bridge (<literal>ovsbr0</literal>) on uCPE 
-        device 1, that uses one DPDK interface:</para>
-        
-        <orderedlist>
-          <listitem><para>Click the <literal>Add</literal> button from the 
-            Bridges tab.</para>
-          </listitem>
-          
-          <listitem><para>Select uCPE device 1, then access 
-            <literal>Configuration</literal> -&gt;<literal>OpenVSwitch</literal> 
-            -&gt;<literal>Bridges</literal>.</para>
-          </listitem>
-        </orderedlist>
+      <para>Create an Open vSwitch bridge (<literal>ovsbr0</literal>) on uCPE
+      device 1, that uses one DPDK interface:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Click the <literal>Add</literal> button from the Bridges
+          tab.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select uCPE device 1, then access
+          <literal>Configuration</literal> -&gt;<literal>OpenVSwitch</literal>
+          -&gt;<literal>Bridges</literal>.</para>
+        </listitem>
+      </orderedlist>
 
       <para><emphasis role="bold">Onboard the Enea VNF:</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>VNF</literal> -&gt;<literal>Descriptor</literal> 
-            -&gt; <literal>On-board</literal>.</para>
+          <para>Select <literal>VNF</literal>
+          -&gt;<literal>Descriptor</literal> -&gt;
+          <literal>On-board</literal>.</para>
         </listitem>
 
         <listitem>
@@ -89,13 +92,14 @@
         </listitem>
 
         <listitem>
-          <para>Provide the path to the qcow image by selecting <literal>Browse
-          </literal> from the <literal>VM image file</literal> option.</para>
+          <para>Provide the path to the qcow image by selecting
+          <literal>Browse </literal> from the <literal>VM image file</literal>
+          option.</para>
         </listitem>
 
         <listitem>
-          <para>Fill the required fields below and press <literal>Onboard</literal>:
-          </para>
+          <para>Fill the required fields below and press
+          <literal>Onboard</literal>:</para>
 
           <itemizedlist spacing="compact">
             <listitem>
@@ -113,16 +117,18 @@
         </listitem>
       </orderedlist>
 
-      <para><emphasis role="bold">Instantiate two VNFs on uCPE device 2:</emphasis></para>
+      <para><emphasis role="bold">Instantiate two VNFs on uCPE device
+      2:</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Select uCPE device 2, then access <literal>VNF</literal> -&gt; 
-            <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+          <para>Select uCPE device 2, then access <literal>VNF</literal> -&gt;
+          <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Fill-in the required fields and click <literal>Create</literal>.</para>
+          <para>Fill-in the required fields and click
+          <literal>Create</literal>.</para>
         </listitem>
 
         <listitem>
@@ -160,15 +166,14 @@
         </listitem>
 
         <listitem>
-          <para>Start pktgen on uCPE device 1. Connect to the device by selecting
-            it first, then access <literal>SSH</literal> -&gt; <literal>user</literal> 
-            (root) and perform the following:</para>
+          <para>Start pktgen on uCPE device 1. Connect to the device by
+          selecting it first, then access <literal>SSH</literal> -&gt;
+          <literal>user</literal> (root) and perform the following:</para>
 
-          <programlisting>
-            cd /usr/share/apps/pktgen/
-            ./pktgen -c 0x7 -n 4 --proc-type auto --socket-mem 256 -w 0000:05:00.3 -- \
-            -P -m "[1:2].0"
-            Pktgen:/&gt; start 0</programlisting>
+          <programlisting>cd /usr/share/apps/pktgen/
+./pktgen -c 0x7 -n 4 --proc-type auto --socket-mem 256 -w 0000:05:00.3 -- \
+-P -m "[1:2].0"
+Pktgen:/&gt; start 0</programlisting>
 
           <note>
             <para>The PCI address &lt;0000:05:00.3&gt; used in this example
@@ -183,11 +188,10 @@
           statistics, by selecting the uCPE device first, then accessing
           <literal>SSH</literal> -&gt; <literal>user</literal> (root):</para>
 
-          <programlisting>
-            Virsh list
-            Virsh console 1
-            # Qemux86-64 login: root
-            tail -f /var/log/testpmd-out</programlisting>
+          <programlisting>Virsh list
+Virsh console 1
+# Qemux86-64 login: root
+tail -f /var/log/testpmd-out</programlisting>
 
           <figure>
             <title>Traffic Statistics</title>
@@ -280,4 +284,4 @@ Run: tail -f /opt/testpmd-out</programlisting>
       </orderedlist>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
index cc158fe..8174aa1 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
@@ -7,11 +7,14 @@
   appliances. The virtual appliances can be integrated in Firewall or SD-WAN
   solution development.</para>
 
-  <para>Enea provides a prepared VNF bundle for download from the Enea Portal,
-  for usage with the Enea NFV Access product. The prepared VNF bundle includes
-  the FortiGate VNF image as well as a VNF Descriptor and other onboarding
-  related configuration files. The VNF Descriptor provided configures a setup,
-  which requires the following resources:</para>
+  <section id="forti_firewall_prereq">
+  <title>Prerequisites</title>
+
+  <para>Enea provides a prepared VNF bundle for usage with the Enea
+  NFV Access product. The bundle includes the FortiGate VNF image as well
+  as a VNF Descriptor and other onboarding related configuration files.
+  The VNF Descriptor provided configures a setup, which requires the
+  following resources:</para>
 
   <itemizedlist>
     <listitem>
@@ -29,19 +32,20 @@
 
   <para>The VNF Descriptor represents one specific setup, suitable for usage
   with the Firewall and SD-WAN VPN instructions in this guide. Alternative VNF
-  Descriptor configurations may be needed to support other configurations
-  required by the customer.</para>
+  Descriptor configurations may be needed to support other setups
+  desired by the customer.</para>
 
   <para>Enea can offer assistance and provide alternative VNF Descriptor
   configurations.</para>
 
   <note>
-    <para>While the prepared FortiGate bundle is available through the Enea Portal,
-    additional content needs to be received from Fortinet directly. The
-    FortiGate VNF license as well as any FortiGate specific documentation
-    shall be requested from the local Fortinet sales representatives in your
-    region, before FortiGate can be used.</para>
+    <para>While the prepared FortiGate bundle is available from Enea,
+    additional content needs to acquired directly from Fortinet. The
+    FortiGate VNF license file as well as any FortiGate specific documentation
+   is available from the local Fortinet sales representatives in your
+    region, and must be requested before FortiGate can be used.</para>
   </note>
+  </section>
 
   <section id="fortigate_firewall">
     <title>FortiGate VNF as a Firewall</title>
@@ -53,8 +57,7 @@
     networks, and provides security ratings to adopt security best
     practices.</para>
 
-    <para>An example firewall configuration for the FortiGate VNF is provided
-    in the Enea Portal. It is a simple firewall base configuration.</para>
+    <para>Enea provides an example of a simple base firewall configuration for the FortiGate VNF.</para>
 
     <table>
       <title>FortiGate VNF Example Configuration</title>
@@ -227,16 +230,12 @@
             <entrytbl cols="1">
               <tbody>
                 <row>
-                  <entry>Download the FortiGate VNF Bundle from the Enea Portal
-                  to the Lab Machine file system. Please see the Download
-                  Chapter for more details.</entry>
+                  <entry>Copy the FortiGate VNF Bundle provided by Enea to the Lab Machine file system.</entry>
                 </row>
 
                 <row>
-                  <entry>Download FortiGate configuration examples from the
-                  Enea Portal to the Lab Machine file system. Please check the
-                  Download Chapter for more details. Unpack the configuration
-                  examples on the Lab Machine.</entry>
+                  <entry>Copy the FortiGate configuration examples from Enea to the Lab Machine file system. Unpack the configuration
+                  examples onto the Lab Machine.</entry>
                 </row>
 
                 <row>
@@ -337,7 +336,7 @@
         <para>Create one Open vSwitch bridge for each firewall network
         connection (WAN, LAN1 and LAN2), by selecting:
         <literal>Configuration</literal> -&gt;
-        <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal> -&gt; <literal>Add</literal>. 
+        <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal> -&gt; <literal>Add</literal>.
           A popup like the following should appear:</para>
 
         <figure>
@@ -381,7 +380,7 @@
       </listitem>
 
       <listitem>
-        <para>Click <literal>Browse</literal> to view selections, and choose the 
+        <para>Click <literal>Browse</literal> to view selections, and choose the
           <literal>Fortigate.zip</literal> file, before clicking <literal>Send</literal>.</para>
       </listitem>
     </orderedlist>
@@ -464,7 +463,7 @@
               <row>
                 <entry align="left">Configuration file</entry>
 
-                <entry align="left">Firewall example configuration file provided by Enea 
+                <entry align="left">Firewall example configuration file provided by Enea
                   (<filename>FGVM080000136187_20180828_0353_basic_fw.conf
                 </filename>).</entry>
               </row>
@@ -472,7 +471,7 @@
               <row>
                 <entry align="left">Port1 - WAN</entry>
 
-                <entry align="left">Set the External Interface type to Dpdk and connect it to the 
+                <entry align="left">Set the External Interface type to Dpdk and connect it to the
                   <literal>wanmgrbr</literal> ovs bridge.</entry>
               </row>
 
@@ -497,12 +496,12 @@
 
     <para><emphasis role="bold">Testing the FortiGate Firewall</emphasis></para>
 
-    <para>Connect the Test Machine on the LAN interface<remark>which lan interface?</remark> 
+    <para>Connect the Test Machine on the LAN interface<remark>which lan interface?</remark>
       and access the internet from the Test Machine to use the firewall on the uCPE device.</para>
 
     <note>
-      <para>The connected Test Machine can be a laptop or a uCPE device. It must have one 
-        interface configured to get a dynamic IP from a DHCP server. The 
+      <para>The connected Test Machine can be a laptop or a uCPE device. It must have one
+        interface configured to get a dynamic IP from a DHCP server. The
         <literal>dhclient &lt;interface&gt;</literal> command can be used to
       request an IP address. The received IP must be in the 172.16.1.2 -
       172.16.1.255 range.</para>
@@ -519,25 +518,25 @@
       </mediaobject>
     </figure>
 
-    <para>In the example above<remark>what example exactly, in the overview picture or?</remark>, 
-      the FortiGate VNF management interface is accessible through the WAN interface. The 
-      WAN IP address can be used from a web browser on the Lab Machine to access the 
-      Fortigate VNF Management Web UI. Please check the Fortigate VNF web management section 
+    <para>In the example above<remark>what example exactly, in the overview picture or?</remark>,
+      the FortiGate VNF management interface is accessible through the WAN interface. The
+      WAN IP address can be used from a web browser on the Lab Machine to access the
+      Fortigate VNF Management Web UI. Please check the Fortigate VNF web management section
       for more information.<remark>Note to self: An olink is needed to this section in this book,
       use fortigate_webmg as the ID.</remark></para>
 
     <para>In another example, the firewall can be setup to use bridges as
-    connection points for the Fortigate VNF. It is possible to replace these 
+    connection points for the Fortigate VNF. It is possible to replace these
       OVS-DPDK bridges with SR-IOV connection points. Please check the network
-      configuration chapter on how to configure an interface for SR-IOV.<remark>An olink 
+      configuration chapter on how to configure an interface for SR-IOV.<remark>An olink
       is needed but I can't add it without clarifying which chapter do you refer to?</remark></para>
 
     <para>It was previously assumed that three physical interfaces are
-    available for VNF connection. In the case of a firewall setup only two physical interfaces 
-      are needed for the data path (one for WAN and one for LAN).</para><remark>Is this the meaning you 
+    available for VNF connection. In the case of a firewall setup only two physical interfaces
+      are needed for the data path (one for WAN and one for LAN).</para><remark>Is this the meaning you
     intented to convey in this sentence?</remark>
-    
-    <para>In the example below only two interfaces will be configured as DPDK, with two 
+
+    <para>In the example below only two interfaces will be configured as DPDK, with two
       bridges created, one for each type of connection.</para>
 
     <para>Please note that at VNF instantiation instead of assigning distinct bridges for each
@@ -585,7 +584,7 @@
       </listitem>
 
       <listitem>
-        <para>To access Fortigate CLI, use <literal>admin</literal> as the user, 
+        <para>To access Fortigate CLI, use <literal>admin</literal> as the user,
           leaving the password blank/empty, and press enter.</para>
 
         <para>Use the CLI command <literal>get system interface</literal> to
@@ -679,7 +678,7 @@
     applied to WAN connections. It connects enterprise networks, including
     branch offices and data centers, over large geographic distances.</para>
 
-    <para>SD-WAN decouples the network from the management plane, detaching 
+    <para>SD-WAN decouples the network from the management plane, detaching
       traffic management and monitoring functions from hardware. Most forms
     of SD-WAN technology create a virtual overlay that is transport-agnostic,
     i.e. it abstracts underlying private or public WAN connections. With an
@@ -694,7 +693,7 @@
 
     <note>
       <para>Example SD-WAN configurations for the FortiGate VNF are provided
-      in the Enea Portal.</para>
+      by Enea.</para>
     </note>
 
     <table>
@@ -928,14 +927,12 @@
             <entrytbl cols="1">
               <tbody>
                 <row>
-                  <entry>FortiGate VNF Bundle downloaded from the Enea Portal
-                  to the Lab Machine file system.</entry>
+                  <entry>FortiGate VNF Bundle copied from Enea to the Lab Machine file system.</entry>
                 </row>
 
                 <row>
-                  <entry>FortiGate configuration examples downloaded from the Enea
-                  Portal to the Lab Machine file system. Unpack the configuration
-                  examples specific for SD-WAN on the Lab Machine.</entry>
+                  <entry>FortiGate configuration examples from Enea, copied to the Lab Machine file system. Unpack the configuration
+                  examples specific for SD-WAN onto the Lab Machine.</entry>
                 </row>
 
                 <row>
@@ -1009,7 +1006,7 @@
           </mediaobject>
         </figure>
 
-        <para>Repeat this step for the other two interfaces. The result of a successful binding 
+        <para>Repeat this step for the other two interfaces. The result of a successful binding
           should look like the following:</para>
 
         <figure>
@@ -1026,8 +1023,8 @@
 
       <listitem>
         <para>Create an Open vSwitch bridge for each SD-WAN network connection
-        (VNF management, WAN and LAN) by selecting the uCPE device then: 
-          <literal>Configuration</literal> -&gt; <literal>OpenvSwitch</literal> -&gt; 
+        (VNF management, WAN and LAN) by selecting the uCPE device then:
+          <literal>Configuration</literal> -&gt; <literal>OpenvSwitch</literal> -&gt;
           <literal>Bridges</literal> -&gt; <literal>Add</literal>. A popup will appear:</para>
 
         <figure>
@@ -1106,14 +1103,14 @@
 
     <para><emphasis role="bold">Instantiating the FortiGate
     VNF</emphasis></para>
-    
-    <note><para>Download locally the valid license files for the Fortigate VNF from 
+
+    <note><para>Download locally the valid license files for the Fortigate VNF from
       Fortinet and  the configuration file provided by Enea as examples.</para>
     </note>
 
     <orderedlist>
       <listitem>
-        <para>Select a uCPE device on the map, then from the top toolbar click 
+        <para>Select a uCPE device on the map, then from the top toolbar click
           <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt; <literal>Add</literal>:</para>
 
         <figure>
@@ -1192,7 +1189,7 @@
           <row>
             <entry>Configuration file(s)</entry>
 
-            <entry>SD-WAN example configuration files provided by Enea: 
+            <entry>SD-WAN example configuration files provided by Enea:
               <literal>FGVM080000136187_20180215_0708_sdwan1.conf</literal>
               <literal>FGVM080000136188_20180215_0708_sdwan2.conf</literal></entry>
           </row>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml b/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
index 3aea4f5..a15b7d5 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
@@ -31,7 +31,7 @@
     </listitem>
   </itemizedlist>
 
-  <para>For prerequisites and further details, please see <xref linkend="inband_management" /> 
+  <para>For prerequisites and further details, please see <xref linkend="inband_management" />
     and <xref linkend="vnf_fortigate" /><remark>Are these references still valid?</remark>.</para>
 
   <section id="mg_activation">
@@ -261,7 +261,7 @@
       </listitem>
     </itemizedlist>
 
-    <para>If you have access from the uCPE Manager to the device as shown above, this 
+    <para>If you have access from the uCPE Manager to the device as shown above, this
       demonstrates that device management traffic passes through the In-band
     management WAN bridge successfully.</para>
 
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml b/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
index 208cd0e..91e15aa 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
@@ -2,16 +2,16 @@
 <chapter id="intro">
   <title>Introduction</title>
 
-  <para>This document describes several example use-cases concerning uCPE device 
-    network interface configuration, onboarding and instantiation of certain VNFs, 
+  <para>This document describes several example use-cases concerning uCPE device
+    network interface configuration, onboarding and instantiation of certain VNFs,
     VNF chaining, and In-band management.</para>
-  
-  <note><para>Before running any example make sure the uCPE device(s) have been 
+
+  <note><para>Before running any example make sure the uCPE device(s) have been
     added to the uCPE Manager and placed on the map.</para>
   </note>
-  
-  <para>For detailed information on how to add a device to the uCPE Manager, how 
-    to configure the network interfaces to use DPDK, PCI-passthrough or SR-IOV drivers, 
+
+  <para>For detailed information on how to add a device to the uCPE Manager, how
+    to configure the network interfaces to use DPDK, PCI-passthrough or SR-IOV drivers,
     or VNF configuration, please refer to the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xpointer="element(book_enea_nfv_access_getting_started/1)" /> Manual.</para>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
index 412af4a..90bf566 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
@@ -28,7 +28,7 @@
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/example_setup.png"
-                     scale="90" />
+                     scale="88" />
         </imageobject>
       </mediaobject>
     </figure>
@@ -52,19 +52,16 @@
       </listitem>
 
       <listitem>
-        <para>Fortigate VNF image. This VNF can be downloaded from <ulink
-        url="https://portal.enea.com/">Enea portal</ulink>.</para>
+        <para>Fortigate VNF image. This image is provided by Enea.</para>
       </listitem>
 
       <listitem>
-        <para>vSRX-domain-update-script. This file can be downloaded from
-        <ulink url="https://portal.enea.com/">Enea portal</ulink>.</para>
+        <para>vSRX-domain-update-script. This file is provided by Enea.</para>
       </listitem>
 
       <listitem>
-        <para>FortiFW-Site&lt;x&gt;.conf as Cloud-Init files. This file can be
-        downloaded from <ulink url="https://portal.enea.com/">Enea
-        portal</ulink>.</para>
+        <para>FortiFW-Site&lt;x&gt;.conf as the Cloud-Init file(s). This file
+        is provided by Enea.</para>
       </listitem>
 
       <listitem>
@@ -292,8 +289,10 @@
     <para>Before testing LAN to LAN connectivity, preliminary tests of service
     can be run to ensure everything was set up properly.</para>
 
-    <para>Before testing LAN to LAN connectivity, one can run preliminary tests of service to ensure everything was
-set-up properly. For instance, by connecting to vSRX CLI (any site), one can test IKE security associations:</para>
+    <para>Before testing LAN to LAN connectivity, one can run preliminary
+    tests of service to ensure everything was set-up properly. For instance,
+    by connecting to vSRX CLI (any site), one can test IKE security
+    associations:</para>
 
     <programlisting>root@Atom-C3000:~ # cli</programlisting>
 
@@ -373,7 +372,7 @@ disable      type: physical   netflow-sampler: disable    sflow-sampler: disable
     be checked (from Site1) as such:</para>
 
     <programlisting>root@atom-c3000:~# ping 172.10.10.2
-PING 172.10.10.1 (172.10.10.2): 56 data bytes 
+PING 172.10.10.1 (172.10.10.2): 56 data bytes
 ...</programlisting>
   </section>
 
@@ -397,4 +396,4 @@ PING 172.10.10.1 (172.10.10.2): 56 data bytes
       </listitem>
     </itemizedlist>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
index 9b28c88..7a30f28 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
@@ -207,7 +207,7 @@ rootfs_destination=</programlisting></para>
 
       <orderedlist>
         <listitem>
-          <para>Download the HDDIMG file from the download portal onto a
+          <para>Copy the HDDIMG image file provided by Enea, onto a
           development machine (Linux or Windows with Cygwin support).</para>
         </listitem>
 
diff --git a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
index e2e9802..c6a4f04 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
@@ -16,12 +16,12 @@
 
   <para>Enea NFV Access for universal Customer Premise Equipment (uCPE) is a
   virtualization and management platform, which allows end-users to introduce,
-  instantiate, and run third-party VNFs onto their systems. The solution is
-  comprised of two major components working in close cooperation:</para>
+  instantiate, and run third-party VNFs onto their systems. It is comprised of
+  two major components working in close cooperation:</para>
 
   <itemizedlist>
     <listitem>
-      <para>The Enea NFV Access Run Time Platform, which acts as the host for
+      <para>The Enea NFV Access Run-Time Platform, which acts as the host for
       Virtualized Network Functions (VNFs) and provides management over
       NETCONF.</para>
     </listitem>
@@ -92,4 +92,4 @@
       </listitem>
     </itemizedlist>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
index e24ae38..d179765 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
@@ -142,7 +142,7 @@
         Access release content.</para>
       </listitem>
 
-      <listitem>
+      <listitem condition="hidden">
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_reference_guide_intel/1)" />.
@@ -153,8 +153,8 @@
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_getting_started/1)" />.
-        Describes how to install the uCPE Manager, the NFV Access platform and
-        Device Management.</para>
+        Describes how to install the uCPE Manager, the NFV Access Run-Time
+        platform and Device Management.</para>
       </listitem>
 
       <listitem>
@@ -165,7 +165,7 @@
         various VNFs.</para>
       </listitem>
 
-      <listitem>
+      <listitem condition="hidden">
         <para>Enea NFV Access VNF Onboarding Guide. Describes the process of
         onboarding a new VNF onto the uCPE Manager.</para>
       </listitem>
@@ -186,14 +186,15 @@
 
       <listitem>
         <para>Enea NFV Access Automation Framework and Test Harness User
-        Guide. Describes the Automation Framework and Test Harness for the
-        Enea NFV Access Solution and provides instructions regarding the
-        necessary steps to run these software tools.</para>
+        Guide. Describes the Automation Framework and Test Harness for Enea
+        NFV Access and provides instructions regarding the necessary steps to
+        run these software tools.</para>
       </listitem>
 
-      <listitem condition="hidden">
-        <para>Enea NFV Access System Test Specification.</para>
+      <listitem>
+        <para>Enea NFV Access System Test Specification. Describes a sample
+        Test Suite for System Testing of Enea NFV Access.</para>
       </listitem>
     </itemizedlist>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml b/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
index 4975ca3..9eecd3c 100644
--- a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
@@ -5,11 +5,10 @@
   <title>Getting Enea NFV Access</title>
 
   <para>Enea NFV Access releases and updates are available as binaries ready
-  for download from the <ulink url="https://portal.enea.com">Enea Download
-  Portal</ulink>.</para>
+  for download.</para>
 
   <para><emphasis role="bold">Downloading Enea NFV Access</emphasis></para>
-
+<remark>Does the content below need to be revised to no longer make reference or mention to Enea Portal?</remark>
   <orderedlist>
     <listitem>
       <para>Log in to the link above using the credentials provided by
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml b/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml
index 7df9acc..f89f8bd 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml
@@ -2,18 +2,10 @@
 <chapter id="overview_sts">
   <title>Overview</title>
 
-  <para>This document specifies a Sample Test Suite for System Testing of the
-  Enea NFV Access Solution. It also provides information regarding the
-  necessary steps to run these tests.</para>
-
-  <section id="scope">
-    <title>Scope</title>
-
-    <para>The scope of this document is to describe the Test Harness (TH)
-    sample test cases for System Testing of the Enea NFV Access Solution.
-    Furthermore, this document shall also describe the necessary environment
-    setup to run these tests successfully.</para>
-  </section>
+  <para>The scope of this document is to describe the Test Harness (TH) sample
+  test cases for System Testing of Enea NFV Access. Furthermore, this document
+  shall also describe the necessary environment setup to run these tests
+  successfully.</para>
 
   <section id="def_acro_sts">
     <title>Definitions and Acronyms</title>
@@ -34,17 +26,10 @@
 
         <tbody>
           <row>
-            <entry>Enea NFV Access Solution</entry>
-
-            <entry>Enea NFV Access (with ODM) Runtime Platform and Enea uCPE
-            Manager.</entry>
-          </row>
-
-          <row>
-            <entry>Enea Portal</entry>
+            <entry>Enea NFV Access</entry>
 
-            <entry><ulink
-            url="https://portal.enea.com">https://portal.enea.com</ulink></entry>
+            <entry>The Enea NFV Access (with ODM) Run-time Platform and the
+            Enea uCPE Manager.</entry>
           </row>
         </tbody>
       </tgroup>
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
index 50907ca..ec2e592 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
@@ -9,8 +9,8 @@
     <title>VNF, Device and Network Smoke Test Cases</title>
 
     <para>The following is an automated test suite that acts as basic smoke
-    tests for the Enea NFV Access Solution and as a sanity-check test suite
-    for the AF and TH.</para>
+    tests for Enea NFV Access, and as a sanity-check test suite for the AF and
+    TH.</para>
 
     <section id="onb_vnf_image">
       <title>VNF - Onboard_VNF_Image</title>
@@ -322,8 +322,8 @@ bridge=&lt;Bridge-name&gt;"</programlisting></para>
     <title>VNF Deployment and Lifecycle</title>
 
     <para>The following details the automated suite that handles the testing
-    of the instantiation, lifecycle and destruction of a VNF for the Enea NFV
-    Access Solution.</para>
+    of the instantiation, lifecycle and destruction of a VNF for Enea NFV
+    Access.</para>
 
     <section id="inst_vnfi">
       <title>Instantiate_VNFI</title>
@@ -467,10 +467,9 @@ Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting
       </orderedlist>
 
       <para>For more information please refer to "FortiGate VNF as a Firewall"
-      chapter from the "Enea NFV Access Example Use-cases" manual.<note>
+      chapter from the "Enea NFV Access Example Use-cases" manual. <note>
           <para>The license and configuration files for the FortiGate VNF are
-          not included in the TH and should be obtained from the user's Enea
-          Portal account.</para>
+          not included in the TH and should be obtained from Enea.</para>
         </note></para>
 
       <section id="fortigate_fw_instance">
@@ -542,15 +541,15 @@ ansible_user=root ansible_pass=root</programlisting></para>
 
           <listitem>
             <para>Download the FortiGate VNF Firewall basic configuration from
-            the Enea Portal, copy it into the
+            Enea, copy it into the
             <filename>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage</filename>
             directory and rename it to<filename>
             fortigateFW.conf</filename>.</para>
           </listitem>
 
           <listitem>
-            <para>Retrieve the FortiGate VNF license from Fortinet or the Enea
-            Portal, copy it into the
+            <para>Retrieve the FortiGate VNF license from Fortinet or Enea,
+            copy it into the
             <literal>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage</literal>
             directory and rename it to
             <filename>fortigateLicense.lic</filename>.</para>
@@ -636,15 +635,15 @@ FortigateFWInstance tested successfully!</programlisting></para>
 
           <listitem>
             <para>Download the FortiGate VNF Firewall basic configuration from
-            the Enea Portal, copy it into the
+            Enea, copy it into the
             <literal>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage</literal>
             directory and rename it to
             <filename>fortigateFW.conf</filename>.</para>
           </listitem>
 
           <listitem>
-            <para>Retrieve the FortiGate VNF license file from Fortinet or the
-            Enea Portal, copy it into the
+            <para>Retrieve the FortiGate VNF license file from Fortinet or
+            Enea, copy it into the
             <literal>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage</literal>
             directory and rename it to
             <filename>fortigateLicense.lic</filename>.</para>
@@ -796,33 +795,33 @@ ansible_pass=root</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>Download the FortiGate VNF Firewall basic configuration files
-          from the Enea Portal (<filename>FortiFW-Site1.conf</filename> and
+          <para>Retrieve the FortiGate VNF Firewall basic configuration files
+          from Enea (<filename>FortiFW-Site1.conf</filename> and
           <filename>FortiFW-Site2.conf</filename>), and copy them into the
           <literal>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateFWImage</literal>
           directory.</para>
         </listitem>
 
         <listitem>
-          <para>Retrieve the FortiGate VNF license from Fortinet or the Enea
-          Portal, copy it into the
+          <para>Retrieve the FortiGate VNF license from Fortinet or Enea, copy
+          it into the
           <literal>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateFWImage</literal>
           directory and rename it to
           <filename>fortigateLicense.lic</filename>.</para>
         </listitem>
 
         <listitem>
-          <para>Download the Juniper vSRX basic configuration files from the
-          Enea Portal (<filename>vSRX-Site1.iso</filename> and
+          <para>Retrieve the Juniper vSRX basic configuration files from Enea
+          (<filename>vSRX-Site1.iso</filename> and
           <filename>vSRX-Site2.iso</filename>), and copy them into the
           <literal>&lt;AF-TH-install-dir&gt;/vnf_config/junipervSRXImage</literal>
           directory.</para>
         </listitem>
 
         <listitem>
-          <para>Download <filename>vSRX-domain-update-script</filename> from
-          the Enea Portal and copy it into the
-          <literal>junipervSRXImage</literal> directory.</para>
+          <para>Retrieve <filename>vSRX-domain-update-script</filename> from
+          Enea and copy it into the <literal>junipervSRXImage</literal>
+          directory.</para>
 
           <para>Please refer to the "VNF Chaining Example Use-case" chapter
           from the Enea NFV Access Example Use-cases manual for additional