diff options
| author |   Sofia Wallin <sofia.wallin@est.tech> | 2018-10-29 19:41:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-29 19:41:24 +0000 |
| commit | ce4883fb4945d6b7df34a6fcde9cdee0e6a43451 (patch) | |
| tree | 8f4b3dce9af597e8225da07d668ce7e9a7957e52 | |
| parent | 665a674dbc04fc5a8a1ac185b1cd6a6bf750bdac (diff) | |
| parent | 8da20a6a31ea58690de6fdb887e0071bf854dac0 (diff) | |
Merge "Convert Unlinked Git Submodules to Intersphinx" into stable/gambia
| -rw-r--r-- | .gitmodules | 25 | ||||
| -rw-r--r-- | docs/conf.py | 3 | ||||
| m--------- | docs/submodules/copper | 0 | ||||
| m--------- | docs/submodules/domino | 0 | ||||
| m--------- | docs/submodules/escalator | 0 | ||||
| m--------- | docs/submodules/moon | 0 | ||||
| m--------- | docs/submodules/netready | 0 |
7 files changed, 3 insertions, 25 deletions
diff --git a/.gitmodules b/.gitmodules index af118f7ad..90c8bd56f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,31 +23,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 @@ -83,11 +68,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 @@ -213,11 +193,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 48c533975..4e5542820 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -281,6 +281,9 @@ html_sidebars = {'**': ['localtoc.html', 'relations.html'],} intersphinx_mapping = {} intersphinx_mapping['armband'] = ('https://opnfv-armband.readthedocs.io/en/latest', None) +intersphinx_mapping['copper'] = ('https://opnfv-copper.readthedocs.io/en/latest', None) +intersphinx_mapping['moon'] = ('https://opnfv-moon.readthedocs.io/en/latest', None) +intersphinx_mapping['netready'] = ('https://opnfv-netready.readthedocs.io/en/latest', 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) diff --git a/docs/submodules/copper b/docs/submodules/copper deleted file mode 160000 -Subproject 505dc7754239feaa28c736abb3019598db2a1a5 diff --git a/docs/submodules/domino b/docs/submodules/domino deleted file mode 160000 -Subproject 8330eea4474bf90a358c2255b1d0c6403829579 diff --git a/docs/submodules/escalator b/docs/submodules/escalator deleted file mode 160000 -Subproject 96c35cdeba27d2e290cb9bd254b3871452ea623 diff --git a/docs/submodules/moon b/docs/submodules/moon deleted file mode 160000 -Subproject cbea4e360e9bfaa9698cf7c61c83c96a1ba89b8 diff --git a/docs/submodules/netready b/docs/submodules/netready deleted file mode 160000 -Subproject 54c5333ac4217a3fcd9c9142c8132b8fec0dd2f |