1 files changed, 34 insertions, 27 deletions

diff --git a/doc/book-enea-nfv-access-guide-intel/doc/using_nfv_access_sdks.xml b/doc/book-enea-nfv-access-guide-intel/doc/using_nfv_access_sdks.xml
index 26e37fb..6280338 100644
--- a/doc/book-enea-nfv-access-guide-intel/doc/using_nfv_access_sdks.xml
+++ b/doc/book-enea-nfv-access-guide-intel/doc/using_nfv_access_sdks.xml
@@ -95,20 +95,24 @@
         <listitem>
           <para>Download the zip image from <ulink
           url="https://portal.enea.com/access/">portal.enea.com/access</ulink>
-          and unzip it on the host machine.</para>
+          and unzip it on the host machine e.g. in the
+          <literal>Enea_NFV_Access_2.0 </literal>directory.</para>
         </listitem>
 
         <listitem>
-          <para><programlisting>$ ./install-sdk.sh</programlisting>After
-          running this script, when prompted, select to install the toolchain
-          in a desired directory, referred to henceforth as
-          <literal>sdkdir</literal>.</para>
+          <para>Run the install script located at
+          <literal>Enea_NFV_Access_2.0/x86_64/install/sdk</literal> directory,
+          when prompted, select to install the toolchain in a desired
+          directory, referred to henceforth as
+          <literal>[sdkdir]</literal>.</para>
+
+          <programlisting>$ ./install-sdk.sh</programlisting>
 
           <para>A default path where the toolchain will be installed will be
           shown in the prompt. The installer will unpack the
           <literal>environment-setup</literal> script in
-          <literal>sdkdir</literal> and the toolchain under
-          <literal>sdkdir/sysroots</literal>.</para>
+          <literal>[sdkdir]</literal> and the toolchain under
+          <literal>[sdkdir]/sysroots</literal>.</para>
 
           <note>
             <para>Choose a unique directory for each toolchain. Installing a
@@ -176,7 +180,7 @@ hello world</programlisting>
 
       <para>Before cross-compiling kernel modules, inside the kernel source
       tree in the installed SDK, available at
-      <literal>sdkdir/sysroots/targetarch-enea-linux/usr/src/kernel</literal>,
+      <literal>[sdkdir]/sysroots/targetarch-enea-linux/usr/src/kernel</literal>,
       run the following command:</para>
 
       <programlisting>make scripts prepare</programlisting>
@@ -310,20 +314,21 @@ $ make</programlisting>
       <title>Installing the Extensible SDK</title>
 
       <para>To install the Extensible SDK on your host development machine,
-      run the installation script provided in the <literal>/esdk</literal>
+      run the installation script provided in the
+      <literal>Enea_NFV_Access_2.0/x86_64/install/esdk</literal>
       folder:</para>
 
       <orderedlist>
         <listitem>
           <para><programlisting>$ ./install-sdk.sh</programlisting>When
           prompted, select to install the toolchain in a desired directory,
-          referred to henceforth as <literal>sdkdir</literal>.</para>
+          referred to henceforth as <literal>[sdkdir]</literal>.</para>
 
           <para>A default path where the toolchain will be installed will be
           shown in the prompt. The installer unpacks the
           <literal>environment-setup</literal> script in
-          <literal>sdkdir</literal> and the toolchain under
-          <literal>sdkdir/sysroots</literal>.</para>
+          <literal>[sdkdir]</literal> and the toolchain under
+          <literal>[sdkdir]/sysroots</literal>.</para>
 
           <note>
             <para>Choose a unique directory for each toolchain. Installing a
@@ -370,9 +375,9 @@ $ make</programlisting>
 
           <para><literal><command>devtool</command></literal> creates a Git
           repository locally during extraction at:
-          <literal>sdkdir/workspace/source/bbexample</literal>, where the
+          <literal>[sdkdir]/workspace/source/bbexample</literal>, where the
           recipe will be created automatically. E.g:
-          <literal>sdkdir/workspace/recipes/bbexample/bbexample.bb</literal>.</para>
+          <literal>[sdkdir]/workspace/recipes/bbexample/bbexample.bb</literal>.</para>
         </listitem>
 
         <listitem>
@@ -380,7 +385,7 @@ $ make</programlisting>
           layer</emphasis></para>
 
           <para>Use <command>devtool modify [recipe]</command> on any recipe
-          from <literal>sdkdir/layers/poky/meta*</literal>, example:</para>
+          from <literal>[sdkdir]/layers/poky/meta*</literal>, example:</para>
 
           <programlisting>$ devtool modify curl</programlisting>
         </listitem>
@@ -395,8 +400,9 @@ $ make</programlisting>
               <para>Clone a recipe from the upstream Yocto project, e.g.
               <literal>meta-security</literal>:</para>
 
-              <programlisting>$ pushd sdkdir/layers/poky
-$ git clone -b rocko git://git.yoctoproject.org/meta-security</programlisting>
+              <programlisting>$ pushd [sdkdir]/layers/poky
+$ git clone -b rocko git://git.yoctoproject.org/meta-security
+$ popd</programlisting>
             </listitem>
 
             <listitem>
@@ -411,13 +417,13 @@ enabled in your configuration</programlisting>To rectify the dependency issue
               exemplified above, clone <literal>meta-perl</literal> from
               openembedded and run <command>add-layers</command>
               again:<programlisting>$ layers/poky/bitbake/bin/bitbake-layers add-layer layers/poky/meta-security</programlisting>Now
-              <literal>sdkdir/layers/poky/meta-security</literal> is created
+              <literal>[sdkdir]/layers/poky/meta-security</literal> is created
               and the layer has been added to
-              <literal>sdkdir/conf/bblayers.conf</literal>:<programlisting>${SDKBASEMETAPATH}/layers/poky/meta-security</programlisting></para>
+              <literal>[sdkdir]/conf/bblayers.conf</literal>:</para>
 
               <note condition="hidden">
                 <para>The image build result can be seen at:
-                <literal>sdkdir/tmp/deploy/images/qemux86-64</literal></para>
+                <literal>[sdkdir]/tmp/deploy/images/qemux86-64</literal></para>
               </note>
             </listitem>
 
@@ -429,8 +435,8 @@ enabled in your configuration</programlisting>To rectify the dependency issue
               <programlisting>$ devtool modify isic</programlisting>
 
               <para>The following directories and files will be created:
-              <literal>sdkdir/workspace/appends/isic_0.07.bbappend</literal>
-              and <literal>sdkdir/workspace/sources/isic</literal>.</para>
+              <literal>[sdkdir]/workspace/appends/isic_0.07.bbappend</literal>
+              and <literal>[sdkdir]/workspace/sources/isic</literal>.</para>
             </listitem>
           </orderedlist>
         </listitem>
@@ -445,9 +451,9 @@ enabled in your configuration</programlisting>To rectify the dependency issue
 
       <para><programlisting>$ devtool build bbexample</programlisting><note>
           <para>The image build result can be seen at
-          <literal>&lt;sdkdir&gt;/tmp/work/&lt;arch&gt;/&lt;recipe&gt;</literal>.
+          <literal>&lt;[sdkdir]&gt;/tmp/work/&lt;arch&gt;/&lt;recipe&gt;</literal>.
           E.g.
-          <literal>sdkdir/tmp/work/corei7-64-enea-linux/bbexample</literal>.</para>
+          <literal>[sdkdir]/tmp/work/corei7-64-enea-linux/bbexample</literal>.</para>
         </note></para>
     </section>
   </section>
@@ -526,8 +532,9 @@ inherit core-image</programlisting>
 
           <note>
             <para>The image build result can be seen at:
-            <literal>sdkdir/tmp/deploy/images/&lt;target&gt;</literal>. E.g.:
-            <literal>sdkdir/tmp/deploy/images/qemux86-64</literal></para>
+            <literal>[sdkdir]/tmp/deploy/images/&lt;target&gt;</literal>.
+            E.g.:
+            <literal>[sdkdir]/tmp/deploy/images/qemux86-64</literal></para>
           </note>
         </listitem>
 
@@ -539,4 +546,4 @@ inherit core-image</programlisting>
       </orderedlist>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>