14 files changed, 1034 insertions, 193 deletions

diff --git a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
index c596735..5f20c7f 100644
--- a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -120,14 +120,14 @@
           <listitem>
             <para><literal>prompt_user</literal> (optional). If the parameter
             is set to "yes", the installer will ask for confirmation before
-            formatting and partitioning the drive. The default behaviour is to
+            formatting and partitioning the drive. The default behavior is to
             proceed automatically without any user interaction.</para>
           </listitem>
         </itemizedlist>
 
         <para>Installation Configuration File Example:</para>
 
-        <programlisting>image_url = http://192.168.1.100/enea-nfv-access-xeon-d.hddimg.gz
+        <programlisting>image_url = http://192.168.1.100/enea-edge-runtime-xeon-d.hddimg.gz
 install_drive = /dev/sda</programlisting>
 
         <note>
@@ -144,9 +144,9 @@ install_drive = /dev/sda</programlisting>
         <literal>/var/lib/tftpboot/pxelinux.cfg/default</literal>). The PXE
         entry should have the following settings:</para>
 
-        <programlisting>default nfv_access
-label nfv_access
-menu label ^NFV_ACCESS_INSTALLER
+        <programlisting>default enea_edge_runtime
+label enea_edge_runtime
+menu label ^ENEA_EDGE_INSTALLER
 kernel &lt;Path to kernel&gt;
 append root=/dev/ram0 initrd=&lt;Path to initramfs&gt; LABEL=pxe-installer \
    INSTALL_CFG=http://&lt;Server IP&gt;/&lt;Path to install config file&gt; \
@@ -300,7 +300,7 @@ ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&
       <title>Customizing Automatic Hugepage Reservation</title>
 
       <para>Configuration of Hugepage reservation is done in
-      <literal>/etc/enea-nfv-access/hugepages.cfg</literal>.</para>
+      <literal>/etc/enea/hugepages.cfg</literal>.</para>
 
       <para><emphasis role="bold">Parameters used by the automatic algorithm:
       </emphasis></para>
@@ -414,61 +414,351 @@ node0.1048576kB = 3 </programlisting>
   <section id="create_certificate">
     <title>Tomcat Certificate Generation</title>
 
-    <para>The self-signed Tomcat Certificate the Enea Edge
-    Management application uses is generated at installation time. It can
-    be regenerated anytime after installation by using the
+    <para>The self-signed Tomcat Certificate the Enea Edge Management
+    application uses is generated at installation time. It can be regenerated
+    anytime after installation by using the
     <filename>createCertificate.sh</filename> script.</para>
 
     <para>On the CentOS 7 server open a terminal, log into a bash shell with
     the root account and perform the following:</para>
 
     <orderedlist>
+      <listitem>
+        <para>Extract
+        <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
+
+        <para>The directory in which the archive has been unpacked will be
+        denoted as: <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Run the following command and change <literal>/opt/ems</literal>
+        to the location where the Enea Edge Management application is
+        installed:</para>
+
+        <programlisting>./createCertificate.sh EneaEdgeManagement &lt;IP_or_domain&gt; \
+            /opt/ems [&lt;service_username&gt;]</programlisting>
+
+        <para>Where the following need to be included:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>The IP or domain name of the server the Enea Edge Management
+            application is running on.</para>
+          </listitem>
+
+          <listitem>
+            <para>The service username, which is the one set when installing
+            the Enea Edge Management application. For more details see <olink
+            targetdoc="book_enea_edge_getting_started"
+            targetptr="fresh_ucpemg_install">Fresh Installation of the Enea
+            Edge Management application 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. Providing the service username is optional. If it is not
+            provided, the default value will be used.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>Restart the Enea Edge Management service:</para>
+
+        <programlisting>service ucpemanager restart</programlisting>
+      </listitem>
+    </orderedlist>
+  </section>
+
+  <section id="nfvi_backup">
+    <title>NFV Infrastructure Backup Operations</title>
+
+    <para>In the following sections are described the operations that can be
+    performed in order to backup and restore the NFV Infrastructure (NFVi)
+    configuration. This allows for recovery from unintended configuration
+    errors.</para>
+
+    <section id="nfvi_snapshot">
+      <title>NFVi Snapshotting</title>
+
+      <para>To perform a snapshot (a backup of the current state) of the NFVi,
+      perform the following steps in the Enea Edge Management
+      application:</para>
+
+      <orderedlist>
         <listitem>
-          <para>Extract <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
+          <para>Select the uCPE device, access the <emphasis
+          role="bold">Configuration</emphasis> menu, and select <emphasis
+          role="bold">NFVI Backup</emphasis>. The <emphasis role="bold">NFVI
+          Config Archive Table</emphasis> will be shown.</para>
+        </listitem>
 
-          <para>The directory in which the archive has been unpacked will be
-          denoted as: <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+        <listitem>
+          <para>Press the <emphasis role="bold">Create</emphasis>
+          button.</para>
         </listitem>
 
         <listitem>
-          <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          <para>Edit the default file name, if needed, and press the <emphasis
+          role="bold">Create</emphasis> button. The current window will close
+          and the success message <emphasis role="bold">Created
+          successfully</emphasis> will be shown.</para>
         </listitem>
+      </orderedlist>
+
+      <para>A new entry will be added in the <emphasis role="bold">NFVI Config
+      Archive Table</emphasis> and the <emphasis
+      role="bold">BackupArchiveCreated</emphasis> event can be seen by
+      accessing the <emphasis role="bold">Fault</emphasis> menu and triggering
+      the <emphasis role="bold">Events</emphasis> window. The backup file will
+      be created on the uCPE device.</para>
+    </section>
+
+    <section id="restore_nfvi_backup">
+      <title>Restoring an NFVi backup</title>
+
+      <para>When needed, an NFVi backup can be restored in the following
+      way:</para>
 
+      <orderedlist>
         <listitem>
-          <para>Run the following command:</para>
+          <para>Select the uCPE device, access the <emphasis
+          role="bold">Configuration</emphasis> menu and select <emphasis
+          role="bold">NFVI Backup</emphasis>. The <emphasis role="bold">NFVI
+          Config Archive Table</emphasis> will be shown.</para>
+        </listitem>
 
-          <programlisting>./createCertificate.sh ucpemanager &lt;IP_or_domain&gt; \
-            /opt/ems [&lt;service_username&gt;]</programlisting>
+        <listitem>
+          <para>Select an existing backup from the NFVI Config Archive
+          Table.</para>
+        </listitem>
 
-          <para>Where the following need to be included:</para>
+        <listitem>
+          <para>Press the <emphasis role="bold">Restore</emphasis> button and
+          <emphasis role="bold">Confirm</emphasis> the action.</para>
+        </listitem>
+      </orderedlist>
 
-          <itemizedlist>
-            <listitem>
-              <para>The IP or domain name of the server the Enea Edge
-              Management application is running on.</para>
-            </listitem>
+      <para>A success message will be shown in the same window: <emphasis
+      role="bold">Restored NFVI configuration</emphasis>. Two events will
+      appear in the <emphasis role="bold">Events</emphasis> window (accessible
+      through the <emphasis role="bold">Fault</emphasis> menu): <emphasis
+      role="bold">Restore started</emphasis> and <emphasis role="bold">Restore
+      complete</emphasis>.</para>
 
-            <listitem>
-              <para>The service username, which is the one set when installing the
-              Enea Edge Management application. For more details
-                see <olink targetdoc="book_enea_edge_getting_started"
-              targetptr="fresh_ucpemg_install">Fresh Installation of the Enea
-              Edge Management application 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.
-              Providing the service username is optional. If it is not provided, the default
-              value will be used.</para>
-            </listitem>
-          </itemizedlist>
+      <note>
+        <para>When restoring an NFVi backup, connectivity with the uCPE device
+        may be lost for a period of time. After a successful restoration the
+        connection with the device will be restored. Any saved custom scripts
+        of type <filename>once-before-startup</filename> or
+        <filename>once-after-startup</filename> will be re-executed as part of
+        the NFVi restore process.</para>
+      </note>
+
+      <para>When restoring an NFVi backup all VNF instances will be removed.
+      Instances that were present at the moment the backup was taken will be
+      restored to their initial state, as if newly created. All snapshots
+      associated with previously instantiated VNFs will be deleted.</para>
+
+      <note>
+        <para>VNF instances will not be recreated if their associated VNF
+        descriptor has been deleted prior to restoring the NFVi backup.</para>
+      </note>
+    </section>
+
+    <section id="delete_nfvi_backup">
+      <title>Deleting an NFVi backup</title>
+
+      <para>Deleting an older NFVi backup can be performed in the following
+      way:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Select the uCPE device, access the <emphasis
+          role="bold">Configuration</emphasis> menu, and select <emphasis
+          role="bold">NFVI Backup</emphasis>. The <emphasis role="bold">NFVI
+          Config Archive Table</emphasis> will be shown.</para>
         </listitem>
 
         <listitem>
-          <para>Restart the Enea Edge Management service:</para>
+          <para>Select an existing backup from the NFVI Config Archive
+          Table.</para>
+        </listitem>
 
-          <programlisting>service ucpemanager restart</programlisting>
+        <listitem>
+          <para>Press the <emphasis role="bold">Delete</emphasis>
+          button.</para>
         </listitem>
       </orderedlist>
+
+      <para>A success message will be shown in the same window: <emphasis
+      role="bold">NFVI configuration backup deleted</emphasis>. The backup
+      file will be deleted from the uCPE device and the table will be
+      updated.</para>
+    </section>
+  </section>
+
+  <section id="mgmt_db_backup">
+    <title>Database backup for the Enea Edge Management application</title>
+
+    <para>The following handles advanced configuration for a database backup.
+    A backup can be used to restore the database in case of corruption.</para>
+
+    <section id="db_backup_once">
+      <title>One-time backup of the database</title>
+
+      <para>The following steps are used to perform a database backup from the
+      Enea Edge Management application:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>In the <emphasis role="bold">System Backup</emphasis> window,
+          select the <emphasis role="bold">Backups</emphasis> tab.</para>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Backup Now</emphasis> button
+          in the <emphasis role="bold">Backups</emphasis> tab.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the new window select the <emphasis role="bold">Database
+          Export</emphasis> option from the <emphasis role="bold">Backup
+          Type</emphasis> drop-down.</para>
+        </listitem>
+
+        <listitem>
+          <para>Set the <emphasis role="bold">Execution</emphasis> option to
+          <emphasis role="bold">Now</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Execute</emphasis> button and
+          wait until the Status message shows: <emphasis role="bold">System
+          Backup Completed</emphasis>.</para>
+        </listitem>
+      </orderedlist>
+
+      <para>Once the backup is successfully executed it will be visible in the
+      <emphasis role="bold">System Backup</emphasis> window with a name that
+      respects the following format:
+      <literal>DatabaseExport_[date]_[timestamp].zip</literal>.</para>
+    </section>
+
+    <section id="db_backup_restore">
+      <title>Restoring the database from a backup</title>
+
+      <para>The following steps are used to perform a database restore from
+      the Enea Edge Management application:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>In the <emphasis role="bold">System Backup</emphasis> window,
+          select the <emphasis role="bold">Backups</emphasis> tab.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select the backup you want to restore from the list.</para>
+
+          <note>
+            <para>Database backups follow the naming convention:
+            <literal>DatabaseExport_[date]_[timestamp].zip</literal>.</para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>Click the <emphasis role="bold">Restore</emphasis>
+          button.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the window that appears, click <emphasis
+          role="bold">OK</emphasis> to proceed with the restore
+          operation.</para>
+        </listitem>
+
+        <listitem>
+          <para>Follow the instructions in the pop-up window to restart the
+          server using the CentOS 7 command:</para>
+
+          <programlisting>sudo systemctl restart ucpemanager.service</programlisting>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section id="db_scheduled_backup">
+      <title>Scheduled backup of the database</title>
+
+      <para>The following steps are used to perform a scheduled database
+      backup from the Enea Edge Management application:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>In the <emphasis role="bold">System Backup</emphasis> window,
+          select the <emphasis role="bold">Backups</emphasis> tab.</para>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Backup Now</emphasis> button
+          in the <emphasis role="bold">Backups</emphasis> tab.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the new window select the <emphasis role="bold">Database
+          Export</emphasis> option from the <emphasis role="bold">Backup
+          Type</emphasis> drop-down.</para>
+        </listitem>
+
+        <listitem>
+          <para>Set the <emphasis role="bold">Execution</emphasis> option to
+          <emphasis role="bold">Scheduled</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fill in the <emphasis role="bold">Description</emphasis>
+          field.</para>
+        </listitem>
+
+        <listitem>
+          <para>Set the <emphasis role="bold">Begin Date</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fill in the non-mandatory fields accordingly.</para>
+
+          <note>
+            <para>The <emphasis role="bold">End Date</emphasis> field becomes
+            available once the <emphasis role="bold">Periodicity</emphasis>
+            option is set to something other than <emphasis
+            role="bold">Once</emphasis>.</para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>Click the <emphasis role="bold">Schedule</emphasis> button to
+          schedule the backup.</para>
+        </listitem>
+      </orderedlist>
+
+      <figure>
+        <title>Scheduled Backup Configuration Example</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" contentwidth="615"
+                       fileref="images/scheduled_backup.png" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>The backups created will be visible in the <emphasis
+      role="bold">System Backup</emphasis> window with a name following the
+      format: <literal>DatabaseExport_[date]_[timestamp].zip</literal>.</para>
+    </section>
   </section>
 
   <section condition="hidden" id="high_availability_ig">
@@ -476,7 +766,7 @@ node0.1048576kB = 3 </programlisting>
     Availability Mode</title>
 
     <para>The following describes the setup needed for running the Enea Edge
-    Management application in High Availabilty (HA) mode, with a MariaDB
+    Management application in High Availability (HA) mode, with a MariaDB
     database cluster. A setup example is illustrated in the diagram
     below.</para>
 
@@ -500,7 +790,7 @@ node0.1048576kB = 3 </programlisting>
     single Virtual IP (VIP). The cluster can be reached either from the
     primary server IP or via VIP (recommended), since the VIP interface is
     spawned on the primary server. In case of a primary failure, a newly
-    elected primary (from one of the backups) will respawn the VIP interface.
+    elected primary (from one of the backups) will re-spawn the VIP interface.
     The firewall in this scenario will allocate a public IP for the outside
     world that will be translated into the VIP. Also in this example, the
     traffic towards the cluster from outside the firewall is done through
@@ -519,8 +809,8 @@ node0.1048576kB = 3 </programlisting>
     Limitations</emphasis></para>
 
     <para>Enea's solution for Edge Management High-Availability is designed to
-    maximize resiliency of the management function. However, the current design 
-      does not provide guaranteed consistency across all Enea Edge
+    maximize resiliency of the management function. However, the current
+    design does not provide guaranteed consistency across all Enea Edge
     Management instances, i.e. some information might become out-of-sync in
     certain conditions.</para>
 
@@ -540,7 +830,7 @@ node0.1048576kB = 3 </programlisting>
     and filesystem have been synchronized. If a Backup instance becomes the
     active one before synchronization takes place, this would result in an
     out-of-sync state.</para>
-    
+
     <section id="ha_reqs">
       <title>Requirements for High Availability</title>
 
@@ -840,7 +1130,7 @@ galera-4-26.4.6-1.el7.centos.x86_64</programlisting>
 #wsrep_provider_options=
 
 # Logical cluster name. Should be the same for all nodes.
-<emphasis role="bold">wsrep_cluster_name="ucpemanager"</emphasis>
+<emphasis role="bold">wsrep_cluster_name="EneaEdgeManagement"</emphasis>
 
 # Group communication system handle
 <emphasis role="bold">wsrep_cluster_address="gcomm://192.168.10.11,192.168.10.12,..,192.168.10.16"</emphasis>
@@ -945,11 +1235,11 @@ Thanks for using MariaDB!</programlisting>
             <para>Create the initial database and grant access to it:</para>
 
             <programlisting>[root@localhost application]# mysql --host=localhost --user=root -p
-MariaDB [(none)]&gt; CREATE DATABASE ucpemanager CHARACTER SET='utf8' \
+MariaDB [(none)]&gt; CREATE DATABASE EneaEdgeManagement CHARACTER SET='utf8' \
 COLLATE='utf8_bin';
 Query OK, 1 row affected (0.004 sec)
 
-MariaDB [(none)]&gt; GRANT ALL PRIVILEGES ON ucpemanager.* \
+MariaDB [(none)]&gt; GRANT ALL PRIVILEGES ON EneaEdgeManagement.* \
 TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
           </listitem>
         </orderedlist>
@@ -978,7 +1268,7 @@ TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
 
       <section id="ha_ucpe_mg">
         <title>Installing the Enea Edge Management application in High
-        Availabilty mode</title>
+        Availability mode</title>
 
         <para>These steps must be taken on each of the CentOS 7 machines that
         will host the Enea Edge Management application. It will be installed
@@ -989,7 +1279,7 @@ TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
         Management application, and run:</para>
 
         <programlisting>[root@localhost distro]#./install.sh /opt/ \
-Enea_NFV_Access_uCPEManager_2.3.0-build23.tar.gz
+Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz
 This will install the Enea Edge Management application into the /opt/ucpemanager folder.
 Select the following options, while asked by the installation script:
 Are you using the embedded PostgreSQL database? [Y/N]: <emphasis role="bold">N</emphasis>
@@ -1008,12 +1298,12 @@ Creating database configuration file \
 Done .
 …
 Installing ucpemanager service ..
-Specify service username [ucpemanager]: 
-Specify service password [ucpemanager]: somepassword
+Specify service username [EneaEdgeManagement]: 
+Specify service password [EneaEdgeManagement]: somepassword
 …
 Specify the IP address of the local interface: <emphasis role="bold">192.168.10.11</emphasis>
 Is this server part of a cluster? [Y/N]: <emphasis role="bold">Y</emphasis>
-Specify the name of the cluster [ucpemanager]: 
+Specify the name of the cluster [EneaEdgeManagement]: 
 Specify the shared (virtual) cluster IP address: <emphasis role="bold">192.168.10.10</emphasis>
 Specify the netmask for the cluster IP address [255.255.255.0]: 
 Specify the IP address of the (optional) arbiter: <emphasis role="bold">192.168.10.13</emphasis>
@@ -1042,17 +1332,19 @@ Configuration complete.</programlisting>
         role="bold">System</emphasis> and select <emphasis role="bold">Cluster
         View</emphasis>. The list of Enea Edge Management servers should be
         displayed, with one listed as Primary and the rest as Backup.</para>
-        
-        <note><para>To avoid split-brain (network-partitioning) scenarios, it is possible 
-          for the user to specify an IP:port tuple for a system that acts as an 
-          Arbiter. In case both Primary and Backup servers cannot reach the Arbiter, 
-          there will be no Primary system to connect to and the management services 
-          will be unavailable.</para>
-        
-        <para>This can be manually remedied by either fixing the network situation 
-          that caused the partitioning or modifying Arbiter information in the 
-          configuration file on the server that the user decides should be the 
-          (one and only) Primary server.</para></note>
+
+        <note>
+          <para>To avoid split-brain (network-partitioning) scenarios, it is
+          possible for the user to specify an IP:port tuple for a system that
+          acts as an Arbiter. In case both Primary and Backup servers cannot
+          reach the Arbiter, there will be no Primary system to connect to and
+          the management services will be unavailable.</para>
+
+          <para>This can be manually remedied by either fixing the network
+          situation that caused the partitioning or modifying Arbiter
+          information in the configuration file on the server that the user
+          decides should be the (one and only) Primary server.</para>
+        </note>
 
         <para><remark>ELCCR-907</remark>At times the VIP address is not
         acquired by any of the backup nodes if a power failure happens on
@@ -1070,7 +1362,7 @@ Configuration complete.</programlisting>
     <section id="ha_upgrade">
       <title>Upgrading a High Availability Deployment</title>
 
-      <para>Upgrading a High Availabilty deployment is a highly complex,
+      <para>Upgrading a High Availability deployment is a highly complex,
       multi-step process that requires care to ensure both consistency and
       high-availability. Some steps need to be done manually.</para>
 
@@ -1163,4 +1455,4 @@ Configuration complete.</programlisting>
       </orderedlist>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/book.xml b/doc/book-enea-edge-getting-started/doc/book.xml
index 07021cb..e74ac85 100644
--- a/doc/book-enea-edge-getting-started/doc/book.xml
+++ b/doc/book-enea-edge-getting-started/doc/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
@@ -7,10 +7,9 @@
   <title><trademark class="registered">Enea</trademark> Edge Getting
   Started</title>
 
-  <subtitle>Release Version <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  <subtitle>Release Version <xi:include href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+  xpointer="element(EneaEdge_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
@@ -37,6 +36,8 @@
   <xi:include href="log_collector.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
+  <xi:include href="submaps.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
   <xi:include href="grafana.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="troubleshooting.xml"
diff --git a/doc/book-enea-edge-getting-started/doc/images/debug_settings.png b/doc/book-enea-edge-getting-started/doc/images/debug_settings.png
index 2c97b2c..7bd9be2 100755
--- a/doc/book-enea-edge-getting-started/doc/images/debug_settings.png
+++ b/doc/book-enea-edge-getting-started/doc/images/debug_settings.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/edit_inter.png b/doc/book-enea-edge-getting-started/doc/images/edit_inter.png
index fddde37..33015fa 100755
--- a/doc/book-enea-edge-getting-started/doc/images/edit_inter.png
+++ b/doc/book-enea-edge-getting-started/doc/images/edit_inter.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/onboard_a_vnf_image.png b/doc/book-enea-edge-getting-started/doc/images/onboard_a_vnf_image.png
index da52202..773c1ef 100755
--- a/doc/book-enea-edge-getting-started/doc/images/onboard_a_vnf_image.png
+++ b/doc/book-enea-edge-getting-started/doc/images/onboard_a_vnf_image.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/scheduled_backup.png b/doc/book-enea-edge-getting-started/doc/images/scheduled_backup.png
new file mode 100644
index 0000000..bf66b99
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/scheduled_backup.png
diff --git a/doc/book-enea-edge-getting-started/doc/installation_guide.xml b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
index 477b5c4..da62568 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -92,14 +92,14 @@
         <para>One or more uCPE devices.</para>
 
         <para>Whitebox devices where the Enea Edge Runtime will be installed,
-        containing a minimum of 2 cores and 4 GB RAM and at least two ethernet
+        containing a minimum of 2 cores and 2 GB RAM and at least two ethernet
         ports that will be configured as WAN and LAN during deployment.</para>
 
         <para>When hosting an entire solution including one or several network
         services, the hardware must also have the resources to host one or
-        more VNFs. During a typical evaluation, a dual VNF service on the Enea
-        Edge Runtime needs a CPU with 4-8 cores and at least 8 GB RAM. The
-        supported Intel CPUs of Enea Edge are documented in the <xi:include
+        more VNFs. A dual VNF service on the Enea Edge Runtime typically needs
+        a CPU with 4-8 cores and at least 8 GB RAM. The supported Intel CPUs
+        of Enea Edge are documented in the <xi:include
         href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_edge_release_info/1)" /> Manual.</para>
@@ -121,12 +121,13 @@
 
           <listitem>
             <para>Connecting to the GUI of the Enea Edge Management
-            application for management and configuration. Network access
-            between the CentOS 7 server and the laptop is required. Please see
-            the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-            xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_edge_release_info/1)" /> Manual
-            available with your release, for recommended browsers.</para>
+            application for management and configuration.</para>
+
+            <note>
+              <para>Network access between the CentOS 7 server and the laptop
+              is required. The recommended browser for the current release is
+              Google Chrome.</para>
+            </note>
           </listitem>
         </itemizedlist>
       </listitem>
@@ -479,12 +480,12 @@ userdel postgres</programlisting>
             <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
 
             <para>The directory in which the archive has been unpacked will be
-            denoted as: <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+            denoted as: <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
           </listitem>
 
           <listitem>
             <para>Enter
-            <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+            <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
           </listitem>
 
           <listitem>
@@ -503,7 +504,7 @@ userdel postgres</programlisting>
             <para>Run the following interactive command:</para>
 
             <programlisting>./install.sh /opt/ems \
-Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
+Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
 
             <para>The default configuration values are specified in brackets.
             If no other value is preferred and typed in, pressing
@@ -565,12 +566,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
                 <itemizedlist spacing="compact">
                   <listitem>
                     <para>Specify a service username
-                    <literal>[ucpemanager]:</literal></para>
+                    <literal>[EneaEdgeManagement]</literal>:</para>
                   </listitem>
 
                   <listitem>
                     <para>Specify a service password
-                    <literal>[ucpemanager]</literal>:</para>
+                    <literal>[EneaEdgeManagement]</literal>:</para>
                   </listitem>
                 </itemizedlist>
               </listitem>
@@ -593,35 +594,51 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
               </listitem>
 
               <listitem>
-                <para>Create the self-signed certificate: <literal>Specify IP or domain name</literal> 
-                  (or press <literal>Enter</literal> to skip):</para>
-
-                  <para>The Tomcat self-signed certificate can be generated
-                  again by running the
-                  <filename>createCertificate.sh</filename>. For more details, please see <olink
-                  targetdoc="book_enea_edge_getting_started"
-                  targetptr="create_certificate">Tomcat Certificate
-                  Generation in the <ns:include
-                  href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                  xpointer="element(book_enea_edge_getting_started/1)"
-                  xmlns:ns="http://www.w3.org/2001/XInclude" /></olink> Manual.</para>
-                
+                <para>Create the self-signed certificate: <literal>Specify IP
+                or domain name</literal> (or press <literal>Enter</literal> to
+                skip):</para>
+
+                <para>The Tomcat self-signed certificate can be generated
+                again by running the
+                <filename>createCertificate.sh</filename>. For more details,
+                please see <olink targetdoc="book_enea_edge_getting_started"
+                targetptr="create_certificate">Tomcat Certificate Generation
+                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.</para>
+
                 <note>
-                  <para>The generation of the Tomcat self-signed cerificate
-                  should be skipped only if another certifcate will be
-                  provided.</para>
+                  <para>The generation of the Tomcat self-signed certificate
+                  should be skipped only if another certificate will be
+                  provided. In case a custom certificate is used, not
+                  generated with the <literal>createCertificate.sh</literal>
+                  script, the keystore file containing the certificate must be
+                  manually copied to the <literal>
+                  /opt/ems/ucpemanager/application/config/certificates</literal>
+                  folder, after the installation is done. The application must
+                  then be restarted in order for the certificate to take
+                  effect. The default name of the file is
+                  <filename>.Keystore</filename>.</para>
+
+                  <para>To change the default name, the configuration file
+                  <filename>server.xml</filename> from the
+                  <literal>/opt/ems/ucpemanager/application/3rdParty/apache-tomcat/conf/config</literal>
+                  folder must be copied to
+                  <literal>/opt/ems/ucpemanager/application/config/</literal>.
+                  The <literal>keystoreFile</literal> attribute from the
+                  <literal>&lt;Connector executor="tomcatThreadPool"</literal>
+                  tag must also be changed. Similarly, if a password has been
+                  set, it should be added to the
+                  <literal>keystorePass</literal> attribute:
+                  <literal>keystorePass="NEW_PASSWORD"</literal>.</para>
                 </note>
               </listitem>
 
               <listitem>
-                <para>Heap Configuration:</para> 
-                
-                <itemizedlist spacing="compact">
-                    <listitem>
-                      <para>Please enter the new Maximum Heap Size
-                      [4g]:</para>
-                    </listitem>
-                  </itemizedlist>
+                <para>Heap Configuration: <literal>Please enter the new
+                Maximum Heap Size [4g]</literal>:</para>
               </listitem>
             </itemizedlist>
 
@@ -649,16 +666,17 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           </listitem>
 
           <listitem>
-            <para>Using the IPv4 address of the CentOS 7 Server in a web
-            browser, running on the laptop, log into the Enea Edge Management
-            GUI using the default username and password:
+            <para>Using the IPv4 address or the FQDN of the CentOS 7 Server in
+            a web browser, running on the laptop, log into the Enea Edge
+            Management GUI using the default username and password:
             <literal>admin/admin</literal>.</para>
           </listitem>
         </orderedlist>
 
         <note>
-          <para>The IPv4 address of the CentOS 7 Server will be used as a configuration
-          parameter when setting up the uCPE devices.</para>
+          <para>The IPv4 address or the FQDN of the CentOS 7 Server will be
+          used as a configuration parameter when setting up the uCPE
+          devices.</para>
 
           <para>If the CentOS 7 Server is installed behind NAT, the IPv4
           address used will be the public IP of the NAT device and port
@@ -692,9 +710,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
           different from the snapshot obtained during an Enea Edge Management
           Upgrade or Uninstall operation
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
-          for recovery of the Enea Edge Management application. For more
-          details, see <olink targetdoc="book_enea_edge_getting_started"
+          (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>)
+          needed for recovery of the Enea Edge Management application. For
+          more details, see <olink targetdoc="book_enea_edge_getting_started"
           targetptr="restore_prev_ucpe_install">Restoring a previous Enea Edge
           Management installation in the <xi:include
           href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -708,7 +726,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         installation:</para>
 
         <programlisting>./install.sh \
-/opt/ems Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz \
+/opt/ems Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz \
 SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
       </section>
     </section>
@@ -754,10 +772,11 @@ sdb       8:0    0    111.8G  0   disk
           <para>Copy the <filename>.hddimg</filename> image onto the USB
           stick, e.g:</para>
 
-          <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
+          <programlisting>sudo dd if=./enea-edge-runtime-&lt;processor&gt;.hddimg \
 of=/dev/sdb bs=4M conv=fsync</programlisting>
 
-          <para>Where <filename>enea-nfv-access-&lt;machine&gt;.hddimg</filename> is
+          <para>Where
+          <filename>enea-edge-runtime-&lt;processor&gt;.hddimg</filename> is
           the <filename>.hddimg</filename> file and <literal>sdb</literal> is
           the assigned USB device name.</para>
         </listitem>
@@ -767,7 +786,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
     <section id="prep_phys_deploy">
       <title>Preparing Physical Deployment for Installation</title>
 
-      <figure>
+      <figure id="prep_hw_installation">
         <title>Preparing for Hardware Installation</title>
 
         <mediaobject>
@@ -911,15 +930,16 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
               be entered here (if needed), are the tag(s) specified when
               creating an offline configuration in the Enea Edge Management
               application. A later addition of customer tags can only be done
-              by reinstalling the uCPE devices.</para>
+              by re-installing the uCPE devices.</para>
             </listitem>
           </itemizedlist>
         </listitem>
 
         <listitem>
-          <para>Connect the WAN cable to the uCPE device (see Figure 2). This
-          will be used as the uCPE management network interface, as described
-          below.</para>
+          <para>Connect the WAN cable to the uCPE device (see <link
+          linkend="prep_hw_installation">Figure 2.1 Preparing for Hardware
+          Installation</link>). This will be used as the uCPE management
+          network interface, as described below.</para>
         </listitem>
 
         <listitem>
@@ -934,8 +954,31 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
             </listitem>
 
             <listitem>
-              <para>Plug-in additional WAN interfaces (if applicable) and
-              provide their Layer 3 configuration.</para>
+              <para>Plug in additional WAN interfaces (if applicable) and
+              provide their Layer 3 configuration. An interface can be
+              configured in <literal>dhcp</literal> or
+              <literal>static</literal> mode. When configured in static mode,
+              the following options are available:</para>
+
+              <itemizedlist spacing="compact">
+                <listitem>
+                  <para>Static IP (mandatory)</para>
+                </listitem>
+
+                <listitem>
+                  <para>Netmask (mandatory)</para>
+                </listitem>
+
+                <listitem>
+                  <para>Gateway (mandatory)</para>
+                </listitem>
+
+                <listitem>
+                  <para>DNS Server List (a comma separated list of IPv4
+                  addresses) (optional). If left empty it will use the Gateway
+                  as the DNS, with 1.1.1.1 as fallback.</para>
+                </listitem>
+              </itemizedlist>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -963,7 +1006,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
     <section id="prep_phys_exec">
       <title>Preparing Physical Deployment for Execution</title>
 
-      <figure>
+      <figure id="prep_deploy_execution">
         <title>Preparing for Deployment Execution</title>
 
         <mediaobject>
@@ -1138,8 +1181,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       (disconnected) in the Enea Edge Management application. The uCPE device
       configuration can be corrected by removing the WAN cable(s),
       reconnecting the laptop to the LAN interface of the uCPE device and
-      rebooting it. At this point, the Web-installer can be accessed from the
-      laptop as described in <olink targetdoc="book_enea_edge_getting_started"
+      rebooting it. After a timeout of a few minutes, the Web-installer can be
+      accessed from the laptop as described in <olink
+      targetdoc="book_enea_edge_getting_started"
       targetptr="install_ena_device">Installing Enea Edge - uCPE Device
       installation in the <xi:include
       href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -1156,7 +1200,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
     application, it is ready for central management. Two important functions
     available in the Enea Edge Management GUI are alarm checking and resource
     allocation. Additionally, the device can be rebooted, the factory settings
-    can be restored or simply the vCPE service can be restarted.</para>
+    can be restored or simply the Enea Edge Management Agent service can be
+    restarted.</para>
 
     <section id="check_alarms">
       <title>Checking Alarms</title>
@@ -1182,17 +1227,17 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       in use.</para>
 
       <para>To check CPU, RAM and disk utilization simply select the uCPE
-      device and go to the <emphasis role="bold">Virtual Machines</emphasis>
-      tab in the map view. The same view will show active VNFs running on the
-      uCPE device once instantiated.</para>
+      device and go to the device view tab (the tab bears the device name 
+        as its title). The same view will show active VNFs running on the 
+        uCPE device once instantiated.</para>
     </section>
 
     <section id="basic_oper_device">
-      <title>Basic operations for uCPE device Managememt</title>
+      <title>Basic operations for uCPE device Management</title>
 
       <para>When the uCPE device is connected to the Enea Edge Management
       application, it can be rebooted, the factory settings can be restored or
-      simply the vCPE service can be restarted.</para>
+      simply the Enea Edge Management Agent service can be restarted.</para>
 
       <para>Select the uCPE device and go to the <emphasis
       role="bold">Operations</emphasis> menu, where the following options are
@@ -1207,20 +1252,23 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
         <listitem>
           <para><emphasis role="bold">Factory reset</emphasis>. Resets the
           device to its default factory settings. All current configuration
-          settings are lost. All running VNFs are destroyed. Any installed
-          custom scripts will be removed and they will need to be
-          reinstalled.</para>
+          settings are lost. All running VNFs are destroyed. All uploaded VM
+          image files are deleted. Existing log files will be kept.</para>
 
-          <para>Only the vCPE service will be restarted, the device will not
-          be rebooted. No reboot is needed.</para>
+          <para>This command will only restart the Enea Edge Management Agent
+          service, the device will not be rebooted. No reboot is
+          needed.</para>
 
-          <para>Once the vCPE service restart completes, appropriate day-0
-          provisioning will take place.</para>
+          <para>Once the service restart completes, appropriate day-0
+          provisioning will take place. Previously installed custom scripts
+          will be reinstalled on the uCPE device, and upon receiving the
+          custom script(s), the device will reboot.</para>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Restart Vcpe</emphasis>. Restarts the
-          vCPE service on the device. The device will not be rebooted.</para>
+          Enea Edge Management Agent service. The device will not be
+          rebooted.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -1252,4 +1300,4 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       </note>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/introduction.xml b/doc/book-enea-edge-getting-started/doc/introduction.xml
index eaa5521..8f1e854 100644
--- a/doc/book-enea-edge-getting-started/doc/introduction.xml
+++ b/doc/book-enea-edge-getting-started/doc/introduction.xml
@@ -62,7 +62,7 @@
       <para>Enea Edge Runtime is a lightweight, multi-architecture
       virtualization platform built on de-facto standards in an SDN/NFV
       ecosystem. It is designed for a high networking performance with minimal
-      hardware footprint, by only providing relevant functionalties and
+      hardware footprint, by only providing relevant functionalities and
       technologies.</para>
 
       <para>Virtualization methods include Virtual Machines (KVM / QEMU) and
@@ -70,7 +70,7 @@
       ensured by an accelerated data plane relying on technologies like DPDK,
       OVS-DPDK and SR-IOV/PCI-Passthrough. Key functionalities, such as
       platform software management, virtualized networking, VNFs life-cycle
-      management and FCAPS are provided through the YANG-modelled NETCONF
+      management and FCAPS are provided through the YANG-modeled NETCONF
       protocol.</para>
 
       <figure>
diff --git a/doc/book-enea-edge-getting-started/doc/log_collector.xml b/doc/book-enea-edge-getting-started/doc/log_collector.xml
index 1148dc2..3499978 100644
--- a/doc/book-enea-edge-getting-started/doc/log_collector.xml
+++ b/doc/book-enea-edge-getting-started/doc/log_collector.xml
@@ -340,7 +340,7 @@
       <para>Often, sending the Enea Edge Management logs together with
       collected uCPE device logs to the support team provides important
       information for troubleshooting (especially in cases of connectivity
-      issues with the uCPE device and error popups).</para>
+      issues with the uCPE device and error pop-ups).</para>
 
       <para>Enea Edge Management log files are located in
       <filename>application/logs/</filename> in the Enea Edge Management
@@ -358,14 +358,14 @@
 
         <listitem>
           <para>Select the desired log file
-          (<filename>ucpemanager.log</filename> or
+          (<filename>EneaEdgeManagement.log</filename> or
           <filename>watchdog.log</filename>) and press the <emphasis
           role="bold">Download</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>A new (blank) popup window opens and the file is downloaded
-          locally. This popup can be closed after the download.</para>
+          <para>A new (blank) pop-up window opens and the file is downloaded
+          locally. This pop-up can be closed after the download.</para>
         </listitem>
 
         <listitem>
@@ -394,7 +394,7 @@
     <para>Log collection from uCPE Devices can also be done when there is no
     Enea Edge Management connection. A SSH connection to the uCPE Device is
     needed for use of the log collector script, which can be found in the uCPE
-    Device file system in <literal>/usr/local/enea/</literal>.</para>
+    Device file system in <literal>/usr/enea/</literal>.</para>
 
     <para>The Log collector script takes relevant information about the system
     and collects it in an archive:</para>
diff --git a/doc/book-enea-edge-getting-started/doc/net_config_options.xml b/doc/book-enea-edge-getting-started/doc/net_config_options.xml
index ff513c9..a9faf0a 100644
--- a/doc/book-enea-edge-getting-started/doc/net_config_options.xml
+++ b/doc/book-enea-edge-getting-started/doc/net_config_options.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="net_config_operations">
   <title>Network Configuration Options</title>
 
@@ -218,9 +218,9 @@
 
           <listitem>
             <para>In order to edit an already configured interface, (as in the
-            example popup shown below, a WAN interface) double click on the
-            desired one and a popup will appear. A different popup appears for
-            each type of interface. From the <emphasis role="bold">Host
+            example pop-up shown below, a WAN interface) double click on the
+            desired one and a pop-up will appear. A different pop-up appears
+            for each type of interface. From the <emphasis role="bold">Host
             Interface</emphasis> window, a user can change the networking type
             and the IP address assignment:</para>
 
@@ -240,9 +240,10 @@
         <note>
           <para>When changing the <literal>address-assignment</literal> from
           static to DHCP, if any of the <literal>ip-address</literal>,
-          <literal>netmask</literal> or <literal>gateway</literal> fields have
-          invalid values a validation error will be triggered. These fields
-          must be empty or have the valid values for their respective address
+          <literal>netmask</literal>, <literal>gateway</literal> or
+          <literal>dns-servers</literal> fields have invalid values a
+          validation error will be triggered. These fields must be empty or
+          have the valid values for their respective address
           assignment.</para>
         </note>
       </section>
@@ -270,7 +271,7 @@
 
           <listitem>
             <para>In order to edit an already configured interface, (as in the
-            example popup shown below, a WAP interface) double click on the
+            example pop-up shown below, a WAP interface) double click on the
             desired one and a pop-up will appear. A different pop-up appears
             for each type of interface. From the <literal>Host
             Interface</literal> window, the following parameters are
@@ -385,7 +386,7 @@
       </note>
 
       <para>There are three types of bridges which can be created, each one
-      fulfiling a different role.</para>
+      fulfilling a different role.</para>
 
       <section id="inband_mg_bridge">
         <title>uCPE In-band Management bridge</title>
@@ -580,9 +581,9 @@
 
         <listitem>
           <para>DeviceVersion: <xi:include
-          href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+          href="../../eltf_params_updated.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(EneaLinux_REL_VER/1)" /></para>
+          xpointer="element(EneaEdge_REL_VER/1)" /></para>
         </listitem>
 
         <listitem>
@@ -651,10 +652,15 @@
     <title>Custom Scripts for Custom Networking Configurations</title>
 
     <para>The custom scripts feature allows users to execute user-defined
-    scripts on the uCPE device at various times.This allows for more flexible
+    scripts on the uCPE device at various times. This allows for more flexible
     and advanced configurations such as a LTE modem configuration, advanced
     network configurations or OVS flow rule programming at any time.</para>
 
+    <note>
+      <para>In the current Enea Edge Management application version custom 
+        scripts are not supported as part of the offline config.</para>
+    </note>
+
     <section id="upload_scripts">
       <title>Uploading Scripts</title>
 
@@ -678,8 +684,8 @@
         </listitem>
 
         <listitem>
-          <para><literal>Once-after-startup</literal>. The script will always
-          execute after the system has rebooted, after all device
+          <para><literal>Once-after-startup</literal>. The script will only
+          execute once after the system has rebooted, after all device
           configuration processes have completed.</para>
         </listitem>
 
@@ -720,6 +726,16 @@
           role="bold">Send</emphasis>.</para>
         </listitem>
       </orderedlist>
+
+      <note>
+        <para>If two scripts are uploaded one at a time, the Enea Edge
+        Management application will delete the first script already added from 
+          the device and apply the new one. In order for both scripts to be available on
+        the device, both scripts must be uploaded at once.</para>
+      
+        <para>If multiple custom scripts of the same type are uploaded at the
+        same time, they are executed in alphabetical order.</para>
+      </note>
     </section>
 
     <section id="remove_scripts">
@@ -900,14 +916,32 @@
       </mediaobject>
     </figure>
 
-    <note>
-      <para>Only a single Wireless AP is allowed on a physical interface. The
+    <para>Only a single Wireless AP is allowed on a physical interface. The
       validation of the <literal>wap-capable</literal> interface is done when
       adding the Wireless AP, so, in case of an error, the parameters of the
       <literal>wap-capable</literal> interface must be rechecked. This can be
       done by accessing the <emphasis role="bold">Configuration</emphasis>
       menu and selecting <emphasis role="bold">External
       Interfaces</emphasis>.</para>
+
+    <note>
+      <para>For the 2.4GHz band, the <literal>802.11 g/n</literal> wireless
+      mode will use a 40MHz channel width by default. For regulatory
+      requirements compliance, channels are scanned in order to avoid
+      overlapping with existing networks. If overlaps are detected, primary
+      and secondary Wireless AP channels will be swapped, resulting in an
+      effective channel width of 20MHz instead of 40Mhz being used.
+      To avoid this, select another wireless channel.</para>
+
+      <para>For the 5GHz band, the <literal>802.11 n</literal> and the 
+        <literal>802.11 ac/n</literal> wireless modes can be configured
+      explicitly to use a specific channel number, even when Automatic
+      Channel Selection (<literal>ACS</literal>) is available. For regulatory
+      requirements compliance, channels are scanned in order to avoid
+      overlapping with existing networks. If overlaps are detected,
+      <literal>ACS</literal> will try to find another free channel,
+      resulting in a different channel number being used instead of the one
+      explicitly configured. To avoid this, select another wireless channel.</para>
     </note>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-edge-getting-started/doc/submaps.xml b/doc/book-enea-edge-getting-started/doc/submaps.xml
new file mode 100644
index 0000000..bdb769e
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/submaps.xml
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="submaps">
+  <title>Submaps</title>
+
+  <para>The System domain of the Enea Edge Managemement application can be
+  split into different submaps, used to organize the uCPE devices more 
+    effectively. Each domain is organized like a tree, with each submap being 
+    able to have several other submaps within it. Each device can be placed in 
+    only one submap and the user can create virtual links between devices.</para>
+
+  <para>Submaps support managed and unmanaged uCPE devices. An unmanaged 
+    device is an icon that looks like a device within the 
+    <emphasis role="bold">Map</emphasis> (it supports links and has a similar 
+    icon) but is not a real managed device.</para>
+
+  <section id="submap_op">
+    <title>Submap Operations</title>
+
+    <para>In the <emphasis role="bold">System</emphasis> view, right-clicking
+    on a submap opens up a menu with the following operations:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Add Submap</para>
+
+        <para>This option is used for adding a new submap, placed in the
+        <emphasis role="bold">System</emphasis> view under the current one in
+        the tree. The new submap will also be added in the <emphasis
+        role="bold">Map</emphasis> view of the parent submap.</para>
+
+        <para>When selecting this option, the following fields need to be set
+        in the <emphasis role="bold">Add Submap</emphasis> window that
+        pops-up:</para>
+
+        <table id="submap_props">
+            <title>Submap properties</title>
+
+            <tgroup cols="2">
+              <tbody>
+                <row>
+                  <entry>Name</entry>
+
+                  <entry>The name of the domain map. This is
+                  mandatory.</entry>
+                </row>
+
+                <row>
+                  <entry>Description</entry>
+
+                  <entry>A text description of the domain map.</entry>
+                </row>
+
+                <row>
+                  <entry>Background Color</entry>
+
+                  <entry>The background color of the domain map. Possible
+                  values: white, black, blue, cyan, grey, green, magenta,
+                  orange, pink, red, yellow.</entry>
+                </row>
+
+                <row>
+                  <entry>Background Image</entry>
+
+                  <entry>The background image of the domain map.</entry>
+                </row>
+
+                <row>
+                  <entry>Icon Image</entry>
+
+                  <entry>The icon image of the domain map.</entry>
+                </row>
+
+                <row>
+                  <entry>Snap to Grid</entry>
+
+                  <entry>True if a placed device should snap to the grid
+                  automatically.</entry>
+                </row>
+
+                <row>
+                  <entry>X Grid (px)</entry>
+
+                  <entry>The number of pixels between placement positions in
+                  the horizontal position in the grid. Disabled if
+                  <literal>Snap to Grid</literal> is false.</entry>
+                </row>
+
+                <row>
+                  <entry>Y Grid (px)</entry>
+
+                  <entry>The number of pixels between placement positions in
+                  the vertical position in the grid. Disabled if <literal>Snap
+                  to Grid</literal> is false.</entry>
+                </row>
+
+                <row>
+                  <entry>Direction</entry>
+
+                  <entry>This value describes the direction of sorting the
+                  items (horizontal or vertical).</entry>
+                </row>
+
+                <row>
+                  <entry>Sort Method</entry>
+
+                  <entry>This value describes the sorting method used when
+                  arranging icons. Natural is [a1,a2,a11] and Alphabetical is
+                  [a1,a11,a2].</entry>
+                </row>
+
+                <row>
+                  <entry>Arrangement Wrap</entry>
+
+                  <entry>This value indicates the maximum number of items
+                  placed before wrapping to the next row or column.</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+
+        <note>
+          <para><literal>Snap to Grid</literal>, <literal>Direction</literal>
+          and <literal>Sort Method</literal> have the <literal>System
+          Default</literal> option. This option can be set by accessing
+          <emphasis role="bold">System</emphasis>, selecting <emphasis
+          role="bold">Configuration</emphasis> under the <emphasis
+          role="bold">Properties</emphasis> tab, and navigating to the <emphasis
+          role="bold">GUI</emphasis> tab.</para>
+
+          <para>More images for backgrounds and icons can be uploaded by
+          accessing <emphasis role="bold">System</emphasis>, selecting
+          <emphasis role="bold">Media Files</emphasis> under the <emphasis
+          role="bold">Icons</emphasis> tab or the <emphasis
+          role="bold">Backgrounds</emphasis> tab, respectively.</para>
+        </note>
+      </listitem>
+
+      <listitem>
+        <para>Remove Submap</para>
+
+        <para>This option is used for removing the current submap. The submap
+        must be empty, all children submaps or uCPE Devices must be deleted first.</para>
+      </listitem>
+
+      <listitem>
+        <para>Properties</para>
+
+        <para>This option is used for viewing and/or editing the properties of
+        the current submap. For more details please see the <link
+        linkend="submap_props">Submap properties</link> table.</para>
+      </listitem>
+
+      <listitem>
+        <para>Move Device</para>
+
+        <para>This option is used for adding devices to the current submap.
+        All devices appear in this list (placed and unplaced). If the device
+        is already added to a submap, it will be moved from that submap to the
+        current one.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section id="map_op">
+    <title>Map Operations</title>
+
+    <para>Right-clicking anywhere in the <emphasis role="bold">Map</emphasis>
+    view opens up a menu with the following operations:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Place Device</para>
+
+        <para>This option is used for adding one or more devices in the
+        current submap. Only unplaced devices appear in this list.</para>
+      </listitem>
+
+      <listitem>
+        <para>Move Device</para>
+
+        <para>This option is used for moving one or more devices from other
+        submaps to the current submap. All devices appear in this list (placed
+        and unplaced). If the device is already added to a submap, it will be
+        removed from that submap.</para>
+      </listitem>
+
+      <listitem>
+        <para>Add Unmanaged</para>
+
+        <para>This option is used for creating an unmanaged device. An
+        unmanaged device is represented by an icon in the current view that
+        looks like a device (it supports links and has a similar icon) but 
+          is not a real managed device. It will be automatically placed in the current
+        submap. When selecting this option, the following fields need to be
+        set in the <emphasis role="bold">Add Unmanaged</emphasis> window that
+        pops-up:</para>
+
+        <table id="unmanaged_props">
+            <title>Unmanaged device properties</title>
+
+            <tgroup cols="2">
+              <tbody>
+                <row>
+                  <entry>Name</entry>
+
+                  <entry>The name of the device.</entry>
+                </row>
+
+                <row>
+                  <entry>Description</entry>
+
+                  <entry>A text description of the device.</entry>
+                </row>
+
+                <row>
+                  <entry>Icon Image</entry>
+
+                  <entry>The icon image of the device.</entry>
+                </row>
+
+                <row>
+                  <entry>Status</entry>
+
+                  <entry>The status of the device.</entry>
+                </row>
+
+                <row>
+                  <entry>Status Tooltip</entry>
+
+                  <entry>The tooltip for the device status.</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+      </listitem>
+
+      <listitem>
+        <para>Add Link</para>
+
+        <para>This option is used for creating a virtual link between two
+        devices. They can be any two devices, it does not matter if they are
+        unplaced, placed in the current submap or placed in any other submap.
+        When selecting this option, the following fields need to be set in the
+        <emphasis role="bold">Add Link</emphasis> window:</para>
+
+        <table id="link_props">
+            <title>Link properties</title>
+
+            <tgroup cols="2">
+              <tbody>
+                <row>
+                  <entry>Name</entry>
+
+                  <entry>The name of the link.</entry>
+                </row>
+
+                <row>
+                  <entry>Description</entry>
+
+                  <entry>A text description of the link.</entry>
+                </row>
+
+                <row>
+                  <entry>From</entry>
+
+                  <entry>One of the endpoints of the link.</entry>
+                </row>
+
+                <row>
+                  <entry>To</entry>
+
+                  <entry>The 2nd endpoint of the link.</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+      </listitem>
+
+      <listitem>
+        <para>Properties</para>
+
+        <para>This option is used for viewing and/or editing the properties of
+        the current submap. For more details please see the <link
+        linkend="submap_props">Submap properties</link> table.</para>
+      </listitem>
+
+      <listitem>
+        <para>Arrange icons</para>
+
+        <para>This option can be used to auto-arrange devices placed in the
+        current submap. The rearrangement is done based on the submap's
+        properties.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section id="device_op">
+    <title>Device Operations</title>
+
+    <para>In the <emphasis role="bold">Map</emphasis> view, right-clicking on
+    a device opens up a menu with the following operations:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Links...</para>
+
+        <para>This option is used for viewing all links to and from that
+        device.</para>
+      </listitem>
+
+      <listitem>
+        <para>Remove</para>
+
+        <para>For managed devices, this option is used for removing the device
+        from the map. The managed device will not be removed completely from
+        the Enea Edge Management application, but will be moved to the <emphasis
+        role="bold">Unplaced</emphasis> submap instead.</para>
+
+        <para>For unmanaged devices, this option removes the device altogether
+        from the Enea Edge Management application.</para>
+      </listitem>
+
+      <listitem>
+        <para>Add Link</para>
+
+        <para>This option is used for creating a virtual link between two
+        devices. They can be any two devices, it does not matter if they are
+        unplaced, placed in the current submap or placed in any other submap.
+        The current device is already selected as the <emphasis
+        role="bold">From</emphasis> endpoint in the <emphasis role="bold">Add
+        Link</emphasis> pop-up. For more details please see the <link
+        linkend="link_props">Link properties</link> table.</para>
+      </listitem>
+
+      <listitem>
+        <para>Properties</para>
+
+        <para>This option is used for viewing and editing the properties of an
+        unmanaged device. For more details please see the <link
+        linkend="unmanaged_props">Unmanaged device properties</link> table.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
index fcf991e..0e6322f 100644
--- a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
@@ -54,7 +54,7 @@
         </row>
 
         <row>
-          <entry>The uCPE Device cannot boot after an upgrade.</entry>
+          <entry>The uCPE device cannot boot after an upgrade.</entry>
 
           <entry><orderedlist>
               <listitem>
@@ -96,7 +96,7 @@
 
           <entry>If a working snapshot obtained during a previous Upgrade or
           Uninstall is available
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>):
+          (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>):
           <orderedlist>
               <listitem>
                 <para>Cleanup the current upgrade attempt with:</para>
@@ -164,7 +164,7 @@
                 <para>Connect to the uCPE Device console and run the factory
                 reset script:</para>
 
-                <programlisting>/usr/local/odm/bin/factory_reset.sh</programlisting>
+                <programlisting>/usr/enea/odm/bin/factory_reset.sh</programlisting>
               </listitem>
 
               <listitem>
diff --git a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
index ac2ebb6..6a02d47 100644
--- a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
@@ -24,11 +24,11 @@
         folder.</para>
 
         <para>The directory in which the archive has been unpacked will be
-        denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+        denoted as <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
       </listitem>
 
       <listitem>
-        <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+        <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
       </listitem>
 
       <listitem>
@@ -37,7 +37,7 @@
         Management installation:</para>
 
         <programlisting>./upgrade.sh /opt/ems \
-Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
+Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
       </listitem>
     </orderedlist>
 
@@ -52,9 +52,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
       <listitem>
         <para>Create a compressed file of the <literal>ucpemanager</literal>
         application folder
-        (<filename>ucpemanager-Back-up-YYYYddMMHHmm.tar.gz</filename>), which
+        (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>), which
         contains a snapshot of the existing installation in the
-        <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
+        <literal>&lt;EEMg-installerdir&gt;/dist</literal> directory.</para>
 
         <note>
           <para>The snapshot file created during the upgrade can be used for
@@ -104,19 +104,19 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <listitem>
           <para>The directory in which the archive has been unpacked will be
-          denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+          denoted as <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
         </listitem>
 
         <listitem>
           <para>Copy the snapshot file
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>)
+          (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>)
           created during a previous Enea Edge Management Upgrade or Enea Edge
           Management Uninstall Operation into the
-          <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
+          <literal>&lt;EEMg-installerdir&gt;/dist</literal> directory.</para>
         </listitem>
 
         <listitem>
-          <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
@@ -124,7 +124,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           <literal>/opt/ems</literal> to the correct location of the Enea Edge
           Management installation:</para>
 
-          <programlisting>./restore.sh /opt/ems ucpemanager-Backup-YYYYddMMHHmm.tar.gz</programlisting>
+          <programlisting>./restore.sh /opt/ems EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</programlisting>
         </listitem>
       </orderedlist>
 
@@ -158,12 +158,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <listitem>
           <para>Navigate to the folder where the Enea Edge Management
           application is unpacked:
-          <filename>&lt;uCPEM-installerdir&gt;</filename>.</para>
+          <filename>&lt;EEMg-installerdir&gt;</filename>.</para>
         </listitem>
         
         <listitem>
           <para>Enter
-          <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
@@ -186,7 +186,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <listitem>
           <para>Create a compressed file of the <literal>ucpemanager</literal>
           application folder:
-          <filename>ucpemanager-Back-up-YYYYddMMHHmm.tar.gz</filename>, which
+          <filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>, which
           contains a snapshot of the existing installation and functions as a
           restore point.</para>
 
@@ -289,7 +289,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
       <note>
         <para>The uCPE Device upgrade is done with image files of the type
-        <literal>rootfs.ostree.tar.bz2</literal>, which are available in the
+        <literal>ostree.tar.bz2</literal>, which are available in the
         <filename>Enea_Edge_Runtime_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         file you downloaded with your release.</para>
       </note>
@@ -313,7 +313,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
             <listitem>
               <para>Select <emphasis role="bold">Choose File</emphasis> to
               provide the path to the image file (must be of type
-              <literal>rootfs.os-tree.tar.bz2</literal>).</para>
+              <literal>ostree.tar.bz2</literal>).</para>
             </listitem>
 
             <listitem>
@@ -470,7 +470,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <para>The status of the installation and upgrade can be viewed in the
         <emphasis role="bold">Upgrade Operations</emphasis> tab. Ongoing or
-        scheduled upgrade operations can be viewed or cancelled.</para>
+        scheduled upgrade operations can be viewed or canceled.</para>
 
         <para><emphasis role="bold">To view the status of an installation or
         upgrade operations</emphasis></para>
@@ -620,4 +620,4 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
       </section>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-edge-getting-started/doc/vnf_mg.xml b/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
index 058be40..beea8fc 100644
--- a/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
+++ b/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
@@ -10,7 +10,7 @@
     <title>Onboarding a VNF</title>
 
     <para>The onboarding of a VNF means adding it to the Enea Edge Management
-    application VNF Catalogue and preparing it for instantiation (deployment
+    application VNF Catalog and preparing it for instantiation (deployment
     on connected uCPE devices). This is accomplished using the Enea Edge
     Management Onboarding graphical user interface.</para>
 
@@ -210,9 +210,8 @@
       Management application.</para>
 
       <note>
-        <para>CAUTION: The user MUST save and use the same order for the
-        virtual interfaces during both the onboarding and instantiation
-        phases.</para>
+        <para>The user MUST save and use the same order for the virtual
+        interfaces during both the onboarding and instantiation phases.</para>
       </note>
 
       <para><emphasis role="bold">Cloud Init Tab</emphasis></para>
@@ -228,7 +227,7 @@
           <para>To onboard a VNF you must specify the <literal>Cloud-Init
           Datasource</literal> that the VNF uses. This information is procured
           from the VNF Vendor. Choose one of the following methods to specify
-          the datasource:</para>
+          the data-source:</para>
 
           <itemizedlist spacing="compact">
             <listitem>
@@ -320,7 +319,7 @@
       </itemizedlist>
 
       <note>
-        <para>The last three properties are useful in conjuction with the
+        <para>The last three properties are useful in conjunction with the
         <literal>vnfMgmt</literal> bridge type. They allow the user to map the
         internal VNF management port to an external port, useful for VNF
         configuration from WAN.</para>
@@ -498,7 +497,8 @@
             role="bold">Reverse SSH</emphasis> . By default, the start port
             will be <literal>7000</literal> and the maximum number of ports
             allocated to all devices is 10. Only one port per device is
-            allowed.</para>
+            allowed. The maximum number of ports allocated can be increased 
+            up to 65536, if necessary.</para>
 
             <para>When the SSH window is closed, the tunnel configuration is
             deleted on the uCPE device and the tunnel is destroyed, so that
@@ -526,4 +526,126 @@
       </listitem>
     </orderedlist>
   </section>
+
+  <section id="vnf_snapshots">
+    <title>VNF Snapshots</title>
+
+    <para>The following sections describe the mechanism of saving
+    (snapshotting) and restoring a VNF context on the uCPE device using the
+    Enea Edge Management application.</para>
+
+    <para>The uCPE devices should be connected to the Enea Edge Management
+    application and should have at least one VNF instantiated.</para>
+
+    <section id="vnf_live_snapshot">
+      <title>VNF Live Snapshot</title>
+
+      <para>To perform a snapshot of an existing VNF on a uCPE device, do the
+      following in the Enea Edge Management application:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Select the uCPE device and access the <emphasis
+          role="bold">Configuration</emphasis> menu, then select <emphasis
+          role="bold">Virtual Machines</emphasis> and <emphasis
+          role="bold">VMs</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select a virtual machine and click the <emphasis
+          role="bold">Snapshots..</emphasis> button. The <emphasis
+          role="bold">VM Snapshot Table on &lt;device-name&gt; (IP)</emphasis>
+          window will open.</para>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Create</emphasis> button and
+          the <emphasis role="bold">Create VM Snapshot on &lt;device-name&gt;
+          (IP)</emphasis> window will open.</para>
+        </listitem>
+
+        <listitem>
+          <para>Change the file name, if needed, and press the <emphasis
+          role="bold">Create</emphasis> button. The current pop-up window will
+          close after a few seconds and a new entry will be shown in the
+          <emphasis role="bold">VM Snapshot Table on &lt;device-name
+          (IP)&gt;</emphasis>.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section id="restore_snapshot">
+      <title>Restoring a VNF Snapshot</title>
+
+      <para>When needed, a VNF snapshot can be restored by doing the
+      following:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Select the uCPE device and access the <emphasis
+          role="bold">Configuration</emphasis> menu, then select <emphasis
+          role="bold">Virtual Machines</emphasis> and choose <emphasis
+          role="bold">VMs</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select a virtual machine and press the <emphasis
+          role="bold">Snapshots</emphasis> button. The <emphasis
+          role="bold">VM Snapshot Table on &lt;device-name&gt; (IP)</emphasis>
+          window will open.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select the snapshot entry from table.</para>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Restore</emphasis> button. A
+          success message will appear in the same window: <literal>Restored VM
+          from snapshot</literal>.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section id="delete_snapshot">
+      <title>Deleting a VNF Snapshot</title>
+
+      <para>Deleting an older snapshot can be performed by doing the
+      following:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Select the uCPE device and access the <emphasis
+          role="bold">Configuration</emphasis> menu, then select <emphasis
+          role="bold">Virtual Machines</emphasis> and choose <emphasis
+          role="bold">VMs</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select a virtual machine and press the <emphasis
+          role="bold">Snapshots..</emphasis> button. The <emphasis
+          role="bold">VM Snapshot Table on &lt;device-name&gt; (IP)</emphasis>
+          window will open.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select the snapshot entry from the table.</para>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Delete</emphasis>
+          button.</para>
+        </listitem>
+      </orderedlist>
+
+      <para>A success message will be shown in the same window:
+      <literal>Snapshot deleted</literal>. The snapshot file will be deleted
+      from the uCPE device and the table will be updated.</para>
+
+      <note>
+        <para>Deleting a VNF instance automatically deletes all snapshots
+        associated with it.</para>
+      </note>
+    </section>
+  </section>
 </chapter>
\ No newline at end of file