diff options
| author |   ChristopherPrice <christopher.price@ericsson.com> | 2016-01-31 18:49:30 +0100 |
|---|---|---|
| committer | Christopher Price <christopher.price@ericsson.com> | 2016-02-01 12:11:36 +0000 |
| commit | ebcbd15ad177ac03f693837e9f1a2e6441bb263b (patch) | |
| tree | 53caa93fde2f0ea9920f4bf6540cab30453b04f3 /docs | |
| parent | 00189df66bad2b629bfeda267d540ab10fcd047e (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')
| -rw-r--r-- | docs/configguide/post-install.rst | 1 | ||||
| -rw-r--r-- | docs/userguide/general-system.rst | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/configguide/post-install.rst b/docs/configguide/post-install.rst index b63d44aac..88c12067d 100644 --- a/docs/configguide/post-install.rst +++ b/docs/configguide/post-install.rst @@ -4,4 +4,5 @@ Post Configuration Activities This section describes the post configuration activitites that will allow you to validate the success of your configuration. Further details may be found in the referred project specific documentation. +.. include:: ../projects/functest/configguide/configguide.rst .. include:: ../projects/joid/configguide/postinstall.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 |