diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-11-01 22:48:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-01 22:48:23 +0000 |
| commit | ba6768ef72b2ef12264f0f110e0108adc1051caa (patch) | |
| tree | 27ab4abdd0a4828e8170fb3887fff73a816215e9 | |
| parent | f43b89991d84b199ca5b20bb61fcdff48a1b34b8 (diff) | |
| parent | 20aa3d59def0c2449766d0c84a5c3c00493c90de (diff) | |
Merge "Transition stor4nfv docs away from submodules"
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rw-r--r-- | docs/conf.py | 1 | ||||
| -rw-r--r-- | docs/release/userguide.introduction.rst | 4 | ||||
| m--------- | docs/submodules/stor4nfv | 0 |
4 files changed, 3 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index 6875c2268..601d6f913 100644 --- a/.gitmodules +++ b/.gitmodules @@ -118,11 +118,6 @@ url = ../storperf branch = . ignore = dirty -[submodule "docs/submodules/stor4nfv"] - path = docs/submodules/stor4nfv - url = ../stor4nfv - branch = . - ignore = dirty [submodule "docs/submodules/ves"] path = docs/submodules/ves url = ../ves diff --git a/docs/conf.py b/docs/conf.py index 08b1d6f38..10905d144 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -293,3 +293,4 @@ intersphinx_mapping['releng'] = ('https://opnfv-releng.readthedocs.io/en/latest' 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) +intersphinx_mapping['stor4nfv'] = ('https://opnfv-stor4nfv.readthedocs.io/en/%s' % branch, None) diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst index aa8801789..fbf6ea8e8 100644 --- a/docs/release/userguide.introduction.rst +++ b/docs/release/userguide.introduction.rst @@ -75,7 +75,7 @@ Feature Configuration Guides - :ref:`Promise Configuration Guide <promise-configguide>` - :ref:`SDNVPN Configuration Guide <sdnvpn-configguide>` - :ref:`SFC Configuration Guide <sfc-configguide>` -- :ref:`Stor4NFV Configuration Guide <stor4nfv-configguide>` +- :ref:`Stor4NFV Configuration Guide <stor4nfv:stor4nfv-configguide>` Feature User Guides =================== @@ -97,4 +97,4 @@ Feature User Guides - :ref:`Parser User Guide <parser-userguide>` - :ref:`SDNVPN User Guide <sdnvpn-userguide>` - :ref:`SFC User Guide <sfc-userguide>` -- :ref:`Stor4NFV User Guide <stor4nfv-userguide>` +- :ref:`Stor4NFV User Guide <stor4nfv:stor4nfv-userguide>` diff --git a/docs/submodules/stor4nfv b/docs/submodules/stor4nfv deleted file mode 160000 -Subproject 56bf48111d4e7f0664789f5b6a567ce2c66d0b8 |