Removed references to Portal and Solution in ENA docs where appropriate.

Change-Id: Idcc466e9c2f4faaeaa5696cb4c24f595b87cab98

1 files changed, 65 insertions, 56 deletions

diff --git a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
index a73c5e8..570ea7a 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
@@ -19,8 +19,9 @@
       </listitem>
 
       <listitem>
-        <para>License for the Clavister VNF (needed as Cloud-Init content in the Cloud-Init tab). 
-          This file is available through the VNF provider.</para>
+        <para>License for the Clavister VNF (needed as Cloud-Init content in
+        the Cloud-Init tab). This file is available through the VNF
+        provider.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -45,19 +46,22 @@
     <section id="clav_vnf_setup_1">
       <title>uCPE device Setup</title>
 
-      <para><emphasis role="bold">Configure Network interfaces on the uCPE devices:</emphasis></para>
+      <para><emphasis role="bold">Configure Network interfaces on the uCPE
+      devices:</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>From the uCPE Manager select uCPE device 1, then access <literal>Configuration</literal> 
-            -&gt; <literal>OpenVSwitch</literal> -&gt; <literal>Host Interfaces</literal> -&gt; 
-            <literal>Add.</literal></para>
+          <para>From the uCPE Manager select uCPE device 1, then access
+          <literal>Configuration</literal> -&gt;
+          <literal>OpenVSwitch</literal> -&gt; <literal>Host
+          Interfaces</literal> -&gt; <literal>Add.</literal></para>
         </listitem>
 
         <listitem>
-          <para>Select the network interface that will be used to connect to uCPE device 2. 
-            Configure it for DPDK, and click <literal>Create</literal> to send the configuration 
-            to that uCPE device.</para>
+          <para>Select the network interface that will be used to connect to
+          uCPE device 2. Configure it for DPDK, and click
+          <literal>Create</literal> to send the configuration to that uCPE
+          device.</para>
         </listitem>
 
         <listitem>
@@ -67,13 +71,13 @@
         </listitem>
 
         <listitem>
-          <para>Once the bridge creation popup appears, fill-in the required fields and add the 
-            physical interface.</para>
+          <para>Once the bridge creation popup appears, fill-in the required
+          fields and add the physical interface.</para>
         </listitem>
 
         <listitem>
-          <para>Repeat the steps above on uCPE device 2, using one DPDK interface and creating 
-            another OVS bridge.</para>
+          <para>Repeat the steps above on uCPE device 2, using one DPDK
+          interface and creating another OVS bridge.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -83,8 +87,9 @@
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>VNF</literal> -&gt; <literal>Descriptor</literal> -&gt; 
-            <literal>On-board</literal>.</para>
+          <para>Select <literal>VNF</literal> -&gt;
+          <literal>Descriptor</literal> -&gt;
+          <literal>On-board</literal>.</para>
         </listitem>
 
         <listitem>
@@ -92,12 +97,14 @@
         </listitem>
 
         <listitem>
-          <para>Provide the path to the qcow image by selecting <literal>Browse</literal>
-          from <literal>VM image file</literal> option.</para>
+          <para>Provide the path to the qcow image by selecting
+          <literal>Browse</literal> from <literal>VM image file</literal>
+          option.</para>
         </listitem>
 
         <listitem>
-          <para>Fill the required fields below and press <literal>Onboard</literal>:</para>
+          <para>Fill the required fields below and press
+          <literal>Onboard</literal>:</para>
 
           <itemizedlist spacing="compact">
             <listitem>
@@ -119,56 +126,61 @@
     <section id="instance_vnfs_clav">
       <title>Instantiate the VNFs</title>
 
-      <para><emphasis role="bold">A) Instantiate the Clavister VNF on uCPE device 1:</emphasis></para>
+      <para><emphasis role="bold">A) Instantiate the Clavister VNF on uCPE
+      device 1:</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Select uCPE device 1, then from the top toolbar: <literal>VNF</literal> -&gt; 
-            <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+          <para>Select uCPE device 1, then from the top toolbar:
+          <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
+          <literal>Add</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Fill in the required information about the Clavister VNF, (the default network 
-            configuration can be used) and select <literal>Create</literal>.</para>
+          <para>Fill in the required information about the Clavister VNF, (the
+          default network configuration can be used) and select
+          <literal>Create</literal>.</para>
         </listitem>
       </orderedlist>
-      
-      <para><emphasis role="bold">B) Instantiate two Enea VNFs (one as the client and one as the 
-        server) on uCPE device 2:</emphasis></para>
-      
+
+      <para><emphasis role="bold">B) Instantiate two Enea VNFs (one as the
+      client and one as the server) on uCPE device 2:</emphasis></para>
+
       <orderedlist>
         <listitem>
-          <para>Select uCPE device 2, then from the top toolbar: <literal>VNF</literal> -&gt; 
-            <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+          <para>Select uCPE device 2, then from the top toolbar:
+          <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
+          <literal>Add</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>In the new <literal>VNF Instance</literal> window, select the Enea VNF from the 
-            dropdown menu, configure it to act as a server by unchecking the <literal>Client mode 
-            IPerf</literal> box, and then click <literal>Create</literal>.</para>
+          <para>In the new <literal>VNF Instance</literal> window, select the
+          Enea VNF from the dropdown menu, configure it to act as a server by
+          unchecking the <literal>Client mode IPerf</literal> box, and then
+          click <literal>Create</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Select <literal>Add</literal> once more, enable the <literal>Client mode 
-            IPerf</literal> checkbox this time, and click <literal>Create</literal> to instantiate 
-            the second <literal>iPerf VNF</literal> as a client, and to run it in client mode.</para>
+          <para>Select <literal>Add</literal> once more, enable the
+          <literal>Client mode IPerf</literal> checkbox this time, and click
+          <literal>Create</literal> to instantiate the second <literal>iPerf
+          VNF</literal> as a client, and to run it in client mode.</para>
         </listitem>
 
         <listitem>
-          <para>In order to check that traffic is forwarded between the two VNFs, connect to the 
-            iPerf VNF client console: <literal>SSH</literal> -&gt; <literal>user</literal> (root) 
-            -&gt; <literal>Connect</literal> and run the following:</para>
-
-          <programlisting>
-            virsh list
-            virsh console
-            root@qemux86-64:~# iperf3 -c 192.168.10.10
-          </programlisting>
+          <para>In order to check that traffic is forwarded between the two
+          VNFs, connect to the iPerf VNF client console:
+          <literal>SSH</literal> -&gt; <literal>user</literal> (root) -&gt;
+          <literal>Connect</literal> and run the following:</para>
+
+          <programlisting>virsh list
+virsh console
+root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
         </listitem>
       </orderedlist>
     </section>
   </section>
-  
+
   <section id="clav_example_sriov">
     <title>Clavister VNF using SR-IOV</title>
 
@@ -210,8 +222,9 @@
         </listitem>
 
         <listitem>
-          <para>Instantiate the Clavister VNF on uCPE device 2: <literal>VNF</literal> 
-            -&gt; <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+          <para>Instantiate the Clavister VNF on uCPE device 2:
+          <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
+          <literal>Add</literal>.</para>
         </listitem>
 
         <listitem>
@@ -251,16 +264,12 @@
           <para>In order to check that traffic is forwarded between the VNFs,
           connect to the iPerf VNF client console by using:
           <literal>SSH</literal> -&gt; <literal>user</literal> (root)
-          -&gt;<literal>Connect</literal> and run the following
-          commands:
-            <programlisting>
-              virsh list
-              virsh console 
-              root@qemux86-64:~# iperf3 -c 192.168.10.10
-            </programlisting>
-          </para>
+          -&gt;<literal>Connect</literal> and run the following commands:
+          <programlisting>virsh list
+virsh console
+root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting></para>
         </listitem>
       </orderedlist>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file