From ebcbd15ad177ac03f693837e9f1a2e6441bb263b Mon Sep 17 00:00:00 2001 From: ChristopherPrice Date: Sun, 31 Jan 2016 18:49:30 +0100 Subject: 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 (cherry picked from commit 145ed01de3d50f82a9ed25ec1421651b8248df63) --- docs/userguide/general-system.rst | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/userguide/general-system.rst') 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 -- cgit 1.2.3-korg