Merge "Remove kvmfornfv from Docs"

diff --git a/.gitmodules b/.gitmodules
index 6561674..6875c22 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,31 +18,16 @@
        url = https://gerrit.opnfv.org/gerrit/container4nfv
        branch = .
        ignore = dirty
-[submodule "docs/submodules/copper"]
-       path = docs/submodules/copper
-       url = ../copper
-       branch = .
-       ignore = dirty
 [submodule "docs/submodules/daisy"]
        path = docs/submodules/daisy
        url = ../daisy
        branch = .
        ignore = dirty
-[submodule "docs/submodules/domino"]
-       path = docs/submodules/domino
-       url = ../domino
-       branch = .
-       ignore = dirty
 [submodule "docs/submodules/dovetail"]
        path = docs/submodules/dovetail
        url = ../dovetail
        branch = .
        ignore = dirty
-[submodule "docs/submodules/escalator"]
-       path = docs/submodules/escalator
-       url = ../escalator
-       branch = .
-       ignore = dirty
 [submodule "docs/submodules/fastpathmetrics"]
        path = docs/submodules/fastpathmetrics
        url = ../fastpathmetrics
@@ -73,11 +58,6 @@
        url = ../multisite
        branch = .
        ignore = dirty
-[submodule "docs/submodules/netready"]
-       path = docs/submodules/netready
-       url = ../netready
-       branch = .
-       ignore = dirty
 [submodule "docs/submodules/nfvbench"]
        path = docs/submodules/nfvbench
        url = https://gerrit.opnfv.org/gerrit/nfvbench
@@ -203,11 +183,6 @@
        url = https://gerrit.opnfv.org/gerrit/ovno
        branch = .
        ignore = dirty
-[submodule "docs/submodules/moon"]
-       path = docs/submodules/moon
-       url = ../moon
-       branch = .
-       ignore = dirty
 [submodule "docs/submodules/calipso"]
        path = docs/submodules/calipso
        url = https://gerrit.opnfv.org/gerrit/calipso

diff --git a/docs/conf.py b/docs/conf.py
index bab9d7b..08b1d6f 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,6 +45,11 @@ author = 'Open Platform for NFV'
 version = 'Latest'
 # The full version, including alpha/beta/rc tags.
 release = 'Latest'
+# The branch this project should link against for projects
+# following the stable-branch process. On the opnfvdocs stable branch
+# this should be set to 'stable/<release>' where '<release>' is the
+# current stable release (Ex: 'stable/gambia')
+branch = 'latest'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -280,8 +285,11 @@ html_sidebars = {'**': ['localtoc.html', 'relations.html'],}
 # texinfo_no_detailmenu = False
 
 intersphinx_mapping = {}
-intersphinx_mapping['armband'] = ('https://opnfv-armband.readthedocs.io/en/latest', None)
+intersphinx_mapping['armband'] = ('https://opnfv-armband.readthedocs.io/en/%s' % branch, None)
+intersphinx_mapping['copper'] = ('https://opnfv-copper.readthedocs.io/en/%s' % branch, None)
+intersphinx_mapping['moon'] = ('https://opnfv-moon.readthedocs.io/en/%s' % branch, None)
+intersphinx_mapping['netready'] = ('https://opnfv-netready.readthedocs.io/en/%s' % branch, None)
 intersphinx_mapping['releng'] = ('https://opnfv-releng.readthedocs.io/en/latest', None)
-intersphinx_mapping['ovn4nfv'] = ('https://opnfv-ovn4nfv.readthedocs.io/en/latest', None)
-intersphinx_mapping['fuel'] = ('https://opnfv-fuel.readthedocs.io/en/latest', None)
-intersphinx_mapping['auto'] = ('https://opnfv-auto.readthedocs.io/en/latest', None)
+intersphinx_mapping['ovn4nfv'] = ('https://opnfv-ovn4nfv.readthedocs.io/en/%s' % branch, None)
+intersphinx_mapping['fuel'] = ('https://opnfv-fuel.readthedocs.io/en/%s' % branch, None)
+intersphinx_mapping['auto'] = ('https://opnfv-auto.readthedocs.io/en/%s' % branch, None)

diff --git a/docs/submodules/copper b/docs/submodules/copper
deleted file mode 160000 (submodule)
index 505dc77..0000000
--- a/docs/submodules/copper
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 505dc7754239feaa28c736abb3019598db2a1a56

diff --git a/docs/submodules/domino b/docs/submodules/domino
deleted file mode 160000 (submodule)
index 8330eea..0000000
--- a/docs/submodules/domino
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8330eea4474bf90a358c2255b1d0c64038295796

diff --git a/docs/submodules/escalator b/docs/submodules/escalator
deleted file mode 160000 (submodule)
index 96c35cd..0000000
--- a/docs/submodules/escalator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 96c35cdeba27d2e290cb9bd254b3871452ea6232

diff --git a/docs/submodules/moon b/docs/submodules/moon
deleted file mode 160000 (submodule)
index cbea4e3..0000000
--- a/docs/submodules/moon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cbea4e360e9bfaa9698cf7c61c83c96a1ba89b8c

diff --git a/docs/submodules/netready b/docs/submodules/netready
deleted file mode 160000 (submodule)
index 54c5333..0000000
--- a/docs/submodules/netready
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54c5333ac4217a3fcd9c9142c8132b8fec0dd2fa

diff --git a/docs/submodules/sfc b/docs/submodules/sfc
index 59697c6..6c11cca 160000 (submodule)
--- a/docs/submodules/sfc
+++ b/docs/submodules/sfc
@@ -1 +1 @@
-Subproject commit 59697c6c0425b3179f0a51e92de7dc035c1ff38c
+Subproject commit 6c11ccaa5e9f036a1b56926d80aaccb3dc5e3d78

diff --git a/docs/submodules/yardstick b/docs/submodules/yardstick
index fdd8206..e0c6f7f 160000 (submodule)
--- a/docs/submodules/yardstick
+++ b/docs/submodules/yardstick
@@ -1 +1 @@
-Subproject commit fdd8206d8f3d456fa3e3b56630e7449d55a71258
+Subproject commit e0c6f7f40d4640210fe1ad41ef40dfcdcef5f463

diff --git a/etc/requirements.txt b/etc/requirements.txt
index 631147a..734f07f 100644 (file)
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -1,5 +1,5 @@
 tox
-Sphinx==1.7.9
+Sphinx==1.5.6
 doc8
 docutils==0.12
 setuptools