7 files changed, 60 insertions, 60 deletions

diff --git a/book-enea-nfv-core-installation-guide/doc/book.xml b/book-enea-nfv-core-installation-guide/doc/book.xml
index e161886..de090ae 100644
--- a/book-enea-nfv-core-installation-guide/doc/book.xml
+++ b/book-enea-nfv-core-installation-guide/doc/book.xml
@@ -1,7 +1,6 @@
 <?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" [
-]>
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" >
 <book id="book_enea_nfv_core_installation_guide">
   <title><trademark class="registered">Enea</trademark> NFV Core Installation Guide</title>
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/book-enea-nfv-core-installation-guide/doc/high_availability.xml b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
index 4fd4c28..a0c0eb3 100644
--- a/book-enea-nfv-core-installation-guide/doc/high_availability.xml
+++ b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
@@ -642,10 +642,7 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
         </listitem>
 
         <listitem>
-          <para>In <literal>Hosts</literal> under the
-          <literal>Configuration</literal> tab, select the template named
-          <literal>Template App Zabbix Agent</literal> and click on
-          <literal>Items</literal>.</para>
+          <para>In the <literal>Configuration</literal> tab, under <literal>Templates</literal>, look for and select the template named <filename>Template App Zabbix Agent</filename> and click on <literal>Items</literal>.</para>
         </listitem>
 
         <listitem>
diff --git a/book-enea-nfv-core-installation-guide/doc/images/net_setup_1_edit.png b/book-enea-nfv-core-installation-guide/doc/images/net_setup_1_edit.png
new file mode 100644
index 0000000..616bbdc
--- /dev/null
+++ b/book-enea-nfv-core-installation-guide/doc/images/net_setup_1_edit.png
diff --git a/book-enea-nfv-core-installation-guide/doc/images/net_setup_2_edit.png b/book-enea-nfv-core-installation-guide/doc/images/net_setup_2_edit.png
new file mode 100644
index 0000000..60f3551
--- /dev/null
+++ b/book-enea-nfv-core-installation-guide/doc/images/net_setup_2_edit.png
diff --git a/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml b/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
index a094351..0fbdc1b 100644
--- a/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
+++ b/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
@@ -7,10 +7,10 @@
   <para>Enea NFV Core <xi:include
   href="../../s_docsrc_common/pardoc-distro.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaNFV_REL_VER/1)" /> leverages the work in the OPNFV
-  Project, delivering selected Installer DVD images together with instructions
-  on how to setup the Installers and deploy OPNFV releases on a Pharos
-  compliant test lab.</para>
+  xpointer="element(EneaNFV_REL_VER/1)" /> leverages the work in the Open
+  Platform for NFV (OPNFV) Project, delivering selected Installer DVD images
+  together with instructions on how to setup the Installers and deploy OPNFV
+  releases on a Pharos compliant test lab.</para>
 
   <para>Enea NFV Core uses the Fuel@OPNFV Installer as a deployment facility,
   hereafter referred to as <emphasis role="bold">Fuel</emphasis>. Fuel is an
@@ -20,12 +20,11 @@
   <para>Enea NFV Core <xi:include
   href="../../s_docsrc_common/pardoc-distro.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaNFV_REL_VER/1)" /> is based on the OPNFV <emphasis
-  role="bold">Danube </emphasis>release. The <ulink
-  url="https://www.opnfv.org/software/downloads">OPNFV download page</ulink>
-  provides general instructions for building and installing the Fuel Installer
-  ISO and also on how to deploy OPNFV Danube using Fuel on a Pharos compliant
-  test lab.</para>
+  xpointer="element(EneaNFV_REL_VER/1)" /> is OPNFV compliant. The <ulink
+  url="https://www.opnfv.org/software/downloads/release-archives">OPNFV
+  download page</ulink> provides general instructions for building and
+  installing the Fuel Installer ISO and also on how to deploy an OPNFV release
+  using Fuel on a Pharos compliant test lab.</para>
 
   <note>
     <para>Covering chapters 1-6 of the Fuel Installation Guide is useful for
@@ -71,8 +70,9 @@
 
       <listitem>
         <para><ulink
-        url="http://docs.openstack.org/developer/fueldocs/plugindocs/fuel-plugin-sdk-guide.html">Fuel
-        Plugin Developers Guide</ulink> (optional)</para>
+        url="https://docs.openstack.org/fuel-docs/latest/plugindocs/fuel-plugin-sdk-guide.html"
+        userlevel="" vendor="">Fuel Plugin Developers Guide</ulink>
+        (optional)</para>
       </listitem>
 
       <listitem>
@@ -150,9 +150,13 @@
     successful.</para>
 
     <note>
-      <para>Enea NFV Core 1.1 can also be installed on a cluster consisting of
-      servers with mixed CPU architectures. The user can deploy x86
-      Controllers and a combination of x86 and aarch64 Compute nodes.</para>
+      <para>Enea NFV Core <xi:include
+      href="../../s_docsrc_common/pardoc-distro.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(EneaNFV_REL_VER/1)" /> can also be installed on a
+      cluster consisting of servers with mixed CPU architectures. The user can
+      deploy x86 Controllers and a combination of x86 and aarch64 Compute
+      nodes.</para>
     </note>
 
     <para><emphasis role="bold">Hardware Requirements for
@@ -429,26 +433,16 @@
         configured for eth1.</para>
 
         <mediaobject>
-          <imageobject role="fo">
-            <imagedata align="center" contentwidth="600"
-                       fileref="images/net_setup_1.svg" />
-          </imageobject>
-
-          <imageobject role="html">
-            <imagedata align="center" fileref="images/net_setup_1.png" />
+          <imageobject>
+            <imagedata align="center" fileref="images/net_setup_1_edit.png" />
           </imageobject>
         </mediaobject>
 
         <para></para>
 
         <mediaobject>
-          <imageobject role="fo">
-            <imagedata align="center" contentwidth="600"
-                       fileref="images/net_setup_2.svg" />
-          </imageobject>
-
-          <imageobject role="html">
-            <imagedata align="center" fileref="images/net_setup_2.png" />
+          <imageobject>
+            <imagedata align="center" fileref="images/net_setup_2_edit.png" />
           </imageobject>
         </mediaobject>
       </listitem>
@@ -590,10 +584,12 @@
   <section id="add_feat_fuel">
     <title>Installing additional Plugins/Features on FUEL</title>
 
-    <para>In order to obtain the extra features used by Enea NFV Core 1.0, a
-    few added Fuel plugins have to be installed at this stage. Supplementary
-    configuration will also need to be performed after the installation is
-    complete.</para>
+    <para>In order to obtain the extra features used by Enea NFV Core
+    <xi:include href="../../s_docsrc_common/pardoc-distro.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xpointer="element(EneaNFV_REL_VER/1)" /> a few added Fuel plugins have to
+    be installed at this stage. Supplementary configuration will also need to
+    be performed after the installation is complete.</para>
 
     <para>The following plugins will need to be installed:</para>
 
@@ -627,7 +623,7 @@
 
     <programlisting>$ fuel plugins --install /opt/opnfv/vitrage-1.0-1.0.4-1.noarch.rpm
 $ fuel plugins --install /opt/opnfv/zabbix_monitoring-2.5-2.5.3-1.noarch.rpm
-$ fuel plugins --install /opt/opnfv/tacker-1.0-1.0.0-1.noarch.rpm
+$ fuel plugins --install /opt/opnfv/tacker-1.1-1.1.0-1.noarch.rpm
 $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</programlisting>
 
     <para>Expected output: <programlisting>Plugin ....... was successfully installed.</programlisting></para>
@@ -1456,9 +1452,12 @@ Actor Flags: A-Activity, T-Timeout, G-Aggregation, S-Synchronization
         <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_core_release_info/1)" /></olink> for
-        the <phrase>1.1</phrase> release, for an updated and comprehensive
-        list of known issues and limitations, including the "Offloading Modes"
-        not being applied during the "Verify Networks" step.</para>
+        the <xi:include href="../../s_docsrc_common/pardoc-distro.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(EneaNFV_REL_VER/1)" /> release, for an updated and
+        comprehensive list of known issues and limitations, including the
+        "Offloading Modes" not being applied during the "Verify Networks"
+        step.</para>
 
         <para>Setting custom "Offloading Modes" in the Fuel GUI will only
         apply during provisioning, not during "Verify Networks". If your
diff --git a/book-enea-nfv-core-installation-guide/doc/post_deploy_scripts.xml b/book-enea-nfv-core-installation-guide/doc/post_deploy_scripts.xml
index c4668e4..19a05d9 100644
--- a/book-enea-nfv-core-installation-guide/doc/post_deploy_scripts.xml
+++ b/book-enea-nfv-core-installation-guide/doc/post_deploy_scripts.xml
@@ -5,8 +5,8 @@
   <title>Post Deploy Scripts</title>
 
   <para>The Post Deploy Scripts is a collection of ENEA specific software that
-  can be used to easily modify existing environments. These projects can be
-  used in many situations, from installing new components to configuring
+  can be used to easily modify existing environments. These scripts can be
+  used in various situations, from installing new components to configuring
   existing ones in a fast and efficient way. They are located on the Fuel
   Master in <literal>/opt/enea/postdeployscripts/</literal>.</para>
 
@@ -28,7 +28,7 @@
       <para>Provider networks only handle layer-2 connectivity for instances,
       lacking support for features such as routers and floating IP addresses.
       Please refer to the <ulink
-      url="https://docs.openstack.org/ocata/install-guide-ubuntu/launch-instance-networks-provider.html">Openstack
+      url="https://docs.openstack.org/ocata/install-guide-ubuntu/launch-instance-networks-provider.html">OpenStack
       documentation</ulink> for examples on using provider networks.</para>
     </note>
 
@@ -82,7 +82,7 @@
 ./init.sh</programlisting></para>
 
         <para>This will create a hosts file that will be used by Ansible to
-        associate the nodes into groups and to access them. </para>
+        associate the nodes into groups and to access them.</para>
 
         <para>It will also create a file named
         <filename>samplenetworks.json</filename>, which will contain a single
@@ -125,31 +125,36 @@
         some interfaces included:<programlisting> {
     "networks":[
        {
-          "name":"prov-net",
-          "nodes":[
+          "allocation-pool": {
+                "end": "192.168.200.100",
+                "start": "192.168.200.20"
+            },
+            "enable-dhcp": "True",
+            "gateway": "192.168.200.1",
+            "name": "prov-net1",
+            "network-type": "vlan",
+            "nodes":[
              {
-                "name":"node-4",
-                "interfaces":[
-                   "em2p1s0f5"
+                    "interfaces": ["em5p144s0"],
+                    "name": "node-4"
                 ]
              },
              {
-                "name":"node-5",
-                "interfaces":[
-                   "em2p1s0f5"
-                ]
+                    "interfaces": ["em5p144s0"],
+                    "name": "node-5"
              }
-          ]
+          ],
+           "provider-segment": "2251",
+           "range": "192.168.200.0/24" 
        }
     ]
  }
-
  cp samplenetworks.json /opt/enea/postdeployscripts/provider-net/files/networks.json</programlisting>The
         snippet shown above infers the following:</para>
 
         <itemizedlist>
           <listitem>
-            <para>An Openstack provider network called
+            <para>An OpenStack provider network called
             <filename>prov-net</filename> will be created.</para>
           </listitem>
 
diff --git a/book-enea-nfv-core-installation-guide/doc/tacker.xml b/book-enea-nfv-core-installation-guide/doc/tacker.xml
index 55cf18c..00ab0ec 100644
--- a/book-enea-nfv-core-installation-guide/doc/tacker.xml
+++ b/book-enea-nfv-core-installation-guide/doc/tacker.xml
@@ -16,7 +16,7 @@
 
     <orderedlist>
       <listitem>
-        <para>Go to the tacker plugin directory:<programlisting>cd /var/www/nailgun/plugins/tacker-1.0/repositories/tacker</programlisting></para>
+        <para>Go to the tacker plugin directory:<programlisting>cd /var/www/nailgun/plugins/tacker-1.1/repositories/tacker</programlisting></para>
       </listitem>
 
       <listitem>