1 files changed, 29 insertions, 21 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 19c3c0b..097f9ff 100644
--- a/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
+++ b/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="install_instructions">
@@ -202,7 +202,7 @@
           <row>
             <entry>Networks</entry>
 
-            <entry><para>Apart from the integrated NICs, one Intel® 82574L
+            <entry><para>Apart from the integrated NICs, one Intel&reg; 82574L
             PCIe card was also installed, to be used by Fuel Admin on each
             server.</para></entry>
           </row>
@@ -235,7 +235,7 @@
           <row>
             <entry>CPU</entry>
 
-            <entry>Intel® Xeon® D-1537 8-core/HT 1.7 GHz 35W</entry>
+            <entry>Intel&reg; Xeon&reg; D-1537 8-core/HT 1.7 GHz 35W</entry>
           </row>
 
           <row>
@@ -255,7 +255,7 @@
 
             <entry><para>NICs: </para><itemizedlist>
                 <listitem>
-                  <para>Intel® i350-AM2 Dual port GbE LAN</para>
+                  <para>Intel&reg; i350-AM2 Dual port GbE LAN</para>
                 </listitem>
 
                 <listitem>
@@ -289,7 +289,8 @@
           <row>
             <entry>CPU</entry>
 
-            <entry>2 x Intel® Xeon® E5-2620 v4 8 -core/HT 2.0 GHz 85W</entry>
+            <entry>2 x Intel&reg; Xeon&reg; E5-2620 v4 8 -core/HT 2.0 GHz
+            85W</entry>
           </row>
 
           <row>
@@ -303,7 +304,7 @@
 
             <entry><para>NICs: </para><itemizedlist>
                 <listitem>
-                  <para>Intel® i350-AM2 Dual port GbE LAN</para>
+                  <para>Intel&reg; i350-AM2 Dual port GbE LAN</para>
                 </listitem>
 
                 <listitem>
@@ -668,7 +669,8 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
       </listitem>
 
       <listitem condition="hidden">
-        <para>In the Additional Services select “Install Vitrage”:</para>
+        <para>In the Additional Services select &rdquor;Install
+        Vitrage&rdquo;:</para>
 
         <mediaobject>
           <imageobject>
@@ -1245,14 +1247,15 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
         <para>Set up targets for "Verify Networks" with non-default
         "Offloading Modes".</para>
 
-        <para>Please check the Release Notes for the <phrase>1.1</phrase>
-        release of Enea NFV Core when using Fuel as a deployment tool,
-        <remark>Change this to an Olink to the Release notes once the ID has
-        been created for that book. Add the ID to pardoc-names.xml and
-        pardoc-common if needed, then updated the OlinkDB</remark>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>Please see the chapter <olink
+        targetdoc="book_enea_nfv_core_release_info"
+        targetptr="bugs-limitations">Known Issues and Limitations, in the
+        <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>
 
         <para>Setting custom "Offloading Modes" in the Fuel GUI will only
         apply during provisioning, not during "Verify Networks". If your
@@ -1339,14 +1342,14 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
 
     <itemizedlist>
       <listitem>
-        <para>Provisioning – at this stage the nodes have been booted from PXE
-        and are running a small bootstrap image in ramdisk. The provisioning
-        process will write the target image onto the disk and make other
-        preparations for running it after reboot.</para>
+        <para>Provisioning &ndash; at this stage the nodes have been booted
+        from PXE and are running a small bootstrap image in ramdisk. The
+        provisioning process will write the target image onto the disk and
+        make other preparations for running it after reboot.</para>
       </listitem>
 
       <listitem>
-        <para>OpenStack installation – at this stage the nodes have been
+        <para>OpenStack installation &ndash; at this stage the nodes have been
         rebooted on the newly written target image and the OpenStack
         components are installed and configured.</para>
       </listitem>
@@ -1376,7 +1379,12 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
     </orderedlist>
 
     <para>On Mixed Arch deployments, certain tests might fail due to
-    limitations detailed in the Enea NFV Core Release Information.</para>
+    limitations detailed in the <olink
+    targetdoc="book_enea_nfv_core_release_info"
+    targetptr="bugs-limitations-gen">Know Issues and Limitations in the
+    <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>.</para>
   </section>
 
   <section id="smoke_test">