summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2017-11-18 18:31:49 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-18 18:31:49 +0000
commit5510de9e379050827a78021335ac0e35940b0d0c (patch)
treeaa51695b752e11e7c8a6c9eac176c08426a86282 /docs
parent474862e420ee2341cf28fbb3c9d10fff2a1dbc6a (diff)
parentbc7238b2cd35e203fb3a4e71123608b2e7b0d998 (diff)
Merge "Infrastructure Documentation Structure Updates"
Diffstat (limited to 'docs')
-rw-r--r--docs/infrastructure/ci.rst11
-rw-r--r--docs/infrastructure/overview.rst10
2 files changed, 15 insertions, 6 deletions
diff --git a/docs/infrastructure/ci.rst b/docs/infrastructure/ci.rst
index c779ffcbe..a6323ef76 100644
--- a/docs/infrastructure/ci.rst
+++ b/docs/infrastructure/ci.rst
@@ -4,8 +4,11 @@
.. SPDX-License-Identifier: CC-BY-4.0
.. (c) Open Platform for NFV Project, Inc. and its contributors
-======================
-Continuous Integration
-======================
+===========================
+Continuous Integration - CI
+===========================
-TBD
+Please see the details of CI from the chapters below.
+
+- :ref:`CI Overview <ci-overview>`
+- :ref:`CI User Guide <ci-user-guide>`
diff --git a/docs/infrastructure/overview.rst b/docs/infrastructure/overview.rst
index 1d503f9b3..1bd792000 100644
--- a/docs/infrastructure/overview.rst
+++ b/docs/infrastructure/overview.rst
@@ -41,9 +41,15 @@ TBD
Software Infrastructure
-----------------------
-TBD
+.. toctree::
+ :maxdepth: 1
+
+ ../submodules/releng/docs/infra/index
+
+Security
+--------
.. toctree::
:maxdepth: 1
- ../submodules/releng/docs/sofware-infrastructure-index
+ ../submodules/releng-anteater/docs/index