14 files changed, 35 insertions, 35 deletions

diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 9f6e64f..555a287 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -45,7 +45,7 @@
       ignored.</para>
 
       <para>In the following script examples, <emphasis>Enea Edge Management
-      </emphasis> is reffered as <emphasis>Enea uCPE
+      </emphasis> is referred as <emphasis>Enea uCPE
       Manager</emphasis>.</para>
     </note>
 
@@ -2801,14 +2801,14 @@ Options:
 
     <para>The <literal>/lab_config</literal> directory stores the JSON
     configuration files related to a device (devices, NICs and bridges) as
-    well as sample custom scripts. Each subfolder should be named exactly like
+    well as sample custom scripts. Each sub-folder should be named exactly like
     the device name and should contain all the related configuration files
     needed for the test cases to be run on it.</para>
 
     <para>The <literal>/vnf_config</literal> directory stores the
     configuration files related to a VNF Descriptor and VNF instances.
     Typically these include a VNF Image JSON, VNF Instance JSON, VNF license
-    and any other files required by the type of the VNF. Each subfolder should
+    and any other files required by the type of the VNF. Each sub-folder should
     be named exactly like the name of the VNF Descriptor and should contain
     all the related configuration files needed for test cases to be run using
     this VNF.</para>
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
index 255138b..599a523 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
@@ -51,7 +51,7 @@
                        fileref="images/environment_basicsetup.png" />
           </imageobject>
         </mediaobject>
-      </figure>The following enviroment setup is needed for running all tests
+      </figure>The following environment setup is needed for running all tests
     defined in the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -223,7 +223,7 @@
     <literal>&lt;AF-THinstall-dir&gt;</literal> directory.</para>
 
     <para>Subsequent use of the installation requires activating the Python
-    virtual enviroment before using the Enea Edge Automation Framework and
+    virtual environment before using the Enea Edge Automation Framework and
     Test Harness: <literal>source
     &lt;AF-TH-install-dir&gt;/testHarness-venv/bin/activate</literal>.</para>
 
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
index 4d30ff6..f554b37 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
@@ -40,7 +40,7 @@
 |  |  |---centos_128t_internet_ci.iso  - 128T cloud init (day-0) iso image.
 |  |---fortigate
 |  |  |---fg_basic_fw.conf             - Fortigate day-0 configuration.
-|  |  |---fortigateInstance.json       - Fortigate instantiantion.
+|  |  |---fortigateInstance.json       - Fortigate instantiation.
 |  |  |---fortigate.json               - Fortigate onboarding.
 |  |  |---fortigateLicense.lic
             - Fortigate license - contact Fortinet to get a VNF image and license file.
@@ -77,7 +77,7 @@
   </itemizedlist>
 
   <note>
-    <para>Before starting the two usecases detailed in the following appendix,
+    <para>Before starting the two use-cases detailed in the following appendix,
     the uCPE Device needs to be added into the Enea Edge Management
     application.</para>
   </note>
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
index abb4be8..ac09bda 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
@@ -3,7 +3,7 @@
   <title>Example Tests Results using the Automation Framework and Test
   Harness</title>
 
-  <para>In order to run the following example usecases, certain configuration
+  <para>In order to run the following example use-cases, certain configuration
   file entries need to be modified according to the network setup that it will
   be used, for more details see the previous appendix:</para>
 
diff --git a/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
index 0c3815e..846ec86 100644
--- a/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
@@ -272,7 +272,7 @@ tail -f /var/log/testpmd-out</programlisting>
       <orderedlist>
         <listitem>
           <para>Make sure that neither uCPE device 1 nor uCPE device 2 have
-          any configured host interfaces by selcting uCPE device :
+          any configured host interfaces by selecting uCPE device :
           <literal>Configuration</literal> -&gt;
           <literal>OpenVSwitch</literal> -&gt; <literal>Host
           Interfaces</literal>.</para>
diff --git a/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
index 4529fbf..1412d68 100644
--- a/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
+++ b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
@@ -10,7 +10,7 @@
     <title>Prerequisites</title>
 
     <para>The 128T router and the Fortinet firewall in a service chain require
-    the following prequisites for this example use case:</para>
+    the following prerequisites for this example use case:</para>
 
     <itemizedlist spacing="compact">
       <listitem>
diff --git a/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
index affbf39..0df2605 100644
--- a/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
+++ b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
@@ -394,7 +394,7 @@ disable      type: physical   netflow-sampler: disable    sflow-sampler: disable
       <para>Since Fortigate VNF, which is acting as router and firewall, is
       configured to be the DHCP server for the LAN network, the device
       interface connected to the uCPE LAN port has to be configured to get
-      dinamically assigned IPs. These IPs are in the 172.0.0.0/24 network for
+      dynamically assigned IPs. These IPs are in the 172.0.0.0/24 network for
       Site1 and the 172.10.10.0/24 network for Site2. Therefore, site-to-site
       connectivity can be checked (from Site1) as such:</para>
 
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 997663b..992a629 100644
--- a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -120,7 +120,7 @@
           <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>
@@ -513,9 +513,9 @@ node0.1048576kB = 3 </programlisting>
       <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
-      acessing 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>
+      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">
@@ -545,7 +545,7 @@ node0.1048576kB = 3 </programlisting>
 
       <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 (accesible
+      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>
@@ -602,7 +602,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>
 
@@ -626,7 +626,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
@@ -1104,7 +1104,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
@@ -1198,7 +1198,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>
 
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 23eef5f..76463f0 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -909,7 +909,7 @@ 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>
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 ea99c9b..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
@@ -364,8 +364,8 @@
         </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>
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 ffa0eb8..ed8674d 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
@@ -218,8 +218,8 @@
 
           <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
+            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>
@@ -271,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
@@ -386,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>
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 7c9c1f9..79acd9d 100644
--- a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
@@ -470,7 +470,7 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
 
         <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>
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 4586a96..628ff76 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>
 
@@ -227,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>
@@ -319,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>
@@ -565,7 +565,7 @@
 
         <listitem>
           <para>Change the file name, if needed, and press the <emphasis
-          role="bold">Create</emphasis> button. The current popup window will
+          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>