Merge changes from topic 'doc/nsb-qsg'

* changes:
  [docs][userguide] Update formatting for Influx instructions in ch04
  [userguide] Update the directory structure listing
  [docs][devguide] Fix line lengths in devguide_nsb_prox.rst

diff --cc docs/testing/developer/devguide/devguide_nsb_prox.rst
index 582668b,a6e5be9..be2b5be
--- 1/docs/testing/developer/devguide/devguide_nsb_prox.rst
--- 2/docs/testing/developer/devguide/devguide_nsb_prox.rst
+++ b/docs/testing/developer/devguide/devguide_nsb_prox.rst
@@@ -13,9 -13,10 +13,10 @@@ optimal system architectures and config
  Prerequisites
  =============
  
- In order to integrate PROX tests into NSB, the following prerequisites are required.
+ In order to integrate PROX tests into NSB, the following prerequisites are
+ required.
  
 -.. _`dpdk wiki page`: http://dpdk.org/
 +.. _`dpdk wiki page`: https://www.dpdk.org/
  .. _`yardstick wiki page`: https://wiki.opnfv.org/display/yardstick/
  .. _`Prox documentation`: https://01.org/intel-data-plane-performance-demonstrators/documentation/prox-documentation
  .. _`openstack wiki page`: https://wiki.openstack.org/wiki/Main_Page

diff --cc docs/testing/user/userguide/04-installation.rst
Simple merge