1 files changed, 36 insertions, 37 deletions

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