3 files changed, 142 insertions, 100 deletions

diff --git a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
index 47c4ea4..649a80d 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
@@ -253,6 +253,14 @@ node0.1048576kB = 3 </programlisting>
     root filesystem. When the installation is complete, the uCPE device is
     automatically rebooted into Enea NFV Access Run Time Platform.</para>
 
+    <note>
+      <para>The <literal>.hddimg</literal>, <literal>initramfs</literal>, and
+      <literal>bzImage</literal> files are available in the
+      Enea_NFV_Access_Run_Time_Platform_
+      &lt;processor&gt;_&lt;version&gt;-&lt;build_number&gt;.tar.gz file you
+      downloaded with your release.</para>
+    </note>
+
     <section id="bare_meta_prov_prereq">
       <title>Prerequisites</title>
 
@@ -303,9 +311,10 @@ node0.1048576kB = 3 </programlisting>
 
         <listitem>
           <para>Compress the Enea NFV Access Run Time Platform
-          <literal>hddimg</literal> image for the uCPE device architecture
-          using <literal>gzip</literal> and copy the resulting
-          <literal>hddimg.gz</literal> file to the HTTP server.</para>
+          <literal>.hddimg</literal> image for the uCPE
+          device architecture using <literal>gzip</literal> and copy the
+          resulting <literal>hddimg.gz</literal> file to the HTTP
+          server.</para>
         </listitem>
       </orderedlist>
 
@@ -348,14 +357,12 @@ node0.1048576kB = 3 </programlisting>
 
         <para>Installation Configuration File Example:</para>
 
-        <programlisting>
- image_url = http://192.168.1.100/enea-nfv-access-xeon-d.hddimg.gz
- install_drive = /dev/sda
+        <programlisting>image_url = http://192.168.1.100/enea-nfv-access-xeon-d.hddimg.gz
+install_drive = /dev/sda</programlisting>
 
-</programlisting>
-      <note>
-        <para>The installation configuration file needs to use the Linux end-of-line
-        format (\n), not the Windows format (\r\n).</para>
+        <note>
+          <para>The installation configuration file needs to use the Linux
+          end-of-line format (\n), not the Windows format (\r\n).</para>
       </note>
       </section>
 
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 bb7b525..d46b4c7 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
@@ -8,16 +8,24 @@
     <title>Enea NFV Access Run Time Platform Installer</title>
 
     <para>The current release supports two methods of installation:</para>
-    
+
     <itemizedlist>
-      <listitem><para>Manual installation from a USB stick using the Enea NFV Access Web-installer,
-      which guarantees a clean installation of NFV Access on a uCPE device.</para></listitem>
-      <listitem><para>Mass installation and automated deployment using
-        Bare Metal Provisioning.</para></listitem>
+      <listitem>
+        <para>Manual installation from a USB stick using the Enea NFV Access
+        Web-installer, which guarantees a clean installation of NFV Access on
+        a uCPE device.</para>
+      </listitem>
+
+      <listitem>
+        <para>Mass installation and automated deployment using Bare Metal
+        Provisioning.</para>
+      </listitem>
     </itemizedlist>
-      
-      <para>For more information about Bare Metal Provisioning please refer 
-        to <xref linkend="bare_meta_prov">5.3, Bare Metal Provisioning"</xref>.</para>
+
+    <para>For more information about Bare Metal Provisioning please refer to
+    <xref linkend="bare_meta_prov">
+         5.3, Bare Metal Provisioning" 
+      </xref>.</para>
 
     <section id="prereq">
       <title>Prerequisites</title>
@@ -202,149 +210,167 @@ rootfs_destination=</programlisting></para>
     <section id="auto_installer">
       <title>Creating a bootable USB stick</title>
 
-      <para>In order to install the Enea NFV Access Run Time Platform, you must
-      first create a bootable USB stick with the image you intend to
+      <para>In order to install the Enea NFV Access Run Time Platform, you
+      must first create a bootable USB stick with the image you intend to
       install. Follow the example below to proceed.</para>
 
+      <note>
+        <para>The <literal>.hddimg</literal> image is available in the
+        Enea_NFV_Access_Run_Time_Platform_
+        &lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz file you
+        downloaded with your release.</para>
+      </note>
+
       <para><emphasis role="bold">Create a bootable USB stick
       image</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Copy the HDDIMG image file provided by Enea, onto a
-          development machine.</para>
+          <para>Copy the <literal>.hddimg</literal> image file provided by
+          Enea, onto a development machine.</para>
         </listitem>
 
         <listitem>
           <para>Connect the USB stick to the development machine and identify
-          the device name given by the system with
-          <command>lsblk</command>:
-            <programlisting>NAME         MAJ:MIN          RM    SIZE    RO TYPE MOUNTPOINT
+          the device name given by the system with <command>lsblk</command>:
+          <programlisting>NAME         MAJ:MIN          RM    SIZE    RO TYPE MOUNTPOINT
 sda            8:0            1     28.7G   0  disk
 sdb            8:0            0     111.8G  0  disk
 |-sdb1         8:1            0     111.8G  0  part</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>Copy the HDDIMG image onto the USB stick, e.g:
-            <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
+          <para>Copy the <literal>.hddimg</literal> image onto the USB stick,
+          e.g: <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
 of=/dev/sdb bs=4M conv=fsync</programlisting></para>
         </listitem>
       </orderedlist>
 
       <para>Where <filename>enea-nfv-access-&lt;machine&gt;.hddimg
-      </filename>is the <literal>.hddimg</literal> file and <literal>sdb</literal> is the
-      assigned USB device name.</para>
+      </filename>is the <literal>.hddimg</literal> file and
+      <literal>sdb</literal> is the assigned USB device name.</para>
     </section>
 
     <section id="install_ena_stick">
       <title>Installing Enea NFV Access</title>
-      
+
       <para><emphasis role="bold">How to install the Enea NFV Access Run Time
       Platform using a bootable USB stick image</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Plug the USB stick into the uCPE device. Connect a laptop directly into one of the ports that will
-          not later be chosen as a WAN port. No other ports should be connected.</para>
+          <para>Plug the USB stick into the uCPE device. Connect a laptop
+          directly into one of the ports that will not later be chosen as a
+          WAN port. No other ports should be connected.</para>
         </listitem>
 
         <listitem>
-          <para>Power up the uCPE device and boot the USB stick. Verify that the
-          USB stick is selected from the BIOS boot menu.</para>
+          <para>Power up the uCPE device and boot the USB stick. Verify that
+          the USB stick is selected from the BIOS boot menu.</para>
         </listitem>
 
         <listitem>
-          <para>Once the USB stick is properly booted, the Web-installer application starts
-            automatically and can be accessed in a web browser at <literal>http://172.16.1.1</literal> (port 80).
-          </para>
-          
-          <para>On the first page of the Web-installer, the user should fill in:</para>
+          <para>Once the USB stick is properly booted, the Web-installer
+          application starts automatically and can be accessed in a web
+          browser at <literal>http://172.16.1.1</literal> (port 80).</para>
+
+          <para>On the first page of the Web-installer, the user should fill
+          in:</para>
 
           <itemizedlist>
             <listitem>
-              <para><emphasis role="bold">The uCPE Manager IP Address</emphasis>.</para>
+              <para><emphasis role="bold">The uCPE Manager IP
+              Address</emphasis>.</para>
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold">The Device ID</emphasis>. The unique identifier of the
-              uCPE device.</para>
-              
+              <para><emphasis role="bold">The Device ID</emphasis>. The unique
+              identifier of the uCPE device.</para>
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold">Customer Tags</emphasis>. They are used for  
-              <link linkend="zero_touch_prov">Zero Touch Provisining (ZTP)</link> and can be left 
-                empty. What can be entered here (as needed), are the tag(s) specified when 
-                creating an offline configuration in the uCPE Manager.</para>
+              <para><emphasis role="bold">Customer Tags</emphasis>. They are
+              used for <link linkend="zero_touch_prov">Zero Touch Provisining
+              (ZTP)</link> and can be left empty. What can be entered here (as
+              needed), are the tag(s) specified when creating an offline
+              configuration in the uCPE Manager.</para>
             </listitem>
           </itemizedlist>
 
-          <para>On the second page of the Web-installer, the user should fill in:</para>
+          <para>On the second page of the Web-installer, the user should fill
+          in:</para>
 
-          <itemizedlist>            
+          <itemizedlist>
             <listitem>
-              <para><emphasis role="bold">The Layer 3 configuration of WAN Interface(s)</emphasis>. 
-                Static or Dynamic IP must be specified.</para>
-              
-              <para>During network configuration, WAN cables will be plugged into the device
-              in order to identify ports and make them available for configuration. Each 
-              port with a physically connected cable will be automatically set as a WAN port and must be
-              configured (DHCP is the default setting). The user needs to connect the same quantity of 
-                cables as the number of WAN ports that he wishes to configure. No LAN ports should be 
-                connected nor configured at this time. The configured WAN cables cannot be removed 
-                after being configured.</para>
-
-              <note>
-                <para>The LAN port used to access the Web-installer from the laptop will not be shown
-              and cannot be configured.</para></note>      
+              <para><emphasis role="bold">The Layer 3 configuration of WAN
+              Interface(s)</emphasis>. Static or Dynamic IP must be
+              specified.</para>
+
+              <para>During network configuration, WAN cables will be plugged
+              into the device in order to identify ports and make them
+              available for configuration. Each port with a physically
+              connected cable will be automatically set as a WAN port and must
+              be configured (DHCP is the default setting). The user needs to
+              connect the same quantity of cables as the number of WAN ports
+              that he wishes to configure. No LAN ports should be connected
+              nor configured at this time. The configured WAN cables cannot be
+              removed after being configured.</para>
+
+              <note>
+                <para>The LAN port used to access the Web-installer from the
+                laptop will not be shown and cannot be configured.</para>
+              </note>
             </listitem>
 
-            <listitem>
-              <para><emphasis role="bold">The Management Interface</emphasis>. The interface that 
-                will be used by the uCPE Manager to communicate with the device.</para>
-              
-            </listitem>
+            <listitem>
+              <para><emphasis role="bold">The Management Interface</emphasis>.
+              The interface that will be used by the uCPE Manager to
+              communicate with the device.</para>
+            </listitem>
           </itemizedlist>
         </listitem>
 
         <listitem>
-          <para>When the user has completed the configuration steps in the Web-installer, NFV Access
-          is installed on the hard drive. The largest drive found on the device will be used for
-          installation.</para>
+          <para>When the user has completed the configuration steps in the
+          Web-installer, NFV Access is installed on the hard drive. The
+          largest drive found on the device will be used for
+          installation.</para>
         </listitem>
-        
       </orderedlist>
     </section>
 
     <section id="boot_ena">
       <title>Booting NFV Access</title>
 
-      <para>When the installation has finished successfully, the user should remove the USB stick 
-      before confirming the reboot of the device in Web-installer and ensure that BIOS is configured
-      to boot from the hard drive.</para>
+      <para>When the installation has finished successfully, the user should
+      remove the USB stick before confirming the reboot of the device in
+      Web-installer and ensure that BIOS is configured to boot from the hard
+      drive.</para>
+
+      <para>When configured with the Web-installer GUI, the uCPE device
+      start-up sequence will configure the interfaces accordingly and try to
+      register the device in the uCPE manager. If connectivity is established
+      with the uCPE manager server and a device with a matching Device ID is
+      found, the configuration is successful, and the connection is
+      established.</para>
 
-      <para>When configured with the Web-installer GUI, the uCPE device start-up sequence will 
-        configure the interfaces accordingly and try to register the device in the uCPE manager. 
-        If connectivity is established with the uCPE manager server and a device with a matching 
-        Device ID is found, the configuration is successful, and the connection is established.</para>
-              
       <note>
-        <para>If NFV Access was installed by Bare Metal Provisioning, the Web-installer will launch at
-        start-up expecting the user to provide the post-installation configuration. The Web-installer will
-        be launched on port 80 for post-installation configuration: <literal>
+        <para>If NFV Access was installed by Bare Metal Provisioning, the
+        Web-installer will launch at start-up expecting the user to provide
+        the post-installation configuration. The Web-installer will be
+        launched on port 80 for post-installation configuration: <literal>
         http://172.16.1.1</literal>.</para>
       </note>
 
-      <para>In case of failure, the user should remove all WAN cables, re-attach the laptop, reboot 
-        the device and then access the Web-installer on <literal>http://172.16.1.1</literal>.
-      </para>
-      
-      <note>      
-        <para>After having established a successful connection with the uCPE Manager, the user will 
-        connect any LAN cable(s) that should be connected to the device.
-        </para>
-      </note>      
+      <para>In case of failure, the user should remove all WAN cables,
+      re-attach the laptop, reboot the device and then access the
+      Web-installer on <literal>http://172.16.1.1</literal>.</para>
+
+      <note>
+        <para>After having established a successful connection with the uCPE
+        Manager, the user will connect any LAN cable(s) that should be
+        connected to the device.</para>
+      </note>
     </section>
 
     <section condition="hidden" id="examples">
@@ -684,4 +710,4 @@ ssh root@&lt;target_ip&gt; "cd /mnt/sda6; tar -zxf -"</programlisting>
       </note>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
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 818bd52..dda71bb 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
@@ -228,11 +228,11 @@ userdel postgres</programlisting>
             </listitem>
 
             <listitem>
-              <para><literal>configureHA.sh</literal></para>
+              <para><filename>configureHA.sh</filename></para>
             </listitem>
 
             <listitem>
-              <para><filename>ucpemanager-x.y-Buildz-Linux.tar.gz</filename></para>
+              <para><filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
             </listitem>
 
             <listitem>
@@ -244,7 +244,8 @@ userdel postgres</programlisting>
         <listitem>
           <para>Run the following command:</para>
 
-          <programlisting>./install.sh /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz</programlisting>
+          <programlisting>./install.sh /opt/ems \
+            Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
         </listitem>
       </orderedlist>
 
@@ -321,7 +322,7 @@ userdel postgres</programlisting>
       additional argument as shown below:</para>
 
       <programlisting>./install.sh \
-      /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz  \
+      /opt/ems Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz  \
       SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
 
       <para>The other steps are exactly the same as specified in the
@@ -350,7 +351,7 @@ userdel postgres</programlisting>
             </listitem>
 
             <listitem>
-              <para><filename>ucpemanager-x.y-Buildz-Linux.tar.gz</filename></para>
+              <para><filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -358,7 +359,8 @@ userdel postgres</programlisting>
         <listitem>
           <para>Run the following command:</para>
 
-          <programlisting>./upgrade.sh /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz</programlisting>
+          <programlisting>./upgrade.sh /opt/ems \
+            Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
         </listitem>
       </orderedlist>
 
@@ -1298,6 +1300,13 @@ userdel postgres</programlisting>
       Uploaded Successfully</literal> appears on the File Upload
       Screen.</para>
 
+      <note>
+        <para>The image file of type <literal>rootfs.ostree.tar.bz2</literal>
+        is available in the
+        Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz
+        file you downloaded with your release.</para>
+      </note>
+
       <section id="upload_image">
         <title>Image Library</title>
 
@@ -1320,7 +1329,7 @@ userdel postgres</programlisting>
             to the image file (must be of type
             <literal>rootfs.ostree.tar.bz2</literal>). Select the target
             hardware platform corresponding to the image being uploaded
-            (xeon-d or atomc-3000).</para>
+            (xeon-d or atom-c3000).</para>
           </listitem>
 
           <listitem>