summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2018-09-06 05:05:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-06 05:05:15 +0000
commit8877b489ea760b6d6b05ec509c192c0bea408397 (patch)
tree6e1b125681e1afe4bf64950b9d3c8047a9380542
parent066004c9f94bb630c437313c0d670c3ddbc6f375 (diff)
parent53de5d7c93593b2603fe82e0198b88c7065688d7 (diff)
Merge "Switch Releng from submodules to intersphinx"
-rw-r--r--.gitmodules4
-rw-r--r--docs/conf.py7
-rw-r--r--docs/infrastructure/ci.rst4
-rw-r--r--docs/infrastructure/overview.rst5
4 files changed, 7 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules
index 4d6455b5f..f0511b58a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -148,10 +148,6 @@
url = ../qtip
branch = .
ignore = dirty
-[submodule "docs/submodules/releng"]
- path = docs/submodules/releng
- url = ../releng
- branch = master
[submodule "docs/submodules/sdnvpn"]
path = docs/submodules/sdnvpn
url = ../sdnvpn
diff --git a/docs/conf.py b/docs/conf.py
index 9d9f28168..45de7d635 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,7 +13,8 @@ needs_sphinx = '1.3'
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinxcontrib.httpdomain', 'sphinx.ext.autodoc',
- 'sphinx.ext.viewcode', 'sphinx.ext.napoleon']
+ 'sphinx.ext.viewcode', 'sphinx.ext.napoleon',
+ 'sphinx.ext.intersphinx']
# Disable javasphinx generation until we have a solution to long build
# times. readthedocs timesout after 902 seconds.
@@ -278,5 +279,5 @@ html_sidebars = {'**': ['localtoc.html', 'relations.html'],}
# If true, do not generate a @detailmenu in the "Top" node's menu.
# texinfo_no_detailmenu = False
-# intersphinx_mapping =
-# {'RTD':('http://opnfvdocsdemo.readthedocs.io/projects/', None)}
+intersphinx_mapping = {}
+intersphinx_mapping['releng'] = ('https://opnfv-releng.readthedocs.io/en/latest', None)
diff --git a/docs/infrastructure/ci.rst b/docs/infrastructure/ci.rst
index a6323ef76..97429a505 100644
--- a/docs/infrastructure/ci.rst
+++ b/docs/infrastructure/ci.rst
@@ -10,5 +10,5 @@ Continuous Integration - CI
Please see the details of CI from the chapters below.
-- :ref:`CI Overview <ci-overview>`
-- :ref:`CI User Guide <ci-user-guide>`
+- :ref:`CI Overview <releng:ci-overview>`
+- :ref:`CI User Guide <releng:ci-user-guide>`
diff --git a/docs/infrastructure/overview.rst b/docs/infrastructure/overview.rst
index 1bd792000..3100907ce 100644
--- a/docs/infrastructure/overview.rst
+++ b/docs/infrastructure/overview.rst
@@ -41,10 +41,7 @@ TBD
Software Infrastructure
-----------------------
-.. toctree::
- :maxdepth: 1
-
- ../submodules/releng/docs/infra/index
+- :ref:`releng:software-infrastructure`
Security
--------