From 2ae9c6a0625432193aeedcd7221ff77f7514ee08 Mon Sep 17 00:00:00 2001 From: Bertrand Souville Date: Thu, 25 Oct 2018 10:53:59 +0200 Subject: [PATCH] Update git submodules for Promise Transition to local documentation build for Promise as defined at: https://docs.opnfv.org/en/latest/how-to-use-docs/local-build-transition.html Change-Id: Icd35cd7b1c56a9de8625a685a8495067cfe60431 Signed-off-by: Bertrand Souville Signed-off-by: Trevor Bramwell --- .gitmodules | 5 ----- docs/conf.py | 1 + docs/release/userguide.introduction.rst | 3 +-- docs/submodules/promise | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 160000 docs/submodules/promise diff --git a/.gitmodules b/.gitmodules index dc5e86145..c1e8f4d97 100644 --- a/.gitmodules +++ b/.gitmodules @@ -98,11 +98,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 08b1d6f38..1426d71e2 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 e98fb5115..412cdbc0a 100644 --- a/docs/release/userguide.introduction.rst +++ b/docs/release/userguide.introduction.rst @@ -72,7 +72,7 @@ Feature Configuration Guides - :ref:`OVN4NFV Configuration Guide ` - :ref:`OVNO Configuration Guide ` - :ref:`Parser Configuration Guide ` -- :ref:`Promise Configuration Guide ` +- :ref:`Promise Configuration Guide ` - :ref:`SDNVPN Configuration Guide ` - :ref:`SFC Configuration Guide ` - :ref:`Stor4NFV Configuration Guide ` @@ -95,7 +95,6 @@ Feature User Guides - :ref:`OVN4NFV User Guide ` - :ref:`OVNO User Guide ` - :ref:`Parser User Guide ` -- :ref:`Promise User Guide ` - :ref:`SDNVPN User Guide ` - :ref:`SFC User Guide ` - :ref:`Stor4NFV User Guide ` diff --git a/docs/submodules/promise b/docs/submodules/promise deleted file mode 160000 index 2e2fe8386..000000000 --- a/docs/submodules/promise +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2e2fe83863b28a152e2ba6d2ed65c872555fd3a2 -- 2.16.6