ELCCR-1566: improve "Restart vCPE" documentation

Change-Id: Ic4eca909f6aba2910bc9ca8fd82ee10b70aff4bf

1 files changed, 42 insertions, 35 deletions

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 dbf4c54..e6f8c82 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="installation_guide">
   <title>Setting up and Installing the Enea Edge Base Configuration</title>
 
@@ -97,9 +97,9 @@
 
         <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. 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
+        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>
@@ -612,24 +612,27 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
                 <note>
                   <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>
+                  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>
+                  <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>
 
@@ -663,16 +666,17 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
           </listitem>
 
           <listitem>
-            <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:
+            <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 or the FQDN 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
@@ -1177,9 +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. 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"
+      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"
@@ -1196,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>
@@ -1232,7 +1237,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <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
@@ -1250,10 +1255,11 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
           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
+          <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>
@@ -1261,7 +1267,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
         <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>
@@ -1293,4 +1300,4 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       </note>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file