doc_fixup: Grammar and link fixes to documentation

[vswitchperf.git] / docs / userguide / testusage.rst

diff --git a/docs/userguide/testusage.rst b/docs/userguide/testusage.rst
index d807590..c020b6c 100755 (executable)
--- a/docs/userguide/testusage.rst
+++ b/docs/userguide/testusage.rst
@@ -16,6 +16,10 @@ support in VSPERF includes:
 - Spirent traffic generator (TestCenter hardware chassis or TestCenter virtual
   in a VM) and a VM to run the Spirent Virtual Deployment Service image,
   formerly known as "Spirent LabServer".
+- Xena Network traffic generator (Xena hardware chassis) that houses the Xena
+  Traffic generator modules.
+- Moongen software traffic generator. Requires a separate machine running
+  moongen to execute packet generation.
 
 If you want to use another traffic generator, please select the Dummy generator
 option as shown in `Traffic generator instructions
@@ -114,6 +118,12 @@ deployment scenarios. The image can be downloaded from
 
     $ wget http://artifacts.opnfv.org/vswitchperf/vloop-vnf-ubuntu-14.04_20151216.qcow2
 
+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>`__
+
+
 vloop_vnf forwards traffic through a VM using one of:
 * DPDK testpmd
 * Linux Bridge
@@ -396,7 +406,7 @@ Execution of test with PCI passthrough with vswitch disabled:
 .. code-block:: console
 
     $ ./vsperf --conf-file=<path_to_custom_conf>/10_custom.conf
-               --vswtich none --vnf QemuPciPassthrough pvp_tput
+               --vswitch none --vnf QemuPciPassthrough pvp_tput
 
 Any of supported guest-loopback-application_ can be used inside VM with
 PCI passthrough support.
@@ -526,7 +536,10 @@ for selected Packet Forwarder:
 
    # testpmd configuration
    TESTPMD_ARGS = []
-   # packet forwarding mode: io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho
+   # packet forwarding mode supported by testpmd; Please see DPDK documentation
+   # for comprehensive list of modes supported by your version.
+   # e.g. io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho|...
+   # Note: Option "mac_retry" has been changed to "mac retry" since DPDK v16.07
    TESTPMD_FWD_MODE = 'csum'
    # checksum calculation layer: ip|udp|tcp|sctp|outer-ip
    TESTPMD_CSUM_LAYER = 'ip'
@@ -642,5 +655,5 @@ More information
 ^^^^^^^^^^^^^^^^
 
 For more information and details refer to the vSwitchPerf user guide at:
-http://artifacts.opnfv.org/vswitchperf/brahmaputra/userguide/index.html
+http://artifacts.opnfv.org/vswitchperf/docs/userguide/index.html