Merge the code from develop to master for 2.4.0Enea_NFV_Access_2.4.0hotfix_EDGESC-6feature_CPDX-3546EE240_HotFix1

Change-Id: Ibc844e001b7d75125d6006fa5333cc65bbf5afa4

1 files changed, 44 insertions, 18 deletions

diff --git a/doc/docsrc_common/pardoc-distro.xml b/doc/docsrc_common/pardoc-distro.xml
index fce0543..b6bc8bb 100644
--- a/doc/docsrc_common/pardoc-distro.xml
+++ b/doc/docsrc_common/pardoc-distro.xml
@@ -1,31 +1,57 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
 <!-- Declarations to inherit by xi:include
 ========================================== -->
 <section id="pardoc_names">
-  <title>Enea NFV Access DocBook XML Based UserDoc Names and Parameters</title>
+  <title>Enea NFV Access DocBook XML Based UserDoc Names and
+  Parameters</title>
 
-  <para>NOTE: DO NOT EDIT THIS FILE IN xmlmind but you can open it to see any errors, don't save!!!!</para>
+  <para>NOTE: DO NOT EDIT THIS FILE IN xmlmind but you can open it to see any
+  errors, don't save!!!</para>
 
   <para>NOTE: Use xi:include to include parameters into a docbook XML file.
-        Note: Only full elements can be included and the included element must
-        be allowed in that place. Example: For ulink, entire ulink elements
-        must be included, not just parts of them.</para>
+  Note: Only full elements can be included and the included element must be
+  allowed in that place. Example: For ulink, entire ulink elements must be
+  included, not just parts of them.</para>
 
   <para>**** The phrase elements below can be used as variables in several
-             places in XML files and/or in make script files ****</para>
+  places in XML files and/or in make script files ****</para>
+
+  <!-- Distribution and release -->
 
-<!-- Distribution and release -->
-<!--
+  <!--
     The parameter 'prev_baseline' is intentionally undefined here since this
     is the first release of the networking profile. The line must be removed.
 -->
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-open-source/doc/licenses.xml</phrase></para>
-<para id="new_lic_file"><phrase>doc/book-enea-nfv-access-open-source/doc/licenses.xml</phrase></para>
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-openstack-open-source/doc/licenses.xml</phrase></para>
-<para id="new_lic_file"><phrase>book-enea-nfv-access-openstack-open-source/doc/licenses.xml</phrase></para>
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-dev-open-source/doc/licenses.xml</phrase></para>
-<para id="new_lic_file"><phrase>doc/book-enea-nfv-access-dev-open-source/doc/licenses.xml</phrase></para>
-</section>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_runtime_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_runtime_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_management_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_management_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_telemetry_open_source/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_telemetry_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_automation_open_source/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_automation_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_auto_fw_th_open_source/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_auto_fw_th_open_source/doc/licenses.xml</phrase></para>
+</section>
\ No newline at end of file