6 files changed, 43 insertions, 45 deletions

diff --git a/doc/book-enea-nfv-access-guide/doc/benchmarks.xml b/doc/book-enea-nfv-access-guide/doc/benchmarks.xml
index cba6150..28b5f20 100644
--- a/doc/book-enea-nfv-access-guide/doc/benchmarks.xml
+++ b/doc/book-enea-nfv-access-guide/doc/benchmarks.xml
@@ -341,7 +341,7 @@ dpdk0 type=dpdk options:dpdk-devargs=0000:03:00.0 ofport_request=2
 ovs-ofctl del-flows ovsbr0
 ovs-ofctl add-flow ovsbr0 in_port=1,action=output:2
 ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1</programlisting>Import a
-          Docker container:<programlisting>docker import enea-image-virtualization-guest-qemux86-64.tar.gz el7_guest</programlisting>Start
+          Docker container:<programlisting>docker import enea-nfv-access-guest-qemux86-64.tar.gz el7_guest</programlisting>Start
           the Docker container:<programlisting>docker run -it --rm -v /var/run/openvswitch/:/var/run/openvswitch/ /
 -v /mnt/huge:/mnt/huge el7_guest /bin/bash</programlisting>Start the testpmd
           application in Docker:<programlisting>testpmd -c 0x30 -n 2 --file-prefix prog1  --socket-mem 512 --no-pci /
@@ -598,7 +598,7 @@ type=dpdk options:dpdk-devargs=0000:03:00.0 ofport_request=3
 ovs-ofctl del-flows ovsbr0
 ovs-ofctl add-flow ovsbr0 in_port=3,action=output:2
 ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1</programlisting>Import a
-          Docker container:<programlisting>docker import enea-image-virtualization-guest-qemux86-64.tar.gz el7_guest</programlisting>Start
+          Docker container:<programlisting>docker import enea-nfv-access-guest-qemux86-64.tar.gz el7_guest</programlisting>Start
           the first Docker:<programlisting>docker run -it --rm --cpuset-cpus=4,5 /
 -v /var/run/openvswitch/:/var/run/openvswitch/ /
 -v /mnt/huge:/mnt/huge el7_guest /bin/bash</programlisting>Start the testpmd
@@ -930,7 +930,7 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1</programlisting>Launch
           QEMU:<programlisting>taskset -c 0,1 qemu-system-x86_64 -cpu host,+invtsc,migratable=no /
 -M q35 -smp cores=2,sockets=1 -vcpu 0,affinity=0 -vcpu 1,affinity=1 /
 -enable-kvm -nographic -realtime mlock=on -kernel /mnt/qemu/bzImage /
--drive file=/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4,/
+-drive file=/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4,/
 if=virtio,format=raw -m 4096 -object memory-backend-file,id=mem,/
 size=4096M,mem-path=/mnt/huge,share=on -numa node,memdev=mem /
 -mem-prealloc -chardev socket,id=char0,path=/var/run/openvswitch/vhost-user1 /
@@ -1212,7 +1212,7 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:3</programlisting>Launch
           first QEMU instance, VM1:<programlisting>taskset -c 0,1 qemu-system-x86_64 -cpu host,+invtsc,migratable=no -M q35 /
 -smp cores=2,sockets=1 -vcpu 0,affinity=0 -vcpu 1,affinity=1 -enable-kvm /
 -nographic -realtime mlock=on -kernel /home/root/qemu/bzImage /
--drive file=/home/root/qemu/enea-image-virtualization-guest-qemux86-64.ext4,/
+-drive file=/home/root/qemu/enea-nfv-access-guest-qemux86-64.ext4,/
 if=virtio,format=raw -m 2048 -object memory-backend-file,id=mem,/
 size=2048M,mem-path=/mnt/huge,share=on -numa node,memdev=mem /
 -mem-prealloc -chardev socket,id=char0,path=/var/run/openvswitch/vhost-user1 /
@@ -1228,7 +1228,7 @@ processor.max_cstate=0 mce=ignore_ce audit=0'</programlisting>Connect to
           this VM2:<programlisting>taskset -c 4,5 qemu-system-x86_64 -cpu host,+invtsc,migratable=no /
 -M q35 -smp cores=2,sockets=1 -vcpu 0,affinity=4 -vcpu 1,affinity=5 /
 -enable-kvm -nographic -realtime mlock=on -kernel /home/root/qemu2/bzImage /
--drive file=/home/root/qemu2/enea-image-virtualization-guest-qemux86-64.ext4,/
+-drive file=/home/root/qemu2/enea-nfv-access-guest-qemux86-64.ext4,/
 if=virtio,format=raw -m 2048 -object memory-backend-file,id=mem,size=2048M,/
 mem-path=/mnt/huge,share=on -numa node,memdev=mem -mem-prealloc /
 -chardev socket,id=char1,path=/var/run/openvswitch/vhost-user2 /
@@ -1423,7 +1423,7 @@ ip link set eno3 vf 1 mac 0c:c4:7a:BF:52:E7</programlisting>Launch two QEMU
           instances: <programlisting>taskset -c 4,5 qemu-system-x86_64 -cpu host,+invtsc,migratable=no -M /
 q35 -smp cores=2,sockets=1 -vcpu 0,affinity=4 -vcpu 1,affinity=5 -enable-kvm /
 -nographic -kernel /mnt/qemu/bzImage /
--drive file=/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4,if=virtio,/
+-drive file=/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4,if=virtio,/
 format=raw -m 4096 -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,/
 share=on -numa node,memdev=mem -mem-prealloc -device vfio-pci,host=03:10.0 /
 -append 'root=/dev/vda console=ttyS0 hugepagesz=2M hugepages=1024 /
@@ -1435,7 +1435,7 @@ processor.max_cstate=0 mce=ignore_ce audit=0'
 taskset -c 2,3 qemu-system-x86_64 -cpu host,+invtsc,migratable=no -M /
 q35 -smp cores=2,sockets=1 -vcpu 0,affinity=2 -vcpu 1,affinity=3  -enable-kvm /
 -nographic -kernel /mnt/qemu/bzImage /
--drive file=/mnt/qemu/enea-image2-virtualization-guest-qemux86-64.ext4,if=virtio,/
+-drive file=/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4,if=virtio,/
 format=raw -m 4096 -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,/
 share=on -numa node,memdev=mem -mem-prealloc -device vfio-pci,host=03:10.2 /
 -append 'root=/dev/vda console=ttyS0 hugepagesz=2M hugepages=1024 /
diff --git a/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml b/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml
index 58133ae..2287146 100644
--- a/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml
+++ b/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml
@@ -46,11 +46,11 @@
     <section id="run-enfv-guest-image">
       <title>Run an Enea NFV Access guest image</title>
 
-      <para>Enea NFV Access guest images can run inside Docker as any
-      other container can. Before starting an Enea NFV Access guest
-      image, a root filesystem has to be imported in Docker:</para>
+      <para>Enea NFV Access guest images can run inside Docker as any other
+      container can. Before starting an Enea NFV Access guest image, a root
+      filesystem has to be imported in Docker:</para>
 
-      <programlisting>docker import enea-linux-virtualization-guest-qemux86-64.tar.gz el7guest</programlisting>
+      <programlisting>docker import enea-nfv-access-guest-qemux86-64.tar.gz el7guest</programlisting>
 
       <para>To check that the Docker image has been imported successfully,
       run:</para>
diff --git a/doc/book-enea-nfv-access-guide/doc/getting_started.xml b/doc/book-enea-nfv-access-guide/doc/getting_started.xml
index 6c20d5e..4763281 100644
--- a/doc/book-enea-nfv-access-guide/doc/getting_started.xml
+++ b/doc/book-enea-nfv-access-guide/doc/getting_started.xml
@@ -7,7 +7,7 @@
   <section id="release-content">
     <title>NFV Access Release content</title>
 
-    <para>The NFV Access 1.0 Release contains along with other items,
+    <para>The NFV Access 1.1 Release contains along with other items,
     documentation, pre-built kernels and images, a bootloader and a
     SDK.</para>
 
@@ -105,7 +105,7 @@
       <itemizedlist>
         <listitem>
           <para>Enea NFV Access ext4 rootfs image -
-          enea-image-virtualization-host-inteld1521.ext4</para>
+          enea-nfv-access-inteld1521.ext4.gz</para>
         </listitem>
 
         <listitem>
@@ -122,8 +122,9 @@
         </listitem>
       </itemizedlist>
 
-      <para>Copy bzImage and enea-image-virtualization-host-inteld1521.ext4.gz
-      images to the tftpserver configured for PXE boot.</para>
+      <para>Unzip enea-nfv-access-inteld1521.ext4 and copy bzImage and
+      enea-nfv-access-inteld1521.ext4 images to the tftpserver configured for
+      PXE boot.</para>
 
       <para>Use the following as an example for the PXE configuration
       file:</para>
@@ -135,7 +136,7 @@ timeout 0
 label el_ramfs
     menu label ^EneaLinux_RAMfs
     kernel bzImage
-    append root=/dev/ram0 initrd=enea-image-virtualization-host-inteld1521.ext4 /
+    append root=/dev/ram0 initrd=enea-nfv-access-inteld1521.ext4 /
     ramdisk_size=1200000 console=ttyS0,115200 eralyprintk=ttyS0,115200</programlisting>
 
       <para>Restart the target. Then enter (F11) in the Boot Menu and select
@@ -154,7 +155,7 @@ label el_ramfs
         <listitem>
           <para>grub (<literal>grub-efi-bootx64.efi</literal>) - availalble as
           a pre-built artifact under
-          <literal>inteld1521/images/enea-image-virtualization-host</literal>.</para>
+          <literal>inteld1521/images/</literal>enea-nfv-access.</para>
         </listitem>
 
         <listitem>
@@ -270,7 +271,7 @@ menuentry "Linux sda7" {
         <listitem>
           <para>Copy your image on target:</para>
 
-          <programlisting>server&gt; scp ./enea-image-virtualization-host-inteld1521.tar.gz /
+          <programlisting>server&gt; scp ./enea-nfv-access-inteld1521.tar.gz /
 root@&lt;target_ip&gt;:/home/root/</programlisting>
         </listitem>
 
@@ -278,13 +279,13 @@ root@&lt;target_ip&gt;:/home/root/</programlisting>
           <para>Extract image onto the desired partition:</para>
 
           <programlisting>target&gt; mount /dev/sda3 /mnt/sda
-target&gt; tar -pzxf /home/root/enea-image-virtualization-host-inteld1521.tar.gz /
+target&gt; tar -pzxf /home/root/enea-nfv-access-inteld1521.tar.gz /
 -C /mnt/sda</programlisting>
 
           <para>Alternately, you can do both steps in one command from the
           server:</para>
 
-          <programlisting>server&gt; cat ./enea-image-virtualization-host-inteld1521.tar.gz | /
+          <programlisting>server&gt; cat ./enea-nfv-access-inteld1521.tar.gz | /
 ssh root@&lt;target_ip&gt; "cd /mnt/sda6; tar -zxf -"</programlisting>
         </listitem>
 
diff --git a/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml b/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml
index dce5855..9733544 100644
--- a/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml
+++ b/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml
@@ -33,7 +33,7 @@
 -vcpu 0,affinity=0 -vcpu 1,affinity=1  \
 -enable-kvm -nographic \
 -kernel bzImage \
--drive file=enea-image-virtualization-guest-qemux86-64.ext4,if=virtio,format=raw \
+-drive file=enea-nfv-access-guest-qemux86-64.ext4,if=virtio,format=raw \
 -append 'root=/dev/vda console=ttyS0,115200' \
 -m 4096 \
 -object memory-backend-file,id=mem,size=4096M,mem-path=/dev/hugepages,share=on \
@@ -193,6 +193,9 @@ $ dpdk-devbind.py --bind=vfio-pci 0000:03:10.2</programlisting>
     <section id="multiqueue">
       <title>Multi-queue</title>
 
+      <para>In order to ensure that network performance scales as the number
+      of vCPUs increases, multi-queue support can be used in QEMU.</para>
+
       <section id="qemu-multiqueue-support">
         <title>QEMU multi queue support configuration</title>
 
@@ -342,7 +345,7 @@ $ testpmd -c 0x7 -- -i --rxq=2 --txq=2 --nb-cores=2 ...</programlisting>
 &lt;devices&gt;
   &lt;disk type='file' device='disk'&gt;
     &lt;driver name='qemu' type='raw' cache='none'/&gt;
-    &lt;source file='enea-image-virtualization-guest-qemux86-64.ext4'/&gt;
+    &lt;source file='enea-nfv-access-guest-qemux86-64.ext4'/&gt;
     &lt;target dev='vda' bus='virtio'/&gt;
   &lt;/disk&gt;
 &lt;/devices&gt;</programlisting>
@@ -596,7 +599,7 @@ $ dpdk-devbind.py --bind=vfio-pci 0000:03:10.0
     &lt;emulator&gt;/usr/bin/qemu-system-x86_64&lt;/emulator&gt;
     &lt;disk type='file' device='disk'&gt;
       &lt;driver name='qemu' type='raw' cache='none'/&gt;
-      &lt;source file='/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4'/&gt;
+      &lt;source file='/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4'/&gt;
       &lt;target dev='vda' bus='virtio'/&gt;
     &lt;/disk&gt;
     &lt;interface type='vhostuser'&gt;
@@ -655,7 +658,7 @@ $ dpdk-devbind.py --bind=vfio-pci 0000:03:10.0
     &lt;emulator&gt;/usr/bin/qemu-system-x86_64&lt;/emulator&gt;
     &lt;disk type='file' device='disk'&gt;
       &lt;driver name='qemu' type='raw' cache='none'/&gt;
-      &lt;source file='/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4'/&gt;
+      &lt;source file='/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4'/&gt;
       &lt;target dev='vda' bus='virtio'/&gt;
     &lt;/disk&gt;
    &lt;interface type='hostdev' managed='yes'&gt;
@@ -718,7 +721,7 @@ $ dpdk-devbind.py --bind=vfio-pci 0000:03:10.0
     &lt;emulator&gt;/usr/bin/qemu-system-x86_64&lt;/emulator&gt;
     &lt;disk type='file' device='disk'&gt;
       &lt;driver name='qemu' type='raw' cache='none'/&gt;
-      &lt;source file='/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4'/&gt;
+      &lt;source file='/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4'/&gt;
       &lt;target dev='vda' bus='virtio'/&gt;
     &lt;/disk&gt;
     &lt;interface type='bridge'&gt;
diff --git a/doc/book-enea-nfv-access-guide/doc/overview.xml b/doc/book-enea-nfv-access-guide/doc/overview.xml
index d3a0d8a..01e70a9 100644
--- a/doc/book-enea-nfv-access-guide/doc/overview.xml
+++ b/doc/book-enea-nfv-access-guide/doc/overview.xml
@@ -4,16 +4,17 @@
 <chapter id="overview">
   <title>Overview</title>
 
-  <para>The NFV Access Guide available with this release of Enea
-  Linux, seeks to provide further information that will help all intended
+  <para>The NFV Access Guide available with this release of Enea NFV Access
+  Platform seeks to provide further information that will help all intended
   users make the most out of the virtualization features.</para>
 
   <section id="description">
     <title>NFV Access Description</title>
 
-    <para>Enea NFV Access is a lightweight virtualization software
-    designed for deployment on edge devices at customer premises. Streamlined
-    for high networking performance and minimal footprints for both and VNFs, it enables very high compute density.</para>
+    <para>Enea NFV Access is a lightweight virtualization software designed
+    for deployment on edge devices at customer premises. Streamlined for high
+    networking performance and minimal footprints for both host platform and
+    VNFs, it enables very high compute density.</para>
 
     <para>ENFV Access also provides a foundation for vCPE agility and
     innovation, reducing cost and complexity for computing at the network
diff --git a/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml b/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml
index e5c28ea..255f733 100644
--- a/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml
+++ b/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml
@@ -4,11 +4,11 @@
 <chapter id="workflow">
   <title>Using NFV Access SDKs</title>
 
-  <para>Enea NFV Access comes with two standard SDKs which can be used to
+  <para>Enea NFV Access comes with a standard SDKs which can be used to
   develop user-applications and kernel modules for both host and guest
   images.</para>
 
-  <para>A standard SDK consists of:</para>
+  <para>The standard SDK consists of:</para>
 
   <itemizedlist>
     <listitem>
@@ -27,20 +27,13 @@
     </listitem>
   </itemizedlist>
 
-  <para>To install the SDK on your host development machine, there are two
-  installation scripts available under the Download section on <emphasis
-  role="bold">portal.enea.com</emphasis>. They have self explanatory
-  names.</para>
+  <para>To install the SDK on your host development machine, there is an
+  installation script available under the Download section on <emphasis
+  role="bold">portal.enea.com</emphasis>:</para>
 
   <itemizedlist>
     <listitem>
-      <para><literal>inteld1521/sdk/enea-glibc-x86_64-enea-image-virtualization-host-sdkcorei7-64-toolchain-7.0.sh</literal>
-      - for host applications.</para>
-    </listitem>
-
-    <listitem>
-      <para><literal>qemux86-64/sdk/enea-glibc-x86_64-enea-image-virtualization-guestsdk-core2-64-toolchain-7.0.sh</literal>
-      - for guest applications.</para>
+      <para>x86_64/install/install-sdk.sh</para>
     </listitem>
   </itemizedlist>
 
@@ -68,7 +61,7 @@
 
     <orderedlist>
       <listitem>
-        <para><programlisting>$ ./enea-glibc-x86_64-enea-image-virtualization-guest-sdk-core2-64-toolchain-7.0.sh</programlisting>When
+        <para><programlisting>$ ./install-sdk.sh</programlisting>When
         prompted, select to install the toolchain in the desired directory,
         referred to as <literal>sdkdir</literal>.</para>
 
@@ -87,7 +80,7 @@
 
       <listitem>
         <para>Setup the toolchain environment for your target by sourcing the
-        environment-setup script. Example: <programlisting>$ source sdkdir/environment-setup-core2-64-enea-linux</programlisting></para>
+        environment-setup script. Example: <programlisting>$ source sdkdir/environment-setup-corei7-64-enea-linux</programlisting></para>
       </listitem>
     </orderedlist>
   </section>