getting started: Fix review comments

 - rename configuration -> device_configuration_and_provisioning

Change-Id: Iaddaf5f6f8c6deea4bd9c41524138a2082820a84
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

6 files changed, 199 insertions, 171 deletions

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 84dbc80..3ba3241 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/book.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/book.xml
@@ -30,7 +30,7 @@
   <xi:include href="getting_started_ucpe_manager.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />                               
                           
-  <xi:include href="configuration.xml"
+  <xi:include href="device_configuration_and_provisioning.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />                       
                           
   <xi:include href="demo_usecases.xml"
diff --git a/doc/book-enea-nfv-access-getting-started/doc/demo_usecases.xml b/doc/book-enea-nfv-access-getting-started/doc/demo_usecases.xml
index e42c4f7..1686427 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/demo_usecases.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/demo_usecases.xml
@@ -1032,7 +1032,7 @@ Run: tail -f /opt/testpmd-out</programlisting>
           settings:</para>
 
           <table>
-            <title>Instantiation requirements</title>
+            <title>Instantiation Requirements</title>
 
             <tgroup cols="2">
               <colspec align="center" colwidth="2*" />
@@ -1894,4 +1894,4 @@ Run: tail -f /opt/testpmd-out</programlisting>
       </note>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/configuration.xml b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
index e87ac44..4062dd3 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/configuration.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
@@ -1,68 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="configuration">
-  <title>Device configuration and provisioning</title>
-
-  <section id="zero_touch_prov">
-    <title>Zero Touch Provisioning</title>
-
-    <para>In order to create a static configuration supporting Zero Touch
-    Provisioning (ZTP), the uCPE Manager user needs to identify the device ID
-    of the machine running NFV Access.</para>
-
-    <para>During the automatic installation process when the "Automatic
-    install" step is reached, enter the option menu "Customize kernel
-    parameters" and set the "uCPE Manager IP" address. Please check <olink
-    targetdoc="book_enea_nfv_access_guide_intel"
-    targetptr="plat-release-content">Getting Started with Enea NFV Access
-    <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_guide_intel/1)" /></olink> , within
-    the Enea NFV Access Reference Guide for more details.</para>
-
-    <para>With the address parameter set, run
-    <literal>list_deviceID.sh</literal> after NFV Access is installed and
-    booted, to get the device ID of the target.</para>
-
-    <note>
-      <para>It is possible to let NFV Access know the uCPE Manager IP address
-      at run-time by setting <literal>vcpemgr=&lt;IP&gt;</literal> as a kernel
-      boot parameter in the grub configuration file. Reboot is required after
-      this update.</para>
-
-      <para>This step needs to be done each time the uCPE Manager host changes
-      the IP address.</para>
-    </note>
-
-    <para>An offline configuration can be prepared in advance for the uCPE
-    Manager to setup the infrastructure on the device. For more details about
-    ZTP, please see the Zero Touch Provisioning Guide from the DeveloperDocs
-    archive that comes with your release.</para>
-  </section>
+<chapter id="configuration_provision">
+  <title>Device Configuration and Provisioning</title>
 
   <section id="man_config">
     <title>Manual Configuration</title>
 
-    <para>Manual configuration can be used as an alternative to Zero Touch
-    Provisioning. It allows for the connection to an instance of NFV Access
-    installed on a specific target, and for the setup of the virtual
-    infrastructure.</para>
+    <para>This section describes how to connect to an instance of NFV Access
+    installed on a specific target, and how to setup the virtual
+    infrastructure manually.</para>
 
-    <para><emphasis role="bold">How to perform the manual
-    configuration</emphasis></para>
+    <para><emphasis role="bold">How to add a board to the management system
+    </emphasis></para>
 
     <orderedlist>
       <listitem>
-        <para>Point your browser to the server machine running uCPE Manger:
-        <literal>https://localhost</literal>.</para>
-      </listitem>
-
-      <listitem>
-        <para>In the login screen, log in with the username: <emphasis
-        role="bold">admin</emphasis> and password: <emphasis
-        role="bold">admin</emphasis>.</para>
-      </listitem>
-
-      <listitem>
         <para>Add the boards running NFV Access to the management system
         (Devices -&gt; Manage-&gt; Add):</para>
 
@@ -311,4 +262,48 @@
       </listitem>
     </orderedlist>
   </section>
+
+  <section id="zero_touch_prov">
+    <title>Zero Touch Provisioning</title>
+
+    <para>Zero-Touch Provisioning is an alternative to Manual configuration.
+    ZTP is a feature that allows the device to be provisioned and configured
+    automatically, with minimal manual work involved when adding devices to a
+    network. Demonstrated when a device boots for the first time, its initial
+    configuration is pushed down by an external management system, so that it
+    is setup for proper operation without additional manual intervention by an
+    operator.</para>
+
+    <para>In order to create a static configuration supporting ZTP, the uCPE
+    Manager user needs to identify the device ID of the machine running NFV
+    Access.</para>
+
+    <para>During the automatic installation process when the
+    <literal>Automatic install</literal> step is reached, enter the option
+    menu <literal>Customize kernel parameters</literal> and set the
+    <literal>uCPE Manager IP</literal> address. Please check <xref
+    linkend="install_ena_stick" />, step 7 for how to set the uCPE Manager IP
+    address at boot time.</para>
+
+    <para>With the address parameter set, run
+    <literal>list_deviceID.sh</literal> after NFV Access is installed and
+    booted, to get the device ID of the target.</para>
+
+    <note>
+      <para>It is possible to let NFV Access know the uCPE Manager IP address
+      at run-time by setting <literal>vcpemgr=&lt;IP&gt;</literal> as a kernel
+      boot parameter in the grub configuration file. Reboot is required after
+      this update.</para>
+
+      <para>This step needs to be done each time the uCPE Manager host changes
+      the IP address.</para>
+    </note>
+
+    <para>An offline configuration can be prepared in advance for the uCPE
+    Manager to setup the infrastructure on the device.</para>
+
+    <para>For more details about ZTP, please see the <literal>Zero Touch
+    Provisioning Guide </literal>from the <literal>DeveloperDocs</literal>
+    archive provided with your release.</para>
+  </section>
 </chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
index 5425f57..0b3121c 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
@@ -268,16 +268,18 @@ sdb            8:0            0     111.8G  0  disk
             </listitem>
           </itemizedlist>
 
-          <mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" contentwidth="600"
-                         fileref="images/screen_1.svg" />
-            </imageobject>
-
-            <imageobject role="html">
-              <imagedata align="center" fileref="images/screen_1.png" />
-            </imageobject>
-          </mediaobject>
+          <figure>
+            <mediaobject>
+              <imageobject role="fo">
+                <imagedata align="center" contentwidth="600"
+                           fileref="images/screen_1.svg" />
+              </imageobject>
+
+              <imageobject role="html">
+                <imagedata align="center" fileref="images/screen_1.png" />
+              </imageobject>
+            </mediaobject>
+          </figure>
 
           <note>
             <para>A use case of the live-boot is to troubleshoot networking
@@ -289,16 +291,18 @@ sdb            8:0            0     111.8G  0  disk
           <para>To launch the installer, select <command>installer</command>
           from the GRUB menu. An installation menu will appear:</para>
 
-          <mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" contentwidth="600"
-                         fileref="images/screen_2.svg" />
-            </imageobject>
+          <figure>
+            <mediaobject>
+              <imageobject role="fo">
+                <imagedata align="center" contentwidth="600"
+                           fileref="images/screen_2.svg" />
+              </imageobject>
 
-            <imageobject role="html">
-              <imagedata align="center" fileref="images/screen_2.png" />
-            </imageobject>
-          </mediaobject>
+              <imageobject role="html">
+                <imagedata align="center" fileref="images/screen_2.png" />
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
 
         <listitem>
@@ -310,16 +314,18 @@ sdb            8:0            0     111.8G  0  disk
           <para>Once the installation has commenced two options are
           displayed:</para>
 
-          <mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" contentwidth="600"
-                         fileref="images/screen_3.svg" />
-            </imageobject>
+          <figure>
+            <mediaobject>
+              <imageobject role="fo">
+                <imagedata align="center" contentwidth="600"
+                           fileref="images/screen_3.svg" />
+              </imageobject>
 
-            <imageobject role="html">
-              <imagedata align="center" fileref="images/screen_3.png" />
-            </imageobject>
-          </mediaobject>
+              <imageobject role="html">
+                <imagedata align="center" fileref="images/screen_3.png" />
+              </imageobject>
+            </mediaobject>
+          </figure>
 
           <itemizedlist>
             <listitem>
@@ -355,16 +361,18 @@ sdb            8:0            0     111.8G  0  disk
           steps</literal> detailing what will be installed and where are
           updated by the installer:</para>
 
-          <mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" contentwidth="600"
-                         fileref="images/screen_7_1.svg" />
-            </imageobject>
+          <figure>
+            <mediaobject>
+              <imageobject role="fo">
+                <imagedata align="center" contentwidth="600"
+                           fileref="images/screen_7_1.svg" />
+              </imageobject>
 
-            <imageobject role="html">
-              <imagedata align="center" fileref="images/screen_7_1.png" />
-            </imageobject>
-          </mediaobject>
+              <imageobject role="html">
+                <imagedata align="center" fileref="images/screen_7_1.png" />
+              </imageobject>
+            </mediaobject>
+          </figure>
 
           <para>Kernel parameters can be customized by selecting the
           <literal>Customize kernel parameters</literal> option highlighted
@@ -390,27 +398,34 @@ sdb            8:0            0     111.8G  0  disk
 
             <listitem>
               <para>uCPE Manager IP address. The IP address needed for
-              contacting the machine running the uCPE Manager, in order to get
-              the default configuration (ZTP).</para>
+              contacting the machine running the uCPE Manager. For more
+              details about call-home configuration please see the call-home
+              section.</para>
             </listitem>
           </itemizedlist>
 
-          <mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" contentwidth="600"
-                         fileref="images/screen_7_2.svg" />
-            </imageobject>
+          <figure>
+            <mediaobject>
+              <imageobject role="fo">
+                <imagedata align="center" contentwidth="600"
+                           fileref="images/screen_7_2.svg" />
+              </imageobject>
 
-            <imageobject role="html">
-              <imagedata align="center" fileref="images/screen_7_2.png" />
-            </imageobject>
-          </mediaobject>
+              <imageobject role="html">
+                <imagedata align="center" fileref="images/screen_7_2.png" />
+              </imageobject>
+            </mediaobject>
+          </figure>
 
           <para>Modifying any of the Default parameters (e.g Core isolation,
           1G huge page count, etc.) will automatically update the kernel
-          paramters string shown. Updating the Custom parameters within the
-          kernel string directly will override any values set previously for
-          the Default parameters.</para>
+          paramters string shown. </para>
+
+          <note>
+            <para>Updating the Custom parameters within the kernel string
+            directly will override any values set previously for the Default
+            parameters.</para>
+          </note>
         </listitem>
 
         <listitem>
@@ -424,32 +439,36 @@ sdb            8:0            0     111.8G  0  disk
             drive.</para>
           </note>
 
-          <mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" contentwidth="600"
-                         fileref="images/screen_7.svg" />
-            </imageobject>
+          <figure>
+            <mediaobject>
+              <imageobject role="fo">
+                <imagedata align="center" contentwidth="600"
+                           fileref="images/screen_7.svg" />
+              </imageobject>
 
-            <imageobject role="html">
-              <imagedata align="center" fileref="images/screen_7.png" />
-            </imageobject>
-          </mediaobject>
+              <imageobject role="html">
+                <imagedata align="center" fileref="images/screen_7.png" />
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
 
         <listitem>
           <para>At the end of the installation process, you can choose between
           running the installer again or rebooting the board.</para>
 
-          <mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" contentwidth="600"
-                         fileref="images/screen_8.svg" />
-            </imageobject>
+          <figure>
+            <mediaobject>
+              <imageobject role="fo">
+                <imagedata align="center" contentwidth="600"
+                           fileref="images/screen_8.svg" />
+              </imageobject>
 
-            <imageobject role="html">
-              <imagedata align="center" fileref="images/screen_8.png" />
-            </imageobject>
-          </mediaobject>
+              <imageobject role="html">
+                <imagedata align="center" fileref="images/screen_8.png" />
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
       </orderedlist>
     </section>
@@ -467,16 +486,18 @@ sdb            8:0            0     111.8G  0  disk
       connected and a menu will appear to let the user select one of the boot
       options:</para>
 
-      <mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" contentwidth="600"
-                     fileref="images/boot_ena.svg" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/boot_ena.png" />
-        </imageobject>
-      </mediaobject>
+      <figure>
+        <mediaobject>
+          <imageobject role="fo">
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/boot_ena.svg" />
+          </imageobject>
+
+          <imageobject role="html">
+            <imagedata align="center" fileref="images/boot_ena.png" />
+          </imageobject>
+        </mediaobject>
+      </figure>
     </section>
 
     <section condition="hidden" id="examples">
@@ -529,16 +550,18 @@ run</programlisting>
       script by pressing <command>ESC</command> and then starting GRUB
       manually:</para>
 
-      <mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" contentwidth="600"
-                     fileref="images/efi_menu.svg" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/efi_menu.png" scale="90" />
-        </imageobject>
-      </mediaobject>
+      <figure>
+        <mediaobject>
+          <imageobject role="fo">
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/efi_menu.svg" />
+          </imageobject>
+
+          <imageobject role="html">
+            <imagedata align="center" fileref="images/efi_menu.png" scale="90" />
+          </imageobject>
+        </mediaobject>
+      </figure>
 
       <para>The default setting will try to boot GRUB from the FS0 device, in
       this case a USB stick. To boot from the newly installed media storage
diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
index 9a8798d..2644f8a 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
@@ -42,7 +42,7 @@
         64-bit platforms: <remark>Is this still accurate, these don't appear
         on the artifact download page for 2.0.3</remark></para>
 
-        <itemizedlist>
+        <itemizedlist spacing="compact">
           <listitem>
             <para>uCPEManager-&lt;version&gt;-Centos.tar.gz (ElementCenter for
             CentOS)</para>
@@ -59,7 +59,7 @@
         <para>The following VNFs can be downloaded from the portal and
         on-boarded into the uCPE Manager/Element Center:</para>
 
-        <itemizedlist>
+        <itemizedlist spacing="compact">
           <listitem>
             <para>Fortigate VNF bundle</para>
           </listitem>
@@ -122,8 +122,19 @@
     Protection</literal>, disable the firewall for "Domain network" and
     "Private network".</para>
 
-    <para>Verify that the installation has succeded, browse to
-    "https://localhost", log in with the username: admin and password:
-    admin.</para>
+    <para>Verify that the installation has succeeded:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Point your browser to the server machine running the uCPE
+        Manger: <literal>https://localhost</literal>.</para>
+      </listitem>
+
+      <listitem>
+        <para>In the login screen, log in with the username: <emphasis
+        role="bold">admin</emphasis> and password: <emphasis
+        role="bold">admin</emphasis>.</para>
+      </listitem>
+    </itemizedlist>
   </section>
 </chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
index 107419e..6cf8a8a 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
@@ -16,9 +16,9 @@
 
   <para>Enea NFV Access seeks to demonstrate a means for which a Network
   Functions Virtualization architecture can be created and managed
-  effectively, suited to your custom needs. It accomplishes this task
-  by teaming two key products together: NFV Access and the uCPE Manager.
-  For evaluation purposes, it also includes VNF examples.</para>
+  effectively, suited to your custom needs. It accomplishes this task by
+  teaming two key products together: NFV Access and the uCPE Manager. For
+  evaluation purposes, it also includes VNF examples.</para>
 
   <para>The purpose of Enea NFV Access is the evaluation of the following
   features:</para>
@@ -49,7 +49,7 @@
     </listitem>
   </itemizedlist>
 
-  <section id="netconf">
+  <section id="nfv_access">
     <title>Enea NFV Access</title>
 
     <para>Enea NFV Access is a lightweight, multi-architecture virtualization
@@ -69,8 +69,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata align="center"
-                     fileref="images/vnf_space.png" scale="80"/>
+          <imagedata align="center" fileref="images/vnf_space.png" scale="80" />
         </imageobject>
       </mediaobject>
     </figure>
@@ -103,20 +102,20 @@
       </listitem>
     </itemizedlist>
 
-    <para>For additional information about the features provided, or how to 
-    install and run the Enea NFV Access on supported devices, please refer to 
-    the Getting Started with Enea NFV Access chapter <remark>make this into 
-    an xref to the section/chapter</remark>.</para>
+    <para>For additional information about the features provided in Enea NFV Access,
+    refer to the <olink>Reference Guide</olink> provided with your release. For how to
+    install and run Enea NFV Access on supported devices, please refer to <xref>Chapter
+    4, Getting Started with Enea NFV Access</xref>.</para>
   </section>
 
   <section id="ucpe_manager">
     <title>Enea uCPE Manager</title>
 
-    <para>Enea uCPE Manager is a control center application providing a
-    full FCAPS and VNF management experience through a GUI and REST API. It
-    can be deployed on a host or a virtual machine. CentOS and Windows are
-    supported host platforms by default. The uCPE Manager uses a southbound
-    EdgeLink NETCONF protocol to connect and manage uCPE devices.</para>
+    <para>Enea uCPE Manager is a control center application providing a full
+    FCAPS and VNF management experience through a GUI and REST API. It can be
+    deployed on a host or a virtual machine. CentOS and Windows are supported
+    host platforms by default. The uCPE Manager uses a southbound EdgeLink
+    NETCONF protocol to connect and manage uCPE devices.</para>
 
     <para>Enea uCPE Manager provides the following key features:</para>
 
@@ -142,8 +141,8 @@
       </listitem>
     </itemizedlist>
 
-    <para>For detailed information about features provided by the uCPE Manager 
-    please refer to the <literal>DeveloperDocs</literal> provided with your 
-    release.</para>
+    <para>For detailed information about the features listed above, please refer
+    to the ElementCenter <literal>DeveloperDocs</literal> documentation archive
+    provided with your release. Enea uCPE Manager is a fork of ElementCenter.</para>
   </section>
 </chapter>