31 files changed, 201 insertions, 215 deletions

diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/book.xml b/doc/book-enea-nfv-access-reference-guide-intel/doc/book.xml
index 325a5d9..939cd23 100644
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/book.xml
+++ b/doc/book-enea-nfv-access-reference-guide-intel/doc/book.xml
@@ -13,8 +13,6 @@
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
         <xi:include href="overview.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-        <xi:include href="getting_started.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
         <xi:include href="hypervisor_virtualization.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
         <xi:include href="container_virtualization.xml"
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/book.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/book.xml
index aebde4a..cde171e 100644
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/book.xml
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/book.xml
@@ -21,13 +21,13 @@
   <xi:include href="prerequisites.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />                               
                           
-  <xi:include href="download_solution.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />                               
-                          
   <xi:include href="documentation.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />     
+
+  <xi:include href="getting_started_nfv_access.xml"
+                xmlns:xi="http://www.w3.org/2001/XInclude" />
                           
-  <xi:include href="installation.xml"
+  <xi:include href="getting_started_ucpe_manager.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />                               
                           
   <xi:include href="configuration.xml"
@@ -36,9 +36,6 @@
   <xi:include href="demo_usecases.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="troubleshooting.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
   <xi:include href="knownissues_limitations.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/configuration.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/configuration.xml
index 577305b..e87ac44 100644
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/configuration.xml
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/configuration.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="configuration">
-  <title>Configuration Options</title>
+  <title>Device configuration and provisioning</title>
 
   <section id="zero_touch_prov">
     <title>Zero Touch Provisioning</title>
@@ -17,7 +17,7 @@
     <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xpointer="element(book_enea_nfv_access_guide_intel/1)" /></olink> , within
-    the Enea NFV Access Guide for more details.</para>
+    the Enea NFV Access Reference Guide for more details.</para>
 
     <para>With the address parameter set, run
     <literal>list_deviceID.sh</literal> after NFV Access is installed and
@@ -311,4 +311,4 @@
       </listitem>
     </orderedlist>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/documentation.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/documentation.xml
index 3fc6e81..84da927 100644
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/documentation.xml
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/documentation.xml
@@ -11,27 +11,27 @@
     </listitem>
 
     <listitem>
-      <para>In the top right menu, select <emphasis role="bold">Standalone
-      uCPE</emphasis> and choose a release version from those listed on the
-      left, (Standalone uCPE Solution X.Y.Z). The newest is always at the top.
-      Enter that version by clicking the blue name text and scroll down until
-      you see the documentation file(s) you wish to download. </para>
+      <para>In the top right menu, select <emphasis
+      role="bold">Access</emphasis> and choose a release version from those
+      listed on the left, (Enea NFV Access X.Y.Z). The newest is always at the
+      top. Enter that version by clicking the blue name text and scroll down
+      until you see the documentation file(s) you wish to download.</para>
 
       <para>The documents listed below are the primary ones to consult:</para>
 
       <itemizedlist>
         <listitem>
-          <para>Enea NFV Access User's Guide</para>
+          <para>Enea NFV Access Reference Guide</para>
         </listitem>
 
         <listitem>
-          <para>Developer Documentation for uCPEManager</para>
+          <para>Enea NFV Access Getting Started</para>
         </listitem>
 
         <listitem>
-          <para>ElementCenter Tutorials</para>
+          <para>DeveloperDocs, Developer Documentation for uCPEManager</para>
         </listitem>
       </itemizedlist>
     </listitem>
   </orderedlist>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/download_solution.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/download_solution.xml
deleted file mode 100644
index d6d663c..0000000
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/download_solution.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="download_solution">
-  <title>Downloading the Solution</title>
-
-  <para>The Enea NFV Access uCPE G.A. artifacts are available for download and
-  use, from the <ulink url="https://portal.enea.com/standalone-ucpe/">Enea
-  Download Portal</ulink>:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>Access the link above and log in with the credentials provided by
-      Enea.</para>
-    </listitem>
-
-    <listitem>
-      <para>In the top right menu, select <emphasis role="bold">Standalone
-      uCPE</emphasis> and choose a release version from those listed on the
-      left, (Standalone uCPE Solution X.Y.Z). The newest is always at the top.
-      Enter that version by clicking the blue name text.</para>
-
-      <figure>
-        <title>Standalone uCPE on the Portal</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="images/select_relversion.png"
-                       scale="90" />
-          </imageobject>
-        </mediaobject>
-      </figure>
-
-      <para>Once inside the release version page, scroll to the bottom and
-      click the <emphasis role="bold">Download</emphasis> button specific to
-      the artifact(s) you wish to download.</para>
-    </listitem>
-
-    <listitem>
-      <para>Download the ElementCenter uCPE Manager and install it on one of
-      the following 64-bit platforms: <remark>Is this still accurate, these
-      don't appear on the artifact download page for 2.0.3</remark></para>
-
-      <itemizedlist>
-        <listitem>
-          <para>uCPEManager-0.9b5-Centos.tar.gz (ElementCenter for
-          CentOS)</para>
-        </listitem>
-
-        <listitem>
-          <para>uCPEManager-0.9b5-Windows.zip (ElementCenter for
-          Windows)</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>The following VNFs can be downloaded from the portal and
-      on-boarded into the uCPE Manager/Element Center:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Fortigate VNF bundle</para>
-        </listitem>
-
-        <listitem>
-          <para>FortigateVNF_example_configurations.tar.gz</para>
-        </listitem>
-
-        <listitem>
-          <para>ClavisterCosStream.zip</para>
-        </listitem>
-
-        <listitem>
-          <para>IPerf.zip</para>
-        </listitem>
-
-        <listitem>
-          <para>TestPmdForwarder.zip</para>
-        </listitem>
-
-        <listitem>
-          <para>TestPmdTerminator.zip</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Download the NFV Access images archive(s) from the portal:
-      <filename>Enea_NFV_Access_[release_version][release_date].zip</filename>.</para>
-    </listitem>
-  </orderedlist>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/getting_started.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/getting_started_nfv_access.xml
index 5425f57..5425f57 100644
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/getting_started.xml
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/getting_started_nfv_access.xml
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/getting_started_ucpe_manager.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/getting_started_ucpe_manager.xml
new file mode 100755
index 0000000..84f5da8
--- /dev/null
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/getting_started_ucpe_manager.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="installation">
+  <title>Getting Started with Enea uCPE Manager</title>
+
+  <section id="download_ucpe_manager">
+    <title>Download Enea uCPE Manager</title>
+
+    <para>Enea uCPE Manager artifacts are available for download and use, from
+    the <ulink url="https://portal.enea.com/access">Enea Download
+    Portal</ulink>.</para>
+
+    <orderedlist>
+      <listitem>
+        <para>Access the link above and log in with the credentials provided
+        by Enea.</para>
+      </listitem>
+
+      <listitem>
+        <para>In the top right menu, select <emphasis
+        role="bold">Access</emphasis> and choose a release version from those
+        listed on the left, (Enea NFV Access X.Y.Z). The newest is always at
+        the top. Enter that version by clicking the blue name text.</para>
+
+        <figure>
+          <title>Enea NFV Access on the Portal</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="images/select_relversion.png"
+                         scale="90" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+
+        <para>Once inside the release version page, scroll to the bottom and
+        click the <emphasis role="bold">Download</emphasis> button specific to
+        the artifact(s) you wish to download.</para>
+      </listitem>
+
+      <listitem>
+        <para>Download the uCPE Manager and install it on one of the following
+        64-bit platforms: <remark>Is this still accurate, these don't appear
+        on the artifact download page for 2.0.3</remark></para>
+
+        <itemizedlist>
+          <listitem>
+            <para>uCPEManager-0.9b5-Centos.tar.gz (ElementCenter for
+            CentOS)</para>
+          </listitem>
+
+          <listitem>
+            <para>uCPEManager-0.9b5-Windows.zip (ElementCenter for
+            Windows)</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>The following VNFs can be downloaded from the portal and
+        on-boarded into the uCPE Manager/Element Center:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>Fortigate VNF bundle</para>
+          </listitem>
+
+          <listitem>
+            <para>FortigateVNF_example_configurations.tar.gz</para>
+          </listitem>
+
+          <listitem>
+            <para>ClavisterCosStream.zip</para>
+          </listitem>
+
+          <listitem>
+            <para>IPerf.zip</para>
+          </listitem>
+
+          <listitem>
+            <para>TestPmdForwarder.zip</para>
+          </listitem>
+
+          <listitem>
+            <para>TestPmdTerminator.zip</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>Download the NFV Access images archive(s) from the portal:
+        <filename>Enea_NFV_Access_[release_version][release_date].zip</filename>.</para>
+      </listitem>
+    </orderedlist>
+  </section>
+
+  <section id="install_ucpe_manager">
+    <title>Install the Enea uCPE Manager</title>
+
+    <para>Unpack the uCPE Manager and install it by following the instructions
+    provided within the release archive:
+    <literal>[unpacked_folder]/dist/README.</literal> For more detailed
+    information about the uCPE Manager, please see the uCPE Manager
+    Installation Guide available within the
+    <filename>DeveloperDocs.zip</filename> archive.</para>
+
+    <para>There are a few things to consider during the installation phase, as
+    there are a few steps where user input is required. In most cases, the
+    default values should be used.</para>
+
+    <para>For demo purposes, use the internal PostgreSQL database (which
+    defaults to Y), and not the machine as part of a cluster (which defaults
+    to N). Installing on a Windows machine, will require the user to follow
+    the Windows password policies when defining the password for the <emphasis
+    role="bold">ucpemanager</emphasis> service. A default password will not be
+    accepted. A good example for an acceptable password would be:
+    <emphasis>_1ucpe#2manager!3_</emphasis>.</para>
+
+    <para>Check that the Windows or CentOS machine where the uCPE Manager is
+    installed has the firewall disabled. To disable the firewall, if using
+    Windows 10, go to the Control Panel, then inside <literal>Network &amp;
+    Internet</literal> and <literal>Firewall &amp; Network
+    Protection</literal>, disable the firewall for "Domain network" and
+    "Private network".</para>
+
+    <para>Verify that the installation has succeded, browse to
+    "https://localhost", log in with the username: admin and password:
+    admin.</para>
+  </section>
+</chapter>
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/boot_ena.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/boot_ena.png
index 87c21e5..87c21e5 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/boot_ena.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/boot_ena.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/boot_ena.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/boot_ena.svg
index 87c21e5..87c21e5 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/boot_ena.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/boot_ena.svg
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/efi_menu.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/efi_menu.png
index f29396a..f29396a 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/efi_menu.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/efi_menu.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/efi_menu.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/efi_menu.svg
index 8a0c863..8a0c863 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/efi_menu.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/efi_menu.svg
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_1.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_1.png
index c35c906..c35c906 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_1.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_1.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_1.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_1.svg
index 6d769f2..6d769f2 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_1.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_1.svg
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_2.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_2.png
index 95d649d..95d649d 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_2.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_2.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_2.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_2.svg
index ce96738..ce96738 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_2.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_2.svg
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_3.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_3.png
index baeefa9..baeefa9 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_3.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_3.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_3.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_3.svg
index 128ab15..128ab15 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_3.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_3.svg
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7.png
index cef2fb2..cef2fb2 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7.svg
index d7cb0d6..d7cb0d6 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7.svg
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7_1.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7_1.png
index 61bb388..61bb388 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7_1.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7_1.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7_1.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7_1.svg
index bca4cc6..bca4cc6 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7_1.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7_1.svg
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7_2.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7_2.png
index 1e7a3b5..1e7a3b5 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7_2.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7_2.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7_2.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7_2.svg
index 1b66972..1b66972 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_7_2.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_7_2.svg
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_8.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_8.png
index 0407532..0407532 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_8.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_8.png
diff --git a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_8.svg b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_8.svg
index 0407209..0407209 100755
--- a/doc/book-enea-nfv-access-reference-guide-intel/doc/images/screen_8.svg
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/screen_8.svg
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/images/select_relversion.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/select_relversion.png
index cb93357..31b3458 100755
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/images/select_relversion.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/select_relversion.png
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/images/vnf_space.png b/doc/book-enea-nfv-access-ucpe-solution/doc/images/vnf_space.png
index 3b8368a..d4f8fde 100755
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/images/vnf_space.png
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/images/vnf_space.png
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/installation.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/installation.xml
deleted file mode 100644
index 4242abe..0000000
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/installation.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="installation">
-  <title>Installing the Solution</title>
-
-  <section id="elem_center">
-    <title>uCPE Manager/ElementCenter</title>
-
-    <para>Unpack the ElementCenter and install it by following the
-    instructions provided within the release archive:
-    <literal>[unpacked_folder]/dist/README.</literal>For more detailed
-    information about the ElementCenter, please see the Element Center
-    Installation Guide available within the
-    <filename>DeveloperDocs.zip</filename> archive.</para>
-
-    <para>There are a few things to consider during the installation phase, as
-    there are a few steps where user input is required. In most cases, the
-    default values should be used.</para>
-
-    <para>For demo purposes, use the internal PostgreSQL database (which
-    defaults to Y), and not the machine as part of a cluster (which defaults
-    to N). Installing on a Windows machine, will require the user to follow
-    the Windows password policies when defining the password for the <emphasis
-    role="bold">ucpemanager</emphasis> service. A default password will not be
-    accepted. A good example for an acceptable password would be:
-    <emphasis>_1ucpe#2manager!3_</emphasis>.</para>
-
-    <para>Check that the Windows or CentOS machine where the uCPE Manager is
-    installed has the firewall disabled. To disable the firewall, if using
-    Windows 10, go to the Control Panel, then inside <literal>Network &amp;
-    Internet</literal> and <literal>Firewall &amp; Network
-    Protection</literal>, disable the firewall for "Domain network" and
-    "Private network".</para>
-  </section>
-
-  <section id="ena">
-    <title>NFV Access</title>
-
-    <para>The current NFV Access release supports two methods of installation:
-    automatic (using the NFV Access installer) and manual installation (only
-    for advanced users).</para>
-
-    <para>Enea recommends using the NFV Access installer in order to guarantee
-    a clean installation of NFV Access on the device. Manual installation is
-    best suited for situations where the user needs to upgrade or install NFV
-    Access on an existing partition without affecting the its current
-    setup.</para>
-
-    <para>Please see <olink targetdoc="book_enea_nfv_access_guide_intel"
-    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_guide_intel/1)" /></olink> , within
-    the Enea NFV Access Guide provided with your release, for details on
-    installing NFV Access automatically. For more details about NFV Access,
-    please see the <xi:include
-    href="../../s_docbuild/olinkdb/pardoc-common.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_guide_intel/1)" /> included with
-    your release.</para>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/introduction.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/introduction.xml
index 8cba646..107419e 100644
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/introduction.xml
@@ -14,13 +14,13 @@
   for important details about formats and how to do! The idea is that ELTF
   will auto-create/update it.</remark></para>
 
-  <para>The Enea Standalone uCPE GA solution seeks to demonstrate a means for
-  which a Network Functions Virtualization architecture can be created and
-  managed effectively, suited to your custom needs. It accomplishes this task
-  by teaming two key products together: NFV Access and the uCPE Manager. For
-  evaluation purposes, it also includes VNF examples.</para>
+  <para>Enea NFV Access seeks to demonstrate a means for which a Network
+  Functions Virtualization architecture can be created and managed
+  effectively, suited to your custom needs. It accomplishes this task
+  by teaming two key products together: NFV Access and the uCPE Manager.
+  For evaluation purposes, it also includes VNF examples.</para>
 
-  <para>The purpose of this EvalKit is the evaluation of the following
+  <para>The purpose of Enea NFV Access is the evaluation of the following
   features:</para>
 
   <itemizedlist>
@@ -33,7 +33,7 @@
     </listitem>
 
     <listitem>
-      <para>VNF On-boarding over NETCONF</para>
+      <para>VNF On-boarding over EdgeLink NETCONF</para>
     </listitem>
 
     <listitem>
@@ -50,7 +50,7 @@
   </itemizedlist>
 
   <section id="netconf">
-    <title>Enea NFV Access with EdgeLink NETCONF</title>
+    <title>Enea NFV Access</title>
 
     <para>Enea NFV Access is a lightweight, multi-architecture virtualization
     platform, supporting Virtual Machines (KVM / QEMU) and container(s)
@@ -69,25 +69,54 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="images/vnf_space.png" />
+          <imagedata align="center"
+                     fileref="images/vnf_space.png" scale="80"/>
         </imageobject>
       </mediaobject>
     </figure>
 
-    <para>Details on how to install and run NFV Access on a device, and a list
-    of supported devices, are available in the Getting Started with Enea NFV
-    Access chapter, within the Enea NFV Access Guide provided with your
-    release.</para>
+    <para>Enea NFV Access provides the following key features:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Low footprint</para>
+      </listitem>
+
+      <listitem>
+        <para>Fast boot</para>
+      </listitem>
+
+      <listitem>
+        <para>Datapath optimizations</para>
+      </listitem>
+
+      <listitem>
+        <para>SW update</para>
+      </listitem>
+
+      <listitem>
+        <para>Secure boot</para>
+      </listitem>
+
+      <listitem>
+        <para>In-band management</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For additional information about the features provided, or how to 
+    install and run the Enea NFV Access on supported devices, please refer to 
+    the Getting Started with Enea NFV Access chapter <remark>make this into 
+    an xref to the section/chapter</remark>.</para>
   </section>
 
   <section id="ucpe_manager">
     <title>Enea uCPE Manager</title>
 
-    <para>The Enea uCPE Manager provides a full FCAPS and VNF management
-    experience through a GUI and REST API, and must be installed on a host
-    machine. CentOS and Windows are supported host platforms by default. The
-    Manager uses a southbound NETCONF protocol to connect and manage uCPE
-    devices.</para>
+    <para>Enea uCPE Manager is a control center application providing a
+    full FCAPS and VNF management experience through a GUI and REST API. It
+    can be deployed on a host or a virtual machine. CentOS and Windows are
+    supported host platforms by default. The uCPE Manager uses a southbound
+    EdgeLink NETCONF protocol to connect and manage uCPE devices.</para>
 
     <para>Enea uCPE Manager provides the following key features:</para>
 
@@ -112,5 +141,9 @@
         <para>Alarms / Events management and monitoring</para>
       </listitem>
     </itemizedlist>
+
+    <para>For detailed information about features provided by the uCPE Manager 
+    please refer to the <literal>DeveloperDocs</literal> provided with your 
+    release.</para>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/prerequisites.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/prerequisites.xml
index 6e484e3..a7c013e 100644
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/prerequisites.xml
+++ b/doc/book-enea-nfv-access-ucpe-solution/doc/prerequisites.xml
@@ -1,26 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="prerequisites">
   <title>Prerequisites</title>
-
-  <para>The following must be present so that the uCPE Manager can function
-  accordingly on your host platorm:</para>
+  <para>Listed below are the main generic prerequisites required so that NFV Access can be deployed on your host platform:</para>
 
   <itemizedlist>
     <listitem>
-      <para>Two boards running NFV Access.</para>
-    </listitem>
-
-    <listitem>
-      <para>At least one network connection between these two boards.</para>
-    </listitem>
-
-    <listitem>
-      <para>A machine running either Windows or CentOS, which can connect to
-      the boards running Enea NFV Access.</para>
+      <para>A physical device that supports NFV Access.</para>
     </listitem>
 
     <listitem>
-      <para>USB stick of at least 2 GB.</para>
+      <para>A machine running either Windows or CentOS with network access to the physical device.</para>
     </listitem>
   </itemizedlist>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-ucpe-solution/doc/troubleshooting.xml b/doc/book-enea-nfv-access-ucpe-solution/doc/troubleshooting.xml
deleted file mode 100644
index f74bbb6..0000000
--- a/doc/book-enea-nfv-access-ucpe-solution/doc/troubleshooting.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="troubleshooting">
-  <title>Troubleshooting</title>
-
-  <para>Information concerning troubleshooting help and guidance is available
-  in this release of the Enea NFV Access Guide, in the Troubleshooting section
-  within the Getting Started with Enea NFV Access chapter.</para>
-</chapter>
\ No newline at end of file