summaryrefslogtreecommitdiffstats
path: root/docs/userguide
diff options
context:
space:
mode:
authorChristopherPrice <christopher.price@ericsson.com>2016-01-31 18:49:30 +0100
committerChristopher Price <christopher.price@ericsson.com>2016-02-01 12:11:36 +0000
commitebcbd15ad177ac03f693837e9f1a2e6441bb263b (patch)
tree53caa93fde2f0ea9920f4bf6540cab30453b04f3 /docs/userguide
parent00189df66bad2b629bfeda267d540ab10fcd047e (diff)
Updating scripts including composite doc input.
Added functest repo to include validation text in userguide and configguide. Also updated the script based on Ryota's input https://gerrit.opnfv.org/gerrit/8849 Ready to merge although another patch will be needed once the toolchain is in place to continue to integrate content. Change-Id: I4d7adbd174cea29aada99fcdbd42d4c182456739 Signed-off-by: ChristopherPrice <christopher.price@ericsson.com> (cherry picked from commit 145ed01de3d50f82a9ed25ec1421651b8248df63)
Diffstat (limited to 'docs/userguide')
-rw-r--r--docs/userguide/general-system.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/userguide/general-system.rst b/docs/userguide/general-system.rst
index b62d723c9..364fbce32 100644
--- a/docs/userguide/general-system.rst
+++ b/docs/userguide/general-system.rst
@@ -9,3 +9,6 @@ need to perform operations, depending on the scenario deployed and types of acti
.. include:: ./opendaylight.rst
.. include:: ./onos.rst
.. include:: ./ovs.rst
+
+.. include:: ../projects/functest/userguide/description.rst
+.. include:: ../projects/functest/userguide/runfunctest.rst