6 files changed, 203 insertions, 249 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 0f5e5e5..171a5fa 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
@@ -4,12 +4,16 @@
 <chapter id="relinfo-about-release">
   <title>About This Release</title>
 
-  <para>Enea NFV Access <xi:include href="eltf_params_updated.xml"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /> includes following
-  components:<remark>INFO <emphasis
-  role="bold">eltf_params_updated.xml</emphasis> contains many parameters in
-  the book, also in the open source books, and MUST be created FROM <emphasis
+  <para>This release of Enea NFV Access <xi:include
+  href="eltf_params_updated.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /> includes optimizations to the
+  FCAPS framework, DPDK, cross-developement on both an SDK and an eSDK,
+  USB-stick based installation options, and various other optimizations,
+  security patches and documentation updated accordingly.</para>
+
+  <para><remark> INFO <emphasis role="bold">eltf_params_updated.xml</emphasis>
+  contains many parameters in the book, also in the open source books, and
+  MUST be created FROM <emphasis
   role="bold">eltf_params_template.xml</emphasis>. The parameters are
   automatically used in the books, via xi:include statements, similar to how
   parameters from pardoc-distro.xml are included in the book. Read the file
@@ -17,84 +21,12 @@
   for important details about formats and how to do! The idea is that ELTF
   will auto-create/update it.</remark></para>
 
-  <itemizedlist>
-    <listitem>
-      <para>DPDK 18.02</para>
-    </listitem>
-
-    <listitem>
-      <para>OVS 2.9</para>
-    </listitem>
-
-    <listitem condition="intel">
-      <para>Element ODM: FCAPS framework with NETCONF and Yang</para>
-    </listitem>
-
-    <listitem>
-      <para>Edge Link Netconf (beta): NETCONF based VNF lifecycle Management
-      Tool</para>
-    </listitem>
-
-    <listitem>
-      <para>Extended Tools Feature Set:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>python-pip</para>
-        </listitem>
-
-        <listitem>
-          <para>dosfstools</para>
-        </listitem>
-
-        <listitem>
-          <para>htop</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Unified cross-development SDK for host and virtualized
-      environments</para>
-    </listitem>
-
-    <listitem>
-      <para>Native toolchain support on development image</para>
-    </listitem>
-
-    <listitem>
-      <para>USB-stick based installation</para>
-    </listitem>
-
-    <listitem>
-      <para>Product Maintenance:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Optimizations</para>
-        </listitem>
-
-        <listitem>
-          <para>Security patches</para>
-        </listitem>
-
-        <listitem>
-          <para>Bug fixes</para>
-        </listitem>
-
-        <listitem>
-          <para>Updated documentation</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-  </itemizedlist>
-
   <section id="release-content">
     <title>Enea NFV Access Release Content</title>
 
-    <para>The current release contains along with other items, documentation,
-    pre-built kernels and images, a bootloader and a SDK. The directory
-    structure is detailed below:</para>
+    <para>The current release contains documentation, prebuilt kernels and
+    images, a bootloader, an SDK and an eSDK. The directory structure is
+    detailed below:</para>
 
     <programlisting condition="intel">-- documentation/
    /* Enea NFV Access documentation */
@@ -185,9 +117,9 @@
     <para>For each combination of image and target, the following set of
     artifacts is available:</para>
 
-    <programlisting condition="arm">-- Image
+    <programlisting condition="intel">-- bzImage
    /* kernel image */
--- Image-target.bin
+-- bzImage-target.bin
    /* kernel image, same as above */
 -- config-target.config
    /* kernel configuration file */
@@ -200,11 +132,13 @@
 -- image-name-target.tar.gz
    /* tar archive of the image */
 -- modules-&lt;target&gt;.tgz
-   /* external kernel modules */</programlisting>
+   /* external kernel modules */
+-- grub-efi-bootx64.efi
+   /* GRUB EFI file */</programlisting>
 
-    <programlisting condition="intel">-- bzImage
+    <programlisting condition="arm">-- Image
    /* kernel image */
--- bzImage-target.bin
+-- Image-target.bin
    /* kernel image, same as above */
 -- config-target.config
    /* kernel configuration file */
@@ -217,9 +151,7 @@
 -- image-name-target.tar.gz
    /* tar archive of the image */
 -- modules-&lt;target&gt;.tgz
-   /* external kernel modules */
--- grub-efi-bootx64.efi
-   /* GRUB EFI file */</programlisting>
+   /* external kernel modules */</programlisting>
   </section>
 
   <section id="relinfo-supported-host-environment">
@@ -247,69 +179,74 @@
               xpointer="element(eltf-target-tables-section)" />
 
   <section id="relinfo-provided-sdk">
-    <title>Provided Toolchain(s) (SDK)</title>
+    <title>Provided Toolchains</title>
 
-    <para>The provided SDK contains toolchains supporting cross-compilation of
-    applications for both the host and the guest targets on an <filename
-    condition="arm">arm64</filename><filename
-    condition="intel">x86-64</filename> machine.</para>
-
-    <para><remark>(Possibly add this in later) See the <trademark
-    class="registered">Enea</trademark> NFV Access Application Development
-    Guide for information on how to build and install a
-    toolchain.</remark></para>
+    <para>The provided SDK and eSDK contain toolchains supporting
+    cross-compilation of applications for both the host and the guest targets
+    on an <filename condition="intel">x86-64</filename><filename
+    condition="arm">arm64</filename> machine.</para>
   </section>
 
   <section id="relinfo-documentation">
     <title>Provided Documentation</title>
 
-    <para>Enea NFV Access is provided with the following set of
+    <para>This release of Enea NFV Access contains the following set of
     documents:</para>
 
     <itemizedlist>
       <listitem>
-        <para>Enea NFV Access Release Information - This document, describing
-        the Enea NFV Access release content.</para>
+        <para>Enea NFV Access Release Information. Describes the Enea NFV
+        Access release content.</para>
       </listitem>
 
-      <listitem>
-        <para>Enea NFV Access Guide - A document describing how to use Enea
-        NFV Access, as well as use cases and benchmark results.</para>
+      <listitem condition="intel">
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_guide_intel/1)" />. Describes
+        how to use Enea NFV Access, provides use cases and benchmark
+        results.</para>
+      </listitem>
+
+      <listitem condition="arm">
+        <para><phrase><olink targetdoc="book_enea_nfv_access_guide">Enea NFV
+        Access Guide</olink></phrase>. Describes how to use Enea NFV Access,
+        provides use cases and benchmark results.</para>
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access Open Source Report - A document containing the
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_open_source/1)" />. Contains
         open source and license information pertaining to packages provided
         with Enea NFV Access.</para>
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access Development Open Source Report - A document
-        containing open source and license information pertaining to packages
-        provided with Enea NFV Access for application developers.</para>
+        <para>Enea NFV Access Development Open Source Report. Contains open
+        source and license information pertaining to packages provided with
+        Enea NFV Access for application developers.</para>
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access Guest Open Source Report - A document containing
-        open source and license information concerning packages provided with
-        Enea NFV Access for a guest target.</para>
+        <para>Enea NFV Access Guest Open Source Report. Contains open source
+        and license information concerning packages provided with Enea NFV
+        Access for a guest target.</para>
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access Guest Development Open Source Report - A
-        document detailing the open source and license information of packages
-        provided with Enea NFV Access for applications development on a guest
-        target.</para>
+        <para>Enea NFV Access Guest Development Open Source Report. Details
+        the open source and license information of packages provided with Enea
+        NFV Access for applications development on a guest target.</para>
       </listitem>
 
       <listitem condition="hidden">
-        <para>Enea NFV Access Test Report - The document that summarizes the
-        test results for the Enea NFV Access release.</para>
+        <para>Enea NFV Access Test Report. Summarizes the test results for the
+        Enea NFV Access release.</para>
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access Security Report - The document that lists all
-        security fixes included in the Enea NFV Access release.</para>
+        <para>Enea NFV Access Security Report. Lists all security fixes
+        included in this release of Enea NFV Access.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -320,4 +257,4 @@
     <para>A detailed list of all security patches included with this release
     is available in the Enea NFV Access Security Report document.</para>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated.xml
index 40bc8bf..d8ae98e 100644
--- a/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated.xml
@@ -42,7 +42,8 @@ export PATH=~/bin:$PATH</programlisting></para>
     correct also compared to the "previous" REL VER in pardoc-distro.xml
     "prev_baseline".</bridgehead>
 
-    <para id="EneaLinux_REL_VER"><phrase>1.1.1</phrase></para>
+    <para id="EneaLinux_REL_VER"><phrase condition="intel">2.0</phrase><phrase
+    condition="arm">1.1.1</phrase></para>
 
     <para id="Yocto_VER"><phrase>2.1</phrase></para>
 
@@ -94,116 +95,130 @@ repo sync</programlisting></para>
     <para>The table(s) below describes the target(s) supported in this Enea
     NFV Access release.</para>
 
-    <section id="eltf-target-table">
+    <table condition="intel">
       <title>MACHINE Information</title>
 
-      <para><informaltable condition="arm">
-          <tgroup cols="2">
-            <colspec colwidth="6*" />
+      <tgroup cols="2">
+        <colspec align="center" />
 
-            <colspec colwidth="9*" />
+        <thead>
+          <row>
+            <entry align="center">Component</entry>
 
-            <tbody>
-              <row>
-                <entry>Target official name</entry>
+            <entry align="center">Description</entry>
+          </row>
+        </thead>
 
-                <entry>OCTEON TX&trade; cn8304</entry>
-              </row>
+        <tbody>
+          <row>
+            <entry align="left">Target official name</entry>
 
-              <row>
-                <entry>Architecture and Description</entry>
+            <entry>Intel Xeon D-1521</entry>
+          </row>
 
-                <entry>arm64</entry>
-              </row>
+          <row>
+            <entry align="left">Architecture and Description</entry>
 
-              <row>
-                <entry>Link to target datasheet</entry>
+            <entry>x86-64</entry>
+          </row>
 
-                <entry>See link to <ulink
-                url="http://www.cavium.com/OCTEON-TX-CN82XX-83XX.html">OCTEON
-                TX&trade; cn8304 datasheet</ulink></entry>
-              </row>
+          <row>
+            <entry align="left">Link to target datasheet</entry>
 
-              <row>
-                <entry>Poky version</entry>
+            <entry><ulink
+            url="https://ark.intel.com/products/91202/Intel-Xeon-Processor-D-1521-6M-Cache-2_40-GHz">Intel's
+            datasheet</ulink></entry>
+          </row>
 
-                <entry>Git-commit-id:
-                f01b909a266498853e6b3f10e6b39f2d95148129</entry>
-              </row>
+          <row>
+            <entry align="left">Poky version</entry>
 
-              <row>
-                <entry>GCC version</entry>
+            <entry>Git-commit-id:
+            f01b909a266498853e6b3f10e6b39f2d95148129</entry>
+          </row>
 
-                <entry>5.3<remark>FIXME</remark></entry>
-              </row>
+          <row>
+            <entry align="left">GCC version</entry>
 
-              <row>
-                <entry>Linux Kernel Version</entry>
+            <entry>5.3<remark>FIXME</remark></entry>
+          </row>
 
-                <entry>3.12<remark>FIXME</remark></entry>
-              </row>
+          <row>
+            <entry align="left">Linux Kernel Version</entry>
 
-              <row condition="hidden">
-                <entry>Supported Drivers</entry>
+            <entry>3.12<remark>FIXME</remark></entry>
+          </row>
 
-                <entry>Ethernet, RTC, UART</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable><informaltable condition="intel">
-          <tgroup cols="2">
-            <colspec colwidth="6*" />
+          <row condition="hidden">
+            <entry align="left">Supported Drivers</entry>
 
-            <colspec colwidth="9*" />
+            <entry>Ethernet, RTC, UART</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
 
-            <tbody>
-              <row>
-                <entry>Target official name</entry>
+    <table condition="arm">
+      <title>MACHINE Information</title>
 
-                <entry>Intel Xeon D-1521</entry>
-              </row>
+      <tgroup cols="2">
+        <colspec align="center" />
 
-              <row>
-                <entry>Architecture and Description</entry>
+        <thead>
+          <row>
+            <entry align="center">Component</entry>
 
-                <entry>x86-64</entry>
-              </row>
+            <entry align="center">Description</entry>
+          </row>
+        </thead>
 
-              <row>
-                <entry>Link to target datasheet</entry>
+        <tbody>
+          <row>
+            <entry align="left">Target official name</entry>
 
-                <entry>See link to <ulink
-                url="https://ark.intel.com/products/91202/Intel-Xeon-Processor-D-1521-6M-Cache-2_40-GHz">Intel's
-                datasheet</ulink></entry>
-              </row>
+            <entry>OCTEON TX&trade; cn8304</entry>
+          </row>
 
-              <row>
-                <entry>Poky version</entry>
+          <row>
+            <entry align="left">Architecture and Description</entry>
 
-                <entry>Git-commit-id:
-                f01b909a266498853e6b3f10e6b39f2d95148129</entry>
-              </row>
+            <entry>arm64</entry>
+          </row>
 
-              <row>
-                <entry>GCC version</entry>
+          <row>
+            <entry align="left">Link to target datasheet</entry>
 
-                <entry>5.3<remark>FIXME</remark></entry>
-              </row>
+            <entry><ulink
+            url="http://www.cavium.com/OCTEON-TX-CN82XX-83XX.html">OCTEON
+            TX&trade; cn8304 datasheet</ulink></entry>
+          </row>
 
-              <row>
-                <entry>Linux Kernel Version</entry>
+          <row>
+            <entry align="left">Poky version</entry>
 
-                <entry>3.12<remark>FIXME</remark></entry>
-              </row>
+            <entry>Git-commit-id:
+            f01b909a266498853e6b3f10e6b39f2d95148129</entry>
+          </row>
+
+          <row>
+            <entry align="left">GCC version</entry>
+
+            <entry>5.3<remark>FIXME</remark></entry>
+          </row>
 
-              <row condition="hidden">
-                <entry>Supported Drivers</entry>
+          <row>
+            <entry align="left">Linux Kernel Version</entry>
 
-                <entry>Ethernet, RTC, UART</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable></para>
-    </section>
+            <entry>3.12<remark>FIXME</remark></entry>
+          </row>
+
+          <row condition="hidden">
+            <entry align="left">Supported Drivers</entry>
+
+            <entry>Ethernet, RTC, UART</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
   </section>
 </section>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml b/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
index 2bf9c22..5d8c1ce 100644
--- a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
@@ -4,25 +4,40 @@
 <chapter id="relinfo-getting-enea-nfv-access">
   <title>Getting Enea NFV Access</title>
 
-  <para>Enea NFV Access releases are available as binaries ready for download
-  on the <ulink
+  <para>Enea NFV Access releases and updates are available as binaries ready
+  for download from the <ulink
   url="https://portal.enea.com/login/?redirect_to=https%3A%2F%2Fportal.enea.com%2F">Enea
-  Download Portal</ulink>. Updates of Enea NFV Access are also available for
-  download through the portal.</para>
-
-  <para>Log in using the credentials provided by Enea. Using the menu at the
-  top, browse to the <literal>NFV</literal> section, which will provide access
-  to a <literal>Files</literal> section and an <literal>Online
-  Documentation</literal> section. The <literal>Files</literal> section lists
-  each Enea NFV Access release version as a separate download package.
-  Clicking on any of the release packages will provide further details such as
-  the date when it was made available, the file size and the changelog. Most
-  importantly, it provides access to the download links.</para>
-
-  <para>Each archive is mirrored in several places, geographically. Choose the
-  archive in the region closest to you for better download speeds. For details
-  about the contents of the release package, please refer to <xref
-  linkend="release-content" />.</para>
+  Download Portal</ulink>.</para>
+
+  <para><emphasis role="bold">Downloading Enea NFV Access</emphasis></para>
+
+  <orderedlist>
+    <listitem>
+      <para>Log in using the credentials provided by Enea.</para>
+    </listitem>
+
+    <listitem>
+      <para>Using the menu at the top, browse to the <literal>NFV</literal>
+      section, which will provide access to a <literal>Files</literal> section
+      and an <literal>Online Documentation</literal> section.</para>
+    </listitem>
+
+    <listitem>
+      <para>The <literal>Files</literal> section lists each Enea NFV Access
+      release version as a separate download package. Clicking on any of the
+      release packages will provide further details such as the date when it
+      was made available, the file size and the changelog. Most importantly,
+      it provides access to the download links.</para>
+    </listitem>
+
+    <listitem>
+      <para>Choose the archive in the region closest to you for better
+      download speeds and download it.</para>
+    </listitem>
+  </orderedlist>
+
+  <para>For details about the contents of the release package, please refer to
+  <xref linkend="release-content" />.</para>
 
   <para>The <literal>Online documentation</literal> section provides quick
   access to the documents delivered with the release. For details about the
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 2d3e576..cccb4df 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
@@ -2,7 +2,7 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="bugs-limitations">
-  <title>Known Problems in This Release</title>
+  <title>Known Issues in this Release</title>
 
   <para>All known issues listed in this chapter will be addressed in
   maintenance updates following the major release.<remark>INFO: The <emphasis
@@ -14,30 +14,11 @@
   <section id="release-specific-limitations">
     <title>Release-Specific Limitations</title>
 
-    <para><emphasis role="bold">Issues concerning the current
-    release</emphasis>:</para>
-
     <itemizedlist>
       <listitem>
-        <para>OFP and ODP are not included with the current release but they
-        will be included in a later maintenance update.<remark>FIXME,
-        requesting help from Ca</remark></para>
-      </listitem>
-
-      <listitem>
         <para>Kernel modules build using the SDK cannot be removed from the
         <filename>enea-nfv-access</filename> image.</para>
       </listitem>
-    </itemizedlist>
-
-    <para><emphasis role="bold">Issues affecting
-    documentation</emphasis>:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Documents provided in this release will continue to be regularly
-        updated with additional content.</para>
-      </listitem>
 
       <listitem>
         <para><emphasis role="bold">PDF navigation</emphasis>: When using
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 48e913f..aabe461 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
@@ -4,9 +4,10 @@
 <chapter id="relinfo-changes">
   <title>Main Changes</title>
 
-  <para>This chapter provides information about the new features added in the
-  current release, as well as details on the provided packages and the
-  backwards compatibility with previous versions of Enea NFV Access.</para>
+  <para>Below you'll find information about the new features and updates made
+  in this release, as well as details on the provided packages and the
+  backwards compatibility with previous versions of Enea NFV Access if
+  applicable.</para>
 
   <section id="relinfo-changes-other">
     <title>New Features</title>
@@ -23,6 +24,10 @@
           <listitem>
             <para>OVS 2.9</para>
           </listitem>
+
+          <listitem condition="arm">
+            <para>ODP</para>
+          </listitem>
         </itemizedlist>
       </listitem>
 
@@ -60,7 +65,7 @@
       </listitem>
 
       <listitem>
-        <para>Unified cross-development SDK for host and virtualized
+        <para>Unified cross-development SDK and eSDK for host and virtualized
         environments</para>
       </listitem>
 
@@ -107,12 +112,12 @@
   <section id="relinfo-backward-compat">
     <title>Compatibility</title>
 
-    <para condition="arm">Due to the fact that the current release is only
-    supported on ARM reference boards, it is not backwards compatible with
-    previous versions of Enea NFV Access.</para>
-
     <para condition="intel">Due to the fact that ODP and OFP are not included
     in this release, any applications dependent on these components are not
     compatible with the current release.</para>
+
+    <para condition="arm">Due to the fact that the current release is only
+    supported on ARM reference boards, it is not backwards compatible with
+    previous versions of Enea NFV Access.</para>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/system_requirements_prerequisites.xml b/doc/book-enea-nfv-access-release-info/doc/system_requirements_prerequisites.xml
index 44e70af..b0317b3 100644
--- a/doc/book-enea-nfv-access-release-info/doc/system_requirements_prerequisites.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/system_requirements_prerequisites.xml
@@ -46,7 +46,8 @@
           <entry>Disk space</entry>
 
           <entry>Your build host should have at least 50 GB of free disk space
-          for installing the SDK or cross-compiling applications.</entry>
+          for installing the SDK, eSDK or cross-compiling
+          applications.</entry>
         </row>
 
         <row>