AccessDocs: some updates after review comments

- rename demo-usecases with example-usecases
- reorder the ZTP and VNF Management chapters
- remove one of the in-band management picture
- remove grub menu option picture
- update Main changes in rel-info
- move how to download ucpe Manager from portal from
  getting started to rel info
- remove references to DeveloperDocs.zip
´
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

Change-Id: Ie5ae30ba7447ceceffb83924dd9205a8a830da91
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

89 files changed, 282 insertions, 458 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 0002f68..0514408 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -50,7 +50,7 @@ DOCBOOK_TO_BOOKDIR ?= yes
 DOCBOOK_CLEANTMP ?= yes
 
 #Components (books) in this subsystem. Now use all books found here
-COMPONENTS := book-enea-nfv-access-demo-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-open-source book-enea-nfv-access-reference-guide-intel book-enea-nfv-access-release-info  
+COMPONENTS := book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-open-source book-enea-nfv-access-reference-guide-intel book-enea-nfv-access-release-info
 #  COMPONENTS += 
 #book-enea-linux-eclipse-open-source (as of 13.04.2017 this is not needed) 
 #book-enea-nfv-access-dev-hardening-guide
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/book.xml b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
index ee365a6..145a6fd 100644
--- a/doc/book-enea-nfv-access-demo-usecases/doc/book.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_demo_usecases">
-  <title><trademark class="registered">Enea</trademark> NFV Access Demo Use-cases</title>
+<book id="book_enea_nfv_access_example_usecases">
+  <title><trademark class="registered">Enea</trademark> NFV Access Example Use-cases</title>
 
   <subtitle>Release Version <xi:include href="eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/demo_usecases.xml b/doc/book-enea-nfv-access-example-usecases/doc/demo_usecases.xml
index 76fd2cf..76fd2cf 100644
--- a/doc/book-enea-nfv-access-demo-usecases/doc/demo_usecases.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/demo_usecases.xml
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_template.xml
index eaa7ebd..eaa7ebd 100644
--- a/doc/book-enea-nfv-access-demo-usecases/doc/eltf_params_template.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_template.xml
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated.xml
index f260584..f260584 100644
--- a/doc/book-enea-nfv-access-demo-usecases/doc/eltf_params_updated.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated.xml
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated_template_how_to_use.txt
index 62e5d02..62e5d02 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/eltf_params_updated_template_how_to_use.txt
+++ b/doc/book-enea-nfv-access-example-usecases/doc/eltf_params_updated_template_how_to_use.txt
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/access_fortigate_cli.png b/doc/book-enea-nfv-access-example-usecases/doc/images/access_fortigate_cli.png
index e61b109..e61b109 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/access_fortigate_cli.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/access_fortigate_cli.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/add_host_interface.png b/doc/book-enea-nfv-access-example-usecases/doc/images/add_host_interface.png
index 3ccdd66..3ccdd66 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/add_host_interface.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/add_host_interface.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/adding_instance.png b/doc/book-enea-nfv-access-example-usecases/doc/images/adding_instance.png
index e07bd9e..e07bd9e 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/adding_instance.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/adding_instance.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/bind_phys_interface.png b/doc/book-enea-nfv-access-example-usecases/doc/images/bind_phys_interface.png
index 73b6ea7..73b6ea7 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/bind_phys_interface.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/bind_phys_interface.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/binding_results.png b/doc/book-enea-nfv-access-example-usecases/doc/images/binding_results.png
index 892bab7..892bab7 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/binding_results.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/binding_results.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/bridge_net_conn.png b/doc/book-enea-nfv-access-example-usecases/doc/images/bridge_net_conn.png
index 1ebcf26..1ebcf26 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/bridge_net_conn.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/bridge_net_conn.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/bridges_tab.png b/doc/book-enea-nfv-access-example-usecases/doc/images/bridges_tab.png
index 9d096c9..9d096c9 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/bridges_tab.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/bridges_tab.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/clav_VNF_demo_SR-IOV.png b/doc/book-enea-nfv-access-example-usecases/doc/images/clav_VNF_demo_SR-IOV.png
index cdfb4d3..cdfb4d3 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/clav_VNF_demo_SR-IOV.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/clav_VNF_demo_SR-IOV.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/clav_VNF_demo_SR-IOV.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/clav_VNF_demo_SR-IOV.svg
index ac4200d..ac4200d 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/clav_VNF_demo_SR-IOV.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/clav_VNF_demo_SR-IOV.svg
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/clavister_vnf_diagram.png b/doc/book-enea-nfv-access-example-usecases/doc/images/clavister_vnf_diagram.png
index e207260..e207260 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/clavister_vnf_diagram.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/clavister_vnf_diagram.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/clavister_vnf_diagram.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/clavister_vnf_diagram.svg
index 16e6630..16e6630 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/clavister_vnf_diagram.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/clavister_vnf_diagram.svg
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/configured_bridges.png b/doc/book-enea-nfv-access-example-usecases/doc/images/configured_bridges.png
index 9f55018..9f55018 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/configured_bridges.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/configured_bridges.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/connection_information.png b/doc/book-enea-nfv-access-example-usecases/doc/images/connection_information.png
index 63ae5d4..63ae5d4 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/connection_information.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/connection_information.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/created_bridges.png b/doc/book-enea-nfv-access-example-usecases/doc/images/created_bridges.png
index a44b26e..a44b26e 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/created_bridges.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/created_bridges.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/descriptor_button.png b/doc/book-enea-nfv-access-example-usecases/doc/images/descriptor_button.png
index 72b59bc..72b59bc 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/descriptor_button.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/descriptor_button.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/enea_vnf_demo_overview.png b/doc/book-enea-nfv-access-example-usecases/doc/images/enea_vnf_demo_overview.png
index a3a8a85..a3a8a85 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/enea_vnf_demo_overview.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/enea_vnf_demo_overview.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/enea_vnf_demo_overview.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/enea_vnf_demo_overview.svg
index 647e121..647e121 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/enea_vnf_demo_overview.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/enea_vnf_demo_overview.svg
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/flow_fwd.png b/doc/book-enea-nfv-access-example-usecases/doc/images/flow_fwd.png
index 43042a1..43042a1 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/flow_fwd.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/flow_fwd.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/flow_term.png b/doc/book-enea-nfv-access-example-usecases/doc/images/flow_term.png
index 757d48e..757d48e 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/flow_term.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/flow_term.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/fortigate_licenses.png b/doc/book-enea-nfv-access-example-usecases/doc/images/fortigate_licenses.png
index 7e3bc4d..7e3bc4d 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/fortigate_licenses.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/fortigate_licenses.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/fortinet_interface.png b/doc/book-enea-nfv-access-example-usecases/doc/images/fortinet_interface.png
index 9452264..9452264 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/fortinet_interface.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/fortinet_interface.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/fortinet_vnf_login.png b/doc/book-enea-nfv-access-example-usecases/doc/images/fortinet_vnf_login.png
index 6277d2c..6277d2c 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/fortinet_vnf_login.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/fortinet_vnf_login.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/host_interface_creation.png b/doc/book-enea-nfv-access-example-usecases/doc/images/host_interface_creation.png
index 6fabb9b..6fabb9b 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/host_interface_creation.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/host_interface_creation.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/intel_whitebox.png b/doc/book-enea-nfv-access-example-usecases/doc/images/intel_whitebox.png
index 3c23daa..3c23daa 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/intel_whitebox.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/intel_whitebox.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/intel_whitebox.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/intel_whitebox.svg
index 8a4f224..8a4f224 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/intel_whitebox.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/intel_whitebox.svg
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/iperf_client_inttype.png b/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_client_inttype.png
index 486f9d9..486f9d9 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/iperf_client_inttype.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_client_inttype.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/iperf_server_inttype.png b/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_server_inttype.png
index 000e250..000e250 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/iperf_server_inttype.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_server_inttype.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/new_vnf.png b/doc/book-enea-nfv-access-example-usecases/doc/images/new_vnf.png
index 902cab0..902cab0 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/new_vnf.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/new_vnf.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/onboard.png b/doc/book-enea-nfv-access-example-usecases/doc/images/onboard.png
index d27c58f..d27c58f 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/onboard.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/onboard.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/onboarded_successfully.png b/doc/book-enea-nfv-access-example-usecases/doc/images/onboarded_successfully.png
index adf9d1a..adf9d1a 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/onboarded_successfully.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/onboarded_successfully.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/onboarding_status.png b/doc/book-enea-nfv-access-example-usecases/doc/images/onboarding_status.png
index 8adb954..8adb954 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/onboarding_status.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/onboarding_status.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_bridge_four.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_four.png
index 1ebcf26..1ebcf26 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_bridge_four.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_four.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_bridge_tab.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_tab.png
index 9d096c9..9d096c9 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_bridge_tab.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_tab.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_bridge_two.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_two.png
index 3f4c427..3f4c427 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_bridge_two.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_two.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_bridge_zero.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_zero.png
index 3f4c427..3f4c427 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_bridge_zero.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_zero.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_host_interface.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_host_interface.png
index 3ccdd66..3ccdd66 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/ovs_host_interface.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_host_interface.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/pciPass_interface.png b/doc/book-enea-nfv-access-example-usecases/doc/images/pciPass_interface.png
index 058ab1f..058ab1f 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/pciPass_interface.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/pciPass_interface.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/reconfiguring_flavor.png b/doc/book-enea-nfv-access-example-usecases/doc/images/reconfiguring_flavor.png
index 3b4c798..3b4c798 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/reconfiguring_flavor.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/reconfiguring_flavor.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/result_of_binding.png b/doc/book-enea-nfv-access-example-usecases/doc/images/result_of_binding.png
index 892bab7..892bab7 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/result_of_binding.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/result_of_binding.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/sdwan1_eg_config.png b/doc/book-enea-nfv-access-example-usecases/doc/images/sdwan1_eg_config.png
index 9ff6284..9ff6284 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/sdwan1_eg_config.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/sdwan1_eg_config.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/sdwan_vpn_overview_1.png b/doc/book-enea-nfv-access-example-usecases/doc/images/sdwan_vpn_overview_1.png
index 684a6af..684a6af 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/sdwan_vpn_overview_1.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/sdwan_vpn_overview_1.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/secondtar_hostinterface.png b/doc/book-enea-nfv-access-example-usecases/doc/images/secondtar_hostinterface.png
index 6fabb9b..6fabb9b 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/secondtar_hostinterface.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/secondtar_hostinterface.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/sriov_configuration.png b/doc/book-enea-nfv-access-example-usecases/doc/images/sriov_configuration.png
index b8fa42e..b8fa42e 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/sriov_configuration.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/sriov_configuration.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/srlov_adap_pool.png b/doc/book-enea-nfv-access-example-usecases/doc/images/srlov_adap_pool.png
index ce9f597..ce9f597 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/srlov_adap_pool.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/srlov_adap_pool.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/t2_vnf_instance.png b/doc/book-enea-nfv-access-example-usecases/doc/images/t2_vnf_instance.png
index e07bd9e..e07bd9e 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/t2_vnf_instance.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/t2_vnf_instance.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/testPMD_VNF_PCI.png b/doc/book-enea-nfv-access-example-usecases/doc/images/testPMD_VNF_PCI.png
index 03f298f..03f298f 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/testPMD_VNF_PCI.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/testPMD_VNF_PCI.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/test_machines.png b/doc/book-enea-nfv-access-example-usecases/doc/images/test_machines.png
index 6ec93fc..6ec93fc 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/test_machines.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/test_machines.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/testing_fortigate.png b/doc/book-enea-nfv-access-example-usecases/doc/images/testing_fortigate.png
index d518564..d518564 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/testing_fortigate.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/testing_fortigate.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/testing_fortigate.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/testing_fortigate.svg
index 43721cc..43721cc 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/testing_fortigate.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/testing_fortigate.svg
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/testpmd_fwdvnf_int.png b/doc/book-enea-nfv-access-example-usecases/doc/images/testpmd_fwdvnf_int.png
index 1d05553..1d05553 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/testpmd_fwdvnf_int.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/testpmd_fwdvnf_int.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/traffic_forward.png b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png
index b9206ca..b9206ca 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/traffic_forward.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/traffic_terminate.png b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png
index 545827f..545827f 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/traffic_terminate.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/two_inst_firewall.png b/doc/book-enea-nfv-access-example-usecases/doc/images/two_inst_firewall.png
index c4dcac8..c4dcac8 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/two_inst_firewall.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/two_inst_firewall.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/two_inst_firewall.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/two_inst_firewall.svg
index d8bce94..d8bce94 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/two_inst_firewall.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/two_inst_firewall.svg
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_br.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_br.png
index f28678b..f28678b 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_br.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_br.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_br2.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_br2.png
index 72f8178..72f8178 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_br2.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_br2.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_dpdk_int_bind.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_dpdk_int_bind.png
index ea1fef7..ea1fef7 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_dpdk_int_bind.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_dpdk_int_bind.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_fg_instantiation.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_fg_instantiation.png
index 9b4d020..9b4d020 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_fg_instantiation.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_fg_instantiation.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_fortigate_onboard.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_fortigate_onboard.png
index 6fa40bd..6fa40bd 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_fortigate_onboard.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_fortigate_onboard.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_lanbr.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_lanbr.png
index 18e074e..18e074e 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_lanbr.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_lanbr.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_solution.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_solution.png
index 10ed27d..10ed27d 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_solution.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_solution.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_solution_test.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_solution_test.png
index 7006068..7006068 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/uc_ibm_solution_test.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_solution_test.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/virsh_console.png b/doc/book-enea-nfv-access-example-usecases/doc/images/virsh_console.png
index 639c235..639c235 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/virsh_console.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/virsh_console.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/vnf_instance.png b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance.png
index ecfee74..ecfee74 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/vnf_instance.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/vnf_instance_client.png b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance_client.png
index 508f4da..508f4da 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/vnf_instance_client.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance_client.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/vnf_instance_server.png b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance_server.png
index a4f84f9..a4f84f9 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/vnf_instance_server.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance_server.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/doc/images/vnf_instances.png b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instances.png
index e07bd9e..e07bd9e 100755
--- a/doc/book-enea-nfv-access-demo-usecases/doc/images/vnf_instances.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instances.png
diff --git a/doc/book-enea-nfv-access-demo-usecases/swcomp.mk b/doc/book-enea-nfv-access-example-usecases/swcomp.mk
index f5c9618..972746a 100755
--- a/doc/book-enea-nfv-access-demo-usecases/swcomp.mk
+++ b/doc/book-enea-nfv-access-example-usecases/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-demo-usecases
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Demo Use-cases"
+BOOKPACKAGES := book-enea-nfv-access-example-usecases
+BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Example Use-cases"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-getting-started/doc/book.xml b/doc/book-enea-nfv-access-getting-started/doc/book.xml
index 5277b5e..aa58335 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/book.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/book.xml
@@ -17,10 +17,6 @@
 
   <xi:include href="introduction.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />                               
-                          
-  <xi:include href="prerequisites.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />                               
-                          
   <xi:include href="documentation.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />     
 
diff --git a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
index 255cfbe..89f6961 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
@@ -204,17 +204,215 @@
     </section>
   </section>
 
+  <section id="zero_touch_prov">
+    <title>Zero Touch Provisioning</title>
+
+    <para>Zero-Touch Provisioning (ZTP) is an alternative to Manual
+    configuration. ZTP refers to the process by which, when a device starts up
+    for the first time, its initial configuration is pushed down by an
+    external management system, so that it is setup for proper operation
+    without additional manual intervention by an operator.</para>
+
+    <para>A variety of operations can occur as part of ZTP such as initial
+    device setup, configuration of managed objects, etc. The goal is to set up
+    a device to the maximum possible extent without forcing an operator to be
+    physically present (initially) to manage the device.</para>
+
+    <para>In order to create a static configuration supporting ZTP, the uCPE
+    Manager user needs to identify the <literal>Device ID</literal> of the
+    machine running NFV Access.</para>
+
+    <para>During the automatic installation process when the
+    <literal>Automatic install</literal> step is reached, enter the option
+    menu <literal>Customize kernel parameters</literal> and set the
+    <literal>uCPE Manager IP address</literal>. Please check <xref
+    linkend="install_ena_stick" />, step 7 for how to set the uCPE Manager IP
+    address at boot time. The Device ID will be listed in the installer under
+    the <literal>Customize kernel parameters</literal> menu.</para>
+
+    <para>With the address parameter set, run
+    <literal>list_deviceID.sh</literal> after NFV Access is installed and
+    booted, to get the device ID of the target.</para>
+
+    <note>
+      <para>It is possible to let NFV Access know the uCPE Manager IP address
+      at run-time by setting <literal>vcpemgr=&lt;IP&gt;</literal> as a kernel
+      boot parameter in the grub configuration file. Reboot is required after
+      this update.</para>
+
+      <para>This step needs to be done each time the uCPE Manager host changes
+      the IP address.</para>
+    </note>
+
+    <para>An offline configuration can be prepared in advance for the uCPE
+    Manager to setup the infrastructure on the device.</para>
+
+    <section id="adding_a_device">
+      <title>Adding a Device</title>
+
+      <para>The uCPE Manager must be configured to bring the target device
+      under management. This is done by using the <literal>Devices -&gt;
+      Manage -&gt; Add</literal> menu:</para>
+
+      <figure>
+        <title>Adding a Device</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="images/add_a_device.png"
+                       scale="50" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>The relevant parameters on this screen are described below:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Type. The type of device to be added, i.e <literal>Enea
+          universal uCPE </literal>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <listitem>
+          <para>Name. The name by which the device is referred to in the uCPE
+          Manager.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <listitem>
+          <para>IP Address. IP address of the device. If a device is installed
+          under a local/private network and not directly visible to the uCPE
+          Manager machine, the Gateway IP of the private network must be
+          used.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <listitem>
+          <para>SSH Port. The NETCONF Port used for communications. This is a
+          relevant parameter if the standard NETCONF SSH (i.e. not Call-Home)
+          is being used. Default is set to 22.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <listitem>
+          <para>SSH User Name. The user name for SSH connectivity. Default
+          user is <literal>root</literal>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <listitem>
+          <para>SSH Password/Private Key/Passphrase. The Authentication
+          Credentials, use one of the aforementioned as appropriate. Default
+          password is empty.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <listitem>
+          <para>Device Calls Home. This checkbox indicates the direction of
+          device communications. When cleared, the uCPE Manager will initiate
+          a connection to the device. When checked, the device will initiate a
+          connection by opening a socket to the uCPE Manager for NETCONF
+          traffic (over SSH), while the uCPE Manager waits for device
+          connection.</para>
+        </listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+        <listitem>
+          <para>Device ID. The unique instance ID of the device. This is what
+          links a device to its day-0 configuration (stored in the offline
+          configuration system). It is a required field if you want to perform
+          Zero-Touch Provisioning.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section id="offline_configuration">
+      <title>Offline Configuration</title>
+
+      <para>The Offline Configuration subsystem is used to pre-populate a
+      configuration for a device that will be brought under management at a
+      future point in time. When creating an offline configuration store, an
+      optional<literal> Device ID</literal> can be specified - this ID
+      uniquely identifies the device to be initialized.</para>
+
+      <para>Use the GUI (shown below) launched by the <literal>Applications
+      -&gt; Offline Config -&gt; Add</literal> menu:</para>
+
+      <figure>
+        <title>Onboard New VNF</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="images/offline_config.png"
+                       scale="80" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>Specify the exact value of the <literal>Device ID</literal> in the
+      required field. This will tag the device needed for the initial
+      configuration provided by the offline configuration store. Choose
+      <literal>Merge</literal> as the Default Upload Method if you do not want
+      any boot configuration set on the device, to be wiped out. Selecting
+      <literal>Replace</literal> will set the entire device configuration to
+      match values in the offline configuration.</para>
+
+      <para>After creating the Offline Config Store, access the device through
+      <literal> Applications -&gt; offline config -&gt; Config App</literal>
+      and provision it with the required initial configuration. This operation
+      mirrors what happens during regular offline configuration.</para>
+
+      <para>Now that the store has been provisioned successfully, it is ready
+      to send this configuration to the device when it first comes
+      online.</para>
+    </section>
+
+    <section id="initial_communications">
+      <title>Initial Communications</title>
+
+      <para>There are two possible paths to this process, depending upon
+      whether or not NETCONF Call-Home functionality is used:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>If Call-Home is not enabled/supported, the uCPE Manager
+          creates a SSH session to the device over the port configured through
+          the <literal>Add Device </literal> process (default 830). It then
+          initiates NETCONF communications over this session.</para>
+        </listitem>
+
+        <listitem>
+          <para>If the device uses Call-Home, it creates a socket connection
+          to port 4334 on the management system which runs the uCPE Manager.
+          The uCPE Manager then creates a SSH session over this socket and
+          initiates NETCONF communications as a client.</para>
+        </listitem>
+      </orderedlist>
+
+      <para>Once communications with the device have been established, the
+      Device Manager will try and connect to it.</para>
+    </section>
+  </section>
+
   <section id="vnf_management">
     <title>VNF Management</title>
 
-    <para>As the acting VNF Manager, the uCPE Manager is responsible for
+    <para>As the acting vnf manager, the uCPE Manager is responsible for
     handling the life-cycles of VNFs that are instantiated and run on the
-    various uCPE hosts. The VNF Manager module is written so as to be able to
+    various uCPE hosts. The vnf manager module is written so as to be able to
     manage multiple VNF types. Along with it is provided a generic
     infrastructure to allow the end-user to introduce new VNF types
     dynamically into the system. This allows for third-party VNFs to be added
     over time to an existing network infrastructure without having to perform
-    an expensive upgrade of the VNF Manager itself.</para>
+    an expensive upgrade of the vnf manager itself.</para>
 
     <para>The process of VNF Onboarding consists of providing the system with
     sufficient information and resources related to the VNF such that it can
@@ -222,7 +420,7 @@
     appropriate, heal and upgrade it when necessary and tear it down at the
     right moment.</para>
 
-    <para>The VNF Manager subsystem in the uCPE Manager inserts a menu item in
+    <para>The vnf manager subsystem in the uCPE Manager inserts a menu item in
     the toolbar, called <literal>VNF</literal> as shown in the screen-shot
     below.</para>
 
@@ -242,7 +440,7 @@
     <itemizedlist>
       <listitem>
         <para><literal>Descriptors</literal>: Choosing this option lets you
-        manage the VNF Descriptors catalog. The VNF Manager maintains a
+        manage the VNF Descriptors catalog. The vnf manager maintains a
         catalog of all VNFs that can be instantiated and managed by the
         system. Before you can use a new VNF, you need to onboard it into the
         catalog.</para>
@@ -251,10 +449,7 @@
       <listitem>
         <para><literal>Instances</literal>: Choosing this option lets you
         instantiate (or destroy) VNFs on a given uCPE host (the
-        <literal>target</literal>). As part of instantiation, the appropriate
-        UI, which includes the UI provided by the
-        <literal>VnfGuiProcessor</literal> described in Section 6.2 is
-        displayed to the user to supply instantiation parameters.</para>
+        <literal>target</literal>)..</para>
       </listitem>
 
       <listitem>
@@ -336,7 +531,7 @@
           </mediaobject>
         </figure>
 
-        <para>This will cause the VNF Manager to do the following: Upload the
+        <para>This will cause the vnf manager to do the following: Upload the
         ZIP file and stage it in a temporary location. Unzip it and verify its
         contents. Extract the various components and stash them in the
         appropriate location(s) for use by the uCPE Manager, so that the VNF
@@ -598,12 +793,8 @@
           This section contains all the parameters a user needs to supply when
           instantiating a VNF of this type. The <literal>VProbe</literal> VNF
           needs to specify network information (network name and IP address)
-          for two separate interfaces (enp0s9 and enp0s10 respectively). Every
-          VNF type will have a different UI section here. This section is
-          populated by the <literal>getInstanceGui()</literal> method in the
-          <literal>VnfGuiProcessorIf</literal> interface, see Section 6.1 to
-          understand exactly how the VProbe method causes the above GUI
-          section to be displayed.</para>
+          for two separate interfaces. Every VNF type will have a different UI
+          section here.</para>
         </listitem>
 
         <listitem>
@@ -690,203 +881,4 @@
       </figure>
     </section>
   </section>
-
-  <section id="zero_touch_prov">
-    <title>Zero Touch Provisioning</title>
-
-    <para>Zero-Touch Provisioning (ZTP) is an alternative to Manual
-    configuration. ZTP refers to the process by which, when a device starts up
-    for the first time, its initial configuration is pushed down by an
-    external management system, so that it is setup for proper operation
-    without additional manual intervention by an operator.</para>
-
-    <para>A variety of operations can occur as part of ZTP such as initial
-    device setup, configuration of managed objects, etc. The goal is to set up
-    a device to the maximum possible extent without forcing an operator to be
-    physically present (initially) to manage the device.</para>
-
-    <para>In order to create a static configuration supporting ZTP, the uCPE
-    Manager user needs to identify the <literal>Device ID</literal> of the
-    machine running NFV Access.</para>
-
-    <para>During the automatic installation process when the
-    <literal>Automatic install</literal> step is reached, enter the option
-    menu <literal>Customize kernel parameters</literal> and set the
-    <literal>uCPE Manager IP address</literal>. Please check <xref
-    linkend="install_ena_stick" />, step 7 for how to set the uCPE Manager IP
-    address at boot time. The Device ID will be listed in the installer under
-    the <literal>Customize kernel parameters</literal> menu.</para>
-
-    <para>With the address parameter set, run
-    <literal>list_deviceID.sh</literal> after NFV Access is installed and
-    booted, to get the device ID of the target.</para>
-
-    <note>
-      <para>It is possible to let NFV Access know the uCPE Manager IP address
-      at run-time by setting <literal>vcpemgr=&lt;IP&gt;</literal> as a kernel
-      boot parameter in the grub configuration file. Reboot is required after
-      this update.</para>
-
-      <para>This step needs to be done each time the uCPE Manager host changes
-      its IP address.</para>
-    </note>
-
-    <para>An offline configuration can be prepared in advance for the uCPE
-    Manager to setup the infrastructure on the device.</para>
-
-    <section id="adding_a_device">
-      <title>Adding a Device</title>
-
-      <para>The uCPE Manager must be configured to bring the target device
-      under management. This is done by using the <literal>Devices -&gt;
-      Manage -&gt; Add</literal> menu:</para>
-
-      <figure>
-        <title>Adding a Device</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="images/add_a_device.png"
-                       scale="50" />
-          </imageobject>
-        </mediaobject>
-      </figure>
-
-      <para>The relevant parameters on this screen are described below:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Type. The type of device to be added, i.e <literal>Enea
-          universal uCPE </literal>.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>Name. The name by which the device is referred to in the uCPE
-          Manager.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>IP Address. IP address of the device. If a device is installed
-          under a local/private network and not directly visible to the uCPE
-          Manager machine, the Gateway IP of the private network must be
-          used.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>SSH Port. The NETCONF Port used for communications. This is a
-          relevant parameter if the standard NETCONF SSH (i.e. not Call-Home)
-          is being used. Default is set to 22.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>SSH User Name. The user name for SSH connectivity. Default
-          user is <literal>root</literal>.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>SSH Password/Private Key/Passphrase. The Authentication
-          Credentials, use one of the aforementioned as appropriate. Default
-          password is empty.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>Device Calls Home. This checkbox indicates the direction of
-          device communications. When cleared, the uCPE Manager will initiate
-          a connection to the device. When checked, the device will initiate a
-          connection by opening a socket to the uCPE Manager for NETCONF
-          traffic (over SSH), while the uCPE Manager waits for device
-          connection.</para>
-        </listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-        <listitem>
-          <para>Device ID. The unique instance ID of the device. This is what
-          links a device to its day-0 configuration (stored in the offline
-          configuration system). It is a required field if you want to perform
-          Zero-Touch Provisioning.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
-    <section id="offline_configuration">
-      <title>Offline Configuration</title>
-
-      <para>The Offline Configuration subsystem (which is designed as a uCPE
-      Manager Application Module) is used to pre-populate a configuration for
-      a device that will be brought under management at a future point in
-      time. When creating an offline configuration store, an optional<literal>
-      Device ID</literal> can be specified - this ID uniquely identifies the
-      device to be initialized.</para>
-
-      <para>Use the GUI (shown below) launched by the <literal>Applications
-      -&gt; Offline Config -&gt; Add</literal> menu:</para>
-
-      <figure>
-        <title>Onboard New VNF</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="images/offline_config.png"
-                       scale="80" />
-          </imageobject>
-        </mediaobject>
-      </figure>
-
-      <para>Specify the exact value of the <literal>Device ID</literal> in the
-      required field. This will tag the device needed for the initial
-      configuration provided by the offline configuration store. Choose
-      <literal>Merge</literal> as the Default Upload Method if you do not want
-      any boot configuration set on the device, to be wiped out. Selecting
-      <literal>Replace</literal> will set the entire device configuration to
-      match values in the offline configuration.</para>
-
-      <para>After creating the Offline Config Store, access the device through
-      <literal> Applications -&gt; offline config -&gt; Config App</literal>
-      and provision it with the required initial configuration. This operation
-      mirrors what happens during regular offline configuration.</para>
-
-      <para>Now that the store has been provisioned successfully, it is ready
-      to send this configuration to the device when it first comes
-      online.</para>
-    </section>
-
-    <section id="initial_communications">
-      <title>Initial Communications</title>
-
-      <para>There are two possible paths to this process, depending upon
-      whether or not NETCONF Call-Home functionality is used:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>If Call-Home is not enabled/supported, the uCPE Manager
-          creates a SSH session to the device over the port configured through
-          the <literal>Add Device </literal> process (default 830). It then
-          initiates NETCONF communications over this session.</para>
-        </listitem>
-
-        <listitem>
-          <para>If the device uses Call-Home, it creates a socket connection
-          to port 4334 on the management system which runs the uCPE Manager.
-          The uCPE Manager then creates a SSH session over this socket and
-          initiates NETCONF communications as a client.</para>
-        </listitem>
-      </orderedlist>
-
-      <para>Once communications with the device have been established, the
-      Device Manager will try and connect to it.</para>
-    </section>
-  </section>
 </chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/documentation.xml b/doc/book-enea-nfv-access-getting-started/doc/documentation.xml
index 26532ea..fb84322 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/documentation.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/documentation.xml
@@ -29,9 +29,6 @@
           <para>Enea NFV Access Getting Started (the present document).</para>
         </listitem>
 
-        <listitem>
-          <para>DeveloperDocs, Developer Documentation for uCPEManager.</para>
-        </listitem>
       </itemizedlist>
     </listitem>
   </orderedlist>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
index 748ef5c..22ee80e 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
@@ -49,20 +49,8 @@ Use dash as the default system shell (/bin/sh)? No</programlisting>
       <title>Prerequisites</title>
 
       <para>To install the Enea NFV Access platform, 3 things are required: a
-      USB stick (16GB or larger), a development machine and a target
-      device.</para>
-
-      <para>The Development machine requires:</para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>Linux distribution</para>
-        </listitem>
-
-        <listitem>
-          <para>Root permissions</para>
-        </listitem>
-      </itemizedlist>
+      USB stick (16GB or larger), a development machine (Linux or Windows) and
+      a target device.</para>
 
       <para>The target device requires:</para>
 
@@ -238,13 +226,14 @@ sdb            8:0            0     111.8G  0  disk
         </listitem>
 
         <listitem>
-          <para>Copy the HDDIMG image to the USB stick, e.g:<programlisting>sudo dd if=./enea-nfv-access&lt;target&gt;.hddimg of=/dev/sdb bs=4M conv=fsync</programlisting></para>
+          <para>Copy the HDDIMG image to the USB stick, e.g:<programlisting>sudo dd if=./enea-nfv-access-edgelink-netconf-&lt;target&gt;.hddimg of=/dev/sdb bs=4M conv=fsync</programlisting></para>
         </listitem>
       </orderedlist>
 
-      <para>Where <filename>enea-nfv-access&lt;target&gt;.hddimg </filename>is
-      the .hddimg file and <literal>sdb</literal> is the assigned USB device
-      name.</para>
+      <para>Where
+      <filename>enea-nfv-access-edgelink-netconf-&lt;target&gt;.hddimg
+      </filename>is the .hddimg file and <literal>sdb</literal> is the
+      assigned USB device name.</para>
     </section>
 
     <section id="install_ena_stick">
@@ -268,22 +257,9 @@ sdb            8:0            0     111.8G  0  disk
           <para>Once the USB stick is properly booted, a GRUB menu appears on
           the serial console. The following options are available:</para>
 
-          <figure>
-            <title>Installing NFV Access</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center"
-                           fileref="images/grub_menu_options.png" scale="75" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-
           <itemizedlist>
             <listitem>
-              <para>live-boot. Boots NFV Access directly from the USB stick. A
-              use case of the live-boot option is to troubleshoot networking
-              and boot on a new hardware. </para>
+              <para>live-boot. Boots NFV Access directly from the USB stick.</para>
             </listitem>
 
             <listitem>
@@ -447,7 +423,7 @@ sdb            8:0            0     111.8G  0  disk
       <itemizedlist>
         <listitem>
           <para><literal>Enea NFV Access 2.2 (rocko) (ostre:0)</literal>:
-          Normal boot.</para>
+          The recommended configuration boot commands.</para>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
index 9bee9e6..72c4b32 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
@@ -2,94 +2,22 @@
 <chapter id="installation">
   <title>Getting Started with Enea uCPE Manager</title>
 
-  <section id="download_ucpe_manager">
-    <title>Download Enea uCPE Manager</title>
+  <section id="prere">
+    <title>Prerequisites</title>
 
-    <para>Enea uCPE Manager artifacts are available for download and use, from
-    the <ulink url="https://portal.enea.com/access">Enea Download
-    Portal</ulink>.</para>
-
-    <orderedlist>
-      <listitem>
-        <para>Access the link above and log in with the credentials provided
-        by Enea.</para>
-      </listitem>
-
-      <listitem>
-        <para>In the top right menu, select <emphasis
-        role="bold">Access</emphasis> and choose a release version from those
-        listed on the left, (Enea NFV Access X.Y.Z). The newest is always at
-        the top. Enter that version by clicking the blue name text.</para>
-
-        <figure>
-          <title>Enea NFV Access on the Portal</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/select_relversion.png"
-                         scale="90" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-
-        <para>Once inside the release version page, scroll to the bottom and
-        click the <emphasis role="bold">Download</emphasis> button specific to
-        the artifact(s) you wish to download.</para>
-      </listitem>
-
-      <listitem>
-        <para>Download the uCPE Manager and install it on one of the following
-        64-bit platforms: <remark>Is this still accurate, these don't appear
-        on the artifact download page for 2.0.3</remark></para>
-
-        <itemizedlist spacing="compact">
-          <listitem>
-            <para>uCPEManager-&lt;version&gt;-Centos.tar.gz (ElementCenter for
-            CentOS)</para>
-          </listitem>
-
-          <listitem>
-            <para>uCPEManager-&lt;version&gt;-Windows.zip (ElementCenter for
-            Windows)</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
+    <para>Listed below are the main generic prerequisites required so that NFV
+    Access can be deployed on your host platform:</para>
 
+    <itemizedlist>
       <listitem>
-        <para>The following VNFs can be downloaded from the portal and
-        on-boarded into the uCPE Manager/Element Center:</para>
-
-        <itemizedlist spacing="compact">
-          <listitem>
-            <para>Fortigate VNF bundle</para>
-          </listitem>
-
-          <listitem>
-            <para>FortigateVNF_example_configurations.tar.gz</para>
-          </listitem>
-
-          <listitem>
-            <para>ClavisterCosStream.zip</para>
-          </listitem>
-
-          <listitem>
-            <para>IPerf.zip</para>
-          </listitem>
-
-          <listitem>
-            <para>TestPmdForwarder.zip</para>
-          </listitem>
-
-          <listitem>
-            <para>TestPmdTerminator.zip</para>
-          </listitem>
-        </itemizedlist>
+        <para>A device that is supported by NFV Access.</para>
       </listitem>
 
       <listitem>
-        <para>Download the NFV Access images archive(s) from the portal:<filename>Enea_NFV_Access_[release_version][release_date].zip</filename>.</para>
+        <para>A machine running either Windows or CentOS with network access
+        to the physical device.</para>
       </listitem>
-    </orderedlist>
+    </itemizedlist>
   </section>
 
   <section id="install_ucpe_manager">
@@ -97,10 +25,7 @@
 
     <para>Unpack the uCPE Manager and install it by following the instructions
     provided within the release archive:
-    <literal>[unpacked_folder]/dist/README.</literal> For more detailed
-    information about the uCPE Manager, please see the uCPE Manager
-    Installation Guide available within the
-    <filename>DeveloperDocs.zip</filename> archive.</para>
+    <literal>[unpacked_folder]/dist/README.</literal> </para>
 
     <para>There are a few things to consider during the installation phase, as
     there are a few steps where user input is required. In most cases, the
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/In-bandManagement.png b/doc/book-enea-nfv-access-getting-started/doc/images/In-bandManagement.png
index 9bb98a2..464fd7a 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/In-bandManagement.png
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/In-bandManagement.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/In-bandManagement2.png b/doc/book-enea-nfv-access-getting-started/doc/images/In-bandManagement2.png
deleted file mode 100755
index f1c5c91..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/images/In-bandManagement2.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/grub_menu_options.png b/doc/book-enea-nfv-access-getting-started/doc/images/grub_menu_options.png
deleted file mode 100755
index 0ebf5f0..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/images/grub_menu_options.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/select_relversion.png b/doc/book-enea-nfv-access-getting-started/doc/images/select_relversion.png
deleted file mode 100755
index 31b3458..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/images/select_relversion.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml b/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml
index 0173ce6..dba3f67 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml
@@ -9,12 +9,7 @@
 
   <para>In some situations, In-Band Management is the only option available to
   both control and configure the device, while also allowing for data-path
-  traffic to pass over the same physical interface. In-band Management can
-  represent a significant risk to the administrator if certain precautions are
-  not taken. These risks center predominantly around the use of unencrypted
-  communications channels. However this use case (i.e. all traffic going over
-  the same physical interface) is required on a setup with a poor
-  infrastructure configuration.</para>
+  traffic to pass over the same physical interface.</para>
 
   <para>The main requirement for this use case solution is to have all traffic
   pass through a defined WAN physical port.</para>
@@ -23,7 +18,7 @@
 
   <itemizedlist>
     <listitem>
-      <para>Device management - e.g.: device configuration, firmware upgrades
+      <para>Device management - e.g.: device configuration
       done by the uCPE Manager.</para>
     </listitem>
 
@@ -60,21 +55,9 @@
   and data-path will be sent to only to one port (WAN) of the VNF.</para>
 
   <note>
-    <para>Only one VNF must be connected to the In-band management WAN bridge.
-    Please make sure the VNF accepts in-band management.</para>
+    <para>Only one VNF must be connected to the In-band management WAN bridge.</para>
   </note>
 
-  <figure>
-    <title>Enea In-band Management solution</title>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/In-bandManagement2.png"
-                   scale="55" />
-      </imageobject>
-    </mediaobject>
-  </figure>
-
   <table>
     <title>Setup Prerequisites</title>
 
diff --git a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
index 46159d1..9913aaf 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
@@ -94,21 +94,10 @@
       </listitem>
 
       <listitem>
-        <para>Secure boot</para>
-      </listitem>
-
-      <listitem>
         <para>In-band management</para>
       </listitem>
     </itemizedlist>
 
-    <para>For additional information about features provided in Enea NFV
-    Access, refer to the <olink targetdoc=
-    "book_enea_nfv_access_reference_guide_intel">Enea NFV Access Reference Guide</olink>
-    provided with your release. For how to install and run Enea
-    NFV Access on supported devices, please refer to <xref
-    linkend="plat-release-content">
-    Chapter 4, Getting Started with Enea NFV Access</xref>.</para>
   </section>
 
   <section id="ucpe_manager">
@@ -144,8 +133,12 @@
       </listitem>
     </itemizedlist>
 
-    <para>For detailed information about the features listed above, please refer
-    to the ElementCenter <literal>DeveloperDocs</literal> documentation archive
-    provided with your release. Enea uCPE Manager is a fork of ElementCenter.</para>
+    <para>For additional information about features provided in Enea NFV
+    Access, refer to the <olink targetdoc=
+    "book_enea_nfv_access_reference_guide_intel">Enea NFV Access Reference Guide</olink>
+    provided with your release. For how to install and run Enea
+    NFV Access on supported devices, please refer to <xref
+    linkend="plat-release-content">
+    Chapter 4, Getting Started with Enea NFV Access</xref>.</para>
   </section>
 </chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/prerequisites.xml b/doc/book-enea-nfv-access-getting-started/doc/prerequisites.xml
deleted file mode 100644
index a7c013e..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/prerequisites.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="prerequisites">
-  <title>Prerequisites</title>
-  <para>Listed below are the main generic prerequisites required so that NFV Access can be deployed on your host platform:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>A physical device that supports NFV Access.</para>
-    </listitem>
-
-    <listitem>
-      <para>A machine running either Windows or CentOS with network access to the physical device.</para>
-    </listitem>
-  </itemizedlist>
-</chapter>
diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
index b4c1072..d63c171 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
@@ -8,8 +8,7 @@
   href="eltf_params_updated.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
   xpointer="element(EneaLinux_REL_VER/1)" /> includes optimizations to the
   FCAPS framework, DPDK, USB-stick based installation, and various other
-  optimizations, security patches and documentation updated
-  accordingly.</para>
+  optimizations, security patches and documentation updates.</para>
 
   <para>
     <remark>INFO <emphasis role="bold">eltf_params_updated.xml</emphasis>
@@ -107,14 +106,14 @@
       </listitem>
 
       <listitem>
-        <para>Enea NFV Access VNF Instantiation Guide. Describes the process
-        of onboarding a new VNF onto the uCPE Manager.</para>
+        <para>Enea NFV Access Example Use-cases. Describes some example
+        use-cases.</para>
       </listitem>
 
-      <listitem>
-        <para>Enea NFV Access Demo Use-cases. Describes the Demo
-        Use-cases.</para>
-      </listitem>
+<!--  <listitem>
+        <para>Enea NFV Access VNF Onboarding Guide. Describes the process
+        of onboarding a new VNF onto the uCPE Manager.</para>
+      </listitem>-->
 
       <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
diff --git a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml b/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
index 3f098d0..8202d78 100644
--- a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
@@ -18,7 +18,28 @@
 
     <listitem>
       <para>From the right corner of the top main menu, choose the
-      <literal>Access</literal> section.</para>
+      <literal>Access</literal> section and download the needed artifacts:
+      </para>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>uCPEManager-&lt;version&gt;-Centos.tar.gz (ElementCenter for
+          CentOS).</para>
+        </listitem>
+
+        <listitem>
+          <para>uCPEManager-&lt;version&gt;-Windows.zip (ElementCenter for
+          Windows).</para>
+        </listitem>
+
+        <listitem>
+          <para>Enea_NFV_Access_XeonD_2.2.</para>
+        </listitem>
+
+        <listitem>
+          <para>Enea_NFV_Access_IntelC3000_2.2.</para>
+        </listitem>
+      </itemizedlist>
     </listitem>
 
     <listitem>
@@ -52,4 +73,4 @@
   <xref linkend="relinfo-documentation" />. For information concerning the
   contents of the release package, please see <xref
   linkend="release-content" />.</para>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
index f23d3e7..3b44d5a 100644
--- a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
@@ -12,72 +12,29 @@
   <section id="relinfo-changes-other">
     <title>New Features</title>
 
-    <orderedlist>
+    <itemizedlist>
       <listitem>
-        <para>Key Component updates:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>Linux 4.14 LTS kernel</para>
-          </listitem>
-
-          <listitem>
-            <para>DPDK 18.02</para>
-          </listitem>
-
-          <listitem>
-            <para>Open vSwitch 2.9</para>
-          </listitem>
-
-          <listitem>
-            <para>libvirt 4.2.0</para>
-          </listitem>
+        <para>Integrated Element ODM 4.0.3: FCAPS framework with NETCONF and
+        Yang</para>
+      </listitem>
 
-        </itemizedlist>
+      <listitem condition="hidden">
+        <para>EdgeLink Netconf : NETCONF based VNF lifecycle Management
+        Tool</para>
       </listitem>
 
       <listitem>
-        <para>Feature Extensions:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>Integrated Element ODM 4.0.3: FCAPS framework with NETCONF
-            and Yang</para>
-          </listitem>
-
-          <listitem condition="hidden">
-            <para>EdgeLink Netconf (beta): NETCONF based VNF lifecycle
-            Management Tool</para>
-          </listitem>
-        </itemizedlist>
+        <para>OSTree</para>
       </listitem>
 
       <listitem>
-        <para>Updated USB-stick based installation</para>
+        <para>In-band Managemnt</para>
       </listitem>
 
       <listitem>
-        <para>Product Maintenance:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>Optimizations</para>
-          </listitem>
-
-          <listitem>
-            <para>Security patches</para>
-          </listitem>
-
-          <listitem>
-            <para>Bug fixes</para>
-          </listitem>
-
-          <listitem>
-            <para>Updated documentation</para>
-          </listitem>
-        </itemizedlist>
+        <para>Updated documentation</para>
       </listitem>
-    </orderedlist>
+    </itemizedlist>
   </section>
 
   <section id="open_source">