diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-11-01 22:49:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-01 22:49:06 +0000 |
| commit | 9afe44b2870497842e4346290d10cb38abe73166 (patch) | |
| tree | 03a5a0ff0f8e7ec0f9ef1997f51ed83a1273f794 | |
| parent | ba6768ef72b2ef12264f0f110e0108adc1051caa (diff) | |
| parent | 2ae9c6a0625432193aeedcd7221ff77f7514ee08 (diff) | |
Merge "Update git submodules for Promise"
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rw-r--r-- | docs/conf.py | 1 | ||||
| -rw-r--r-- | docs/release/userguide.introduction.rst | 2 | ||||
| m--------- | docs/submodules/promise | 0 |
4 files changed, 2 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index 601d6f913..52974e156 100644 --- a/.gitmodules +++ b/.gitmodules @@ -93,11 +93,6 @@ url = ../pharos branch = . ignore = dirty -[submodule "docs/submodules/promise"] - path = docs/submodules/promise - url = ../promise - branch = . - ignore = dirty [submodule "docs/submodules/qtip"] path = docs/submodules/qtip url = ../qtip diff --git a/docs/conf.py b/docs/conf.py index 10905d144..27be952b3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -289,6 +289,7 @@ intersphinx_mapping['armband'] = ('https://opnfv-armband.readthedocs.io/en/%s' % 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['promise'] = ('https://opnfv-promise.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/%s' % branch, None) intersphinx_mapping['fuel'] = ('https://opnfv-fuel.readthedocs.io/en/%s' % branch, None) diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst index fbf6ea8e8..1a8a096ba 100644 --- a/docs/release/userguide.introduction.rst +++ b/docs/release/userguide.introduction.rst @@ -72,7 +72,7 @@ Feature Configuration Guides - :ref:`OVN4NFV Configuration Guide <xyz-configguide>` - :ref:`OVNO Configuration Guide <ovno-configguide>` - :ref:`Parser Configuration Guide <parser-configguide>` -- :ref:`Promise Configuration Guide <promise-configguide>` +- :ref:`Promise Configuration Guide <promise:promise-configguide>` - :ref:`SDNVPN Configuration Guide <sdnvpn-configguide>` - :ref:`SFC Configuration Guide <sfc-configguide>` - :ref:`Stor4NFV Configuration Guide <stor4nfv:stor4nfv-configguide>` diff --git a/docs/submodules/promise b/docs/submodules/promise deleted file mode 160000 -Subproject 2e2fe83863b28a152e2ba6d2ed65c872555fd3a |