Merge branch 'develop'Enea_Edge_2.6.0

Change-Id: I5b91b0eebe7cdf49944af93f47f1e304dcffba45

10 files changed, 722 insertions, 183 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 5f20c7f..e1917f4 100644
--- a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -440,7 +440,7 @@ node0.1048576kB = 3 </programlisting>
         to the location where the Enea Edge Management application is
         installed:</para>
 
-        <programlisting>./createCertificate.sh EneaEdgeManagement &lt;IP_or_domain&gt; \
+        <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>
@@ -521,6 +521,12 @@ node0.1048576kB = 3 </programlisting>
     <section id="restore_nfvi_backup">
       <title>Restoring an NFVi backup</title>
 
+      <note>
+        <para>In order to restore an NFVi backup, the Enea Edge Runtime
+        version installed on the uCPE device needs to be the same at
+        restoration as it was when the snapshot was created.</para>
+      </note>
+
       <para>When needed, an NFVi backup can be restored in the following
       way:</para>
 
@@ -1201,20 +1207,20 @@ Switch to unix_socket authentication [Y/n] <emphasis role="bold">Y</emphasis>
 Enabled successfully!
 Reloading privilege tables..
  ... Success!
-…
+...
 Change the root password? [Y/n] <emphasis role="bold">Y</emphasis>
 New password: 
 Re-enter new password: 
 Password updated successfully!
 Reloading privilege tables..
  ... Success!
-…
+...
 Remove anonymous users? [Y/n] <emphasis role="bold">Y</emphasis>
  ... Success!
-…
+...
 Disallow root login remotely? [Y/n] <emphasis role="bold">Y</emphasis>
  ... Success!
-…
+...
 Remove test database and access to it? [Y/n] <emphasis role="bold">Y (optional)</emphasis>
  - Dropping test database...
  ... Success!
@@ -1287,7 +1293,7 @@ External database selected, getting user information ...
 Press 1 for PostgreSQL, 2 for MariaDB, 3 for SQL Server, 4 for Oracle and 5 \
 for MySQL: <emphasis role="bold">2</emphasis>
 Specify database server name(s) or IP Address(es): \
-<emphasis role="bold">192.168.10.11,192.168.10.12,…,192.168.10.16 *(see note)</emphasis>
+<emphasis role="bold">192.168.10.11,192.168.10.12,...,192.168.10.16 *(see note)</emphasis>
 Specify database ID (or name) [ucpemanager]: 
 Specify database server port [3306]: 
 Specify database user name [root]: enea
@@ -1296,11 +1302,11 @@ Specify database startup thread pool size [1]:
 Creating database configuration file \
 /opt/ucpemanager/application/config/databaseConfig.xml ...
 Done .
-…
+...
 Installing ucpemanager service ..
 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 [EneaEdgeManagement]: 
diff --git a/doc/book-enea-edge-getting-started/doc/book.xml b/doc/book-enea-edge-getting-started/doc/book.xml
index e74ac85..e0126ba 100644
--- a/doc/book-enea-edge-getting-started/doc/book.xml
+++ b/doc/book-enea-edge-getting-started/doc/book.xml
@@ -38,6 +38,10 @@
 
   <xi:include href="submaps.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
+  <xi:include href="security.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="whitelabel.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/create_tileserver.png b/doc/book-enea-edge-getting-started/doc/images/create_tileserver.png
new file mode 100644
index 0000000..169ad81
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/create_tileserver.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/mfa_first_time_setup.png b/doc/book-enea-edge-getting-started/doc/images/mfa_first_time_setup.png
new file mode 100644
index 0000000..c0230f5
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/mfa_first_time_setup.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/mfa_login.png b/doc/book-enea-edge-getting-started/doc/images/mfa_login.png
new file mode 100644
index 0000000..79d9696
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/mfa_login.png
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 a9faf0a..e964ecd 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
@@ -930,7 +930,7 @@
       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.
+      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 
diff --git a/doc/book-enea-edge-getting-started/doc/security.xml b/doc/book-enea-edge-getting-started/doc/security.xml
new file mode 100644
index 0000000..9929786
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/security.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="security">
+  <title>Security</title>
+
+  <section id="mfa_security">
+    <title>Authenticating using Multi-Factor Authentication</title>
+
+    <para>Enea Edge Management provides the ability to authenticate using the
+    MFA authentication method. This is offered as a two-step procedure: first,
+    the user enters the local user/password credentials. Then the security
+    token generated by Google Authenticator must be introduced. This is based
+    on a shared secret between the Enea Edge Management and the Google
+    Authenticator applications. The shared secret is a 32 character long
+    string that is presented to the user upon first login as a character
+    sequence and a QR code.</para>
+
+    <note>
+      <para>Configuring MFA will only be possible using the Web interface, and
+      not the REST API. Users with MFA enabled will not be able to log in
+      through the REST API. If attempted, a <literal>401</literal> HTTP code
+      will be returned, with the <literal>EMS-Error</literal> header
+      containing the <literal>EMS_UserMFAEnabled</literal> error.</para>
+    </note>
+
+    <section id="config_mfa">
+      <title>Configuring User MFA</title>
+
+      <para>The administrator must enable MFA authentication for the desired
+      new user:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Access the <emphasis role="bold">Security</emphasis> tab and
+          choose the <emphasis role="bold">Configuration</emphasis>
+          menu.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select the <emphasis role="bold">Add</emphasis> option, enter
+          the details for the new user and enable the <emphasis
+          role="bold">Enable MFA Login</emphasis> checkbox.</para>
+        </listitem>
+      </orderedlist>
+
+      <para>It is also possible to enable/disable MFA for existing users by
+      selecting the user and checking/unchecking the Enable MFA Login checkbox
+      in the right-hand side panel. Disabling MFA for a user will also clear
+      the secret from the database, therefore upon re-enabling it the user will
+      be asked to configure a new shared secret. For more details on how to
+      configure a new shared secret, please see the following section.</para>
+
+      <para>All MFA information for enabled users will be preserved upon
+      upgrading or restoring the Enea Edge Management application.</para>
+    </section>
+
+    <section id="security_authentication">
+      <title>Security Authentication</title>
+
+      <para>The user will enter his credentials (username and password) as in
+      a typical local authentication. He will then be redirected to a second
+      page that presents the secret as a QR code, that he must scan using the
+      Google Authenticator application. The secret is also presented in clear
+      text ready for copying and manual entry, in case scanning the QR code
+      does not work.</para>
+
+      <figure>
+        <title>Initial setup for Multi-Factor login</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center"
+                       fileref="images/mfa_first_time_setup.png" scale="60" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>Once the scanning or manual entry is completed successfully, the
+      Edge Management and Google Authenticator applications have the same
+      secret configured. The Authenticator application will then offer a
+      security token as a six digit number that the user must enter on the
+      same page, in the Enea Edge Management application. If the token is
+      correct, authentication is successful. The six digit token is available
+      for a maximum of 30 seconds.</para>
+
+      <para>Subsequent logins will still be done using a two-step method. The
+      user will provide first his credentials, and on the second page the
+      token as generated by Google Authenticator.</para>
+
+      <figure>
+        <title>Second login</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="images/mfa_login.png"
+                       scale="80" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <note>
+        <para>If the shared secret is lost, it can be regenerated by the
+        administrator by disabling and re-enabling the MFA Login for the selected
+        user. For more information, please see <olink targetdoc="book_enea_edge_getting_started"
+    targetptr="config_mfa">Configuring User MFA in the <ns:include
+    href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:ns="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_edge_getting_started/1)" /></olink> Manual. When the
+        MFA Login is disabled, the secret is also erased from the
+        database.</para>
+      </note>
+    </section>
+
+    <section id="token_generators">
+      <title>Supported Token Generators</title>
+
+      <para>Multi Factor Authentication in the Enea Edge Management
+      application is supported only for Google Authenticator.</para>
+
+      <para>The time on the server hosting the Enea Edge Management
+      application and the device holding the Authenticator application must
+      be synchronized, within an error margin of 30 seconds.</para>
+    </section>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/submaps.xml b/doc/book-enea-edge-getting-started/doc/submaps.xml
index bdb769e..192e420 100644
--- a/doc/book-enea-edge-getting-started/doc/submaps.xml
+++ b/doc/book-enea-edge-getting-started/doc/submaps.xml
@@ -1,38 +1,43 @@
-<?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">
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter condition="hidden" id="maps">
+  <title>Maps</title>
+
+  <section id="submaps">
+    <title>Submaps</title>
+
+    <para>The System domain of the Enea Edge Management 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">
@@ -54,7 +59,7 @@
                   <entry>Background Color</entry>
 
                   <entry>The background color of the domain map. Possible
-                  values: white, black, blue, cyan, grey, green, magenta,
+                  values: white, black, blue, cyan, gray, green, magenta,
                   orange, pink, red, yellow.</entry>
                 </row>
 
@@ -118,84 +123,86 @@
             </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">
+          <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">
@@ -232,18 +239,18 @@
               </tbody>
             </tgroup>
           </table>
-      </listitem>
+        </listitem>
 
-      <listitem>
-        <para>Add Link</para>
+        <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>
+          <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">
+          <table id="link_props">
             <title>Link properties</title>
 
             <tgroup cols="2">
@@ -274,71 +281,324 @@
               </tbody>
             </tgroup>
           </table>
-      </listitem>
+        </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>
+  </section>
 
-      <listitem>
-        <para>Properties</para>
+  <section id="tileserver">
+    <title>Tile Server Map</title>
 
-        <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>
+    <para>The Enea Edge Management application has the capacity to render a
+    map from a tile server. Each uCPE device can have a set location and will
+    be automatically placed on the tile server map at its exact
+    location.</para>
 
-      <listitem>
-        <para>Arrange icons</para>
+    <section id="tileserver_config">
+      <title>Tile Server Configuration</title>
 
-        <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>
+      <para>To configure the tile server map, perform the following steps in
+      the Enea Edge Management application:</para>
 
-  <section id="device_op">
-    <title>Device Operations</title>
+      <orderedlist>
+        <listitem>
+          <para>Access the <emphasis role="bold">System</emphasis> menu and
+          select <emphasis role="bold">Configuration</emphasis>. A new window
+          will open.</para>
+        </listitem>
 
-    <para>In the <emphasis role="bold">Map</emphasis> view, right-clicking on
-    a device opens up a menu with the following operations:</para>
+        <listitem>
+          <para>In the <emphasis role="bold">System Configuration</emphasis>
+          window, under the <emphasis role="bold">Properties</emphasis> tab,
+          navigate to the <emphasis role="bold">GUI</emphasis> tab.</para>
+        </listitem>
 
-    <itemizedlist>
-      <listitem>
-        <para>Links...</para>
+        <listitem>
+          <para>Under the <emphasis role="bold">Tile Server</emphasis>
+          category, the user can set the following properties:</para>
 
-        <para>This option is used for viewing all links to and from that
-        device.</para>
-      </listitem>
+          <table id="tileserver_props">
+            <title>Tile Server properties</title>
 
-      <listitem>
-        <para>Remove</para>
+            <tgroup cols="2">
+              <tbody>
+                <row>
+                  <entry>Name</entry>
+
+                  <entry>The name of the domain map. This is
+                  mandatory.</entry>
+                </row>
 
-        <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>
+                <row>
+                  <entry>Tile server URL</entry>
 
-        <para>For unmanaged devices, this option removes the device altogether
-        from the Enea Edge Management application.</para>
-      </listitem>
+                  <entry>The URL of the tile server's XYZ.</entry>
+                </row>
 
-      <listitem>
-        <para>Add Link</para>
+                <row>
+                  <entry>TileJSON URL</entry>
 
-        <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>
+                  <entry>The URL of the TileJSON configuration file. Leave it
+                  blank if the tile server used does not support json
+                  configuration files.</entry>
+                </row>
 
-      <listitem>
-        <para>Properties</para>
+                <row>
+                  <entry>Tile server attribution</entry>
 
-        <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>
+                  <entry>The attribution to be displayed on the map.</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Apply</emphasis> button. The
+          <emphasis role="bold">Saved successfully</emphasis> message will be
+          shown.</para>
+        </listitem>
+      </orderedlist>
+
+      <note>
+        <para>The Browser Cross-Origin Resource Sharing (CORS) policy prevents
+        requests from HTTPS to an external HTTP. This means that if the
+        default HTTPS configuration is used for the Enea Edge Management
+        application, the application will not be able to reach a tile server
+        that is accessible only through HTTP. In this case a proxy can be
+        installed that provides a gateway for HTTPS calls to HTTP. Optionally,
+        HTTP web access can be used for accessing the Enea Edge Management
+        application.</para>
+      </note>
+    </section>
+
+    <section id="tileserver_create">
+      <title>Creating the Tile Server View</title>
+
+      <para>To create a tile server view, perform the following steps in the
+      Enea Edge Management application:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Access the <emphasis role="bold">Security</emphasis> menu and
+          select <emphasis role="bold">Configuration</emphasis>. A new window
+          will open.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the <emphasis role="bold">Security Configuration</emphasis>
+          window, navigate to the <emphasis role="bold">Views</emphasis> tab.
+          The <emphasis role="bold">Views Table</emphasis> will be
+          shown.</para>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Add</emphasis> button. A new
+          window will open.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the <emphasis role="bold">Create View</emphasis> window,
+          set a name for the TileServer view, select
+          <literal>tileserver</literal> in the <emphasis role="bold">Map
+          Type</emphasis> drop-down menu and place the admin user in the
+          right-hand side list-box.</para>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">OK</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">Views
+      Table</emphasis>.</para>
+
+      <figure>
+        <title>Create a tile server view</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/create_tileserver.png" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>In the main window, select the newly created tile server view in
+      the <emphasis role="bold">View</emphasis> drop-down menu. Upon a correct
+      configuration, the map will be loaded.</para>
+    </section>
+
+    <section id="tileserver_latlon">
+      <title>Setting uCPE Device Location</title>
+
+      <para>To set the location of a managed uCPE device, perform the
+      following steps:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Access the <emphasis role="bold">Device</emphasis> menu and
+          select <emphasis role="bold">Manage</emphasis>. A new window will
+          open.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the <emphasis role="bold">Manage Devices</emphasis> window,
+          navigate to the <emphasis role="bold">Devices</emphasis> tab. The
+          <emphasis role="bold">Managed Devices Table</emphasis> will be
+          shown.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select de desired uCPE device. The device's properties will be
+          shown on the right side of the window.</para>
+        </listitem>
+
+        <listitem>
+          <para>Navigate to the <emphasis role="bold">Location</emphasis> tab.
+          Latitude and longitude can be set here.</para>
+
+          <note>
+            <para>Latitude and longitude should be in the decimal degrees (DD)
+            format.</para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>Press the <emphasis role="bold">Apply</emphasis> button. The
+          <emphasis role="bold">Saved successfully</emphasis> message will be
+          shown.</para>
+
+          <para>The device will be automatically added on the map in the tile
+          server view. If the device is already added on the tile server map,
+          its location will be updated.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section id="tileserver_map">
+      <title>Placing the uCPE Device on the Map</title>
+
+      <para>To place a uCPE device on the map in the tile server view, perform
+      the following steps:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Right-click on the map and choose the <emphasis
+          role="bold">Place device</emphasis> option. A new window will
+          open.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the <emphasis role="bold">Add Device</emphasis> window,
+          select the desired device.</para>
+        </listitem>
+
+        <listitem>
+          <para>If the <emphasis role="bold">Override device
+          location</emphasis> checkbox is left unchecked, the device will be
+          placed at the coordinates previously set in the <emphasis
+          role="bold">Location</emphasis> tab.</para>
+        </listitem>
+
+        <listitem>
+          <para>If the <emphasis role="bold">Override device
+          location</emphasis> checkbox is checked, the coordinates set on the
+          device previously will be ignored, and the device will be placed at
+          the cursor's position.</para>
+
+          <note>
+            <para>Checking the <emphasis role="bold">Override device
+            location</emphasis> checkbox does not alter the coordinates
+            already set for the device.</para>
+          </note>
+        </listitem>
+      </orderedlist>
+
+      <para>A device already placed on the map can be dragged and dropped
+      inside the map. Coordinates will not be changed.</para>
+
+      <para>If two or more uCPE devices are too close together on the map, and
+      the current zoom level cannot accommodate all their icons, a cluster
+      will be shown. The cluster is represented by a large circle that
+      displays a number representing the number of devices it contains. The
+      color of the cluster changes according to the alarms of the devices in
+      the cluster.</para>
+
+      <para>Once clicked, the cluster will zoom in to a degree where all
+      elements can be distinguished. When hovering over the cluster, a window
+      with information about the cluster will be available. It will contain
+      the number of the devices in the cluster, as well as their status. The
+      Devices link will open a drop-down menu that contains all the
+      devices.</para>
+    </section>
   </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 0e6322f..1693b5f 100644
--- a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
@@ -222,6 +222,15 @@
               </listitem>
             </orderedlist></entry>
         </row>
+
+        <row>
+          <entry>Logging into the Enea Edge Management application over HTTP
+          fails, producing the error <literal>You have been automatically
+          logged out</literal>.</entry>
+
+          <entry>Clear the <literal>JSESSIONID</literal> browser's cookie
+          or close and restart the browser.</entry>
+        </row>
       </tbody>
     </tgroup>
   </table>
diff --git a/doc/book-enea-edge-getting-started/doc/whitelabel.xml b/doc/book-enea-edge-getting-started/doc/whitelabel.xml
new file mode 100644
index 0000000..7e98438
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/whitelabel.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="whitelabel">
+  <title>White-labeling the Enea Edge Management Login</title>
+
+  <para>The Enea Edge Management login page and main page logos can be changed
+  to replace the Enea logo with a custom one. The login logo
+  URL, the title and the favicon may also be changed.</para>
+
+  <section id="white_conf_screen">
+    <title>White-labeling Configuration Screen</title>
+
+    <para>In the <emphasis role="bold">System</emphasis> menu, click on the
+    <emphasis role="bold">Configuration</emphasis> sub-menu and on the
+    <emphasis role="bold">Properties</emphasis> tab click the <emphasis
+    role="bold">Whitelabel</emphasis> sub-tab. This will open a screen where
+      the following fields must be completed:</para>
+
+    <table id="white_conf_table">
+      <title>White-label configuration screen</title>
+
+      <tgroup cols="2">
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Company name</emphasis></entry>
+
+            <entry>The name of the company. The default value is "Enea AB".
+            The value must have max. 255 characters.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis role="bold">Display title</emphasis></entry>
+
+            <entry>The product name. It is used in the login page and as
+            the title of the pages. The default value is "Enea Edge
+            Management". The value must have max. 255 characters.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis role="bold">Login logo URL</emphasis></entry>
+
+            <entry>The official address of the company. It is used as a
+            hyperlink for the login logo. The default value is
+            "http://enea.com". This must be a valid and complete URL address,
+            starting with http / https.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis role="bold">Login logo</emphasis></entry>
+
+            <entry>The logo image from the login page. The default value is
+            the image <filename>images/enea_logo.png</filename>. The logo
+            must be a PNG file with maximum 800 px width and 55 px
+            height.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis role="bold">Display logo</emphasis></entry>
+
+            <entry>The logo image from the main screen. The default value is
+            the image <filename>images/enea_logo.png</filename>. The logo
+            must be a PNG file with maximum 800 px width and 55 px
+            height.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis role="bold">Favicon</emphasis></entry>
+
+            <entry>The favicon icon. The default icon is
+            <filename>images/favicon/favicon.ico</filename>. The image must
+            be an ICO file with exactly 16 px width and 16 px height.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis role="bold">Restart now</emphasis></entry>
+
+            <entry>If checked, when pressing the 
+              <emphasis role="bold">Apply</emphasis> button, the
+            application will restart.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis role="bold">Reset to defaults</emphasis></entry>
+
+            <entry>When pressed, all the values will be reset to the default
+            ones.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <note>
+      <para>A restart is necessary in order to apply the changes in the
+      application. This can be done either by checking the <emphasis
+      role="bold">Restart now</emphasis> checkbox, before pressing the
+      <emphasis role="bold">Apply</emphasis> button, or alternatively, 
+        by manually restarting the application.</para>
+    </note>
+
+    <para>The logo images and the favicon will be saved under a new folder:
+      <filename>images/whitelabel</filename>.</para>
+
+    <para>Only a user with administrative privileges will be able to modify
+    the Whitelabel values, the other users may only see the values.</para>
+  </section>
+
+  <section id="white_bck_restore">
+    <title>Backup and restore when using White-labels</title>
+
+    <para>The backup from the application may be done by accessing the <emphasis
+    role="bold">System</emphasis> menu, then choosing <emphasis
+    role="bold">System Backup</emphasis>, selecting the <emphasis
+    role="bold">Backups</emphasis> tab, and clicking the <emphasis
+    role="bold">Backup Now</emphasis> button. For the <emphasis
+    role="bold">Backup Type</emphasis> select <literal>System
+    Backup</literal>. A backup will be created and it will appear in the
+    table of backups.</para>
+
+    <para>The restore operation is made from the same tab: <emphasis
+    role="bold">Backup</emphasis>. The backup file must be selected and
+    then the <emphasis role="bold">Restore</emphasis> button needs to be clicked. 
+      In order to restore the Whitelabel settings, both the <emphasis
+    role="bold">EMS Configuration</emphasis> and the <emphasis
+    role="bold">Media Files (Images/Sounds)</emphasis> checkboxes must be
+    selected. The <emphasis role="bold">EMS
+    Configuration</emphasis> will restore the entries from the database and
+    the <emphasis role="bold">Media Files (Images/Sounds)</emphasis> will
+    restore the actual images.</para>
+  </section>
+
+  <section id="white_upgrade">
+    <title>Upgrading when using White-labels</title>
+
+    <para>During an Enea Edge Management upgrade operation, the Whitelabel
+    settings will be preserved without any additional steps involved.</para>
+  </section>
+</chapter>
\ No newline at end of file