3 files changed, 95 insertions, 53 deletions

diff --git a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
index 2590dec..80ae36b 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
@@ -291,9 +291,13 @@ userdel postgres</programlisting>
         </listitem>
 
         <listitem>
-          <para>Follow the installation instruction for the uCPE Manager
-          available in section <remark>add olink to section with ID
-          "install_ucpe_mg"</remark></para>
+          <para>Follow the installation steps for the uCPE Manager available
+          in <olink targetdoc="book_enea_nfv_access_getting_started"
+          targetptr="install_ucpe_mg">Installing the 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>
         </listitem>
       </orderedlist>
     </section>
@@ -401,7 +405,7 @@ userdel postgres</programlisting>
 
         <orderedlist>
           <listitem>
-            <para>Unzip
+            <para>Extract
             <literal>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
 
             <para>The directory in which the archive has been unpacked will be
@@ -430,15 +434,15 @@ userdel postgres</programlisting>
             <programlisting>./install.sh /opt/ems \
 Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
 
-            <para>Use the default configuration values specified below in the
-            interactive install command in brackets. For these types of
-            entries, pressing <literal>ENTER</literal> will suffice. When
-            there is an option within brackets (i.e. Y/N), a value must be
+            <para>The default configuration values are specified in brackets.
+            If no other value is preferred and typed in, pressing
+            <literal>ENTER</literal> will keep the default values. When there
+            is an option within parentheses (i.e.Y/N), a value must be
             specified.</para>
 
             <note>
-              <para>The same configuration values will need to be provided
-              when upgrading or uninstalling the uCPE Manager.</para>
+              <para>The same configuration values set now will need to be
+              provided when upgrading or uninstalling the uCPE Manager.</para>
             </note>
 
             <itemizedlist>
@@ -453,32 +457,32 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
                   <listitem>
                     <para>Specify the database process password
-                    <literal>[postgres]</literal></para>
+                    <literal>[postgres]:</literal></para>
                   </listitem>
 
                   <listitem>
                     <para>Specify the database ID (or name)
-                    <literal>[ucpemanager]</literal></para>
+                    <literal>[ucpemanager]:</literal></para>
                   </listitem>
 
                   <listitem>
                     <para>Specify the database server port
-                    <literal>[5432]</literal></para>
+                    <literal>[5432]:</literal></para>
                   </listitem>
 
                   <listitem>
-                    <para>Specify the database user name
-                    <literal>[postgres]</literal></para>
+                    <para>Specify a database user name
+                    <literal>[postgres]:</literal></para>
                   </listitem>
 
                   <listitem>
-                    <para>Specify database password
-                    <literal>[postgres]</literal></para>
+                    <para>Specify a database password
+                    <literal>[postgres]:</literal></para>
                   </listitem>
 
                   <listitem>
-                    <para>Specify database startup thread pool size
-                    <literal>[1]</literal></para>
+                    <para>Specify the database startup thread pool size
+                    <literal>[1]:</literal></para>
                   </listitem>
                 </itemizedlist>
               </listitem>
@@ -488,13 +492,13 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
                 <itemizedlist spacing="compact">
                   <listitem>
-                    <para>Specify service username
-                    [<literal>ucpemanager</literal>]</para>
+                    <para>Specify a service username
+                    [<literal>ucpemanager</literal>]:</para>
                   </listitem>
 
                   <listitem>
-                    <para>Specify service password
-                    <literal>[ucpemanager</literal>]</para>
+                    <para>Specify a service password
+                    <literal>[ucpemanager</literal>]:</para>
                   </listitem>
                 </itemizedlist>
               </listitem>
@@ -521,8 +525,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
                 <itemizedlist spacing="compact">
                   <listitem>
-                    <para>Please enter the new Maximum Heap Size: <literal>4
-                    GB</literal>.</para>
+                    <para>Please enter the new Maximum Heap Size
+                    [<literal>4g]</literal>:</para>
                   </listitem>
                 </itemizedlist>
               </listitem>
@@ -588,8 +592,14 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           different from the uCPE Manager snapshot obtained during a uCPE
           Manager Upgrade or Uninstall operation
           (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
-          for recovery of the uCPE Manager.<remark>add olink to section with
-          id "restore_prev_ucpe_install"</remark></para>
+          for recovery of the uCPE Manager. For more details please see <olink
+          targetdoc="book_enea_nfv_access_getting_started"
+          targetptr="restore_prev_ucpe_install">Restoring a previous uCPE
+          Manager installation 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>
         </note>
 
         <para>To install the uCPE Manager with the restore option provide an
diff --git a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml b/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
index fc2350a..9bf8822 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
@@ -4,9 +4,13 @@
 
   <para>The following is a small list of possible NFV Access problems, and
   their solutions. <emphasis role="bold">In all scenarios collect the logs if
-  possible for a later debugging.</emphasis> More information on log
-  collecting can be found in <remark>add an olink to the log collector chapter
-  after the olink update</remark>.</para>
+  possible for debugging.</emphasis> More information on log collecting can be
+  found in <olink targetdoc="book_enea_nfv_access_getting_started"
+  targetptr="log_collector">Using the Log Collector 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>
 
   <para>If you encounter other issues or can't get NFV Access to work
   successfully after consulting the information below, please use the <olink
@@ -14,7 +18,7 @@
   targetptr="contacting_enea_support">Enea Support team Form, available 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_release_info/1)" /></olink> manual
+  xpointer="element(book_enea_nfv_access_release_info/1)" /></olink> Manual
   downloaded with your release.</para>
 
   <table>
@@ -43,9 +47,14 @@
               </listitem>
 
               <listitem>
-                <para>Reinitiate the Upgrade procedure according to
-                <remark>(Link to NFV Access Getting Started -Device
-                Upgrade)</remark>.</para>
+                <para>Reinitiate the Upgrade procedure according to the steps
+                in section <olink
+                targetdoc="book_enea_nfv_access_getting_started"
+                targetptr="upgrade_devices">uCPE device upgrades 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>
               </listitem>
             </orderedlist></entry>
         </row>
@@ -56,9 +65,13 @@
 
           <entry>Reinstall NFV Access on the uCPE device and redeploy the
           initial configuration and virtualized services, by following the
-          Getting Started Guide.<remark>add link to Install uCPE Device.
-          Retitle it if need be or point to specific chapter in book with
-          olink</remark></entry>
+          steps in <olink targetdoc="book_enea_nfv_access_getting_started"
+          targetptr="install_ena_device">Installing Enea NFV Access - uCPE
+          Device installation 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.</entry>
         </row>
 
         <row>
@@ -76,17 +89,21 @@
               </listitem>
 
               <listitem>
-                <para>Restore the previous installation as described in</para>
-
-                <remark>olink to the section/chapter: link to Restore a
-                previous uCPE Manager Installation</remark>
+                <para>Restore the previous installation as described in <olink
+                targetdoc="book_enea_nfv_access_getting_started"
+                targetptr="restore_prev_ucpe_install">Restoring a previous
+                uCPE Manager installation 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>
               </listitem>
             </orderedlist></entry>
         </row>
 
         <row>
           <entry>The uCPE Manager upgrade fails and no working snapshot is
-          available.</entry>
+          available, but a System Back-up file exists.</entry>
 
           <entry><orderedlist>
               <listitem>
@@ -96,11 +113,15 @@
               </listitem>
 
               <listitem>
-                <para>Perform a installation with the restore option of a
-                previous uCPE Manager configuration as described in</para>
-
-                <remark>olink to the section/chapter describing: Installing
-                with the restore option.</remark>
+                <para>Perform an installation with the restore option of a
+                previous uCPE Manager configuration as described in <olink
+                targetdoc="book_enea_nfv_access_getting_started"
+                targetptr="install_ucpemg_from_backup">Installation of the
+                uCPE Manager using a System Back-up 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>
               </listitem>
             </orderedlist></entry>
         </row>
@@ -129,8 +150,14 @@
 
               <listitem>
                 <para>If the above actions do not work, reinstall and
-                reconfigure the device using the steps provided in the
-                <remark>Installing the uCPE device (add link)</remark></para>
+                reconfigure the device using the steps provided in <olink
+                targetdoc="book_enea_nfv_access_getting_started"
+                targetptr="install_ena_device">Installing Enea NFV Access -
+                uCPE Device installation 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>
               </listitem>
             </orderedlist></entry>
         </row>
@@ -141,8 +168,13 @@
 
           <entry>Perform a hardware reboot on the uCPE device. If the problem
           is not fixed, reinstall and reconfigure the device using the steps
-          provided in the <remark>Installing the uCPE device (add
-          link)</remark></entry>
+          provided in <olink targetdoc="book_enea_nfv_access_getting_started"
+          targetptr="install_ena_device">Installing Enea NFV Access - uCPE
+          Device installation 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.</entry>
         </row>
 
         <row>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml b/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
index 61e1306..0876709 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
@@ -17,7 +17,7 @@
 
     <orderedlist>
       <listitem>
-        <para>Unzip the
+        <para>Extract the
         <filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         folder.</para>
 
@@ -77,7 +77,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
       <orderedlist>
         <listitem>
-          <para>Unzip
+          <para>Extract
           <filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
         </listitem>