4 files changed, 26 insertions, 28 deletions

diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
index d550178..31e8edb 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
@@ -74,8 +74,7 @@
     <section id="lic_0">
       <title>ENEA-SRC-R2</title>
 
-      <para><programlisting>
- Copyright (C) 2019 by Enea.
+      <para><programlisting> Copyright (C) 2019 by Enea.
  All rights reserved.
 
  This Software is furnished under a software license agreement and
@@ -87,15 +86,13 @@
  This Software consists of confidential information.
  Trade secret law and copyright law protect this Software.
  The above notice of copyright on this Software does not indicate
- any actual or intended publication of such Software.
-</programlisting></para>
+ any actual or intended publication of such Software.</programlisting></para>
     </section>
 
     <section id="lic_1">
       <title>ENEA-EXAMPLE-R2</title>
 
-      <para><programlisting>
- Copyright (C) 2019 by Enea Software AB.
+      <para><programlisting> Copyright (C) 2019 by Enea Software AB.
  All rights reserved.
 
  This Example is furnished under a Software License Agreement and
@@ -109,8 +106,7 @@
  DISCLAIMER
  This Example is delivered "AS IS", consequently
  Enea Software AB makes no representations or warranties,
- expressed or implied, for the Example.
-</programlisting></para>
+ expressed or implied, for the Example.</programlisting></para>
     </section>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index d2c686a..4ab9cd1 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -583,19 +583,19 @@ Options:
 
         <programlisting>{
  "name": "intelc3850-2",
- "deviceId": "intelc3850-2",
  "deviceGroupingTags": " ",
  "description": "",
- "address": "192.168.1.100",
+ "address": "172.24.12.114",
+ "version": "2.3.0",
  "port": "22",
  "username": "root",
  "password": "root",
  "certificate": null,
  "passphrase": null,
  "callHome": "false",
- "maintMode": "false"
-}
-</programlisting>
+ "maintMode": "false",
+ "deviceId": "intelc3850-2"
+}</programlisting>
       </section>
 
       <section id="run_py_mod">
@@ -2429,11 +2429,11 @@ phase always-after-startup from inteld1521-6
         <para>Example of a <filename>CONFIGSTORE</filename> json file:</para>
 
         <programlisting>{
-"descr": "intelc3850-2",
-"version": "2.2.2",
-"deviceGroupingTags": "",
-"deviceId": "intelc3850-2",
-"name": "intelc3850-2"
+ "descr": "intelc3850-2",
+ "version": "2.3.0",
+ "deviceGroupingTags": "",
+ "deviceId": "intelc3850-2",
+ "name": "intelc3850-2"
 }</programlisting>
       </section>
 
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 884ea18..9b775a7 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
@@ -34,7 +34,7 @@
       <para>For more on Enea uCPE Manager installation instructions, please
       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 the
+      targetptr="install_ucpe_mg">Installing the Enea uCPE Manager in the
       <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
@@ -72,8 +72,9 @@
 
       <para>For more on Enea NFV Access installation instructions, please
       refer to chapter <olink targetdoc="book_enea_nfv_access_getting_started"
-      targetptr="access_installer">Getting Started with Enea NFV Access in the
-      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      targetptr="prep_usb_ena">Preparing the USB stick for installation of the
+      Enea NFV Access Runtime Platform in the <xi:include
+      href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
       Manual.</para>
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 735b7a9..4a3fb31 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
@@ -52,10 +52,11 @@
           </imageobject>
         </mediaobject>
       </figure>The following enviroment setup is needed for running all tests
-    defined in the <xi:include
-    href="../../s_docbuild/olinkdb/pardoc-common.xml"
+    defined in the <olink targetdoc="book_enea_nfv_access_getting_started"
+    targetptr="install_ucpe_mg">Installing the Enea uCPE Manager in the
+    <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_system_test_specification/1)" />
+    xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
     manual:</para>
 
     <para><emphasis role="bold">Lab Network
@@ -87,8 +88,8 @@
         <note>
           <para>For details on how to install the uCPE Manager, see <olink
           targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="install_ucpe_manager">Install the Enea uCPE Manager in
-          the <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          targetptr="install_ucpe_mg">Installing the Enea uCPE Manager in the
+          <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
           Manual.</para>
@@ -116,8 +117,8 @@
           <note>
             <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 the <xi:include
+            targetptr="prep_usb_ena">Preparing the USB stick for installation
+            of the Enea NFV Access Runtime Platform in the <xi:include
             href="../../s_docbuild/olinkdb/pardoc-names.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
             xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>