6 files changed, 20 insertions, 17 deletions
diff --git a/docs/testing/user/configguide/index.rst b/docs/testing/user/configguide/index.rst
index 75a2082d..87c32d11 100644
--- a/docs/testing/user/configguide/index.rst
+++ b/docs/testing/user/configguide/index.rst
@@ -31,7 +31,7 @@ new techniques together. A new IETF benchmarking specification (RFC8204) is base
 2015. VSPERF is also contributing to development of ETSI NFV test specifications through the Test and Open Source
 Working Group.
 
-* Wiki: https://wiki.opnfv.org/characterize_vswitch_performance_for_telco_nfv_use_cases
+* Wiki: https://wiki.opnfv.org/display/vsperf
 * Repository: https://git.opnfv.org/vswitchperf
 * Artifacts: https://artifacts.opnfv.org/vswitchperf.html
 * Continuous Integration: https://build.opnfv.org/ci/view/vswitchperf/
@@ -57,10 +57,10 @@ VSPERF Test Guide
 .. toctree::
    :caption: VSPERF Test Execution
    :maxdepth: 2
-   :numbered:
 
    ../userguide/testusage.rst
    ../userguide/teststeps.rst
    ../userguide/integration.rst
+   ../userguide/trafficcapture.rst
    ../userguide/yardstick.rst
    ../userguide/testlist.rst
diff --git a/docs/testing/user/configguide/installation.rst b/docs/testing/user/configguide/installation.rst
index fcf5b05d..b950442e 100644
--- a/docs/testing/user/configguide/installation.rst
+++ b/docs/testing/user/configguide/installation.rst
@@ -167,8 +167,12 @@ repository provided by Software Collections (`a link`_). The installation script
 will also use `virtualenv`_ to create a vsperf virtual environment, which is
 isolated from the default Python environment, using the Python3 package located
 in **/usr/bin/python3**. This environment will reside in a directory called
-**vsperfenv** in $HOME. It will ensure, that system wide Python installation
- is not modified or broken by VSPERF installation. The complete list of Python
+**vsperfenv** in $HOME. 
+
+It will ensure, that system wide Python installation is not modified or
+broken by VSPERF installation. 
+ 
+The complete list of Python
 packages installed inside virtualenv can be found in the file
 ``requirements.txt``, which is located at the vswitchperf repository.
 
@@ -266,8 +270,8 @@ running any of the above. For example:
     export http_proxy=proxy.mycompany.com:123
     export https_proxy=proxy.mycompany.com:123
 
-.. _a link: http://www.softwarecollections.org/en/scls/rhscl/python33/
-.. _virtualenv: https://virtualenv.readthedocs.org/en/latest/
+.. _a link: https://www.softwarecollections.org/en/scls/rhscl/python33/
+.. _virtualenv: https://virtualenv.pypa.io/en/latest/
 .. _vloop-vnf-ubuntu-14.04_20160823: http://artifacts.opnfv.org/vswitchperf/vnf/vloop-vnf-ubuntu-14.04_20160823.qcow2
 .. _vloop-vnf-ubuntu-14.04_20160804: http://artifacts.opnfv.org/vswitchperf/vnf/vloop-vnf-ubuntu-14.04_20160804.qcow2
 .. _vloop-vnf-ubuntu-14.04_20160303: http://artifacts.opnfv.org/vswitchperf/vnf/vloop-vnf-ubuntu-14.04_20160303.qcow2
@@ -326,7 +330,7 @@ to your OS documentation to set hugepages correctly. It is recommended to set
 the required amount of hugepages to be allocated by default on reboots.
 
 Information on hugepage requirements for dpdk can be found at
-http://dpdk.org/doc/guides/linux_gsg/sys_reqs.html
+http://doc.dpdk.org/guides/linux_gsg/sys_reqs.html
 
 You can review your hugepage amounts by executing the following command
 
@@ -356,7 +360,7 @@ default on the Linux DUT
 VSPerf recommends the latest tuned-adm package, which can be downloaded from the
 following location:
 
-http://www.tuned-project.org/2017/04/27/tuned-2-8-0-released/
+https://github.com/redhat-performance/tuned/releases
 
 Follow the instructions to install the latest tuned-adm onto your system. For
 current RHEL customers you should already have the most current version. You
diff --git a/docs/testing/user/configguide/tools.rst b/docs/testing/user/configguide/tools.rst
index 362bfca8..72e515fa 100644
--- a/docs/testing/user/configguide/tools.rst
+++ b/docs/testing/user/configguide/tools.rst
@@ -46,7 +46,7 @@ Installation
 
 No installation is required for *pidstat*, whereas, collectd has to be installed
 separately. For installation of collectd, we recommend to follow the process described
-in *OPNFV-Barometer* project, which can be found here `Barometer-Euphrates <http://docs.opnfv.org/en/stable-euphrates/submodules/barometer/docs/release/userguide/feature.userguide.html#building-all-barometer-upstreamed-plugins-from-scratch>`_ or the most
+in *OPNFV-Barometer* project, which can be found here `Barometer <https://opnfv-barometer.readthedocs.io/en/latest/release/userguide>`_
 recent release.
 
 VSPERF assumes that collectd is installed and configured to send metrics over localhost.
diff --git a/docs/testing/user/configguide/trafficgen.rst b/docs/testing/user/configguide/trafficgen.rst
index 705e5397..3bb09d52 100644
--- a/docs/testing/user/configguide/trafficgen.rst
+++ b/docs/testing/user/configguide/trafficgen.rst
@@ -407,7 +407,7 @@ Spirent Setup
 Spirent installation files and instructions are available on the
 Spirent support website at:
 
-http://support.spirent.com
+https://support.spirent.com
 
 Select a version of Spirent TestCenter software to utilize. This example
 will use Spirent TestCenter v4.57 as an example. Substitute the appropriate
@@ -459,7 +459,7 @@ STC ReST API. Basic ReST functionality is provided by the resthttp module,
 and may be used for writing ReST clients independent of STC.
 
 - Project page: <https://github.com/Spirent/py-stcrestclient>
-- Package download: <http://pypi.python.org/pypi/stcrestclient>
+- Package download: <https://pypi.python.org/project/stcrestclient>
 
 To use REST interface, follow the instructions in the Project page to
 install the package. Once installed, the scripts named with 'rest' keyword
@@ -618,7 +618,7 @@ support contract.
 To execute the Xena2544.exe file under Linux distributions the mono-complete
 package must be installed. To install this package follow the instructions
 below. Further information can be obtained from
-http://www.mono-project.com/docs/getting-started/install/linux/
+https://www.mono-project.com/docs/getting-started/install/linux/
 
 .. code-block:: console
 
@@ -754,7 +754,7 @@ trafficgen.lua
 
 Follow MoonGen set up and execution instructions here:
 
-https://github.com/atheurer/lua-trafficgen/blob/master/README.md
+https://github.com/atheurer/trafficgen/blob/master/README.md
 
 Note one will need to set up ssh login to not use passwords between the server
 running MoonGen and the device under test (running the VSPERF test
@@ -1006,7 +1006,7 @@ dictionary are shown. The rest of the TRAFFIC dictionary is set to default value
 as they are defined in ``conf/03_traffic.conf``.
 
 Please check official documentation of SCAPY project for details about SCAPY frame
-definition and supported network layers at: http://www.secdev.org/projects/scapy
+definition and supported network layers at: https://scapy.net
 
 #. Generate ICMP frames:
 
diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst
index 350fbe54..2c7a78ff 100644
--- a/docs/testing/user/userguide/index.rst
+++ b/docs/testing/user/userguide/index.rst
@@ -11,7 +11,6 @@ VSPERF Test Guide
 .. toctree::
    :caption: VSPERF Test Execution
    :maxdepth: 2
-   :numbered:
 
    ./testusage.rst
    ./teststeps.rst
diff --git a/docs/testing/user/userguide/testusage.rst b/docs/testing/user/userguide/testusage.rst
index 9dc80bb7..3dd41846 100644
--- a/docs/testing/user/userguide/testusage.rst
+++ b/docs/testing/user/userguide/testusage.rst
@@ -1,6 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. (c) OPNFV, Intel Corporation, AT&T and others.
+.. (c) OPNFV, Intel Corporation, Spirent, AT&T and others.
 
 vSwitchPerf test suites userguide
 ---------------------------------
@@ -662,7 +662,7 @@ modified to use igb_uio_from_src instead.
 Note: vfio_no_iommu requires kernels equal to or greater than 4.5 and dpdk
 16.04 or greater. Using this option will also taint the kernel.
 
-Please refer to the dpdk documents at http://dpdk.org/doc/guides for more
+Please refer to the dpdk documents at https://doc.dpdk.org/guides for more
 information on these drivers.
 
 Guest Core and Thread Binding