21 files changed, 21 insertions, 7 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/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index 0408099db..d143a743f 100644
--- a/docs/release/userguide.introduction.rst
+++ b/docs/release/userguide.introduction.rst
@@ -61,10 +61,8 @@ Feature Configuration Guides
 - :ref:`Doctor Configuration Guide <doctor-configguide>`
 - :ref:`IPv6 Configuration Guide <ipv6-configguide>`
 - :ref:`KVMforNFV Configuration Guide <kvmfornfv-configguide>`
-- :ref:`Moon Configuration Guide <moon-configguide>`
 - :ref:`Multisite Configuration Guide <multisite-configguide>`
 - :ref:`ONOSFW Configuration Guide <onosfw-configguide>`
-- :ref:`OVSNFV Configuration Guide <ovsnfv-configguide>`
 - :ref:`Promise Configuration Guide <promise-configguide>`
 - :ref:`SFC Configuration Guide <sfc-configguide>`
 
@@ -77,10 +75,8 @@ Feature User Guides
 - :ref:`Domino User Guide <domino-userguide>`
 - :ref:`IPv6 User Guide <ipv6-userguide>`
 - :ref:`KVMforNFV User Guide <kvmfornfv-userguide>`
-- :ref:`Moon User Guide <moon-userguide>`
 - :ref:`Multisite User Guide <multisite-userguide>`
 - :ref:`ONOSFW User Guide <onosfw-userguide>`
-- :ref:`OVSNFV User Guide <ovsnfv-userguide>`
 - :ref:`Parser User Guide <parser-userguide>`
 - :ref:`Promise User Guide <promise-userguide>`
 - :ref:`SDNVPN User Guide <sdnvpn-userguide>`
diff --git a/docs/submodules/apex b/docs/submodules/apex
-Subproject 1447fa43970aac807d2490ce8e77a065fb1dbd5
+Subproject 2ea2ee214210f1eec14c8bdf91260ee883eb319
diff --git a/docs/submodules/armband b/docs/submodules/armband
-Subproject 572bb5a1ba7bef7df4bb73daca650b066e8c9ef
+Subproject 07aee826543dae0cd529a9f8b6eac19f7580707
diff --git a/docs/submodules/barometer b/docs/submodules/barometer
-Subproject 9e7e7ae9e4115b09e35622ed8dbe43c6c2dd3fe
+Subproject 15ec4e3a0edcb0d38313b19f63bc18d0121e91e
diff --git a/docs/submodules/bottlenecks b/docs/submodules/bottlenecks
-Subproject 4b36a57727cad302976ee38ad0046a759533984
+Subproject ec58becb7fe95a1d6fbc651a7a2032c3948659d
diff --git a/docs/submodules/compass4nfv b/docs/submodules/compass4nfv
-Subproject 366a89b97863c820a063b62609fa88142550a2f
+Subproject 751fe977da4661d7c99733afc7d0b1d060da198
diff --git a/docs/submodules/fuel b/docs/submodules/fuel
-Subproject cc3f3226b0e48c035549247d8a716f91675955f
+Subproject 8b28c44a4be6beef8a71e672f543001bcc0a080
diff --git a/docs/submodules/functest b/docs/submodules/functest
-Subproject 84a87e788b47d5a8fa3565195672fdddd35f4cf
+Subproject 8d177dd1ac61078cb4134a1ff925ce25a777f5a
diff --git a/docs/submodules/joid b/docs/submodules/joid
-Subproject 4afffb76ced3bafae18e92a80137c25f969898f
+Subproject b2c77af4a4d474b23428575f801a87b374fc45b
diff --git a/docs/submodules/kvmfornfv b/docs/submodules/kvmfornfv
-Subproject 7fc433e94358dcf9f7702e4430db588bad5ab95
+Subproject 1f4ef5ee33f715c03a85a868f12e89744f889cf
diff --git a/docs/submodules/opera b/docs/submodules/opera
-Subproject a6346420a0e0d2f4564d8ecc030146cae098a7f
+Subproject 7ee5c95db62d13d860d51974aa9c0a14404cee5
diff --git a/docs/submodules/ovsnfv b/docs/submodules/ovsnfv
-Subproject 9a1a1e3cd9ed2e8a3b960b63d4c740ae55abe83
+Subproject ab6bd208cdc38e7b1594824b9d233e894f529f2
diff --git a/docs/submodules/qtip b/docs/submodules/qtip
-Subproject ff0316e4a23ac9edcd64e3f312a344d3cc527e7
+Subproject 1dce84474538f1bdbba604bd4312793e3f57acf
diff --git a/docs/submodules/releng b/docs/submodules/releng
-Subproject 7e049cf81d28097f79e0e27f6372d9011f30948
+Subproject eab89fda5f0fde5b8c608b7facb3f8d45970a8e
diff --git a/docs/submodules/sdnvpn b/docs/submodules/sdnvpn
-Subproject a720669923b555f348235076369479bb1357197
+Subproject 7d9d4d18b64fef71d9d4a7de0c4f143e2154ec2
diff --git a/docs/submodules/sfc b/docs/submodules/sfc
-Subproject d41124f9c8cd14cfab61d4848a70aa227e80eef
+Subproject e011a3d122888444c36fba6ee74b27b95535648
diff --git a/docs/submodules/vswitchperf b/docs/submodules/vswitchperf
-Subproject 4b4678350347e6c6faa7b60a4bb814008f7bf2e
+Subproject 725033715118bc318fdd6aa3745c2c07ca71408
diff --git a/docs/submodules/yardstick b/docs/submodules/yardstick
-Subproject 4ea6acb22260ba5076857136c95a6f9223c9f7c
+Subproject 4c1b439ccd286dc8c8a84cd8eed57d1b230c617
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