Updates and clarification of AF-TH manual.

Change-Id: I8d59b9eacf0b652ff6cf4075406ce036f79fd6be

1 files changed, 36 insertions, 23 deletions

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 2fecf5b..28abdd3 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
@@ -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>Enea NFV Access is comprised of the Enea uCPE Manager and the Enea
+    NFV Access Run Time Platform.</para>
 
     <section id="eucpe_manager">
       <title>Enea uCPE Manager</title>
@@ -32,25 +32,29 @@
       used in testing.</para>
 
       <para>For more on Enea uCPE Manager installation instructions, please
-      refer to chapter "Getting Started with Enea uCPE Manager" from the Enea
-      NFV Access Getting Started manual.</para>
+      refer to the section on how to <olink
+      targetdoc="book_enea_nfv_access_getting_started"
+      targetptr="install_ucpe_manager">Install the Enea uCPE Manager 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>
     </section>
 
     <section id="ena_plat">
-      <title>Enea NFV Access Run time Platform</title>
+      <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 Enea NFV Access Run Time
+      Platform are required as hosts to run 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>
+      <para>Adding a VcpeAgent device can be done via two methods:</para>
 
       <itemizedlist>
         <listitem>
           <para>Through the uCPE Manager GUI. Add the device using the
-          appropriate parameters by launching the UI under Devices -&gt;
-          Manage in the main screen.</para>
+          appropriate parameters by launching the UI under
+          <literal>Devices</literal> -&gt; <literal>Manage</literal> in the
+          main screen.</para>
         </listitem>
 
         <listitem>
@@ -60,8 +64,11 @@
       </itemizedlist>
 
       <para>For more on Enea NFV Access installation instructions, please
-      refer to chapter "Getting Started with Enea NFV Access" from the Enea
-      NFV Access Getting Started manual.</para>
+      refer to chapter <olink targetdoc="book_enea_nfv_access_getting_started"
+      targetptr="access_installer">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>
     </section>
   </section>
 
@@ -74,9 +81,9 @@
     unit-test suite that is able to automatically run test-cases defined for
     each available Python script.</para>
 
-    <para>In either case, it is desirable to use a third system (instead of
+    <para>In either case, it is desirable to use a different host (instead of
     running the tests on the same system as the uCPE Manager) in order to
-    ensure that uCPE Manager is setup and installed correctly in terms of
+    ensure that the uCPE Manager is setup and installed correctly in terms of
     allowing external users to access it and use it effectively.</para>
   </section>
 
@@ -94,25 +101,31 @@
     <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
+        that acts as basic smoke tests for Enea NFV Access and also as a
         sanity-check test suite for the AF and TH.</para>
       </listitem>
 
       <listitem>
         <para>VNF Deployment and Lifecycle. A sample test suite that verifies
-        the instantiation, lifecycle control and destruction of a VNF for the
-        Enea NFV Access.</para>
+        the instantiation, lifecycle control and destruction of a VNF for Enea
+        NFV Access.</para>
       </listitem>
 
       <listitem>
-        <para>Service Creation and Lifecycle: A sample test suite that
+        <para>Service Creation and Lifecycle. A sample test suite that
         contains complex test cases showcasing service creation and lifecycle
         management.</para>
       </listitem>
     </itemizedlist>
 
-    <para>For details about the test suites or test cases please refer to the
-    chapter "Sample Test Cases" from the Enea NFV Access System Test
-    Specification document.</para>
+    <para>For details about the test suites or test cases please refer to
+    chapter <olink targetdoc="book_enea_nfv_access_system_test_specification"
+    targetptr="sample_testcases">Sample Test Cases 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>
+
+    <remark>this olink needs to be fixed it points to getting started not the
+    test spec manual, an olinkdb update is needed to know why.</remark>
   </section>
 </chapter>
\ No newline at end of file