AccessDocs: update RelInfo and GettingStarted

- add release content in the rel info
- remove the reference to step 7, it is not correct
- remove picturece from add a device (from Manual Configuration
  and ZTP, Adding a Device)and explain the fiels only in one section
- add reference to the grub configuration file in the Reference Guide
- fix SSH Password/Private Key/Passphrase

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

9 files changed, 154 insertions, 202 deletions

diff --git a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
index 89f6961..861c739 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="configuration_provision">
   <title>Device Configuration and Provisioning</title>
 
@@ -12,89 +12,73 @@
     <para><emphasis role="bold">How to add a board to the management system
     </emphasis></para>
 
-    <orderedlist>
-      <listitem>
-        <para>Add the boards running NFV Access to the management system
-        (Devices -&gt; Manage-&gt; Add):</para>
-
-        <figure>
-          <title>Manage Devices</title>
+    <para>Add the boards running NFV Access to the management system. This is
+    done by using the <literal>Devices -&gt; Manage -&gt; Add</literal> menu.
+    Supply information about the board running NFV Access, and set the
+    parameters that will be used to connect to the board. The relevant
+    parameters are described below:</para>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/manage_devices.png"
-                         scale="70" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+    <itemizedlist>
+      <listitem>
+        <para>Type. The type of device to be added, i.e <literal>Enea
+        universal uCPE </literal>.</para>
       </listitem>
+    </itemizedlist>
 
+    <itemizedlist>
       <listitem>
-        <para>Supply information about the board running NFV Access, and set
-        the parameters that will be used to connect to the board (port: 22;
-        SSH username/password: <emphasis
-        role="bold">root/root</emphasis>):</para>
-
-        <figure>
-          <title>Managed Element</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/managed_element.png"
-                         scale="80" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+        <para>Name. The name by which the device is referred to in the uCPE
+        Manager.</para>
       </listitem>
+    </itemizedlist>
 
+    <itemizedlist>
       <listitem>
-        <para>In the main screen, check that the management system has
-        connected to the board (System -&gt; Unplaced):</para>
-
-        <figure>
-          <title>Connecting the System</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/unplaced.png"
-                         scale="80" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+        <para>IP Address. IP address of the device. If a device is installed
+        under a local/private network and not directly visible to the uCPE
+        Manager machine, the Gateway IP of the private network must be
+        used.</para>
       </listitem>
+    </itemizedlist>
 
+    <itemizedlist>
       <listitem>
-        <para>Place the new device on the map by right clicking on the map
-        tab:</para>
-
-        <figure>
-          <title>Placing the Device</title>
+        <para>SSH Port. The NETCONF Port used for communications. This is a
+        relevant parameter if the standard NETCONF SSH (i.e. not Call-Home) is
+        being used. Default is set to 22.</para>
+      </listitem>
+    </itemizedlist>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/place_device.png"
-                         scale="55" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+    <itemizedlist>
+      <listitem>
+        <para>SSH User Name. The user name for SSH connectivity. Default user
+        is <literal>root</literal>.</para>
       </listitem>
+    </itemizedlist>
 
+    <itemizedlist>
       <listitem>
-        <para>Follow the same steps listed above, to add other boards to the
-        management system:</para>
+        <para>SSH Password. Leave this blank.</para>
+      </listitem>
+    </itemizedlist>
 
-        <figure>
-          <title>Adding more boards</title>
+    <itemizedlist>
+      <listitem>
+        <para>Device Calls Home. This checkbox indicates the direction of
+        device communications. In the Manual Configuration, leave this box
+        blank. For more info about how to add a device please refer to
+      <link linkend="adding_a_device">Zero Touch Provisioning, Adding a Device</link>.</para>
+      </listitem>
+    </itemizedlist>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/adding_boards.png"
-                         scale="55" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+    <itemizedlist>
+      <listitem>
+        <para>Device ID. The unique instance ID of the device. This is what
+        links a device to its day-0 configuration (stored in the offline
+        configuration system). It is a required field if you want to perform
+        Zero-Touch Provisioning.</para>
       </listitem>
-    </orderedlist>
+    </itemizedlist>
   </section>
 
   <section id="host_int_net_config">
@@ -226,9 +210,9 @@
     <literal>Automatic install</literal> step is reached, enter the option
     menu <literal>Customize kernel parameters</literal> and set the
     <literal>uCPE Manager IP address</literal>. Please check <xref
-    linkend="install_ena_stick" />, step 7 for how to set the uCPE Manager IP
-    address at boot time. The Device ID will be listed in the installer under
-    the <literal>Customize kernel parameters</literal> menu.</para>
+    linkend="install_ena_stick" />, for how to set the uCPE Manager IP address
+    at boot time. The Device ID will be listed in the installer under the
+    <literal>Customize kernel parameters</literal> menu.</para>
 
     <para>With the address parameter set, run
     <literal>list_deviceID.sh</literal> after NFV Access is installed and
@@ -238,7 +222,8 @@
       <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>
+      this update. For additional information about grub configuration, please
+      refer to the Enea NFV Access Reference Guide provided with your release.</para>
 
       <para>This step needs to be done each time the uCPE Manager host changes
       the IP address.</para>
@@ -251,87 +236,14 @@
       <title>Adding a Device</title>
 
       <para>The uCPE Manager must be configured to bring the target device
-      under management. This is done by using the <literal>Devices -&gt;
-      Manage -&gt; Add</literal> menu:</para>
-
-      <figure>
-        <title>Adding a Device</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="images/add_a_device.png"
-                       scale="50" />
-          </imageobject>
-        </mediaobject>
-      </figure>
-
-      <para>The relevant parameters on this screen are described below:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Type. The type of device to be added, i.e <literal>Enea
-          universal uCPE </literal>.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>Name. The name by which the device is referred to in the uCPE
-          Manager.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>IP Address. IP address of the device. If a device is installed
-          under a local/private network and not directly visible to the uCPE
-          Manager machine, the Gateway IP of the private network must be
-          used.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>SSH Port. The NETCONF Port used for communications. This is a
-          relevant parameter if the standard NETCONF SSH (i.e. not Call-Home)
-          is being used. Default is set to 22.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>SSH User Name. The user name for SSH connectivity. Default
-          user is <literal>root</literal>.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>SSH Password/Private Key/Passphrase. The Authentication
-          Credentials, use one of the aforementioned as appropriate. Default
-          password is empty.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>Device Calls Home. This checkbox indicates the direction of
-          device communications. When cleared, the uCPE Manager will initiate
-          a connection to the device. When checked, the device will initiate a
-          connection by opening a socket to the uCPE Manager for NETCONF
-          traffic (over SSH), while the uCPE Manager waits for device
-          connection.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>Device ID. The unique instance ID of the device. This is what
-          links a device to its day-0 configuration (stored in the offline
-          configuration system). It is a required field if you want to perform
-          Zero-Touch Provisioning.</para>
-        </listitem>
-      </itemizedlist>
+      under management. This is done by selecting <literal>Device Calls
+      Home</literal> checkbox when adding a device. When Device Calls
+      Home checkbox is checked, the device will initiate a
+      connection by opening a socket to the uCPE Manager for NETCONF
+      traffic (over SSH), while the uCPE Manager waits for device connection.</para>
+      
+      <para>For more info about how to add a device please refer to 
+      <link linkend="man_config">Manual Configuration</link>.</para>
     </section>
 
     <section id="offline_configuration">
@@ -545,6 +457,20 @@
       <section id="onboarding_a_bundled_vnf_wizard">
         <title>Onboarding a VNF VM Image using the Onboarding Wizard</title>
 
+        <para><emphasis role="bold">How to onboard a VNF onto the uCPE Manager
+        using the Onboarding Wizard</emphasis></para>
+
+        <orderedlist>
+          <listitem>
+            <para>Click the <literal>On-board</literal> button.</para>
+          </listitem>
+
+          <listitem>
+            <para>When prompted by the following UI, make sure the
+            <literal>VNF Image</literal> radio button is selected.</para>
+          </listitem>
+        </orderedlist>
+
         <para>If you click the <literal>VM Image</literal> radio button at the
         top of the onboarding screen, you will get a pop-up containing fields
         which you can fill, suppling the necessary information about the VNF.
@@ -673,6 +599,12 @@
             <para><emphasis role="bold">NoCloud</emphasis>. This is a simpler
             method that uses only one cloud init file (User-Data).</para>
           </listitem>
+
+          <listitem>
+            <para><emphasis role="bold">ISO</emphasis>. Pre-cooked cloud-init
+            image. This image must be created by user according to VNF
+            requirements.</para>
+          </listitem>
         </itemizedlist>
 
         <para>The Cloud-Init Disk Type field must be set to either
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 22ee80e..661b951 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
@@ -226,7 +226,8 @@ sdb            8:0            0     111.8G  0  disk
         </listitem>
 
         <listitem>
-          <para>Copy the HDDIMG image to the USB stick, e.g:<programlisting>sudo dd if=./enea-nfv-access-edgelink-netconf-&lt;target&gt;.hddimg of=/dev/sdb bs=4M conv=fsync</programlisting></para>
+          <para>Copy the HDDIMG image to the USB stick, e.g:<programlisting>sudo dd if=./enea-nfv-access-edgelink-netconf-&lt;target&gt;.hddimg \
+of=/dev/sdb bs=4M conv=fsync</programlisting></para>
         </listitem>
       </orderedlist>
 
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/add_a_device.png b/doc/book-enea-nfv-access-getting-started/doc/images/add_a_device.png
index 8368e61..5d52334 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/add_a_device.png
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/add_a_device.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/add_a_device_callhome.png b/doc/book-enea-nfv-access-getting-started/doc/images/add_a_device_callhome.png
new file mode 100755
index 0000000..eaf224b
--- /dev/null
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/add_a_device_callhome.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/managed_element.png b/doc/book-enea-nfv-access-getting-started/doc/images/managed_element.png
deleted file mode 100755
index 9ab7284..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/images/managed_element.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/onboard_a_vnf_image.png b/doc/book-enea-nfv-access-getting-started/doc/images/onboard_a_vnf_image.png
index 8df385e..da52202 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/onboard_a_vnf_image.png
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/onboard_a_vnf_image.png
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 d63c171..f4f30b5 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="relinfo-about-release">
@@ -26,16 +26,58 @@
   <section id="release-content">
     <title>Enea NFV Access Release Content</title>
 
-    <para>The release directory structure is detailed below:</para>
+    <para>The release contents is detailed below:</para>
 
-    <programlisting>-- Documentation. Enea NFV Access documentation 
--- x86-64
-    -- atom-c3000
-         enea-nfv-access-edgelink-netconf-atom-c3000.hddimg
-         HDD image for bootable USB stick installer
-    -- xeon-d
-         enea-nfv-access-edgelink-netconf-xeon-d.hddimg
-         HDD image for bootable USB stick installer</programlisting>
+    <itemizedlist>
+      <listitem>
+        <para>Enea_NFV_Access_XeonD_2.2.zip</para>
+      </listitem>
+
+      <listitem>
+        <para>Enea_NFV_Access_C3000_2.2.zip</para>
+      </listitem>
+
+      <listitem>
+        <para>uCPEManager-1.0-Windows.zip</para>
+      </listitem>
+
+      <listitem>
+        <para>uCPEManager-1.0-CentOS.zip</para>
+      </listitem>
+
+      <listitem>
+        <para>ena22_automation_and_systemtest.zip</para>
+      </listitem>
+
+      <listitem>
+        <para>IPerf VNF Bundle (Iperf.zip)</para>
+      </listitem>
+
+      <listitem>
+        <para>Fortigate VNF Bundle (fortigate-vnf.rar)</para>
+      </listitem>
+
+      <listitem>
+        <para>Fortigate VNF Example Configurations
+        (FortigateVNF_example_configuration.tar.gz)</para>
+      </listitem>
+
+      <listitem>
+        <para>Packet Generator VNF Bundle (PacketGenerator.zip)</para>
+      </listitem>
+
+      <listitem>
+        <para>TestPmdForwarder VNF Bundle (TestPmdForwarder.zip)</para>
+      </listitem>
+
+      <listitem>
+        <para>TestPmdTerminator VNF Bundle (TestPmdTerminator.zip)</para>
+      </listitem>
+
+      <listitem>
+        <para>ClavisterCosStream VNF Bundle (ClavisterCosStream.zip)</para>
+      </listitem>
+    </itemizedlist>
 
     <programlisting condition="arm">-- documentation/
    /* Enea NFV Access documentation */
@@ -110,7 +152,7 @@
         use-cases.</para>
       </listitem>
 
-<!--  <listitem>
+      <!--  <listitem>
         <para>Enea NFV Access VNF Onboarding Guide. Describes the process
         of onboarding a new VNF onto the uCPE Manager.</para>
       </listitem>-->
@@ -123,15 +165,18 @@
         with Enea NFV Access.</para>
       </listitem>
 
-      <listitem condition="hidden">
-        <para>Enea NFV Access Test Report. Summarizes the test results for the
-        Enea NFV Access release.</para>
+      <listitem>
+        <para>Enea NFV Access uCPE Manager Open-Source Report</para>
+      </listitem>
+
+      <listitem>
+        <para>Enea NFV Access Automation Framework and Test Harness User
+        Guide</para>
       </listitem>
 
       <listitem condition="hidden">
-        <para>Enea NFV Access Security Report. Lists all security fixes
-        included in this release of Enea NFV Access.</para>
+        <para>Enea NFV Access System Test Specification</para>
       </listitem>
     </itemizedlist>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml b/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
index 8202d78..4975ca3 100644
--- a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
@@ -18,28 +18,7 @@
 
     <listitem>
       <para>From the right corner of the top main menu, choose the
-      <literal>Access</literal> section and download the needed artifacts:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>uCPEManager-&lt;version&gt;-Centos.tar.gz (ElementCenter for
-          CentOS).</para>
-        </listitem>
-
-        <listitem>
-          <para>uCPEManager-&lt;version&gt;-Windows.zip (ElementCenter for
-          Windows).</para>
-        </listitem>
-
-        <listitem>
-          <para>Enea_NFV_Access_XeonD_2.2.</para>
-        </listitem>
-
-        <listitem>
-          <para>Enea_NFV_Access_IntelC3000_2.2.</para>
-        </listitem>
-      </itemizedlist>
+      <literal>Access</literal> section.</para>
     </listitem>
 
     <listitem>
diff --git a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
index 3b44d5a..86244f6 100644
--- a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
@@ -14,26 +14,21 @@
 
     <itemizedlist>
       <listitem>
-        <para>Integrated Element ODM 4.0.3: FCAPS framework with NETCONF and
-        Yang</para>
-      </listitem>
-
-      <listitem condition="hidden">
-        <para>EdgeLink Netconf : NETCONF based VNF lifecycle Management
-        Tool</para>
+        <para>uCPE Manager 1.0.</para>
       </listitem>
 
       <listitem>
-        <para>OSTree</para>
+        <para>OSTree-based upgrade system support.</para>
       </listitem>
 
       <listitem>
-        <para>In-band Managemnt</para>
+        <para>In-band management of uCPEs.</para>
       </listitem>
 
       <listitem>
-        <para>Updated documentation</para>
+        <para>Automation Framework and Test Harness.</para>
       </listitem>
+
     </itemizedlist>
   </section>