summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2016-02-04 14:11:24 -0800
committerChristopher Price <christopher.price@ericsson.com>2016-02-05 06:47:08 +0000
commitf436981eedcaaacf8be760c95404c6ba5a9fa4de (patch)
tree01dc5e76ba2a80923ed57d686500bd02ea6e6344 /docs
parent9a2c12340f60ea2322d1013c19181d104804e4f7 (diff)
Add ipv6 docs entries in feature-config.rst, post-install.rst, userguide.rst and build-composite.sh
Change-Id: I3783c30d4adfe4ebe913cfeeace3e76d5bb57f38 Signed-off-by: Bin Hu <bh526r@att.com> (cherry picked from commit 3f9b7e0eebea5599b3393d92f3220c2d0827c5ac)
Diffstat (limited to 'docs')
-rw-r--r--docs/configguide/feature-config.rst1
-rw-r--r--docs/configguide/post-install.rst1
-rw-r--r--docs/userguide/feature-usage.rst1
3 files changed, 3 insertions, 0 deletions
diff --git a/docs/configguide/feature-config.rst b/docs/configguide/feature-config.rst
index 60696caf4..1d0650200 100644
--- a/docs/configguide/feature-config.rst
+++ b/docs/configguide/feature-config.rst
@@ -10,6 +10,7 @@ The following sections describe the configuration options for specific platform
Further details for each feature are captured in the referred project documentation.
.. include:: ../projects/copper/configguide/configguide.rst
+.. include:: ../projects/ipv6/configguide/featureconfig.rst
.. include:: ../projects/promise/configguide/featureconfig.rst
.. include:: ../projects/sdnvpn/configguide/configguide.rst
diff --git a/docs/configguide/post-install.rst b/docs/configguide/post-install.rst
index 1a7c4ca53..af5039306 100644
--- a/docs/configguide/post-install.rst
+++ b/docs/configguide/post-install.rst
@@ -13,6 +13,7 @@ The following guides provide information on how to validate the installation of
based on the tools and test suites available for the installation tool you have selected:
.. include:: ../projects/functest/configguide/configguide.rst
+.. include:: ../projects/ipv6/configguide/postinstall.rst
.. include:: ../projects/joid/configguide/postinstall.rst
The following sections provide information on how to validate the features you have
diff --git a/docs/userguide/feature-usage.rst b/docs/userguide/feature-usage.rst
index 0b23c42eb..a90038fb9 100644
--- a/docs/userguide/feature-usage.rst
+++ b/docs/userguide/feature-usage.rst
@@ -12,4 +12,5 @@ some operation in this section may refer back to the guides in the general syste
.. include:: ../projects/promise/userguide/userguide.rst
.. include:: ../projects/copper/userguide/userguide.rst
+.. include:: ../projects/ipv6/userguide/userguide.rst