34 files changed, 41 insertions, 4712 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 8f7a2ce..80a93c7 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -31,8 +31,8 @@ JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generate
 MACHINE_LIST_XML    := book-enea-nfv-access-release-info/doc/machine_list_generated.xml
-ELTF_PARAMS_TEMPLATE := book-enea-nfv-access-release-info/doc/eltf_params_template.xml
+ELTF_PARAMS_TEMPLATE := s_doceneacommon/doc/eltf_params_template.xml
-ELTF_PARAMS_UPDATED  := book-enea-nfv-access-release-info/doc/eltf_params_updated.xml
+ELTF_PARAMS_UPDATED  := s_doceneacommon/doc/eltf_params_updated.xml
@@ -52,12 +52,13 @@ DOCBOOK_CLEANTMP ?= yes
 #Components (books) in this subsystem. Now use all books found here
 COMPONENTS := book-enea-nfv-access-auto-fw-th-open-source book-enea-nfv-access-auto-fw-th-user-guide book-enea-nfv-access-cmc-example-usecases book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-evalkit
 #  COMPONENTS +=
-#book-enea-linux-eclipse-open-source
 #book-enea-nfv-access-dev-hardening-guide
 #book-enea-nfv-access-esdk-open-source
 #book-enea-nfv-access-guide
+#book-enea-nfv-access-reference-guide-intel
 #book-enea-nfv-access-sdk-open-source
 #book-enea-nfv-access-user-hardening-guide
+#book-enea-nfv-access-vnf-onboarding-guide
 #COMPONENTS := $(shell ls -d book-enea* )
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml
index 7ef8baa..dbf06e3 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml
@@ -7,7 +7,8 @@
  <para>This document contains the open source and license information
  pertaining to the Automation Framework and Test Harness provided with
  Enea NFV Access <xi:include
-  href="../../book-enea-nfv-access-release-info/doc/eltf_params_updated.xml"
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
+  
 </chapter>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml
index 483d220..3305873 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml
@@ -5,10 +5,13 @@
 ]>
 <book id="book_enea_nfv_access_auto_fw_th_open_source">
  <title><trademark class="registered">Enea</trademark> NFV Access Automation Framework and Test Harness Open Source Report</title>
+  
  <subtitle>Release Version
-         <xi:include href="../../book-enea-nfv-access-release-info/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+                 
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
+  
  <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include href="about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include href="licenses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
index dac4bb5..d550178 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
@@ -36,7 +36,7 @@
            <entry>Automation Framework and Test Harness</entry>
            <entry><xi:include
-            href="../../book-enea-nfv-access-release-info/doc/eltf_params_updated.xml"
+            href="../../s_doceneacommon/doc/eltf_params_updated.xml"
            xmlns:xi="http://www.w3.org/2001/XInclude"
            xpointer="element(EneaLinux_REL_VER/1)" /></entry>
@@ -50,7 +50,7 @@
            <entry>Automation Framework and Test Harness</entry>
            <entry><xi:include
-            href="../../book-enea-nfv-access-release-info/doc/eltf_params_updated.xml"
+            href="../../s_doceneacommon/doc/eltf_params_updated.xml"
            xmlns:xi="http://www.w3.org/2001/XInclude"
            xpointer="element(EneaLinux_REL_VER/1)" /></entry>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
index 58b4650..0b96de2 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
@@ -6,9 +6,9 @@
 <book id="book_enea_nfv_access_auto_fw_th_user_guide">
  <title><trademark class="registered">Enea</trademark> NFV Access Automation Framework and Test Harness User Guide</title>
-  <subtitle>Release Version <xi:include href="eltf_params_updated.xml"
+  <subtitle>Release Version
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_template.xml
deleted file mode 100644
index eaa7ebd..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_template.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting>ELTF_PL_HOST_PREREQ</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>ELTF_PL_GET_REPO</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>ELTF_EL_REL_VER</phrase></para>
-    <para id="Yocto_VER"><phrase>ELTF_YOCTO_VER</phrase></para>
-    <para id="Yocto_NAME"><phrase>ELTF_YOCTO_NAME</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    url="ELTF_YOCTO_PROJ_DOWNLOAD_URL">ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL</ulink></para>
-    <para id="ULINK_ENEA_LINUX_URL"><ulink
-    url="ELTF_EL_DOWNLOAD_URL">ELTF_EL_DOWNLOAD_TXTURL</ulink></para>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>ELTF_PL_CLONE_W_REPO</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY BOTH in the
-    template.xml and in the updated.xml, set condition hidden on the
-    &lt;row&gt;, if eclipse is not in the release.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row id="eltf-eclipse-version-row">
-            <entry>Eclipse version ELTF_ECLIPSE_VERSION plus command line
-            development tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Targets with Parameters</title>
-    <para>The tables below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-      <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-      <para><informaltable>
-          <tgroup cols="2">
-            <colspec colwidth="6*" />
-            <colspec colwidth="9*" />
-            <tbody>
-              <row>
-                <entry>Target official name</entry>
-                <entry>ELTF_T_NAME</entry>
-              </row>
-              <row>
-                <entry>Architecture and Description</entry>
-                <entry>ELTF_T_ARC_DESC</entry>
-              </row>
-              <row>
-                <entry>Link to target datasheet</entry>
-                <entry>See <ulink
-                url="ELTF_T_DS_URL">ELTF_T_DS_TXTURL</ulink></entry>
-              </row>
-              <row>
-                <entry>Poky version</entry>
-                <entry>ELTF_T_POKY_VER</entry>
-              </row>
-              <row>
-                <entry>GCC version</entry>
-                <entry>ELTF_T_GCC_VER</entry>
-              </row>
-              <row>
-                <entry>Linux Kernel Version</entry>
-                <entry>ELTF_T_KERN_VER</entry>
-              </row>
-              <row>
-                <entry>Supported Drivers</entry>
-                <entry>ELTF_T_DRIVERS</entry>
-              </row>
-              <row>
-                <entry>Enea rpm folder for downloading RPM packages for this
-                target</entry>
-                <entry><ulink
-                url="ELTF_T_EL_RPM_URL">ELTF_T_EL_RPM_TXTURL</ulink></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable></para>
-    </section>
-    <!-- ELTFADD_MORE_TARGET_SECTIONS_BELOW_IF_NEEDED -->
-  </section>
-</section>
-\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_updated.xml
deleted file mode 100644
index be0be23..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_updated.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting># Host Ubuntu 16.04 LTS 64bit
-sudo apt-get -y update
-sudo apt-get -y install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo &gt; ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>2.2.2</phrase></para>
-    <para id="Yocto_VER"><phrase>2.4</phrase></para>
-    <para id="Yocto_NAME"><phrase>rocko</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    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>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY in book, set
-    condition hidden if eclipse is not in the release. Do this both in
-    template.xml and updated.xml.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row condition="hidden" id="eltf-eclipse-version-row">
-            <entry>Eclipse version 4.3 (Mars) plus command line development
-            tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Reference Boards with Parameters</title>
-    <para>The table(s) below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <table>
-      <title>MACHINE Information Intel Xeon D</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Xeon D</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <title>MACHINE Information Intel Atom C3000</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Atom C3000</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/products/docs/processors/atom/c-series/c3000-family-datasheet.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table condition="arm">
-      <title>MACHINE Information</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>OCTEON TX™ cn8304</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>arm64</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>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            f01b909a266498853e6b3f10e6b39f2d95148129</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>5.3<remark>FIXME</remark></entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <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>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_updated_template_how_to_use.txt
deleted file mode 100755
index 62e5d02..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/eltf_params_updated_template_how_to_use.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-eltf_params_template_updated_howto_use.txt
-This is a way to collect all parameters for an Enea NFV Access release
-in one parameter file, easy to automatically update by ELTF regularly.
-NOTE: Both the release info AND the open source books use parameters from
-      here, but the XML file is inside the release info book directory.
-NOTE: The manifest_conf.mk, or overridden by the environment variable
-      MANIFESTHASH, contains the full tag (or hashvalue) for downloading
-      the manifest when the books are built. The list of target
-      directories are fetched from the manifest into the book.
-      The eltf_params_updates.xml can all the time contain
-      the final next complete tag e.g. refs/tags/EL6 or similar
-      in the ELTF_PL_CLONE_W_REPO parameter command lines.
-The ordinary book XML files use xi:include statements to include elements
-from this parameter file. The book XML files can thus be manually edited.
-Before editing, you must run "make init".
-Any other text in the template or updated.xml file, outside the parts that
-are included in the book, are not used but still all must be correct
-DocBook XML files.
-ELTF work:
- template => ELTF replaces ALL ELTF_xxx variables => updated XML file
-    => push to git only if changed
-eltf_params_template.xml  (in git)
-   File used by ELTF to autocreate/update the real parameter
-   file eltf_params_updated.xml.
-eltf_params_updated.xml  (in git)
-   Real parameter file where ELTF has replaced all ELTF_xx variables with
-   strings, in several cases with multiline strings.
-   No spaces or linefeed allowed in beginning or end of the variable values!
-xi:include: Each parameter is xi:include'ed in various book files, using
-   the IDs existing in the parameter files.
-   In most cases the 1:st element inside an element with an ID is included
-   using a format like eltf-prereq-apt-get-commands-host/1.
-   In very few cases the element with the ID is included in the book, one
-   example is the target section which has an ID, but which contains
-   multiple subsections, one per target.
-   All IDs in a book must be unique.
-DocBook XML: All XML files must be correct DocBook XML files.
-Do NOT edit/save the real *updated.xml file with XMLmind to avoid changes
-   not done by ELTF. But it is OK to open the real file in XMLmind to
-   check that the format is correct.
-ELTF should autocreate a temporary "real" file but only replace
-   and push the eltf_params_updated.xml if it is changed.
-make eltf
-   This lists all ELTF_xxx variables and some rules how to treat them
-DocBook Format: All elements - rules:
-   Several strict generic XML rules apply for all strings:
-    1. No TABs allowed or any other control chr than "linefeed"
-    2. Only 7-bit ASCII
-    3. Any < > & must be converted to &lt; &gt; and &amp;
-       Similar for any other non-7-bit-ASCII but avoid those!
-    4. No leading spaces or linefeeds when replacing the ELTF_* variable
-    5. No trailing spaces or linefeeds when replacing the ELTF_* variable
-    6. Note: Keep existing spaces before/efter ELTF_* in a few cases.
-DocBook Format: <programlisting> - rules: ELTF*PL* variables
-   Several strict rules apply for the multiline string in programlisting
-   in addition to the general XML rules above:
-    7. Max line length < 80 char
-    8. Use backslash (\) to break longer lines
-    9. Use spaces (e.g. 4) to indent continuation lines in programlistings
-   10. No trailing spaces on any line
-   11. No spaces or linefeed immediately after leading <programlisting>
-   12. No spaces or linefeed before trailing </programlisting>
-DocBook Format: <ulink> - rules: ELTF_*URL* variables
-   13. ELTF_*URL and corresponding ELTF_*TXTURL shall be identical strings
-   14. Only if the URL is extremely long, the TXTURL can be a separate string
-Each target has one section with target parameters:
-       <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-        <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-          ..... with many ELTF_ variables ....
-       </section>
-   15. If there is only one target. ELTF just replaces ELTF parameters
-   16. It there are multiple targets. ELTF copies the section and appends the
-       section the required number of times.
-       Each section ID will become unique: eltf-target-table-ELTF_T_MANIFEST_DIR
-       Each section title will become unique
-Tables with target parameters in each target section:
-   17. It is possible for ELTF to append more rows with one parameter each
-       to these tables, because the entire tables are included in the book
-Special - NOT YET READY DEFINED how to handle the optionally included
-   Eclipse and its version, but this is a first suggestion:
-   18. Just now ELTF can define ELFT_ECLIPSE_VERSION as a full string
-       with both version number and name,
-   19. MANUALLY if Eclipse is NOT included in the release,
-       the release manager should manually set condition="hidden" on
-       the entire section in the book XML about Eclipse
-BELOW WE TRY TO EXPLAIN EACH ELTF_* variable, but always check with make eltf
-if there are more new variables, missing in this description file.
-_____________________________________________________________________________
-ELTF_PL_HOST_PREREQ       Multiline list of host prerequisites, e.g. commands
-                          like sudo apt-get install xxxx or similar.
-                          First line = comment with the complete host name!
-                          It is possible to include multiple hosts by just
-                          adding an empty line, comment with host name, etc.
-                          xi:include eltf-prereq-apt-get-commands-host/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-# Host Ubuntu 14.04.5 LTS 64bit
-sudo apt-get update
-sudo apt-get install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl
-_____________________________________________________________________________
-ELTF_PL_GET_REPO          Multiline commands to download the repo tool
-                          xi:include eltf-getting-repo-install-command/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH
-_____________________________________________________________________________
-ELTF_EL_REL_VER           General parameter string: The version of this Enea
-                          NFV Access release. Major version and optional .Minor
-                          Typically created from MAJOR and MINOR in enea.conf
-                          MINOR in enea.conf is empty or contains a dot+minor
-                          xi_include EneaLinux_REL_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Examples:
-6
-  or
-6.1
-_____________________________________________________________________________
-ELTF_YOCTO_VER            General parameter string: Yocto version, created
-                          from DISTRO in poky.ent
-                          xi:include Yocto_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-2.1
-_____________________________________________________________________________
-ELTF_YOCTO_NAME           General parameter string: Yocto name (branch), created
-                          from DISTRO_NAME_NO_CAP in poky.ent
-                          xi:include Yocto_NAME/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-krogoth
-_____________________________________________________________________________
-ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL  General parameters. These two are IDENTICAL
-ELTF_YOCTO_PROJ_DOWNLOAD_URL     strings with correct Yocto version string
-                                 at the end, typically without "dot".
-                          xi:include ULINK_YOCTO_PROJECT_DOWNLOAD/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://www.yoctoproject.org/downloads/core/krogoth/21
-_____________________________________________________________________________
-ELTF_EL_DOWNLOAD_TXTURL   General parameters. These two are IDENTICAL strings
-ELTF_EL_DOWNLOAD_URL      and shall be the http:/..... address where
-                          Enea NFV Access can be downloaded
-                          Often containing same version as in ELTF_EL_REL_VER
-                          xi:include ULINK_ENEA_LINUX_URL/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://linux.enea.com/6
-_____________________________________________________________________________
-ELTF_PL_CLONE_W_REPO      Multiline commands to run repo to clone everything.
-                          Use the variable $MACHINE/default.xml (the text in
-                          the book will list the avaiable values of MACHINE,
-                          taken from the manifest repository)
-                          xi:include eltf-repo-cloning-enea-linux/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync
-_____________________________________________________________________________
-ELTF_ECLIPSE_VERSION      Optional general parameter string.
-                          NOT YET READY DEFINED
-                          Just now a release manage must manually set
-                          condition="hidden" on the Eclipse section,
-                          if Eclipse is not included in the release.
-                          ELTF just replaces ELTF_ECLIPSE_VERSION with a full
-                          string with "X.Y (name)"
-                          It includes the ID and can only be ONCE in the book.
-                          xi:include eltf-eclipse-version-row
-                          Example.
-4.5 (Mars)
-_____________________________________________________________________________
-ELTF_T_*                  All these are in each target (MACHINE) and ELTF
-                          must separately replace them with strings for
-                          each target
-                          NOTE: All (except the MANIFEST_DIR) are in rows
-                                in a table and ELTF can select to append
-                                more parameters by adding more rows
-_____________________________________________________________________________
-ELTF_T_MANIFEST_DIR       This happens to be in two places. Must be exactly
-ELTF_T_MANIFEST_DIR       the directory name in the manifest, e.g. same
-                          as the MACHINE names in $MACHINE/default.xml.
-                          In book: a) Part of section ID
-                                   b) Part of section title
-                          Examples:
-p2041rgb
-  or
-ls1021aiot
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_NAME               Target specific: "Target Official Name"
-                          NOT same as the target directory name in most cases.
-                          In book: An <entry> element in a row
-                          Examples:
-P2041RGB
-  or
-LS1021a-IoT
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_ARC_DESC           Target specific: "Architecture and Description"
-                          It can be a short identification string or
-                          it can be a longer descriptive sentence.
-                          In book: An <entry> element in a row
-                          Examples:
-Power, e500mc
-  or
-ARM Cortex-A7
-_____________________________________________________________________________
-ELTF_T_DS_TXTURL          Target specific: "Link to target datasheet. These
-ELTF_T_DS_URL             two usually are IDENTICAL strings with correct
-                          hyperlink to the target's official datasheet.
-                          In book: an <ulink url="...">...</ulink>
-                          Only if the link is VERY LONG, the text part shall
-                          instead be a descriptive string (see 2:nd example).
-                          NOTE: Also here no spaces or line-feeds!
-                          Examples:
-url="http://wiki.qemu.org">http://wiki.qemu.org
-or
-url="http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls1021a-iot-gateway-reference-design:LS1021A-IoT">link to NXP's datasheet
-_____________________________________________________________________________
-ELTF_T_POKY_VER           Target specific: "Poky version" created either
-                          from POKYVERSION in poky.ent
-                          or using a hashvalue with a leading string, in
-                          which case it may be different per target.
-                          In book: An <entry> in a row
-                          Examples:
-15.0.0
-or
-Git commit id: 75ca53211488a3e268037a44ee2a7ac5c7181bd2
-_____________________________________________________________________________
-ELTF_T_GCC_VER            Target specific: "GCC Version". Should be in poky
-                          but not easy to find among various parameters.
-                          ELTF would extract it from build logs building SDK
-                          and it is possibly different per target.
-                          In book: An <entry> in a row
-                          Example:
-5.3
-_____________________________________________________________________________
-ELTF_T_KERN_VER           Target specific: "Linux Kernel Version". Often
-                          different per target.
-                          In book: An <entry> in a row
-                          Example:
-3.12
-_____________________________________________________________________________
-ELTF_T_DRIVERS            Target specific: "Supported Drivers". This is a
-                          comma-separated list of driver names.
-                          ELTF should create the list in same order for each
-                          target, e.g. alphabetic migth be OK.
-                          In book: An <entry> in a row
-                          Example:
-Ethernet, I2C, SPI, PCI, USB, SD/SDHC/SDXC
-_____________________________________________________________________________
-ELTF_T_EL_RPM_TXTURL      Target specific: "Enea rpm folder for downloading
-ELTF_T_EL_RPM_URL         RPM packages for this target". These two are
-                          INDENTICAL strings with hyperlink to the web site
-                          at Enea where the customer can download RPMs
-                          Note: Often the ELFT_EL_REL_VER value and
-                                the ELTF_T_MANIFEST_DIR are used in the link.
-                          In book: an <ulink url="...">...</ulink>
-                          Example:
-url="https://linux.enea.com/6/ls1021aiot/rpm">https://linux.enea.com/6/ls1021aiot/rpm
-_____________________________________________________________________________
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/book.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/book.xml
index 7dadd65..459aec8 100644
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/book.xml
+++ b/doc/book-enea-nfv-access-cmc-example-usecases/doc/book.xml
@@ -6,9 +6,9 @@
 <book id="book_enea_nfv_access_cmc_example_usecases">
  <title><trademark class="registered">Enea</trademark> NFV Access CMC Networks Example Use-cases</title>
-  <subtitle>Release Version <xi:include href="eltf_params_updated.xml"
+  <subtitle>Release Version
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_template.xml
deleted file mode 100644
index eaa7ebd..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_template.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting>ELTF_PL_HOST_PREREQ</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>ELTF_PL_GET_REPO</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>ELTF_EL_REL_VER</phrase></para>
-    <para id="Yocto_VER"><phrase>ELTF_YOCTO_VER</phrase></para>
-    <para id="Yocto_NAME"><phrase>ELTF_YOCTO_NAME</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    url="ELTF_YOCTO_PROJ_DOWNLOAD_URL">ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL</ulink></para>
-    <para id="ULINK_ENEA_LINUX_URL"><ulink
-    url="ELTF_EL_DOWNLOAD_URL">ELTF_EL_DOWNLOAD_TXTURL</ulink></para>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>ELTF_PL_CLONE_W_REPO</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY BOTH in the
-    template.xml and in the updated.xml, set condition hidden on the
-    &lt;row&gt;, if eclipse is not in the release.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row id="eltf-eclipse-version-row">
-            <entry>Eclipse version ELTF_ECLIPSE_VERSION plus command line
-            development tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Targets with Parameters</title>
-    <para>The tables below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-      <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-      <para><informaltable>
-          <tgroup cols="2">
-            <colspec colwidth="6*" />
-            <colspec colwidth="9*" />
-            <tbody>
-              <row>
-                <entry>Target official name</entry>
-                <entry>ELTF_T_NAME</entry>
-              </row>
-              <row>
-                <entry>Architecture and Description</entry>
-                <entry>ELTF_T_ARC_DESC</entry>
-              </row>
-              <row>
-                <entry>Link to target datasheet</entry>
-                <entry>See <ulink
-                url="ELTF_T_DS_URL">ELTF_T_DS_TXTURL</ulink></entry>
-              </row>
-              <row>
-                <entry>Poky version</entry>
-                <entry>ELTF_T_POKY_VER</entry>
-              </row>
-              <row>
-                <entry>GCC version</entry>
-                <entry>ELTF_T_GCC_VER</entry>
-              </row>
-              <row>
-                <entry>Linux Kernel Version</entry>
-                <entry>ELTF_T_KERN_VER</entry>
-              </row>
-              <row>
-                <entry>Supported Drivers</entry>
-                <entry>ELTF_T_DRIVERS</entry>
-              </row>
-              <row>
-                <entry>Enea rpm folder for downloading RPM packages for this
-                target</entry>
-                <entry><ulink
-                url="ELTF_T_EL_RPM_URL">ELTF_T_EL_RPM_TXTURL</ulink></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable></para>
-    </section>
-    <!-- ELTFADD_MORE_TARGET_SECTIONS_BELOW_IF_NEEDED -->
-  </section>
-</section>
-\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml
deleted file mode 100644
index f260584..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting># Host Ubuntu 16.04 LTS 64bit
-sudo apt-get -y update
-sudo apt-get -y install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo &gt; ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>2.2</phrase></para>
-    <para id="Yocto_VER"><phrase>2.1</phrase></para>
-    <para id="Yocto_NAME"><phrase>krogoth</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>
-    <para id="ULINK_ENEA_LINUX_URL"><ulink
-    url="https://linux.enea.com/6">https://linux.enea.com/6</ulink></para>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY in book, set
-    condition hidden if eclipse is not in the release. Do this both in
-    template.xml and updated.xml.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row condition="hidden" id="eltf-eclipse-version-row">
-            <entry>Eclipse version 4.3 (Mars) plus command line development
-            tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Reference Boards with Parameters</title>
-    <para>The table(s) below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <table>
-      <title>MACHINE Information Intel Xeon D</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Xeon D</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <title>MACHINE Information Intel Atom C3000</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Atom C3000</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/products/docs/processors/atom/c-series/c3000-family-datasheet.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table condition="arm">
-      <title>MACHINE Information</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>OCTEON TX™ cn8304</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>arm64</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>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            f01b909a266498853e6b3f10e6b39f2d95148129</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>5.3<remark>FIXME</remark></entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <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-cmc-example-usecases/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated_template_how_to_use.txt
deleted file mode 100755
index 62e5d02..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated_template_how_to_use.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-eltf_params_template_updated_howto_use.txt
-This is a way to collect all parameters for an Enea NFV Access release
-in one parameter file, easy to automatically update by ELTF regularly.
-NOTE: Both the release info AND the open source books use parameters from
-      here, but the XML file is inside the release info book directory.
-NOTE: The manifest_conf.mk, or overridden by the environment variable
-      MANIFESTHASH, contains the full tag (or hashvalue) for downloading
-      the manifest when the books are built. The list of target
-      directories are fetched from the manifest into the book.
-      The eltf_params_updates.xml can all the time contain
-      the final next complete tag e.g. refs/tags/EL6 or similar
-      in the ELTF_PL_CLONE_W_REPO parameter command lines.
-The ordinary book XML files use xi:include statements to include elements
-from this parameter file. The book XML files can thus be manually edited.
-Before editing, you must run "make init".
-Any other text in the template or updated.xml file, outside the parts that
-are included in the book, are not used but still all must be correct
-DocBook XML files.
-ELTF work:
- template => ELTF replaces ALL ELTF_xxx variables => updated XML file
-    => push to git only if changed
-eltf_params_template.xml  (in git)
-   File used by ELTF to autocreate/update the real parameter
-   file eltf_params_updated.xml.
-eltf_params_updated.xml  (in git)
-   Real parameter file where ELTF has replaced all ELTF_xx variables with
-   strings, in several cases with multiline strings.
-   No spaces or linefeed allowed in beginning or end of the variable values!
-xi:include: Each parameter is xi:include'ed in various book files, using
-   the IDs existing in the parameter files.
-   In most cases the 1:st element inside an element with an ID is included
-   using a format like eltf-prereq-apt-get-commands-host/1.
-   In very few cases the element with the ID is included in the book, one
-   example is the target section which has an ID, but which contains
-   multiple subsections, one per target.
-   All IDs in a book must be unique.
-DocBook XML: All XML files must be correct DocBook XML files.
-Do NOT edit/save the real *updated.xml file with XMLmind to avoid changes
-   not done by ELTF. But it is OK to open the real file in XMLmind to
-   check that the format is correct.
-ELTF should autocreate a temporary "real" file but only replace
-   and push the eltf_params_updated.xml if it is changed.
-make eltf
-   This lists all ELTF_xxx variables and some rules how to treat them
-DocBook Format: All elements - rules:
-   Several strict generic XML rules apply for all strings:
-    1. No TABs allowed or any other control chr than "linefeed"
-    2. Only 7-bit ASCII
-    3. Any < > & must be converted to &lt; &gt; and &amp;
-       Similar for any other non-7-bit-ASCII but avoid those!
-    4. No leading spaces or linefeeds when replacing the ELTF_* variable
-    5. No trailing spaces or linefeeds when replacing the ELTF_* variable
-    6. Note: Keep existing spaces before/efter ELTF_* in a few cases.
-DocBook Format: <programlisting> - rules: ELTF*PL* variables
-   Several strict rules apply for the multiline string in programlisting
-   in addition to the general XML rules above:
-    7. Max line length < 80 char
-    8. Use backslash (\) to break longer lines
-    9. Use spaces (e.g. 4) to indent continuation lines in programlistings
-   10. No trailing spaces on any line
-   11. No spaces or linefeed immediately after leading <programlisting>
-   12. No spaces or linefeed before trailing </programlisting>
-DocBook Format: <ulink> - rules: ELTF_*URL* variables
-   13. ELTF_*URL and corresponding ELTF_*TXTURL shall be identical strings
-   14. Only if the URL is extremely long, the TXTURL can be a separate string
-Each target has one section with target parameters:
-       <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-        <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-          ..... with many ELTF_ variables ....
-       </section>
-   15. If there is only one target. ELTF just replaces ELTF parameters
-   16. It there are multiple targets. ELTF copies the section and appends the
-       section the required number of times.
-       Each section ID will become unique: eltf-target-table-ELTF_T_MANIFEST_DIR
-       Each section title will become unique
-Tables with target parameters in each target section:
-   17. It is possible for ELTF to append more rows with one parameter each
-       to these tables, because the entire tables are included in the book
-Special - NOT YET READY DEFINED how to handle the optionally included
-   Eclipse and its version, but this is a first suggestion:
-   18. Just now ELTF can define ELFT_ECLIPSE_VERSION as a full string
-       with both version number and name,
-   19. MANUALLY if Eclipse is NOT included in the release,
-       the release manager should manually set condition="hidden" on
-       the entire section in the book XML about Eclipse
-BELOW WE TRY TO EXPLAIN EACH ELTF_* variable, but always check with make eltf
-if there are more new variables, missing in this description file.
-_____________________________________________________________________________
-ELTF_PL_HOST_PREREQ       Multiline list of host prerequisites, e.g. commands
-                          like sudo apt-get install xxxx or similar.
-                          First line = comment with the complete host name!
-                          It is possible to include multiple hosts by just
-                          adding an empty line, comment with host name, etc.
-                          xi:include eltf-prereq-apt-get-commands-host/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-# Host Ubuntu 14.04.5 LTS 64bit
-sudo apt-get update
-sudo apt-get install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl
-_____________________________________________________________________________
-ELTF_PL_GET_REPO          Multiline commands to download the repo tool
-                          xi:include eltf-getting-repo-install-command/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH
-_____________________________________________________________________________
-ELTF_EL_REL_VER           General parameter string: The version of this Enea
-                          NFV Access release. Major version and optional .Minor
-                          Typically created from MAJOR and MINOR in enea.conf
-                          MINOR in enea.conf is empty or contains a dot+minor
-                          xi_include EneaLinux_REL_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Examples:
-6
-  or
-6.1
-_____________________________________________________________________________
-ELTF_YOCTO_VER            General parameter string: Yocto version, created
-                          from DISTRO in poky.ent
-                          xi:include Yocto_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-2.1
-_____________________________________________________________________________
-ELTF_YOCTO_NAME           General parameter string: Yocto name (branch), created
-                          from DISTRO_NAME_NO_CAP in poky.ent
-                          xi:include Yocto_NAME/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-krogoth
-_____________________________________________________________________________
-ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL  General parameters. These two are IDENTICAL
-ELTF_YOCTO_PROJ_DOWNLOAD_URL     strings with correct Yocto version string
-                                 at the end, typically without "dot".
-                          xi:include ULINK_YOCTO_PROJECT_DOWNLOAD/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://www.yoctoproject.org/downloads/core/krogoth/21
-_____________________________________________________________________________
-ELTF_EL_DOWNLOAD_TXTURL   General parameters. These two are IDENTICAL strings
-ELTF_EL_DOWNLOAD_URL      and shall be the http:/..... address where
-                          Enea NFV Access can be downloaded
-                          Often containing same version as in ELTF_EL_REL_VER
-                          xi:include ULINK_ENEA_LINUX_URL/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://linux.enea.com/6
-_____________________________________________________________________________
-ELTF_PL_CLONE_W_REPO      Multiline commands to run repo to clone everything.
-                          Use the variable $MACHINE/default.xml (the text in
-                          the book will list the avaiable values of MACHINE,
-                          taken from the manifest repository)
-                          xi:include eltf-repo-cloning-enea-linux/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync
-_____________________________________________________________________________
-ELTF_ECLIPSE_VERSION      Optional general parameter string.
-                          NOT YET READY DEFINED
-                          Just now a release manage must manually set
-                          condition="hidden" on the Eclipse section,
-                          if Eclipse is not included in the release.
-                          ELTF just replaces ELTF_ECLIPSE_VERSION with a full
-                          string with "X.Y (name)"
-                          It includes the ID and can only be ONCE in the book.
-                          xi:include eltf-eclipse-version-row
-                          Example.
-4.5 (Mars)
-_____________________________________________________________________________
-ELTF_T_*                  All these are in each target (MACHINE) and ELTF
-                          must separately replace them with strings for
-                          each target
-                          NOTE: All (except the MANIFEST_DIR) are in rows
-                                in a table and ELTF can select to append
-                                more parameters by adding more rows
-_____________________________________________________________________________
-ELTF_T_MANIFEST_DIR       This happens to be in two places. Must be exactly
-ELTF_T_MANIFEST_DIR       the directory name in the manifest, e.g. same
-                          as the MACHINE names in $MACHINE/default.xml.
-                          In book: a) Part of section ID
-                                   b) Part of section title
-                          Examples:
-p2041rgb
-  or
-ls1021aiot
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_NAME               Target specific: "Target Official Name"
-                          NOT same as the target directory name in most cases.
-                          In book: An <entry> element in a row
-                          Examples:
-P2041RGB
-  or
-LS1021a-IoT
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_ARC_DESC           Target specific: "Architecture and Description"
-                          It can be a short identification string or
-                          it can be a longer descriptive sentence.
-                          In book: An <entry> element in a row
-                          Examples:
-Power, e500mc
-  or
-ARM Cortex-A7
-_____________________________________________________________________________
-ELTF_T_DS_TXTURL          Target specific: "Link to target datasheet. These
-ELTF_T_DS_URL             two usually are IDENTICAL strings with correct
-                          hyperlink to the target's official datasheet.
-                          In book: an <ulink url="...">...</ulink>
-                          Only if the link is VERY LONG, the text part shall
-                          instead be a descriptive string (see 2:nd example).
-                          NOTE: Also here no spaces or line-feeds!
-                          Examples:
-url="http://wiki.qemu.org">http://wiki.qemu.org
-or
-url="http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls1021a-iot-gateway-reference-design:LS1021A-IoT">link to NXP's datasheet
-_____________________________________________________________________________
-ELTF_T_POKY_VER           Target specific: "Poky version" created either
-                          from POKYVERSION in poky.ent
-                          or using a hashvalue with a leading string, in
-                          which case it may be different per target.
-                          In book: An <entry> in a row
-                          Examples:
-15.0.0
-or
-Git commit id: 75ca53211488a3e268037a44ee2a7ac5c7181bd2
-_____________________________________________________________________________
-ELTF_T_GCC_VER            Target specific: "GCC Version". Should be in poky
-                          but not easy to find among various parameters.
-                          ELTF would extract it from build logs building SDK
-                          and it is possibly different per target.
-                          In book: An <entry> in a row
-                          Example:
-5.3
-_____________________________________________________________________________
-ELTF_T_KERN_VER           Target specific: "Linux Kernel Version". Often
-                          different per target.
-                          In book: An <entry> in a row
-                          Example:
-3.12
-_____________________________________________________________________________
-ELTF_T_DRIVERS            Target specific: "Supported Drivers". This is a
-                          comma-separated list of driver names.
-                          ELTF should create the list in same order for each
-                          target, e.g. alphabetic migth be OK.
-                          In book: An <entry> in a row
-                          Example:
-Ethernet, I2C, SPI, PCI, USB, SD/SDHC/SDXC
-_____________________________________________________________________________
-ELTF_T_EL_RPM_TXTURL      Target specific: "Enea rpm folder for downloading
-ELTF_T_EL_RPM_URL         RPM packages for this target". These two are
-                          INDENTICAL strings with hyperlink to the web site
-                          at Enea where the customer can download RPMs
-                          Note: Often the ELFT_EL_REL_VER value and
-                                the ELTF_T_MANIFEST_DIR are used in the link.
-                          In book: an <ulink url="...">...</ulink>
-                          Example:
-url="https://linux.enea.com/6/ls1021aiot/rpm">https://linux.enea.com/6/ls1021aiot/rpm
-_____________________________________________________________________________
diff --git a/doc/book-enea-nfv-access-evalkit/doc/book.xml b/doc/book-enea-nfv-access-evalkit/doc/book.xml
index e78cbf9..04c3dea 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/book.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/book.xml
@@ -6,9 +6,9 @@
 <book id="book_enea_nfv_access_evalkit">
  <title><trademark class="registered">Enea</trademark> NFV Access EvalKit Manual</title>
-  <subtitle>Release Version <xi:include href="eltf_params_updated.xml"
+  <subtitle>Release Version
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-nfv-access-evalkit/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-evalkit/doc/eltf_params_updated.xml
deleted file mode 100644
index 1a640a3..0000000
--- a/doc/book-enea-nfv-access-evalkit/doc/eltf_params_updated.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting># Host Ubuntu 16.04 LTS 64bit
-sudo apt-get -y update
-sudo apt-get -y install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo &gt; ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>2.2.1</phrase></para>
-    <para id="Yocto_VER"><phrase>2.4</phrase></para>
-    <para id="Yocto_NAME"><phrase>rocko</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    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>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY in book, set
-    condition hidden if eclipse is not in the release. Do this both in
-    template.xml and updated.xml.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row condition="hidden" id="eltf-eclipse-version-row">
-            <entry>Eclipse version 4.3 (Mars) plus command line development
-            tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Processor with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Reference Processor with Parameters</title>
-    <para>The table(s) below describes the processors supported in this Enea
-    NFV Access release.</para>
-    <table>
-      <title>Processor Information Intel Xeon D-1500</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Processor official name</entry>
-            <entry>Intel Xeon D-1500</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to processor datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <title>Processor Information Intel Atom C3000</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Processor official name</entry>
-            <entry>Intel Atom C3000</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to the processor datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/products/docs/processors/atom/c-series/c3000-family-datasheet.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </section>
-</section>
diff --git a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
index 922be79..d2254f0 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
@@ -153,7 +153,10 @@
      </listitem>
    </itemizedlist>
-    <para>See the Enea NFV Access 2.2.1 Release Information for more
+    <para>See the Enea NFV Access <xi:include
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /> Release Information for more
    details.</para>
  </section>
 </chapter>
 \ No newline at end of file
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/book.xml b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
index e3e6adc..05fd522 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/book.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
@@ -6,9 +6,9 @@
 <book id="book_enea_nfv_access_example_usecases">
  <title><trademark class="registered">Enea</trademark> NFV Access Example Use-cases</title>
-  <subtitle>Release Version <xi:include href="eltf_params_updated.xml"
+  <subtitle>Release Version
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_template.xml
deleted file mode 100644
index eaa7ebd..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_template.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting>ELTF_PL_HOST_PREREQ</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>ELTF_PL_GET_REPO</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>ELTF_EL_REL_VER</phrase></para>
-    <para id="Yocto_VER"><phrase>ELTF_YOCTO_VER</phrase></para>
-    <para id="Yocto_NAME"><phrase>ELTF_YOCTO_NAME</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    url="ELTF_YOCTO_PROJ_DOWNLOAD_URL">ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL</ulink></para>
-    <para id="ULINK_ENEA_LINUX_URL"><ulink
-    url="ELTF_EL_DOWNLOAD_URL">ELTF_EL_DOWNLOAD_TXTURL</ulink></para>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>ELTF_PL_CLONE_W_REPO</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY BOTH in the
-    template.xml and in the updated.xml, set condition hidden on the
-    &lt;row&gt;, if eclipse is not in the release.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row id="eltf-eclipse-version-row">
-            <entry>Eclipse version ELTF_ECLIPSE_VERSION plus command line
-            development tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Targets with Parameters</title>
-    <para>The tables below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-      <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-      <para><informaltable>
-          <tgroup cols="2">
-            <colspec colwidth="6*" />
-            <colspec colwidth="9*" />
-            <tbody>
-              <row>
-                <entry>Target official name</entry>
-                <entry>ELTF_T_NAME</entry>
-              </row>
-              <row>
-                <entry>Architecture and Description</entry>
-                <entry>ELTF_T_ARC_DESC</entry>
-              </row>
-              <row>
-                <entry>Link to target datasheet</entry>
-                <entry>See <ulink
-                url="ELTF_T_DS_URL">ELTF_T_DS_TXTURL</ulink></entry>
-              </row>
-              <row>
-                <entry>Poky version</entry>
-                <entry>ELTF_T_POKY_VER</entry>
-              </row>
-              <row>
-                <entry>GCC version</entry>
-                <entry>ELTF_T_GCC_VER</entry>
-              </row>
-              <row>
-                <entry>Linux Kernel Version</entry>
-                <entry>ELTF_T_KERN_VER</entry>
-              </row>
-              <row>
-                <entry>Supported Drivers</entry>
-                <entry>ELTF_T_DRIVERS</entry>
-              </row>
-              <row>
-                <entry>Enea rpm folder for downloading RPM packages for this
-                target</entry>
-                <entry><ulink
-                url="ELTF_T_EL_RPM_URL">ELTF_T_EL_RPM_TXTURL</ulink></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable></para>
-    </section>
-    <!-- ELTFADD_MORE_TARGET_SECTIONS_BELOW_IF_NEEDED -->
-  </section>
-</section>
-\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated.xml
deleted file mode 100644
index bb969c6..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting># Host Ubuntu 16.04 LTS 64bit
-sudo apt-get -y update
-sudo apt-get -y install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo &gt; ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>2.2.1</phrase></para>
-    <para id="Yocto_VER"><phrase>2.1</phrase></para>
-    <para id="Yocto_NAME"><phrase>krogoth</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>
-    <para id="ULINK_ENEA_LINUX_URL"><ulink
-    url="https://linux.enea.com/6">https://linux.enea.com/6</ulink></para>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY in book, set
-    condition hidden if eclipse is not in the release. Do this both in
-    template.xml and updated.xml.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row condition="hidden" id="eltf-eclipse-version-row">
-            <entry>Eclipse version 4.3 (Mars) plus command line development
-            tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Reference Boards with Parameters</title>
-    <para>The table(s) below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <table>
-      <title>MACHINE Information Intel Xeon D</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Xeon D</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <title>MACHINE Information Intel Atom C3000</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Atom C3000</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/products/docs/processors/atom/c-series/c3000-family-datasheet.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table condition="arm">
-      <title>MACHINE Information</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>OCTEON TX™ cn8304</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>arm64</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>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            f01b909a266498853e6b3f10e6b39f2d95148129</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>5.3<remark>FIXME</remark></entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <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-example-usecases/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated_template_how_to_use.txt
deleted file mode 100755
index 62e5d02..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated_template_how_to_use.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-eltf_params_template_updated_howto_use.txt
-This is a way to collect all parameters for an Enea NFV Access release
-in one parameter file, easy to automatically update by ELTF regularly.
-NOTE: Both the release info AND the open source books use parameters from
-      here, but the XML file is inside the release info book directory.
-NOTE: The manifest_conf.mk, or overridden by the environment variable
-      MANIFESTHASH, contains the full tag (or hashvalue) for downloading
-      the manifest when the books are built. The list of target
-      directories are fetched from the manifest into the book.
-      The eltf_params_updates.xml can all the time contain
-      the final next complete tag e.g. refs/tags/EL6 or similar
-      in the ELTF_PL_CLONE_W_REPO parameter command lines.
-The ordinary book XML files use xi:include statements to include elements
-from this parameter file. The book XML files can thus be manually edited.
-Before editing, you must run "make init".
-Any other text in the template or updated.xml file, outside the parts that
-are included in the book, are not used but still all must be correct
-DocBook XML files.
-ELTF work:
- template => ELTF replaces ALL ELTF_xxx variables => updated XML file
-    => push to git only if changed
-eltf_params_template.xml  (in git)
-   File used by ELTF to autocreate/update the real parameter
-   file eltf_params_updated.xml.
-eltf_params_updated.xml  (in git)
-   Real parameter file where ELTF has replaced all ELTF_xx variables with
-   strings, in several cases with multiline strings.
-   No spaces or linefeed allowed in beginning or end of the variable values!
-xi:include: Each parameter is xi:include'ed in various book files, using
-   the IDs existing in the parameter files.
-   In most cases the 1:st element inside an element with an ID is included
-   using a format like eltf-prereq-apt-get-commands-host/1.
-   In very few cases the element with the ID is included in the book, one
-   example is the target section which has an ID, but which contains
-   multiple subsections, one per target.
-   All IDs in a book must be unique.
-DocBook XML: All XML files must be correct DocBook XML files.
-Do NOT edit/save the real *updated.xml file with XMLmind to avoid changes
-   not done by ELTF. But it is OK to open the real file in XMLmind to
-   check that the format is correct.
-ELTF should autocreate a temporary "real" file but only replace
-   and push the eltf_params_updated.xml if it is changed.
-make eltf
-   This lists all ELTF_xxx variables and some rules how to treat them
-DocBook Format: All elements - rules:
-   Several strict generic XML rules apply for all strings:
-    1. No TABs allowed or any other control chr than "linefeed"
-    2. Only 7-bit ASCII
-    3. Any < > & must be converted to &lt; &gt; and &amp;
-       Similar for any other non-7-bit-ASCII but avoid those!
-    4. No leading spaces or linefeeds when replacing the ELTF_* variable
-    5. No trailing spaces or linefeeds when replacing the ELTF_* variable
-    6. Note: Keep existing spaces before/efter ELTF_* in a few cases.
-DocBook Format: <programlisting> - rules: ELTF*PL* variables
-   Several strict rules apply for the multiline string in programlisting
-   in addition to the general XML rules above:
-    7. Max line length < 80 char
-    8. Use backslash (\) to break longer lines
-    9. Use spaces (e.g. 4) to indent continuation lines in programlistings
-   10. No trailing spaces on any line
-   11. No spaces or linefeed immediately after leading <programlisting>
-   12. No spaces or linefeed before trailing </programlisting>
-DocBook Format: <ulink> - rules: ELTF_*URL* variables
-   13. ELTF_*URL and corresponding ELTF_*TXTURL shall be identical strings
-   14. Only if the URL is extremely long, the TXTURL can be a separate string
-Each target has one section with target parameters:
-       <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-        <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-          ..... with many ELTF_ variables ....
-       </section>
-   15. If there is only one target. ELTF just replaces ELTF parameters
-   16. It there are multiple targets. ELTF copies the section and appends the
-       section the required number of times.
-       Each section ID will become unique: eltf-target-table-ELTF_T_MANIFEST_DIR
-       Each section title will become unique
-Tables with target parameters in each target section:
-   17. It is possible for ELTF to append more rows with one parameter each
-       to these tables, because the entire tables are included in the book
-Special - NOT YET READY DEFINED how to handle the optionally included
-   Eclipse and its version, but this is a first suggestion:
-   18. Just now ELTF can define ELFT_ECLIPSE_VERSION as a full string
-       with both version number and name,
-   19. MANUALLY if Eclipse is NOT included in the release,
-       the release manager should manually set condition="hidden" on
-       the entire section in the book XML about Eclipse
-BELOW WE TRY TO EXPLAIN EACH ELTF_* variable, but always check with make eltf
-if there are more new variables, missing in this description file.
-_____________________________________________________________________________
-ELTF_PL_HOST_PREREQ       Multiline list of host prerequisites, e.g. commands
-                          like sudo apt-get install xxxx or similar.
-                          First line = comment with the complete host name!
-                          It is possible to include multiple hosts by just
-                          adding an empty line, comment with host name, etc.
-                          xi:include eltf-prereq-apt-get-commands-host/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-# Host Ubuntu 14.04.5 LTS 64bit
-sudo apt-get update
-sudo apt-get install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl
-_____________________________________________________________________________
-ELTF_PL_GET_REPO          Multiline commands to download the repo tool
-                          xi:include eltf-getting-repo-install-command/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH
-_____________________________________________________________________________
-ELTF_EL_REL_VER           General parameter string: The version of this Enea
-                          NFV Access release. Major version and optional .Minor
-                          Typically created from MAJOR and MINOR in enea.conf
-                          MINOR in enea.conf is empty or contains a dot+minor
-                          xi_include EneaLinux_REL_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Examples:
-6
-  or
-6.1
-_____________________________________________________________________________
-ELTF_YOCTO_VER            General parameter string: Yocto version, created
-                          from DISTRO in poky.ent
-                          xi:include Yocto_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-2.1
-_____________________________________________________________________________
-ELTF_YOCTO_NAME           General parameter string: Yocto name (branch), created
-                          from DISTRO_NAME_NO_CAP in poky.ent
-                          xi:include Yocto_NAME/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-krogoth
-_____________________________________________________________________________
-ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL  General parameters. These two are IDENTICAL
-ELTF_YOCTO_PROJ_DOWNLOAD_URL     strings with correct Yocto version string
-                                 at the end, typically without "dot".
-                          xi:include ULINK_YOCTO_PROJECT_DOWNLOAD/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://www.yoctoproject.org/downloads/core/krogoth/21
-_____________________________________________________________________________
-ELTF_EL_DOWNLOAD_TXTURL   General parameters. These two are IDENTICAL strings
-ELTF_EL_DOWNLOAD_URL      and shall be the http:/..... address where
-                          Enea NFV Access can be downloaded
-                          Often containing same version as in ELTF_EL_REL_VER
-                          xi:include ULINK_ENEA_LINUX_URL/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://linux.enea.com/6
-_____________________________________________________________________________
-ELTF_PL_CLONE_W_REPO      Multiline commands to run repo to clone everything.
-                          Use the variable $MACHINE/default.xml (the text in
-                          the book will list the avaiable values of MACHINE,
-                          taken from the manifest repository)
-                          xi:include eltf-repo-cloning-enea-linux/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync
-_____________________________________________________________________________
-ELTF_ECLIPSE_VERSION      Optional general parameter string.
-                          NOT YET READY DEFINED
-                          Just now a release manage must manually set
-                          condition="hidden" on the Eclipse section,
-                          if Eclipse is not included in the release.
-                          ELTF just replaces ELTF_ECLIPSE_VERSION with a full
-                          string with "X.Y (name)"
-                          It includes the ID and can only be ONCE in the book.
-                          xi:include eltf-eclipse-version-row
-                          Example.
-4.5 (Mars)
-_____________________________________________________________________________
-ELTF_T_*                  All these are in each target (MACHINE) and ELTF
-                          must separately replace them with strings for
-                          each target
-                          NOTE: All (except the MANIFEST_DIR) are in rows
-                                in a table and ELTF can select to append
-                                more parameters by adding more rows
-_____________________________________________________________________________
-ELTF_T_MANIFEST_DIR       This happens to be in two places. Must be exactly
-ELTF_T_MANIFEST_DIR       the directory name in the manifest, e.g. same
-                          as the MACHINE names in $MACHINE/default.xml.
-                          In book: a) Part of section ID
-                                   b) Part of section title
-                          Examples:
-p2041rgb
-  or
-ls1021aiot
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_NAME               Target specific: "Target Official Name"
-                          NOT same as the target directory name in most cases.
-                          In book: An <entry> element in a row
-                          Examples:
-P2041RGB
-  or
-LS1021a-IoT
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_ARC_DESC           Target specific: "Architecture and Description"
-                          It can be a short identification string or
-                          it can be a longer descriptive sentence.
-                          In book: An <entry> element in a row
-                          Examples:
-Power, e500mc
-  or
-ARM Cortex-A7
-_____________________________________________________________________________
-ELTF_T_DS_TXTURL          Target specific: "Link to target datasheet. These
-ELTF_T_DS_URL             two usually are IDENTICAL strings with correct
-                          hyperlink to the target's official datasheet.
-                          In book: an <ulink url="...">...</ulink>
-                          Only if the link is VERY LONG, the text part shall
-                          instead be a descriptive string (see 2:nd example).
-                          NOTE: Also here no spaces or line-feeds!
-                          Examples:
-url="http://wiki.qemu.org">http://wiki.qemu.org
-or
-url="http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls1021a-iot-gateway-reference-design:LS1021A-IoT">link to NXP's datasheet
-_____________________________________________________________________________
-ELTF_T_POKY_VER           Target specific: "Poky version" created either
-                          from POKYVERSION in poky.ent
-                          or using a hashvalue with a leading string, in
-                          which case it may be different per target.
-                          In book: An <entry> in a row
-                          Examples:
-15.0.0
-or
-Git commit id: 75ca53211488a3e268037a44ee2a7ac5c7181bd2
-_____________________________________________________________________________
-ELTF_T_GCC_VER            Target specific: "GCC Version". Should be in poky
-                          but not easy to find among various parameters.
-                          ELTF would extract it from build logs building SDK
-                          and it is possibly different per target.
-                          In book: An <entry> in a row
-                          Example:
-5.3
-_____________________________________________________________________________
-ELTF_T_KERN_VER           Target specific: "Linux Kernel Version". Often
-                          different per target.
-                          In book: An <entry> in a row
-                          Example:
-3.12
-_____________________________________________________________________________
-ELTF_T_DRIVERS            Target specific: "Supported Drivers". This is a
-                          comma-separated list of driver names.
-                          ELTF should create the list in same order for each
-                          target, e.g. alphabetic migth be OK.
-                          In book: An <entry> in a row
-                          Example:
-Ethernet, I2C, SPI, PCI, USB, SD/SDHC/SDXC
-_____________________________________________________________________________
-ELTF_T_EL_RPM_TXTURL      Target specific: "Enea rpm folder for downloading
-ELTF_T_EL_RPM_URL         RPM packages for this target". These two are
-                          INDENTICAL strings with hyperlink to the web site
-                          at Enea where the customer can download RPMs
-                          Note: Often the ELFT_EL_REL_VER value and
-                                the ELTF_T_MANIFEST_DIR are used in the link.
-                          In book: an <ulink url="...">...</ulink>
-                          Example:
-url="https://linux.enea.com/6/ls1021aiot/rpm">https://linux.enea.com/6/ls1021aiot/rpm
-_____________________________________________________________________________
diff --git a/doc/book-enea-nfv-access-getting-started/doc/book.xml b/doc/book-enea-nfv-access-getting-started/doc/book.xml
index 4ddc693..893546b 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/book.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/book.xml
@@ -6,9 +6,9 @@
 <book id="book_enea_nfv_access_getting_started">
  <title><trademark class="registered">Enea</trademark> NFV Access Getting Started</title>
-  <subtitle>Release Version <xi:include href="eltf_params_updated.xml"
+  <subtitle>Release Version
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-nfv-access-getting-started/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-getting-started/doc/eltf_params_template.xml
deleted file mode 100644
index eaa7ebd..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/eltf_params_template.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting>ELTF_PL_HOST_PREREQ</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>ELTF_PL_GET_REPO</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>ELTF_EL_REL_VER</phrase></para>
-    <para id="Yocto_VER"><phrase>ELTF_YOCTO_VER</phrase></para>
-    <para id="Yocto_NAME"><phrase>ELTF_YOCTO_NAME</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    url="ELTF_YOCTO_PROJ_DOWNLOAD_URL">ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL</ulink></para>
-    <para id="ULINK_ENEA_LINUX_URL"><ulink
-    url="ELTF_EL_DOWNLOAD_URL">ELTF_EL_DOWNLOAD_TXTURL</ulink></para>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>ELTF_PL_CLONE_W_REPO</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY BOTH in the
-    template.xml and in the updated.xml, set condition hidden on the
-    &lt;row&gt;, if eclipse is not in the release.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row id="eltf-eclipse-version-row">
-            <entry>Eclipse version ELTF_ECLIPSE_VERSION plus command line
-            development tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Targets with Parameters</title>
-    <para>The tables below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-      <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-      <para><informaltable>
-          <tgroup cols="2">
-            <colspec colwidth="6*" />
-            <colspec colwidth="9*" />
-            <tbody>
-              <row>
-                <entry>Target official name</entry>
-                <entry>ELTF_T_NAME</entry>
-              </row>
-              <row>
-                <entry>Architecture and Description</entry>
-                <entry>ELTF_T_ARC_DESC</entry>
-              </row>
-              <row>
-                <entry>Link to target datasheet</entry>
-                <entry>See <ulink
-                url="ELTF_T_DS_URL">ELTF_T_DS_TXTURL</ulink></entry>
-              </row>
-              <row>
-                <entry>Poky version</entry>
-                <entry>ELTF_T_POKY_VER</entry>
-              </row>
-              <row>
-                <entry>GCC version</entry>
-                <entry>ELTF_T_GCC_VER</entry>
-              </row>
-              <row>
-                <entry>Linux Kernel Version</entry>
-                <entry>ELTF_T_KERN_VER</entry>
-              </row>
-              <row>
-                <entry>Supported Drivers</entry>
-                <entry>ELTF_T_DRIVERS</entry>
-              </row>
-              <row>
-                <entry>Enea rpm folder for downloading RPM packages for this
-                target</entry>
-                <entry><ulink
-                url="ELTF_T_EL_RPM_URL">ELTF_T_EL_RPM_TXTURL</ulink></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable></para>
-    </section>
-    <!-- ELTFADD_MORE_TARGET_SECTIONS_BELOW_IF_NEEDED -->
-  </section>
-</section>
-\ No newline at end of file
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
deleted file mode 100644
index be0be23..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/eltf_params_updated.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting># Host Ubuntu 16.04 LTS 64bit
-sudo apt-get -y update
-sudo apt-get -y install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo &gt; ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>2.2.2</phrase></para>
-    <para id="Yocto_VER"><phrase>2.4</phrase></para>
-    <para id="Yocto_NAME"><phrase>rocko</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    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>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY in book, set
-    condition hidden if eclipse is not in the release. Do this both in
-    template.xml and updated.xml.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row condition="hidden" id="eltf-eclipse-version-row">
-            <entry>Eclipse version 4.3 (Mars) plus command line development
-            tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Reference Boards with Parameters</title>
-    <para>The table(s) below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <table>
-      <title>MACHINE Information Intel Xeon D</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Xeon D</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <title>MACHINE Information Intel Atom C3000</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Atom C3000</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/products/docs/processors/atom/c-series/c3000-family-datasheet.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table condition="arm">
-      <title>MACHINE Information</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>OCTEON TX™ cn8304</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>arm64</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>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            f01b909a266498853e6b3f10e6b39f2d95148129</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>5.3<remark>FIXME</remark></entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <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>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-getting-started/doc/eltf_params_updated_template_how_to_use.txt
deleted file mode 100755
index 62e5d02..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/eltf_params_updated_template_how_to_use.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-eltf_params_template_updated_howto_use.txt
-This is a way to collect all parameters for an Enea NFV Access release
-in one parameter file, easy to automatically update by ELTF regularly.
-NOTE: Both the release info AND the open source books use parameters from
-      here, but the XML file is inside the release info book directory.
-NOTE: The manifest_conf.mk, or overridden by the environment variable
-      MANIFESTHASH, contains the full tag (or hashvalue) for downloading
-      the manifest when the books are built. The list of target
-      directories are fetched from the manifest into the book.
-      The eltf_params_updates.xml can all the time contain
-      the final next complete tag e.g. refs/tags/EL6 or similar
-      in the ELTF_PL_CLONE_W_REPO parameter command lines.
-The ordinary book XML files use xi:include statements to include elements
-from this parameter file. The book XML files can thus be manually edited.
-Before editing, you must run "make init".
-Any other text in the template or updated.xml file, outside the parts that
-are included in the book, are not used but still all must be correct
-DocBook XML files.
-ELTF work:
- template => ELTF replaces ALL ELTF_xxx variables => updated XML file
-    => push to git only if changed
-eltf_params_template.xml  (in git)
-   File used by ELTF to autocreate/update the real parameter
-   file eltf_params_updated.xml.
-eltf_params_updated.xml  (in git)
-   Real parameter file where ELTF has replaced all ELTF_xx variables with
-   strings, in several cases with multiline strings.
-   No spaces or linefeed allowed in beginning or end of the variable values!
-xi:include: Each parameter is xi:include'ed in various book files, using
-   the IDs existing in the parameter files.
-   In most cases the 1:st element inside an element with an ID is included
-   using a format like eltf-prereq-apt-get-commands-host/1.
-   In very few cases the element with the ID is included in the book, one
-   example is the target section which has an ID, but which contains
-   multiple subsections, one per target.
-   All IDs in a book must be unique.
-DocBook XML: All XML files must be correct DocBook XML files.
-Do NOT edit/save the real *updated.xml file with XMLmind to avoid changes
-   not done by ELTF. But it is OK to open the real file in XMLmind to
-   check that the format is correct.
-ELTF should autocreate a temporary "real" file but only replace
-   and push the eltf_params_updated.xml if it is changed.
-make eltf
-   This lists all ELTF_xxx variables and some rules how to treat them
-DocBook Format: All elements - rules:
-   Several strict generic XML rules apply for all strings:
-    1. No TABs allowed or any other control chr than "linefeed"
-    2. Only 7-bit ASCII
-    3. Any < > & must be converted to &lt; &gt; and &amp;
-       Similar for any other non-7-bit-ASCII but avoid those!
-    4. No leading spaces or linefeeds when replacing the ELTF_* variable
-    5. No trailing spaces or linefeeds when replacing the ELTF_* variable
-    6. Note: Keep existing spaces before/efter ELTF_* in a few cases.
-DocBook Format: <programlisting> - rules: ELTF*PL* variables
-   Several strict rules apply for the multiline string in programlisting
-   in addition to the general XML rules above:
-    7. Max line length < 80 char
-    8. Use backslash (\) to break longer lines
-    9. Use spaces (e.g. 4) to indent continuation lines in programlistings
-   10. No trailing spaces on any line
-   11. No spaces or linefeed immediately after leading <programlisting>
-   12. No spaces or linefeed before trailing </programlisting>
-DocBook Format: <ulink> - rules: ELTF_*URL* variables
-   13. ELTF_*URL and corresponding ELTF_*TXTURL shall be identical strings
-   14. Only if the URL is extremely long, the TXTURL can be a separate string
-Each target has one section with target parameters:
-       <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-        <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-          ..... with many ELTF_ variables ....
-       </section>
-   15. If there is only one target. ELTF just replaces ELTF parameters
-   16. It there are multiple targets. ELTF copies the section and appends the
-       section the required number of times.
-       Each section ID will become unique: eltf-target-table-ELTF_T_MANIFEST_DIR
-       Each section title will become unique
-Tables with target parameters in each target section:
-   17. It is possible for ELTF to append more rows with one parameter each
-       to these tables, because the entire tables are included in the book
-Special - NOT YET READY DEFINED how to handle the optionally included
-   Eclipse and its version, but this is a first suggestion:
-   18. Just now ELTF can define ELFT_ECLIPSE_VERSION as a full string
-       with both version number and name,
-   19. MANUALLY if Eclipse is NOT included in the release,
-       the release manager should manually set condition="hidden" on
-       the entire section in the book XML about Eclipse
-BELOW WE TRY TO EXPLAIN EACH ELTF_* variable, but always check with make eltf
-if there are more new variables, missing in this description file.
-_____________________________________________________________________________
-ELTF_PL_HOST_PREREQ       Multiline list of host prerequisites, e.g. commands
-                          like sudo apt-get install xxxx or similar.
-                          First line = comment with the complete host name!
-                          It is possible to include multiple hosts by just
-                          adding an empty line, comment with host name, etc.
-                          xi:include eltf-prereq-apt-get-commands-host/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-# Host Ubuntu 14.04.5 LTS 64bit
-sudo apt-get update
-sudo apt-get install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl
-_____________________________________________________________________________
-ELTF_PL_GET_REPO          Multiline commands to download the repo tool
-                          xi:include eltf-getting-repo-install-command/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH
-_____________________________________________________________________________
-ELTF_EL_REL_VER           General parameter string: The version of this Enea
-                          NFV Access release. Major version and optional .Minor
-                          Typically created from MAJOR and MINOR in enea.conf
-                          MINOR in enea.conf is empty or contains a dot+minor
-                          xi_include EneaLinux_REL_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Examples:
-6
-  or
-6.1
-_____________________________________________________________________________
-ELTF_YOCTO_VER            General parameter string: Yocto version, created
-                          from DISTRO in poky.ent
-                          xi:include Yocto_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-2.1
-_____________________________________________________________________________
-ELTF_YOCTO_NAME           General parameter string: Yocto name (branch), created
-                          from DISTRO_NAME_NO_CAP in poky.ent
-                          xi:include Yocto_NAME/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-krogoth
-_____________________________________________________________________________
-ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL  General parameters. These two are IDENTICAL
-ELTF_YOCTO_PROJ_DOWNLOAD_URL     strings with correct Yocto version string
-                                 at the end, typically without "dot".
-                          xi:include ULINK_YOCTO_PROJECT_DOWNLOAD/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://www.yoctoproject.org/downloads/core/krogoth/21
-_____________________________________________________________________________
-ELTF_EL_DOWNLOAD_TXTURL   General parameters. These two are IDENTICAL strings
-ELTF_EL_DOWNLOAD_URL      and shall be the http:/..... address where
-                          Enea NFV Access can be downloaded
-                          Often containing same version as in ELTF_EL_REL_VER
-                          xi:include ULINK_ENEA_LINUX_URL/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://linux.enea.com/6
-_____________________________________________________________________________
-ELTF_PL_CLONE_W_REPO      Multiline commands to run repo to clone everything.
-                          Use the variable $MACHINE/default.xml (the text in
-                          the book will list the avaiable values of MACHINE,
-                          taken from the manifest repository)
-                          xi:include eltf-repo-cloning-enea-linux/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync
-_____________________________________________________________________________
-ELTF_ECLIPSE_VERSION      Optional general parameter string.
-                          NOT YET READY DEFINED
-                          Just now a release manage must manually set
-                          condition="hidden" on the Eclipse section,
-                          if Eclipse is not included in the release.
-                          ELTF just replaces ELTF_ECLIPSE_VERSION with a full
-                          string with "X.Y (name)"
-                          It includes the ID and can only be ONCE in the book.
-                          xi:include eltf-eclipse-version-row
-                          Example.
-4.5 (Mars)
-_____________________________________________________________________________
-ELTF_T_*                  All these are in each target (MACHINE) and ELTF
-                          must separately replace them with strings for
-                          each target
-                          NOTE: All (except the MANIFEST_DIR) are in rows
-                                in a table and ELTF can select to append
-                                more parameters by adding more rows
-_____________________________________________________________________________
-ELTF_T_MANIFEST_DIR       This happens to be in two places. Must be exactly
-ELTF_T_MANIFEST_DIR       the directory name in the manifest, e.g. same
-                          as the MACHINE names in $MACHINE/default.xml.
-                          In book: a) Part of section ID
-                                   b) Part of section title
-                          Examples:
-p2041rgb
-  or
-ls1021aiot
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_NAME               Target specific: "Target Official Name"
-                          NOT same as the target directory name in most cases.
-                          In book: An <entry> element in a row
-                          Examples:
-P2041RGB
-  or
-LS1021a-IoT
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_ARC_DESC           Target specific: "Architecture and Description"
-                          It can be a short identification string or
-                          it can be a longer descriptive sentence.
-                          In book: An <entry> element in a row
-                          Examples:
-Power, e500mc
-  or
-ARM Cortex-A7
-_____________________________________________________________________________
-ELTF_T_DS_TXTURL          Target specific: "Link to target datasheet. These
-ELTF_T_DS_URL             two usually are IDENTICAL strings with correct
-                          hyperlink to the target's official datasheet.
-                          In book: an <ulink url="...">...</ulink>
-                          Only if the link is VERY LONG, the text part shall
-                          instead be a descriptive string (see 2:nd example).
-                          NOTE: Also here no spaces or line-feeds!
-                          Examples:
-url="http://wiki.qemu.org">http://wiki.qemu.org
-or
-url="http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls1021a-iot-gateway-reference-design:LS1021A-IoT">link to NXP's datasheet
-_____________________________________________________________________________
-ELTF_T_POKY_VER           Target specific: "Poky version" created either
-                          from POKYVERSION in poky.ent
-                          or using a hashvalue with a leading string, in
-                          which case it may be different per target.
-                          In book: An <entry> in a row
-                          Examples:
-15.0.0
-or
-Git commit id: 75ca53211488a3e268037a44ee2a7ac5c7181bd2
-_____________________________________________________________________________
-ELTF_T_GCC_VER            Target specific: "GCC Version". Should be in poky
-                          but not easy to find among various parameters.
-                          ELTF would extract it from build logs building SDK
-                          and it is possibly different per target.
-                          In book: An <entry> in a row
-                          Example:
-5.3
-_____________________________________________________________________________
-ELTF_T_KERN_VER           Target specific: "Linux Kernel Version". Often
-                          different per target.
-                          In book: An <entry> in a row
-                          Example:
-3.12
-_____________________________________________________________________________
-ELTF_T_DRIVERS            Target specific: "Supported Drivers". This is a
-                          comma-separated list of driver names.
-                          ELTF should create the list in same order for each
-                          target, e.g. alphabetic migth be OK.
-                          In book: An <entry> in a row
-                          Example:
-Ethernet, I2C, SPI, PCI, USB, SD/SDHC/SDXC
-_____________________________________________________________________________
-ELTF_T_EL_RPM_TXTURL      Target specific: "Enea rpm folder for downloading
-ELTF_T_EL_RPM_URL         RPM packages for this target". These two are
-                          INDENTICAL strings with hyperlink to the web site
-                          at Enea where the customer can download RPMs
-                          Note: Often the ELFT_EL_REL_VER value and
-                                the ELTF_T_MANIFEST_DIR are used in the link.
-                          In book: an <ulink url="...">...</ulink>
-                          Example:
-url="https://linux.enea.com/6/ls1021aiot/rpm">https://linux.enea.com/6/ls1021aiot/rpm
-_____________________________________________________________________________
diff --git a/doc/book-enea-nfv-access-open-source/doc/about.xml b/doc/book-enea-nfv-access-open-source/doc/about.xml
index 0ca3155..a7d0215 100644
--- a/doc/book-enea-nfv-access-open-source/doc/about.xml
+++ b/doc/book-enea-nfv-access-open-source/doc/about.xml
@@ -6,7 +6,7 @@
  <para>This document contains the open source and license information
  pertaining to packages provided with Enea NFV Access <xi:include
-  href="../../book-enea-nfv-access-release-info/doc/eltf_params_updated.xml"
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
 </chapter>
 \ No newline at end of file
diff --git a/doc/book-enea-nfv-access-open-source/doc/book.xml b/doc/book-enea-nfv-access-open-source/doc/book.xml
index 49c7e40..7c0efdb 100644
--- a/doc/book-enea-nfv-access-open-source/doc/book.xml
+++ b/doc/book-enea-nfv-access-open-source/doc/book.xml
@@ -6,7 +6,7 @@
 <book id="book_enea_nfv_access_open_source">
  <title><trademark class="registered">Enea</trademark> NFV Access Open Source Report</title>
  <subtitle>Release Version
-         <xi:include href="../../book-enea-nfv-access-release-info/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
  <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
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 fa85b7e..4235d36 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
@@ -5,7 +5,7 @@
  <title>About This Release</title>
  <para>The Enea NFV Access <xi:include
-  href="eltf_params_updated.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
  xpointer="element(EneaLinux_REL_VER/1)" /> Release includes a new version
  of the uCPE Manager as well as other features and optimizations, security
  patches and documentation updates. A list of new features can be found
@@ -93,7 +93,7 @@
  it is in the beginning. The subtitles shall have the directory name of the
  target in the manifest.</remark>
-  <xi:include href="eltf_params_updated.xml"
+  <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude"
              xpointer="element(eltf-target-tables-section)" />
diff --git a/doc/book-enea-nfv-access-release-info/doc/book.xml b/doc/book-enea-nfv-access-release-info/doc/book.xml
index 0673983..057a911 100644
--- a/doc/book-enea-nfv-access-release-info/doc/book.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/book.xml
@@ -7,9 +7,9 @@
  <title><trademark class="registered">Enea</trademark> NFV Access Release
  Information</title>
-  <subtitle>Release Version <xi:include href="eltf_params_updated.xml"
+  <subtitle>Release Version
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
@@ -19,11 +19,6 @@
  <xi:include href="about_release.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <!--
-  <xi:include href="getting_enea_nfv_access.xml" 
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-  -->
  <xi:include href="main_changes.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/doc/book-enea-nfv-access-release-info/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-release-info/doc/eltf_params_template.xml
deleted file mode 100644
index eaa7ebd..0000000
--- a/doc/book-enea-nfv-access-release-info/doc/eltf_params_template.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting>ELTF_PL_HOST_PREREQ</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>ELTF_PL_GET_REPO</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>ELTF_EL_REL_VER</phrase></para>
-    <para id="Yocto_VER"><phrase>ELTF_YOCTO_VER</phrase></para>
-    <para id="Yocto_NAME"><phrase>ELTF_YOCTO_NAME</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    url="ELTF_YOCTO_PROJ_DOWNLOAD_URL">ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL</ulink></para>
-    <para id="ULINK_ENEA_LINUX_URL"><ulink
-    url="ELTF_EL_DOWNLOAD_URL">ELTF_EL_DOWNLOAD_TXTURL</ulink></para>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>ELTF_PL_CLONE_W_REPO</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY BOTH in the
-    template.xml and in the updated.xml, set condition hidden on the
-    &lt;row&gt;, if eclipse is not in the release.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row id="eltf-eclipse-version-row">
-            <entry>Eclipse version ELTF_ECLIPSE_VERSION plus command line
-            development tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Targets with Parameters</title>
-    <para>The tables below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-      <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-      <para><informaltable>
-          <tgroup cols="2">
-            <colspec colwidth="6*" />
-            <colspec colwidth="9*" />
-            <tbody>
-              <row>
-                <entry>Target official name</entry>
-                <entry>ELTF_T_NAME</entry>
-              </row>
-              <row>
-                <entry>Architecture and Description</entry>
-                <entry>ELTF_T_ARC_DESC</entry>
-              </row>
-              <row>
-                <entry>Link to target datasheet</entry>
-                <entry>See <ulink
-                url="ELTF_T_DS_URL">ELTF_T_DS_TXTURL</ulink></entry>
-              </row>
-              <row>
-                <entry>Poky version</entry>
-                <entry>ELTF_T_POKY_VER</entry>
-              </row>
-              <row>
-                <entry>GCC version</entry>
-                <entry>ELTF_T_GCC_VER</entry>
-              </row>
-              <row>
-                <entry>Linux Kernel Version</entry>
-                <entry>ELTF_T_KERN_VER</entry>
-              </row>
-              <row>
-                <entry>Supported Drivers</entry>
-                <entry>ELTF_T_DRIVERS</entry>
-              </row>
-              <row>
-                <entry>Enea rpm folder for downloading RPM packages for this
-                target</entry>
-                <entry><ulink
-                url="ELTF_T_EL_RPM_URL">ELTF_T_EL_RPM_TXTURL</ulink></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable></para>
-    </section>
-    <!-- ELTFADD_MORE_TARGET_SECTIONS_BELOW_IF_NEEDED -->
-  </section>
-</section>
-\ 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
deleted file mode 100644
index df317aa..0000000
--- a/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting># Host Ubuntu 16.04 LTS 64bit
-sudo apt-get -y update
-sudo apt-get -y install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo &gt; ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>2.2.2</phrase></para>
-    <para id="Yocto_VER"><phrase>2.4</phrase></para>
-    <para id="Yocto_NAME"><phrase>rocko</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    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>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY in book, set
-    condition hidden if eclipse is not in the release. Do this both in
-    template.xml and updated.xml.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row condition="hidden" id="eltf-eclipse-version-row">
-            <entry>Eclipse version 4.3 (Mars) plus command line development
-            tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Processor with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Reference Processor with Parameters</title>
-    <para>The table(s) below describes the processors supported in this Enea
-    NFV Access release.</para>
-    <table>
-      <title>Processor Information Intel Xeon D-1500</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Processor official name</entry>
-            <entry>Intel Xeon D-1500</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to processor datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <title>Processor Information Intel Atom C3000</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Processor official name</entry>
-            <entry>Intel Atom C3000</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to the processor datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/products/docs/processors/atom/c-series/c3000-family-datasheet.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </section>
-</section>
diff --git a/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated_template_how_to_use.txt
deleted file mode 100644
index 62e5d02..0000000
--- a/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated_template_how_to_use.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-eltf_params_template_updated_howto_use.txt
-This is a way to collect all parameters for an Enea NFV Access release
-in one parameter file, easy to automatically update by ELTF regularly.
-NOTE: Both the release info AND the open source books use parameters from
-      here, but the XML file is inside the release info book directory.
-NOTE: The manifest_conf.mk, or overridden by the environment variable
-      MANIFESTHASH, contains the full tag (or hashvalue) for downloading
-      the manifest when the books are built. The list of target
-      directories are fetched from the manifest into the book.
-      The eltf_params_updates.xml can all the time contain
-      the final next complete tag e.g. refs/tags/EL6 or similar
-      in the ELTF_PL_CLONE_W_REPO parameter command lines.
-The ordinary book XML files use xi:include statements to include elements
-from this parameter file. The book XML files can thus be manually edited.
-Before editing, you must run "make init".
-Any other text in the template or updated.xml file, outside the parts that
-are included in the book, are not used but still all must be correct
-DocBook XML files.
-ELTF work:
- template => ELTF replaces ALL ELTF_xxx variables => updated XML file
-    => push to git only if changed
-eltf_params_template.xml  (in git)
-   File used by ELTF to autocreate/update the real parameter
-   file eltf_params_updated.xml.
-eltf_params_updated.xml  (in git)
-   Real parameter file where ELTF has replaced all ELTF_xx variables with
-   strings, in several cases with multiline strings.
-   No spaces or linefeed allowed in beginning or end of the variable values!
-xi:include: Each parameter is xi:include'ed in various book files, using
-   the IDs existing in the parameter files.
-   In most cases the 1:st element inside an element with an ID is included
-   using a format like eltf-prereq-apt-get-commands-host/1.
-   In very few cases the element with the ID is included in the book, one
-   example is the target section which has an ID, but which contains
-   multiple subsections, one per target.
-   All IDs in a book must be unique.
-DocBook XML: All XML files must be correct DocBook XML files.
-Do NOT edit/save the real *updated.xml file with XMLmind to avoid changes
-   not done by ELTF. But it is OK to open the real file in XMLmind to
-   check that the format is correct.
-ELTF should autocreate a temporary "real" file but only replace
-   and push the eltf_params_updated.xml if it is changed.
-make eltf
-   This lists all ELTF_xxx variables and some rules how to treat them
-DocBook Format: All elements - rules:
-   Several strict generic XML rules apply for all strings:
-    1. No TABs allowed or any other control chr than "linefeed"
-    2. Only 7-bit ASCII
-    3. Any < > & must be converted to &lt; &gt; and &amp;
-       Similar for any other non-7-bit-ASCII but avoid those!
-    4. No leading spaces or linefeeds when replacing the ELTF_* variable
-    5. No trailing spaces or linefeeds when replacing the ELTF_* variable
-    6. Note: Keep existing spaces before/efter ELTF_* in a few cases.
-DocBook Format: <programlisting> - rules: ELTF*PL* variables
-   Several strict rules apply for the multiline string in programlisting
-   in addition to the general XML rules above:
-    7. Max line length < 80 char
-    8. Use backslash (\) to break longer lines
-    9. Use spaces (e.g. 4) to indent continuation lines in programlistings
-   10. No trailing spaces on any line
-   11. No spaces or linefeed immediately after leading <programlisting>
-   12. No spaces or linefeed before trailing </programlisting>
-DocBook Format: <ulink> - rules: ELTF_*URL* variables
-   13. ELTF_*URL and corresponding ELTF_*TXTURL shall be identical strings
-   14. Only if the URL is extremely long, the TXTURL can be a separate string
-Each target has one section with target parameters:
-       <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-        <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-          ..... with many ELTF_ variables ....
-       </section>
-   15. If there is only one target. ELTF just replaces ELTF parameters
-   16. It there are multiple targets. ELTF copies the section and appends the
-       section the required number of times.
-       Each section ID will become unique: eltf-target-table-ELTF_T_MANIFEST_DIR
-       Each section title will become unique
-Tables with target parameters in each target section:
-   17. It is possible for ELTF to append more rows with one parameter each
-       to these tables, because the entire tables are included in the book
-Special - NOT YET READY DEFINED how to handle the optionally included
-   Eclipse and its version, but this is a first suggestion:
-   18. Just now ELTF can define ELFT_ECLIPSE_VERSION as a full string
-       with both version number and name,
-   19. MANUALLY if Eclipse is NOT included in the release,
-       the release manager should manually set condition="hidden" on
-       the entire section in the book XML about Eclipse
-BELOW WE TRY TO EXPLAIN EACH ELTF_* variable, but always check with make eltf
-if there are more new variables, missing in this description file.
-_____________________________________________________________________________
-ELTF_PL_HOST_PREREQ       Multiline list of host prerequisites, e.g. commands
-                          like sudo apt-get install xxxx or similar.
-                          First line = comment with the complete host name!
-                          It is possible to include multiple hosts by just
-                          adding an empty line, comment with host name, etc.
-                          xi:include eltf-prereq-apt-get-commands-host/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-# Host Ubuntu 14.04.5 LTS 64bit
-sudo apt-get update
-sudo apt-get install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl
-_____________________________________________________________________________
-ELTF_PL_GET_REPO          Multiline commands to download the repo tool
-                          xi:include eltf-getting-repo-install-command/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH
-_____________________________________________________________________________
-ELTF_EL_REL_VER           General parameter string: The version of this Enea
-                          NFV Access release. Major version and optional .Minor
-                          Typically created from MAJOR and MINOR in enea.conf
-                          MINOR in enea.conf is empty or contains a dot+minor
-                          xi_include EneaLinux_REL_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Examples:
-6
-  or
-6.1
-_____________________________________________________________________________
-ELTF_YOCTO_VER            General parameter string: Yocto version, created
-                          from DISTRO in poky.ent
-                          xi:include Yocto_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-2.1
-_____________________________________________________________________________
-ELTF_YOCTO_NAME           General parameter string: Yocto name (branch), created
-                          from DISTRO_NAME_NO_CAP in poky.ent
-                          xi:include Yocto_NAME/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-krogoth
-_____________________________________________________________________________
-ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL  General parameters. These two are IDENTICAL
-ELTF_YOCTO_PROJ_DOWNLOAD_URL     strings with correct Yocto version string
-                                 at the end, typically without "dot".
-                          xi:include ULINK_YOCTO_PROJECT_DOWNLOAD/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://www.yoctoproject.org/downloads/core/krogoth/21
-_____________________________________________________________________________
-ELTF_EL_DOWNLOAD_TXTURL   General parameters. These two are IDENTICAL strings
-ELTF_EL_DOWNLOAD_URL      and shall be the http:/..... address where
-                          Enea NFV Access can be downloaded
-                          Often containing same version as in ELTF_EL_REL_VER
-                          xi:include ULINK_ENEA_LINUX_URL/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://linux.enea.com/6
-_____________________________________________________________________________
-ELTF_PL_CLONE_W_REPO      Multiline commands to run repo to clone everything.
-                          Use the variable $MACHINE/default.xml (the text in
-                          the book will list the avaiable values of MACHINE,
-                          taken from the manifest repository)
-                          xi:include eltf-repo-cloning-enea-linux/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync
-_____________________________________________________________________________
-ELTF_ECLIPSE_VERSION      Optional general parameter string.
-                          NOT YET READY DEFINED
-                          Just now a release manage must manually set
-                          condition="hidden" on the Eclipse section,
-                          if Eclipse is not included in the release.
-                          ELTF just replaces ELTF_ECLIPSE_VERSION with a full
-                          string with "X.Y (name)"
-                          It includes the ID and can only be ONCE in the book.
-                          xi:include eltf-eclipse-version-row
-                          Example.
-4.5 (Mars)
-_____________________________________________________________________________
-ELTF_T_*                  All these are in each target (MACHINE) and ELTF
-                          must separately replace them with strings for
-                          each target
-                          NOTE: All (except the MANIFEST_DIR) are in rows
-                                in a table and ELTF can select to append
-                                more parameters by adding more rows
-_____________________________________________________________________________
-ELTF_T_MANIFEST_DIR       This happens to be in two places. Must be exactly
-ELTF_T_MANIFEST_DIR       the directory name in the manifest, e.g. same
-                          as the MACHINE names in $MACHINE/default.xml.
-                          In book: a) Part of section ID
-                                   b) Part of section title
-                          Examples:
-p2041rgb
-  or
-ls1021aiot
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_NAME               Target specific: "Target Official Name"
-                          NOT same as the target directory name in most cases.
-                          In book: An <entry> element in a row
-                          Examples:
-P2041RGB
-  or
-LS1021a-IoT
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_ARC_DESC           Target specific: "Architecture and Description"
-                          It can be a short identification string or
-                          it can be a longer descriptive sentence.
-                          In book: An <entry> element in a row
-                          Examples:
-Power, e500mc
-  or
-ARM Cortex-A7
-_____________________________________________________________________________
-ELTF_T_DS_TXTURL          Target specific: "Link to target datasheet. These
-ELTF_T_DS_URL             two usually are IDENTICAL strings with correct
-                          hyperlink to the target's official datasheet.
-                          In book: an <ulink url="...">...</ulink>
-                          Only if the link is VERY LONG, the text part shall
-                          instead be a descriptive string (see 2:nd example).
-                          NOTE: Also here no spaces or line-feeds!
-                          Examples:
-url="http://wiki.qemu.org">http://wiki.qemu.org
-or
-url="http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls1021a-iot-gateway-reference-design:LS1021A-IoT">link to NXP's datasheet
-_____________________________________________________________________________
-ELTF_T_POKY_VER           Target specific: "Poky version" created either
-                          from POKYVERSION in poky.ent
-                          or using a hashvalue with a leading string, in
-                          which case it may be different per target.
-                          In book: An <entry> in a row
-                          Examples:
-15.0.0
-or
-Git commit id: 75ca53211488a3e268037a44ee2a7ac5c7181bd2
-_____________________________________________________________________________
-ELTF_T_GCC_VER            Target specific: "GCC Version". Should be in poky
-                          but not easy to find among various parameters.
-                          ELTF would extract it from build logs building SDK
-                          and it is possibly different per target.
-                          In book: An <entry> in a row
-                          Example:
-5.3
-_____________________________________________________________________________
-ELTF_T_KERN_VER           Target specific: "Linux Kernel Version". Often
-                          different per target.
-                          In book: An <entry> in a row
-                          Example:
-3.12
-_____________________________________________________________________________
-ELTF_T_DRIVERS            Target specific: "Supported Drivers". This is a
-                          comma-separated list of driver names.
-                          ELTF should create the list in same order for each
-                          target, e.g. alphabetic migth be OK.
-                          In book: An <entry> in a row
-                          Example:
-Ethernet, I2C, SPI, PCI, USB, SD/SDHC/SDXC
-_____________________________________________________________________________
-ELTF_T_EL_RPM_TXTURL      Target specific: "Enea rpm folder for downloading
-ELTF_T_EL_RPM_URL         RPM packages for this target". These two are
-                          INDENTICAL strings with hyperlink to the web site
-                          at Enea where the customer can download RPMs
-                          Note: Often the ELFT_EL_REL_VER value and
-                                the ELTF_T_MANIFEST_DIR are used in the link.
-                          In book: an <ulink url="...">...</ulink>
-                          Example:
-url="https://linux.enea.com/6/ls1021aiot/rpm">https://linux.enea.com/6/ls1021aiot/rpm
-_____________________________________________________________________________
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/book.xml b/doc/book-enea-nfv-access-system-test-specification/doc/book.xml
index d1b0cae..2620554 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/book.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/book.xml
@@ -6,9 +6,9 @@
 <book id="book_enea_nfv_access_system_test_specification">
  <title><trademark class="registered">Enea</trademark> NFV Access System Test Specification</title>
-  <subtitle>Release Version <xi:include href="eltf_params_updated.xml"
+  <subtitle>Release Version
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-system-test-specification/doc/eltf_params_template.xml
deleted file mode 100644
index eaa7ebd..0000000
--- a/doc/book-enea-nfv-access-system-test-specification/doc/eltf_params_template.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting>ELTF_PL_HOST_PREREQ</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>ELTF_PL_GET_REPO</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>ELTF_EL_REL_VER</phrase></para>
-    <para id="Yocto_VER"><phrase>ELTF_YOCTO_VER</phrase></para>
-    <para id="Yocto_NAME"><phrase>ELTF_YOCTO_NAME</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    url="ELTF_YOCTO_PROJ_DOWNLOAD_URL">ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL</ulink></para>
-    <para id="ULINK_ENEA_LINUX_URL"><ulink
-    url="ELTF_EL_DOWNLOAD_URL">ELTF_EL_DOWNLOAD_TXTURL</ulink></para>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>ELTF_PL_CLONE_W_REPO</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY BOTH in the
-    template.xml and in the updated.xml, set condition hidden on the
-    &lt;row&gt;, if eclipse is not in the release.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row id="eltf-eclipse-version-row">
-            <entry>Eclipse version ELTF_ECLIPSE_VERSION plus command line
-            development tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Targets with Parameters</title>
-    <para>The tables below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-      <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-      <para><informaltable>
-          <tgroup cols="2">
-            <colspec colwidth="6*" />
-            <colspec colwidth="9*" />
-            <tbody>
-              <row>
-                <entry>Target official name</entry>
-                <entry>ELTF_T_NAME</entry>
-              </row>
-              <row>
-                <entry>Architecture and Description</entry>
-                <entry>ELTF_T_ARC_DESC</entry>
-              </row>
-              <row>
-                <entry>Link to target datasheet</entry>
-                <entry>See <ulink
-                url="ELTF_T_DS_URL">ELTF_T_DS_TXTURL</ulink></entry>
-              </row>
-              <row>
-                <entry>Poky version</entry>
-                <entry>ELTF_T_POKY_VER</entry>
-              </row>
-              <row>
-                <entry>GCC version</entry>
-                <entry>ELTF_T_GCC_VER</entry>
-              </row>
-              <row>
-                <entry>Linux Kernel Version</entry>
-                <entry>ELTF_T_KERN_VER</entry>
-              </row>
-              <row>
-                <entry>Supported Drivers</entry>
-                <entry>ELTF_T_DRIVERS</entry>
-              </row>
-              <row>
-                <entry>Enea rpm folder for downloading RPM packages for this
-                target</entry>
-                <entry><ulink
-                url="ELTF_T_EL_RPM_URL">ELTF_T_EL_RPM_TXTURL</ulink></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable></para>
-    </section>
-    <!-- ELTFADD_MORE_TARGET_SECTIONS_BELOW_IF_NEEDED -->
-  </section>
-</section>
-\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-system-test-specification/doc/eltf_params_updated.xml
deleted file mode 100644
index feabc9f..0000000
--- a/doc/book-enea-nfv-access-system-test-specification/doc/eltf_params_updated.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<section id="eltf_created_params">
-  <title>File with Parameters in the Book Auto-updated by ELFT</title>
-  <note>
-    <para>See the <emphasis
-    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
-    file for description of how to create the final <emphasis
-    role="bold">eltf_params_updated.xml</emphasis> from this template and for
-    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
-    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
-    ELTF variables, which always begins with ELTF_ and don't only rely on the
-    howto text file list! The plan is that ELTF will auto-update this when
-    needed.</para>
-  </note>
-  <section id="host_prereq">
-    <title>Common Parameters</title>
-    <bridgehead>A programlisting, ID
-    "eltf-prereq-apt-get-commands-host"</bridgehead>
-    <para id="eltf-prereq-apt-get-commands-host"><programlisting># Host Ubuntu 16.04 LTS 64bit
-sudo apt-get -y update
-sudo apt-get -y install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl</programlisting></para>
-    <bridgehead>A programlisting, ID
-    "eltf-getting-repo-install-command"</bridgehead>
-    <para id="eltf-getting-repo-install-command"><programlisting>mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo &gt; ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH</programlisting></para>
-    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
-    correct also compared to the "previous" REL VER in pardoc-distro.xml
-    "prev_baseline".</bridgehead>
-    <para id="EneaLinux_REL_VER"><phrase>2.2.1</phrase></para>
-    <para id="Yocto_VER"><phrase>2.4</phrase></para>
-    <para id="Yocto_NAME"><phrase>rocko</phrase></para>
-    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
-    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>
-    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
-    $MACHINE/default.xml as parameter, where MACHINE is one of the target
-    directory names in the manifest.</bridgehead>
-    <para id="eltf-repo-cloning-enea-linux"><programlisting>mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync</programlisting></para>
-    <bridgehead>A table with ONE row, only the row with ID
-    "eltf-eclipse-version-row" is included in the book. MANUALLY in book, set
-    condition hidden if eclipse is not in the release. Do this both in
-    template.xml and updated.xml.</bridgehead>
-    <informaltable>
-      <tgroup cols="1">
-        <tbody>
-          <row condition="hidden" id="eltf-eclipse-version-row">
-            <entry>Eclipse version 4.3 (Mars) plus command line development
-            tools are included in this Enea NFV Access release.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <bridgehead>Below is one big section with title "Supported Targets with
-    Parameters". The entire section is included completely in the book via ID
-    "eltf-target-tables-section" and shall be LAST in the template. The
-    template contains ONE target subsection. COPY/APPEND it, if multiple
-    targets exist in the release and optionally add rows with additional
-    target parameters in each target subsection table.</bridgehead>
-  </section>
-  <section id="eltf-target-tables-section">
-    <title>Supported Reference Boards with Parameters</title>
-    <para>The table(s) below describes the target(s) supported in this Enea
-    NFV Access release.</para>
-    <table>
-      <title>MACHINE Information Intel Xeon D</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Xeon D</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table>
-      <title>MACHINE Information Intel Atom C3000</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>Intel Atom C3000</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>x86-64</entry>
-          </row>
-          <row>
-            <entry align="left">Link to target datasheet</entry>
-            <entry><ulink
-            url="https://www.intel.com/content/www/us/en/products/docs/processors/atom/c-series/c3000-family-datasheet.html">Intel's
-            datasheet</ulink></entry>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            7e7ee662f5dea4d090293045f7498093322802cc</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>7.3</entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <entry>4.14</entry>
-          </row>
-          <row condition="hidden">
-            <entry align="left">Supported Drivers</entry>
-            <entry>Ethernet, RTC, UART</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table condition="arm">
-      <title>MACHINE Information</title>
-      <tgroup cols="2">
-        <colspec align="center" />
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-            <entry align="center">Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry align="left">Target official name</entry>
-            <entry>OCTEON TX™ cn8304</entry>
-          </row>
-          <row>
-            <entry align="left">Architecture and Description</entry>
-            <entry>arm64</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>
-          </row>
-          <row>
-            <entry align="left">Poky version</entry>
-            <entry>Git-commit-id:
-            f01b909a266498853e6b3f10e6b39f2d95148129</entry>
-          </row>
-          <row>
-            <entry align="left">GCC version</entry>
-            <entry>5.3<remark>FIXME</remark></entry>
-          </row>
-          <row>
-            <entry align="left">Linux Kernel Version</entry>
-            <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-system-test-specification/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-system-test-specification/doc/eltf_params_updated_template_how_to_use.txt
deleted file mode 100755
index 62e5d02..0000000
--- a/doc/book-enea-nfv-access-system-test-specification/doc/eltf_params_updated_template_how_to_use.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-eltf_params_template_updated_howto_use.txt
-This is a way to collect all parameters for an Enea NFV Access release
-in one parameter file, easy to automatically update by ELTF regularly.
-NOTE: Both the release info AND the open source books use parameters from
-      here, but the XML file is inside the release info book directory.
-NOTE: The manifest_conf.mk, or overridden by the environment variable
-      MANIFESTHASH, contains the full tag (or hashvalue) for downloading
-      the manifest when the books are built. The list of target
-      directories are fetched from the manifest into the book.
-      The eltf_params_updates.xml can all the time contain
-      the final next complete tag e.g. refs/tags/EL6 or similar
-      in the ELTF_PL_CLONE_W_REPO parameter command lines.
-The ordinary book XML files use xi:include statements to include elements
-from this parameter file. The book XML files can thus be manually edited.
-Before editing, you must run "make init".
-Any other text in the template or updated.xml file, outside the parts that
-are included in the book, are not used but still all must be correct
-DocBook XML files.
-ELTF work:
- template => ELTF replaces ALL ELTF_xxx variables => updated XML file
-    => push to git only if changed
-eltf_params_template.xml  (in git)
-   File used by ELTF to autocreate/update the real parameter
-   file eltf_params_updated.xml.
-eltf_params_updated.xml  (in git)
-   Real parameter file where ELTF has replaced all ELTF_xx variables with
-   strings, in several cases with multiline strings.
-   No spaces or linefeed allowed in beginning or end of the variable values!
-xi:include: Each parameter is xi:include'ed in various book files, using
-   the IDs existing in the parameter files.
-   In most cases the 1:st element inside an element with an ID is included
-   using a format like eltf-prereq-apt-get-commands-host/1.
-   In very few cases the element with the ID is included in the book, one
-   example is the target section which has an ID, but which contains
-   multiple subsections, one per target.
-   All IDs in a book must be unique.
-DocBook XML: All XML files must be correct DocBook XML files.
-Do NOT edit/save the real *updated.xml file with XMLmind to avoid changes
-   not done by ELTF. But it is OK to open the real file in XMLmind to
-   check that the format is correct.
-ELTF should autocreate a temporary "real" file but only replace
-   and push the eltf_params_updated.xml if it is changed.
-make eltf
-   This lists all ELTF_xxx variables and some rules how to treat them
-DocBook Format: All elements - rules:
-   Several strict generic XML rules apply for all strings:
-    1. No TABs allowed or any other control chr than "linefeed"
-    2. Only 7-bit ASCII
-    3. Any < > & must be converted to &lt; &gt; and &amp;
-       Similar for any other non-7-bit-ASCII but avoid those!
-    4. No leading spaces or linefeeds when replacing the ELTF_* variable
-    5. No trailing spaces or linefeeds when replacing the ELTF_* variable
-    6. Note: Keep existing spaces before/efter ELTF_* in a few cases.
-DocBook Format: <programlisting> - rules: ELTF*PL* variables
-   Several strict rules apply for the multiline string in programlisting
-   in addition to the general XML rules above:
-    7. Max line length < 80 char
-    8. Use backslash (\) to break longer lines
-    9. Use spaces (e.g. 4) to indent continuation lines in programlistings
-   10. No trailing spaces on any line
-   11. No spaces or linefeed immediately after leading <programlisting>
-   12. No spaces or linefeed before trailing </programlisting>
-DocBook Format: <ulink> - rules: ELTF_*URL* variables
-   13. ELTF_*URL and corresponding ELTF_*TXTURL shall be identical strings
-   14. Only if the URL is extremely long, the TXTURL can be a separate string
-Each target has one section with target parameters:
-       <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
-        <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
-          ..... with many ELTF_ variables ....
-       </section>
-   15. If there is only one target. ELTF just replaces ELTF parameters
-   16. It there are multiple targets. ELTF copies the section and appends the
-       section the required number of times.
-       Each section ID will become unique: eltf-target-table-ELTF_T_MANIFEST_DIR
-       Each section title will become unique
-Tables with target parameters in each target section:
-   17. It is possible for ELTF to append more rows with one parameter each
-       to these tables, because the entire tables are included in the book
-Special - NOT YET READY DEFINED how to handle the optionally included
-   Eclipse and its version, but this is a first suggestion:
-   18. Just now ELTF can define ELFT_ECLIPSE_VERSION as a full string
-       with both version number and name,
-   19. MANUALLY if Eclipse is NOT included in the release,
-       the release manager should manually set condition="hidden" on
-       the entire section in the book XML about Eclipse
-BELOW WE TRY TO EXPLAIN EACH ELTF_* variable, but always check with make eltf
-if there are more new variables, missing in this description file.
-_____________________________________________________________________________
-ELTF_PL_HOST_PREREQ       Multiline list of host prerequisites, e.g. commands
-                          like sudo apt-get install xxxx or similar.
-                          First line = comment with the complete host name!
-                          It is possible to include multiple hosts by just
-                          adding an empty line, comment with host name, etc.
-                          xi:include eltf-prereq-apt-get-commands-host/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-# Host Ubuntu 14.04.5 LTS 64bit
-sudo apt-get update
-sudo apt-get install sed wget subversion git-core coreutils unzip texi2html \
-   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
-   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
-   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
-   libxml-parser-perl
-_____________________________________________________________________________
-ELTF_PL_GET_REPO          Multiline commands to download the repo tool
-                          xi:include eltf-getting-repo-install-command/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=~/bin:$PATH
-_____________________________________________________________________________
-ELTF_EL_REL_VER           General parameter string: The version of this Enea
-                          NFV Access release. Major version and optional .Minor
-                          Typically created from MAJOR and MINOR in enea.conf
-                          MINOR in enea.conf is empty or contains a dot+minor
-                          xi_include EneaLinux_REL_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Examples:
-6
-  or
-6.1
-_____________________________________________________________________________
-ELTF_YOCTO_VER            General parameter string: Yocto version, created
-                          from DISTRO in poky.ent
-                          xi:include Yocto_VER/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-2.1
-_____________________________________________________________________________
-ELTF_YOCTO_NAME           General parameter string: Yocto name (branch), created
-                          from DISTRO_NAME_NO_CAP in poky.ent
-                          xi:include Yocto_NAME/1
-                          This is a <phrase>X.x</phrase> used in many places.
-                          Example:
-krogoth
-_____________________________________________________________________________
-ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL  General parameters. These two are IDENTICAL
-ELTF_YOCTO_PROJ_DOWNLOAD_URL     strings with correct Yocto version string
-                                 at the end, typically without "dot".
-                          xi:include ULINK_YOCTO_PROJECT_DOWNLOAD/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://www.yoctoproject.org/downloads/core/krogoth/21
-_____________________________________________________________________________
-ELTF_EL_DOWNLOAD_TXTURL   General parameters. These two are IDENTICAL strings
-ELTF_EL_DOWNLOAD_URL      and shall be the http:/..... address where
-                          Enea NFV Access can be downloaded
-                          Often containing same version as in ELTF_EL_REL_VER
-                          xi:include ULINK_ENEA_LINUX_URL/1
-                          This is an <ulink url="...">...</ulink>
-                          Example:
-http://linux.enea.com/6
-_____________________________________________________________________________
-ELTF_PL_CLONE_W_REPO      Multiline commands to run repo to clone everything.
-                          Use the variable $MACHINE/default.xml (the text in
-                          the book will list the avaiable values of MACHINE,
-                          taken from the manifest repository)
-                          xi:include eltf-repo-cloning-enea-linux/1
-                          This is a <programlisting>...</programlisting>
-                          Example:
-mkdir enea-linux
-cd enea-linux
-repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
-    -b refs/tags/EL6 -m $MACHINE/default.xml
-repo sync
-_____________________________________________________________________________
-ELTF_ECLIPSE_VERSION      Optional general parameter string.
-                          NOT YET READY DEFINED
-                          Just now a release manage must manually set
-                          condition="hidden" on the Eclipse section,
-                          if Eclipse is not included in the release.
-                          ELTF just replaces ELTF_ECLIPSE_VERSION with a full
-                          string with "X.Y (name)"
-                          It includes the ID and can only be ONCE in the book.
-                          xi:include eltf-eclipse-version-row
-                          Example.
-4.5 (Mars)
-_____________________________________________________________________________
-ELTF_T_*                  All these are in each target (MACHINE) and ELTF
-                          must separately replace them with strings for
-                          each target
-                          NOTE: All (except the MANIFEST_DIR) are in rows
-                                in a table and ELTF can select to append
-                                more parameters by adding more rows
-_____________________________________________________________________________
-ELTF_T_MANIFEST_DIR       This happens to be in two places. Must be exactly
-ELTF_T_MANIFEST_DIR       the directory name in the manifest, e.g. same
-                          as the MACHINE names in $MACHINE/default.xml.
-                          In book: a) Part of section ID
-                                   b) Part of section title
-                          Examples:
-p2041rgb
-  or
-ls1021aiot
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_NAME               Target specific: "Target Official Name"
-                          NOT same as the target directory name in most cases.
-                          In book: An <entry> element in a row
-                          Examples:
-P2041RGB
-  or
-LS1021a-IoT
-  or
-qemuarm
-_____________________________________________________________________________
-ELTF_T_ARC_DESC           Target specific: "Architecture and Description"
-                          It can be a short identification string or
-                          it can be a longer descriptive sentence.
-                          In book: An <entry> element in a row
-                          Examples:
-Power, e500mc
-  or
-ARM Cortex-A7
-_____________________________________________________________________________
-ELTF_T_DS_TXTURL          Target specific: "Link to target datasheet. These
-ELTF_T_DS_URL             two usually are IDENTICAL strings with correct
-                          hyperlink to the target's official datasheet.
-                          In book: an <ulink url="...">...</ulink>
-                          Only if the link is VERY LONG, the text part shall
-                          instead be a descriptive string (see 2:nd example).
-                          NOTE: Also here no spaces or line-feeds!
-                          Examples:
-url="http://wiki.qemu.org">http://wiki.qemu.org
-or
-url="http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls1021a-iot-gateway-reference-design:LS1021A-IoT">link to NXP's datasheet
-_____________________________________________________________________________
-ELTF_T_POKY_VER           Target specific: "Poky version" created either
-                          from POKYVERSION in poky.ent
-                          or using a hashvalue with a leading string, in
-                          which case it may be different per target.
-                          In book: An <entry> in a row
-                          Examples:
-15.0.0
-or
-Git commit id: 75ca53211488a3e268037a44ee2a7ac5c7181bd2
-_____________________________________________________________________________
-ELTF_T_GCC_VER            Target specific: "GCC Version". Should be in poky
-                          but not easy to find among various parameters.
-                          ELTF would extract it from build logs building SDK
-                          and it is possibly different per target.
-                          In book: An <entry> in a row
-                          Example:
-5.3
-_____________________________________________________________________________
-ELTF_T_KERN_VER           Target specific: "Linux Kernel Version". Often
-                          different per target.
-                          In book: An <entry> in a row
-                          Example:
-3.12
-_____________________________________________________________________________
-ELTF_T_DRIVERS            Target specific: "Supported Drivers". This is a
-                          comma-separated list of driver names.
-                          ELTF should create the list in same order for each
-                          target, e.g. alphabetic migth be OK.
-                          In book: An <entry> in a row
-                          Example:
-Ethernet, I2C, SPI, PCI, USB, SD/SDHC/SDXC
-_____________________________________________________________________________
-ELTF_T_EL_RPM_TXTURL      Target specific: "Enea rpm folder for downloading
-ELTF_T_EL_RPM_URL         RPM packages for this target". These two are
-                          INDENTICAL strings with hyperlink to the web site
-                          at Enea where the customer can download RPMs
-                          Note: Often the ELFT_EL_REL_VER value and
-                                the ELTF_T_MANIFEST_DIR are used in the link.
-                          In book: an <ulink url="...">...</ulink>
-                          Example:
-url="https://linux.enea.com/6/ls1021aiot/rpm">https://linux.enea.com/6/ls1021aiot/rpm
-_____________________________________________________________________________