Merge "ReleaseInfo: update Release Info"

4 files changed, 32 insertions, 127 deletions

diff --git a/doc/book-enea-nfv-access-getting-started/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-getting-started/doc/eltf_params_updated.xml
index f260584..0386515 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/eltf_params_updated.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/eltf_params_updated.xml
@@ -44,12 +44,12 @@ export PATH=~/bin:$PATH</programlisting></para>
 
     <para id="EneaLinux_REL_VER"><phrase>2.2</phrase></para>
 
-    <para id="Yocto_VER"><phrase>2.1</phrase></para>
+    <para id="Yocto_VER"><phrase>2.4</phrase></para>
 
-    <para id="Yocto_NAME"><phrase>krogoth</phrase></para>
+    <para id="Yocto_NAME"><phrase>rocko</phrase></para>
 
     <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    url="http://www.yoctoproject.org/downloads/core/krogoth/21">http://www.yoctoproject.org/downloads/core/krogoth/21</ulink></para>
+    url="http://www.yoctoproject.org/downloads">http://www.yoctoproject.org/downloads</ulink></para>
 
     <para id="ULINK_ENEA_LINUX_URL"><ulink
     url="https://linux.enea.com/6">https://linux.enea.com/6</ulink></para>
@@ -283,4 +283,4 @@ repo sync</programlisting></para>
       </tgroup>
     </table>
   </section>
-</section>
\ No newline at end of file
+</section>
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 3f66d94..8d32090 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
@@ -33,22 +33,11 @@
    /* Enea NFV Access documentation */
 -- x86-64 /* architecture */
         -- atom-c3000/
-                -- images/
-                    -- enea-nfv-access
-                        /* HDD image for bootable USB stick installer */
-                        -- enea-nfv-access-atom-c3000.hddimg
-        -- install
-                -- esdk
-                    /* Extensible SDK installer */
-                    -- install-sdk.sh
-                -- sdk
-                    /* SDK installer */
-                    -- install-sdk.sh
+               -- enea-nfv-access-edgelink-netconf-atom-c3000.hddimg
+               /* HDD image for bootable USB stick installer */
         -- xeon-d/
-                -- images/
-                    -- enea-nfv-access
-                        /* HDD image for bootable USB stick installer */
-                        -- enea-nfv-access-xeon-d.hddimg</programlisting>
+               -- enea-nfv-access-edgelink-netconf-xeon-d.hddimg
+               /* HDD image for bootable USB stick installer */</programlisting>
 
     <programlisting condition="arm">-- documentation/
    /* Enea NFV Access documentation */
@@ -82,59 +71,7 @@
                           for developing, debugging and profiling applications and
                           kernel modules  */
                         -- various artifacts
-        -- install
-                -- sdk
-                   /* SDK related artifacts including SDK installer and manifests  */
-                        -- install-sdk.sh
-                           /* self-extracting archive installing cross-compilation
-                              toolchain for the platform */
-                -- esdk
-                   /* Extensible SDK related artifacts including SDK installer and
-                      manifests  */
-                        -- install-esdk.sh
-                           /* self-extracting archive installing cross-compilation
-                              toolchain for the platform */
-                -- nfv-installer
-                   /* Various tools assisting in booting Enea NFV Access  */
-                        -- docker-pxe-ramboot
-                           /* tools and files used in buidling a boot setup  */</programlisting>
-
-    <para condition="hidden">For each combination of image and target, the
-    following set of artifacts is available:</para>
-
-    <programlisting condition="hidden">-- bzImage
-   /* kernel image */
--- bzImage-&lt;target&gt;.bin
-   /* kernel image, same as above */
--- config-&lt;target&gt;.config
-   /* kernel configuration file */
--- enea-nfv-access-&lt;target&gt;.hddimg
-   /* HDD image for bootable USB stick installer */
--- enea-nfv-access-&lt;target&gt;.ext4.gz
-   /* compressed EXT4 image of the rootfs */
--- enea-nfv-access-&lt;target&gt;.tar.gz
-   /* tar archive of the image */
--- modules-&lt;target&gt;.tgz
-   /* external kernel modules */
--- grub-efi-bootx64.efi
-   /* GRUB EFI file */</programlisting>
-
-    <programlisting condition="arm">-- Image
-   /* kernel image */
--- Image-target.bin
-   /* kernel image, same as above */
--- config-target.config
-   /* kernel configuration file */
--- image-name-target.ext4.gz
-   /* compressed EXT4 image of the rootfs */
--- image-name-target.qcow2
-   /* QCOW image for QEMU - only for guest images */
--- image-name-target.qemuboot.conf
-   /* qemu config file for the guest images */
--- image-name-target.tar.gz
-   /* tar archive of the image */
--- modules-&lt;target&gt;.tgz
-   /* external kernel modules */</programlisting>
+</programlisting>
   </section>
 
   <remark>INFO Below is a complete section with ID
@@ -168,19 +105,17 @@
       </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_guide_intel/1)" />. Describes
-        how to use Enea NFV Access, provides use cases and benchmark
-        results.</para>
+        <para>Enea NFV Access Demo Use-cases. Describes the Demo Use-cases.</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>
+        <para>Enea NFV Access Getting Started. Describes how to install uCPE Manger,
+        NFV Access and Device Management.</para>
+      </listitem>
+
+      <listitem>
+        <para>Enea NFV Access Reference Guide. Describes the Enea NFV Access
+        platform.</para>
       </listitem>
 
       <listitem>
@@ -191,27 +126,6 @@
         with Enea NFV Access.</para>
       </listitem>
 
-      <listitem>
-        <para>Enea NFV Access eSDK Open Source Report.</para>
-      </listitem>
-
-      <listitem>
-        <para>Enea NFV Access SDK Open Source Report.</para>
-      </listitem>
-
-      <listitem>
-        <para>Enea Element On-Device Management Kick Start Guide. Use this
-        guide to learn about the Element ODM software product, and install and
-        use Element ODM on both development and target platforms.</para>
-      </listitem>
-
-      <listitem>
-        <para>Enea Element On-Device Management Guide. Use this guide to
-        assist in working with the Element ODM product including building
-        applications, API reference information, and using the Northbound
-        Agents.</para>
-      </listitem>
-
       <listitem condition="hidden">
         <para>Enea NFV Access Test Report. Summarizes the test results for the
         Enea NFV Access release.</para>
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 74311e5..8b761a1 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,14 +42,14 @@ 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>2.0</phrase></para>
+    <para id="EneaLinux_REL_VER"><phrase>2.2</phrase></para>
 
-    <para id="Yocto_VER"><phrase>2.1</phrase></para>
+    <para id="Yocto_VER"><phrase>2.4</phrase></para>
 
-    <para id="Yocto_NAME"><phrase>krogoth</phrase></para>
+    <para id="Yocto_NAME"><phrase>rocko</phrase></para>
 
     <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    url="http://www.yoctoproject.org/downloads/core/krogoth/21">http://www.yoctoproject.org/downloads/core/krogoth/21</ulink></para>
+    url="http://www.yoctoproject.org/downloads">http://www.yoctoproject.org/downloads</ulink></para>
 
     <para id="ULINK_ENEA_LINUX_URL"><ulink
     url="https://linux.enea.com/6">https://linux.enea.com/6</ulink></para>
@@ -220,8 +220,8 @@ repo sync</programlisting></para>
       </tgroup>
     </table>
 
-    <table condition="arm">
-      <title>MACHINE Information</title>
+    <table>
+      <title>MACHINE Information, QEMU</title>
 
       <tgroup cols="2">
         <colspec align="center" />
@@ -238,21 +238,21 @@ repo sync</programlisting></para>
           <row>
             <entry align="left">Target official name</entry>
 
-            <entry>OCTEON TX™ cn8304</entry>
+            <entry>QEMU</entry>
           </row>
 
           <row>
             <entry align="left">Architecture and Description</entry>
 
-            <entry>arm64</entry>
+            <entry>x86</entry>
           </row>
 
           <row>
             <entry align="left">Link to target datasheet</entry>
 
             <entry><ulink
-            url="http://www.cavium.com/OCTEON-TX-CN82XX-83XX.html">OCTEON
-            TX™ cn8304 datasheet</ulink></entry>
+            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">
+            wiki.qemu.org</ulink></entry>
           </row>
 
           <row>
@@ -265,13 +265,13 @@ repo sync</programlisting></para>
           <row>
             <entry align="left">GCC version</entry>
 
-            <entry>5.3<remark>FIXME</remark></entry>
+            <entry>7.3</entry>
           </row>
 
           <row>
             <entry align="left">Linux Kernel Version</entry>
 
-            <entry>3.12<remark>FIXME</remark></entry>
+            <entry>4.14</entry>
           </row>
 
           <row condition="hidden">
@@ -283,4 +283,4 @@ repo sync</programlisting></para>
       </tgroup>
     </table>
   </section>
-</section>
\ No newline at end of file
+</section>
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 60f00a3..d52f6d5 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
@@ -36,10 +36,6 @@
           <listitem>
             <para>QEMU 2.11</para>
           </listitem>
-
-          <listitem condition="arm">
-            <para>ODP</para>
-          </listitem>
         </itemizedlist>
       </listitem>
 
@@ -60,11 +56,6 @@
       </listitem>
 
       <listitem>
-        <para>Extensible SDK for cross-development and deployment of
-        applications as docker containers</para>
-      </listitem>
-
-      <listitem>
         <para>Updated USB-stick based installation</para>
       </listitem>
 
@@ -109,4 +100,4 @@
     possible. Necessary compatibility breaks will be done only as needed and
     in major releases.</para>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>