summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2017-03-24 15:00:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-24 15:00:52 +0000
commit802e0b95554291b3bf3c2dc9a38c3729f056f295 (patch)
tree23e2b5aab41674c42932934f1d943ef47662d6f6
parent03e5da3e44956e12878da81eb9881c2630753649 (diff)
parentcb5d501a339ef5b8ce262efd17d5b1729d95757a (diff)
Merge "Updated vsperf doc refs for release-notes and testing"
-rw-r--r--docs/release/release-notes.rst4
-rw-r--r--docs/testing/testing-dev.rst8
-rw-r--r--docs/testing/testing-user.rst12
3 files changed, 21 insertions, 3 deletions
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index 46f5901d3..02ba32fbf 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -169,9 +169,9 @@ Vnf_Forwarding_Graph
-------------------
:ref:`Vnf_Forwarding_Graph Release Notes <vnf_forwarding_graph-releasenotes>`
-Vswitchperf
+VSPERF
------------
-:ref:`Vswitchperf Release Notes <vswitchperf-releasenotes>`
+:ref:`VSPERF Release Notes <vswitchperf-releasenotes>`
Yardstick
----------
diff --git a/docs/testing/testing-dev.rst b/docs/testing/testing-dev.rst
index 11f6bd029..970abe2ae 100644
--- a/docs/testing/testing-dev.rst
+++ b/docs/testing/testing-dev.rst
@@ -35,3 +35,11 @@ QTIP
:maxdepth: 1
../submodules/qtip/docs/testing/developer/devguide/index
+
+
+VSPERF
+-------
+.. toctree::
+ :maxdepth: 1
+
+ ../submodules/vswitchperf/docs/testing/developer/index
diff --git a/docs/testing/testing-user.rst b/docs/testing/testing-user.rst
index 52042ba5b..dc2163c2f 100644
--- a/docs/testing/testing-user.rst
+++ b/docs/testing/testing-user.rst
@@ -38,4 +38,14 @@ QTIP
:maxdepth: 1
../submodules/qtip/docs/testing/user/userguide/index
- ../submodules/qtip/docs/testing/user/configguide/index \ No newline at end of file
+ ../submodules/qtip/docs/testing/user/configguide/index
+
+
+VSPERF
+------
+
+.. toctree::
+ :maxdepth: 1
+
+ ../submodules/vswitchperf/docs/testing/user/configguide/index
+ ../submodules/vswitchperf/docs/testing/user/userguide/index