Changed the makefile to suit this custom release,feature_CPDX-3453

Updated the Getting Started Manual,
Updated the eltf_updated_params.xml to fit this release.

USERDOCAP-728

Change-Id: Ieb31e9b119808877b80b1e10d248e869d7d67675
Signed-off-by: mrpa <miruna.paun@enea.com>

3 files changed, 38 insertions, 49 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 5c1a6b9..6df8448 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -51,7 +51,7 @@ DOCBOOK_TO_BOOKDIR ?= yes
 DOCBOOK_CLEANTMP ?= yes
 
 #Components (books) in this subsystem. Now use all books found here
-COMPONENTS := book-enea-edge-auto-fw-th-open-source book-enea-edge-auto-fw-th-user-guide book-enea-edge-automation-open-source book-enea-edge-automation-user-guide book-enea-nfv-access-evalkit book-enea-edge-example-usecases book-enea-edge-getting-started book-enea-edge-runtime-open-source book-enea-edge-release-info book-enea-edge-system-test-specification book-enea-edge-telemetry-open-source book-enea-edge-management-open-source
+COMPONENTS := book-enea-edge-getting-started book-enea-edge-management-open-source
 
 
 # --------------------------------------------------------------
@@ -184,8 +184,8 @@ endif
 
 books: init
 # BOOKPACKAGES is defined in all book-*/swcomp.mk
-        $(VERB)DISTRO_VERSION=`egrep '"EneaEdge_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \
-               BOOKVER="Enea Edge-$$DISTRO_VERSION"-$(shell date +"%Y.%m.%d"); \
+        $(VERB)DISTRO_VERSION=`egrep '"EneaEdge_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; BUILD_NUMBER=`egrep '"ENA_BUILD_VER"><phrase>'  $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \
+               BOOKVER="Enea Edge-$$DISTRO_VERSION-build-$$BUILD_NUMBER"; \
          for book in $(BOOKPACKAGES); do \
           for format in $(FORMAT); do \
             $(MAKE) -f $(DOCBOOKMAKE)/make_docbook_standalone.mk BOOK=$$book FORMAT=$$format BOOK_VER="$$BOOKVER" books || exit 10; \
@@ -196,7 +196,7 @@ books: init
                   cp $$COMP/$$book.pdf $$COMP/eclipse/plugins/com.enea.doc.book-*/. ; \
                 fi ; \
           done ; \
-         done
+         done    
 ifeq ($(DOCBOOK_TO_BOOKDIR),yes)
          $(VERB)rm -rf doc tmp
 else
diff --git a/doc/book-enea-edge-getting-started/doc/security.xml b/doc/book-enea-edge-getting-started/doc/security.xml
index 0812a2f..c98014a 100644
--- a/doc/book-enea-edge-getting-started/doc/security.xml
+++ b/doc/book-enea-edge-getting-started/doc/security.xml
@@ -16,9 +16,9 @@
 
     <note>
       <para>Configuring MFA will only be possible using the Web interface, and
-      not the REST API. Users with MFA enabled will not be able to log
-      in through the REST API. If attempted, a <literal>401</literal> HTTP
-      code will be returned, with the <literal>EMS-Error</literal> header
+      not the REST API. Users with MFA enabled will not be able to log in
+      through the REST API. If attempted, a <literal>401</literal> HTTP code
+      will be returned, with the <literal>EMS-Error</literal> header
       containing the <literal>EMS_UserMFAEnabled</literal> error.</para>
     </note>
 
@@ -26,23 +26,19 @@
       <title>Configuring User MFA</title>
 
       <para>The administrator must enable MFA authentication for the desired
-      new user by:</para>
+      new user:</para>
 
       <orderedlist>
         <listitem>
-          <para>Accessing the <emphasis role="bold">Security</emphasis>
-          tab.</para>
-        </listitem>
-
-        <listitem>
-          <para>Accessing the <emphasis role="bold">Configuration</emphasis>
+          <para>Access the <emphasis role="bold">Security</emphasis> tab and
+          choose the <emphasis role="bold">Configuration</emphasis>
           menu.</para>
         </listitem>
 
         <listitem>
-          <para>Selecting the <emphasis role="bold">Add</emphasis> option,
-          entering the details for the new user and then enabling the
-          <emphasis role="bold">Enable MFA Login</emphasis> checkbox.</para>
+          <para>Select the <emphasis role="bold">Add</emphasis> option, enter
+          the details for the new user and enable the <emphasis
+          role="bold">Enable MFA Login</emphasis> checkbox.</para>
         </listitem>
       </orderedlist>
 
@@ -53,30 +49,27 @@
       be asked to configure a new shared secret. For more details on how to
       configure a new shared secret, please see the following section.</para>
 
-      <note>
-        <para>All MFA information for enabled users will be preserved upon
-        upgrading the Enea Edge Management application.</para>
-      </note>
+      <para>All MFA information for enabled users will be preserved upon
+      upgrading or restoring the Enea Edge Management application.</para>
     </section>
 
     <section id="security_authentication">
       <title>Security Authentication</title>
 
-      <para>Before the user logs in, there is no secret set in the Enea Edge
-      Management database. Initially, the user will enter his credentials as
-      in a normal, local authentication. He will then be redirected to a
-      second page that presents the secret as a QR code, that he must scan
-      using the Google Authenticator application. The secret is also presented
-      in clear text ready for copying and manual entry, in case scanning the
-      QR code does not work.</para>
+      <para>The user will enter his credentials (username and password) as in
+      a typical local authentication. He will then be redirected to a second
+      page that presents the secret as a QR code, that he must scan using the
+      Google Authenticator application. The secret is also presented in clear
+      text ready for copying and manual entry, in case scanning the QR code
+      does not work.</para>
 
       <figure>
         <title>Initial setup for Multi-Factor login</title>
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" scale="60"
-                       fileref="images/mfa_first_time_setup.png" />
+            <imagedata align="center"
+                       fileref="images/mfa_first_time_setup.png" scale="60" />
           </imageobject>
         </mediaobject>
       </figure>
@@ -89,34 +82,30 @@
       correct, authentication is successful. The six digit token is available
       for a maximum of 30 seconds.</para>
 
-      <para>Once the initial login succeeds and the secret is saved in the
-      database, subsequent logins will still be done using a two-step method.
-      The user will provide first his classic credentials, and then, on the
-      second page he will enter the token as generated by Google
-      Authenticator, this time, however, the secret will no longer be
-      displayed.</para>
+      <para>Subsequent logins will still be done using a two-step method. The
+      user will provide first his credentials, and on the second page the
+      token as generated by Google Authenticator.</para>
 
       <figure>
         <title>Second login</title>
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" scale="80"
-                       fileref="images/mfa_login.png" />
+            <imagedata align="center" fileref="images/mfa_login.png"
+                       scale="80" />
           </imageobject>
         </mediaobject>
       </figure>
 
       <note>
-        <para>If the shared secret is ever lost, it can always be regenerated,
-        but only upon request to the administrator. It is done by accessing
-        the <emphasis role="bold">Security</emphasis> tab, selecting the
-        <emphasis role="bold">Configuration</emphasis> menu and choosing the
-        user, and on the right-hand side panel unchecking the <emphasis
-        role="bold">Enable MFA Login</emphasis> checkbox. Then pressing the
-        <emphasis role="bold">Apply</emphasis> button, checking it again, and
-        clicking <emphasis role="bold">Apply</emphasis> one final time. When
-        the MFA Login is disabled, the secret is also erased from the
+        <para>If the shared secret is lost, it can be regenerated by the
+        administrator by disabling and re-enabling the MFA Login for the selected
+        user. For more information, please see <olink targetdoc="book_enea_edge_getting_started"
+    targetptr="config_mfa">Configuring User MFA in the <ns:include
+    href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:ns="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_edge_getting_started/1)" /></olink> Manual. When the
+        MFA Login is disabled, the secret is also erased from the
         database.</para>
       </note>
     </section>
diff --git a/doc/eltf_params_updated.xml b/doc/eltf_params_updated.xml
index 39755ef..2d3b25e 100644
--- a/doc/eltf_params_updated.xml
+++ b/doc/eltf_params_updated.xml
@@ -11,9 +11,9 @@
     correct also compared to the "previous" REL VER in pardoc-distro.xml
     "prev_baseline".</bridgehead>
 
-    <para id="EneaEdge_REL_VER"><phrase>2.5.0</phrase></para>
+    <para id="EneaEdge_REL_VER"><phrase>2.5.0-mfa</phrase></para>
 
-    <para id="ENA_BUILD_VER"><phrase>1</phrase></para>
+    <para id="ENA_BUILD_VER"><phrase>2</phrase></para>
 
     <bridgehead>Below is one big section with title "Supported Processor with
     Parameters". The entire section is included completely in the book via ID