diff options
author | Maryam Tahhan <maryam.tahhan@intel.com> | 2016-09-07 14:51:46 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-07 14:51:46 +0000 |
commit | c4ba1cd1c33938ab54b217599d7ed9d9259a6caa (patch) | |
tree | 0ee79ee46ecace6965aba42499d96a5f46b3aec5 /docs/userguide | |
parent | a12a717991c17abbbd298dff4f19d25f92c4f971 (diff) | |
parent | 3a86248dff1834267900423891c9b2829803fd8a (diff) |
Merge "docs: Fix links and formatting" into stable/coloradocolorado.1.0
Diffstat (limited to 'docs/userguide')
-rwxr-xr-x | docs/userguide/testusage.rst | 10 | ||||
-rwxr-xr-x | docs/userguide/yardstick.rst | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/userguide/testusage.rst b/docs/userguide/testusage.rst index c020b6ca..a2abcf99 100755 --- a/docs/userguide/testusage.rst +++ b/docs/userguide/testusage.rst @@ -23,21 +23,21 @@ support in VSPERF includes: If you want to use another traffic generator, please select the Dummy generator option as shown in `Traffic generator instructions -<http://artifacts.opnfv.org/vswitchperf/docs/configguide/trafficgen.html>`__ +<http://artifacts.opnfv.org/vswitchperf/colorado/configguide/trafficgen.html>`__ VSPERF Installation ^^^^^^^^^^^^^^^^^^^ To see the supported Operating Systems, vSwitches and system requirements, please follow the `installation instructions -<http://artifacts.opnfv.org/vswitchperf/docs/configguide/installation.html>`__ to +<http://artifacts.opnfv.org/vswitchperf/colorado/configguide/installation.html>`__ to install. Traffic Generator Setup ^^^^^^^^^^^^^^^^^^^^^^^ Follow the `Traffic generator instructions -<http://artifacts.opnfv.org/vswitchperf/docs/configguide/trafficgen.html>`__ to +<http://artifacts.opnfv.org/vswitchperf/colorado/configguide/trafficgen.html>`__ to install and configure a suitable traffic generator. Cloning and building src dependencies @@ -121,7 +121,7 @@ deployment scenarios. The image can be downloaded from Newer vloop_vnf images are available. Please reference the installation instructions for information on these images `installation instructions -<http://artifacts.opnfv.org/vswitchperf/docs/configguide/installation.html>`__ +<http://artifacts.opnfv.org/vswitchperf/colorado/configguide/installation.html>`__ vloop_vnf forwards traffic through a VM using one of: @@ -655,5 +655,5 @@ More information ^^^^^^^^^^^^^^^^ For more information and details refer to the vSwitchPerf user guide at: -http://artifacts.opnfv.org/vswitchperf/docs/userguide/index.html +http://artifacts.opnfv.org/vswitchperf/colorado/userguide/index.html diff --git a/docs/userguide/yardstick.rst b/docs/userguide/yardstick.rst index ec306d57..2ecf7511 100755 --- a/docs/userguide/yardstick.rst +++ b/docs/userguide/yardstick.rst @@ -46,7 +46,7 @@ image, which can be downloaded from `<http://artifacts.opnfv.org/>`__. $ wget http://artifacts.opnfv.org/vswitchperf/vloop-vnf-ubuntu-14.04_20151216.qcow2 Please follow the `installation instructions -<http://artifacts.opnfv.org/vswitchperf/docs/configguide/installation.html>`__ to +<http://artifacts.opnfv.org/vswitchperf/colorado/configguide/installation.html>`__ to install vswitchperf inside vloop-vnf image. As vswitchperf will be run in trafficgen mode, it is possible to skip installation and compilation of OVS, QEMU and DPDK to keep image size smaller. |