Updated all books to now reference Manual instead of manualfeature_CPDX-3405

where relevant.
Updated the Getting started and Release Notes Manuals with
info regarding HA, hiding references for Early Access only
clients.

Change-Id: Ie7b53c62ccef69547f9b71c6acd637960f50b34d
Signed-off-by: mrpa <miruna.paun@enea.com>

11 files changed, 58 insertions, 48 deletions

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 eee6636..6f029f7 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
@@ -56,7 +56,7 @@
     href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xpointer="element(book_enea_nfv_access_system_test_specification/1)" />
-    manual:</para>
+    Manual:</para>
 
     <para><emphasis role="bold">Lab Network
     Requirements</emphasis><itemizedlist spacing="compact">
diff --git a/doc/book-enea-nfv-access-evalkit/doc/introduction.xml b/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
index 1e84ed4..afa5fc6 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
@@ -34,7 +34,7 @@
   flexiWAN and pfSense VNFs service chained together on a uCPE device.</para>
 
   <para>This document will present all information required to replicate the
-  use case described in the user's environment. The first part of this manual
+  use case described in the user's environment. The first part of this Manual
   uses the GUI mode of the uCPE Manager to detail the steps in order to
   reproduce the use cases, while the chapters thereafter use the automation
   framework.</para>
@@ -46,7 +46,7 @@
     are described in Appendix A.</para>
 
     <para>This document assumes the user is familiar with Enea NFV Access and
-    has read the Enea NFV Access Getting Started manual before continuing with
+    has read the Enea NFV Access Getting Started Manual before continuing with
     the following.</para>
   </note>
 
diff --git a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
index d2254f0..fca409c 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
@@ -53,9 +53,9 @@
                 </listitem>
 
                 <listitem>
-                  <para>NFV Access installed on both uCPE devices. Please see
-                  <emphasis>Enea NFV Access Getting Started</emphasis> Manual,
-                  chapter "Getting Started with Enea NFV Access" for more
+                  <para>Enea Edge installed on both uCPE devices. Please see
+                  <emphasis>Enea Edge Getting Started</emphasis> Manual,
+                  chapter "Getting Started with Enea Edge" for more
                   details.</para>
                 </listitem>
               </itemizedlist>
diff --git a/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml b/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
index d157c06..f14805b 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
@@ -18,7 +18,7 @@
   <note>
     <para>All tests are just examples. In order to run on user specific
     devices they need to be updated accordingly. Please check the Enea NFV
-    Access System Test Specification manual for more details.</para>
+    Access System Test Specification Manual for more details.</para>
   </note>
 
   <programlisting>&gt; cd automation_framework/unittestSuite/
diff --git a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
index 0fef6bb..eab7eda 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
@@ -78,19 +78,19 @@
 
       <listitem>
         <para>Install NFV Access on the uCPE devices. See the <remark>make
-        this into an olink</remark> Enea NFV Access Getting Started manual,
-        chapter Getting Started with the Enea NFV Access, for more
+        this into an olink</remark>Enea NFV Access Getting Started Manual,
+        chapter "Getting Started with the Enea NFV Access", for more
         details.</para>
       </listitem>
 
       <listitem>
-        <para>Install the uCPE Manager on the CentOS host or VM. See the
+        <para>Install the Enea uCPE Manager on the CentOS 7 host or VM. See the
         <remark>make this into an olink</remark> Enea NFV Access Getting
-        Started manual, chapter Getting Started with Enea uCPE Manager, for
+        Started Manual, chapter "Getting Started with Enea uCPE Manager", for
         more details.</para>
 
         <note>
-          <para>The uCPE Manager host machine must be connected to the network
+          <para>The Enea uCPE Manager host machine must be connected to the network
           so all uCPE devices can access it.</para>
         </note>
       </listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
index cb0ae5b..71ee775 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
@@ -421,7 +421,7 @@ node0.1048576kB = 3 </programlisting>
     </section>
   </section>
 
-  <section id="high_availability_ig">
+  <section condition="hidden" id="high_availability_ig">
     <title>Installing the Enea uCPE Manager in High Availability Mode</title>
 
     <para>The following describes the setup needed for running the Enea uCPE
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 67aff16..981b536 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
@@ -103,7 +103,7 @@
         the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_release_info/1)" />
-        manual.</para>
+        Manual.</para>
 
         <para>Enea NFV Access needs EFI support in BIOS to boot. When
         configuring the uCPE device BIOS a serial connection is
@@ -127,7 +127,7 @@
             server and the laptop is required. 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_release_info/1)" /> manual
+            xpointer="element(book_enea_nfv_access_release_info/1)" /> Manual
             available with your release, for recommended browsers.</para>
           </listitem>
         </itemizedlist>
@@ -189,7 +189,7 @@ sudo systemctl mask now firewalld</programlisting>
 
               <entry>UDP</entry>
 
-              <entry>Required for the Enea uCPE Manager High Availability
+             <entry condition="hidden">Required for the Enea uCPE Manager High Availability
               Configuration.</entry>
             </row>
 
@@ -198,7 +198,7 @@ sudo systemctl mask now firewalld</programlisting>
 
               <entry>TCP</entry>
 
-              <entry>Required for the Enea uCPE Manager High Availability
+              <entry condition="hidden">Required for the Enea uCPE Manager High Availability
               Configuration.</entry>
             </row>
 
@@ -473,8 +473,7 @@ userdel postgres</programlisting>
 
         <orderedlist>
           <listitem>
-            <para>Extract
-            <literal>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
+            <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
             denoted as: <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
@@ -572,10 +571,10 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
                 </itemizedlist>
               </listitem>
 
-              <listitem>
+              <listitem condition="hidden">
                 <para>High Availability Configurations:</para>
 
-                <itemizedlist spacing="compact">
+                <itemizedlist>
                   <listitem>
                     <para>Specify the IP address of the local interface: The
                     CentOS 7 Server loopback address:
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 5f8a5ad..dedfe37 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
@@ -45,7 +45,7 @@
     </itemizedlist>
 
     <para>In addition, Enea NFV Access also includes a software framework for
-    Automation and Testing (AFTH). More information can be found in
+    Automation and Testing (AFTH). More information can be found in the 
     <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" />.</para>
@@ -54,7 +54,7 @@
     structure, are provided in the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_release_info/1)" /> manual included
+    xpointer="element(book_enea_nfv_access_release_info/1)" /> Manual included
     with your release.</para>
 
     <section id="nfv_access">
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 9f9a50d..eae371e 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
@@ -81,7 +81,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
     Manual contains information about the input required to be entered during
     the execution of the upgrade script.</para>
 
-    <para>For an example on how to upgrade an Enea uCPE Manager installation
+    <para condition="hidden">For an example on how to upgrade an Enea uCPE Manager installation
     in a High Availability setup, consult <olink
     targetdoc="book_enea_nfv_access_getting_started"
     targetptr="ha_upgrade">Upgrading a High Availability Deployment in the
diff --git a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
index 10faf28..075d655 100644
--- a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
@@ -26,16 +26,11 @@
       </listitem>
 
       <listitem>
-        <para><remark>CPDX-3498</remark>High Availability support with redundant 
-                Enea uCPE Managers in active standby configuration.</para>              
-      </listitem>
-
-      <listitem>
         <para><remark>CPDX-3407</remark>HTTPS based downloads of VNFs for
         simplified deployment of the Enea uCPE Manager in cloud
         environments.</para>
       </listitem>
-          
+
       <listitem>
         <para><remark>CPDX-3500</remark>The Enea NFV Access Automation
         Framework, a tool for automatic system configuration based on Python
@@ -51,7 +46,7 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_system_test_specification/1)" />
         are deprecated starting with Enea NFV Access 2.4.0.</para>
-      </listitem>         
+      </listitem>
     </itemizedlist>
 
     <para><emphasis role="bold">Improvements:</emphasis></para>
@@ -75,13 +70,29 @@
 
     <para><emphasis role="bold">Early Access Features:</emphasis></para>
 
-    <para>The following Early Access features are included in this release
-    (made originally available with Enea NFV Access 2.3.0):</para>
+    <para>The following Early Access features are included in this
+    release:</para>
 
     <itemizedlist>
       <listitem>
+        <para><remark>CPDX-3498</remark>High Availability support with
+        redundant Enea uCPE Managers in active standby configuration.</para>
+
+        <para>In order to increase resiliency on the uCPE management side, 
+          the Enea uCPE Manager can be installed in High-Availability mode. 
+          Deployment consists of multiple instances of the Enea uCPE Manager, 
+          which can be distributed across different Data Centers and 
+          geographical locations, and with multiple MariaDB servers for 
+          each location.</para>
+      </listitem>
+
+      <listitem>
         <para>Platform and VNF Snapshots:</para>
 
+        <note>
+          <para>Made originally available with Enea NFV Access 2.3.0.</para>
+        </note>
+
         <itemizedlist>
           <listitem>
             <para>Platform Snapshots allow users to store, manage and restore
@@ -124,33 +135,33 @@
     <itemizedlist>
       <listitem>
         <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xpointer="element(book_enea_nfv_access_platform_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_platform_open_source/1)" />.</para>
       </listitem>
 
       <listitem>
         <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xpointer="element(book_enea_nfv_access_ucpem_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_ucpem_open_source/1)" />.</para>
       </listitem>
-          
-          <listitem>
+
+      <listitem>
         <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xpointer="element(book_enea_nfv_access_telemetry_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_telemetry_open_source/1)" />.</para>
       </listitem>
 
       <listitem>
         <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xpointer="element(book_enea_nfv_access_auto_fw_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_auto_fw_open_source/1)" />.</para>
       </listitem>
 
       <listitem>
         <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
-      </listitem>         
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)" />.</para>
+      </listitem>
     </itemizedlist>
   </section>
 
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 2fa087b..808ee22 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
@@ -1542,7 +1542,7 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
 
       <para><emphasis role="bold">Description:</emphasis> This sample test
       case corresponds to the "VNF Chaining Example Use-case" from the Enea
-      NFV Access Example Use-cases manual.</para>
+      NFV Access Example Use-cases Manual.</para>
 
       <para>For details please refer to:</para>
 
@@ -1688,7 +1688,7 @@ ansible_pass=root</programlisting></para>
           <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
-          manual for additional information about preconditions.</para>
+          Manual for additional information about preconditions.</para>
         </listitem>
       </itemizedlist>