3 files changed, 49 insertions, 18 deletions

diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
index e9c80aa..fae9d07 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="relinfo-about-release">
@@ -34,6 +34,10 @@
       </listitem>
 
       <listitem>
+        <para>Enea_NFV_Access_AutomationFramework_&lt;version&gt;-build&lt;build_number&gt;.zip</para>
+      </listitem>
+
+      <listitem>
         <para>Enea_NFV_Access_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip</para>
       </listitem>
 
@@ -100,15 +104,17 @@
     <itemizedlist>
       <listitem>
         <para>Enea NFV Access Release Information. Describes the Enea NFV
-        Access release content.</para>
+        Access release content, main changes, the list of known issues and
+        limitations.</para>
       </listitem>
 
       <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_getting_started/1)" />.
-        Describes how to install the Enea uCPE Manager, the Enea NFV Access
-        Runtime platform and Device Management.</para>
+        Describes how to deploy and upgrade an Enea NFV Access base
+        configuration, advanced configurations of the system and
+        troubleshooting information.</para>
       </listitem>
 
       <listitem>
@@ -129,6 +135,11 @@
       </listitem>
 
       <listitem>
+        <para>Enea NFV Access Automation Framework User Guide. Describes the
+        Automation Framework for Enea NFV Access.</para>
+      </listitem>
+
+      <listitem>
         <para><xi:include 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)" />.
diff --git a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
index db430a0..a7d4d77 100644
--- a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
@@ -66,15 +66,22 @@
     </listitem>
 
     <listitem>
-      <para><remark>STCR-6224</remark>The Automation Framework and Test
-      Harness do not support multiple custom scripts uploaded to the device at
-      the same time.</para>
+      <para><remark>STCR-6224</remark>The Enea NFV Access Automation Framework
+      and the Enea NFV Access Automation Framework and Test Harness do not
+      support multiple custom scripts uploaded to a uCPE device at the same
+      time.</para>
     </listitem>
 
     <listitem>
       <para><remark>STCR-6292</remark>Management of WAN Interfaces is not
       implemented in the Automation Framework and Test Harness.</para>
     </listitem>
+    
+    <listitem>
+      <para><remark>USERDOCAP-628</remark>Enea NFV Access Automation Framework 
+        and Test harness does not have support for product features implemented 
+        in Enea NFV Access 2.4.0 or newer.</para>
+    </listitem>
 
     <listitem>
       <para><remark>ELCCR-912</remark>Adding an upgrade image into the Enea
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 625f163..57933e5 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="relinfo-changes">
@@ -16,6 +16,23 @@
 
     <itemizedlist>
       <listitem>
+        <para><remark>CPDX-3500</remark>The Enea NFV Access Automation Framework, 
+          a tool for automatic system configuration based on Python scripting 
+          that will replace the existing Enea NFV Access Automation Framework 
+          and Test Harness in the next major release.</para>
+
+        <para>The Enea NFV Access Automation Framework and Test Harness, and
+        its related documentation 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)" /> and 
+          the <xi:include 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)" /> 
+          are deprecated starting with Enea NFV Access 2.4.0.</para>
+      </listitem>
+
+      <listitem>
         <para><remark>CPDX-3385</remark>Support for managing multiple devices
         behind a NAT. This includes improvements to the call-home feature and
         the use of reverse SSH when creating an SSH session for a device
@@ -104,16 +121,6 @@
           assistance.</para>
         </note>
       </listitem>
-
-      <listitem>
-        <para>Automation Framework - Early Access, is a redesigned automation
-        framework that will replace the existing AF&amp;TH in the next major
-        release. The new automation framework has improved usability and an
-        extended automation feature set. It has to be downloaded separately as
-        it is not part of the standard Enea NFV Access 2.3 distribution. The
-        Automation Framework - Early Access distribution also includes updated
-        user documentation.</para>
-      </listitem>
     </itemizedlist>
 
     <para>Early Access features are provided for evaluation and early
@@ -154,6 +161,12 @@
         Provides license information pertaining to packages available with the
         AF-TH.</para>
       </listitem>
+
+      <listitem>
+        <para>Enea NFV Access Automation Framework Open Source Report.
+        Provides license information pertaining to packages available with the
+        Automation Framework.</para>
+      </listitem>
     </itemizedlist>
   </section>