diff options
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rw-r--r-- | docs/conf.py | 1 | ||||
| -rw-r--r-- | docs/featureprojects.rst | 14 | ||||
| -rw-r--r-- | docs/release/release-notes.rst | 2 | ||||
| -rw-r--r-- | docs/release/subrelease.rst | 6 | ||||
| m--------- | docs/submodules/armband | 0 | ||||
| m--------- | docs/submodules/bottlenecks | 0 | ||||
| m--------- | docs/submodules/clover | 0 | ||||
| m--------- | docs/submodules/container4nfv | 0 | ||||
| m--------- | docs/submodules/dovetail | 0 | ||||
| m--------- | docs/submodules/fuel | 0 | ||||
| m--------- | docs/submodules/functest | 0 | ||||
| m--------- | docs/submodules/nfvbench | 0 | ||||
| m--------- | docs/submodules/sdnvpn | 0 | ||||
| m--------- | docs/submodules/sfc | 0 | ||||
| m--------- | docs/submodules/storperf | 0 | ||||
| m--------- | docs/submodules/vswitchperf | 0 |
17 files changed, 8 insertions, 20 deletions
diff --git a/.gitmodules b/.gitmodules index fbe2a007f..af118f7ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,11 +3,6 @@ url = ../apex branch = . ignore = dirty -[submodule "docs/submodules/armband"] - path = docs/submodules/armband - url = ../armband - branch = . - ignore = dirty [submodule "docs/submodules/auto"] path = docs/submodules/auto url = ../auto diff --git a/docs/conf.py b/docs/conf.py index a3866d9cf..48c533975 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -280,6 +280,7 @@ 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['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/featureprojects.rst b/docs/featureprojects.rst index d5afec867..b2eac4314 100644 --- a/docs/featureprojects.rst +++ b/docs/featureprojects.rst @@ -1,7 +1,7 @@ .. _opnfv-featureprojects: OPNFV Projects -================ +============== Apex ---- @@ -19,16 +19,10 @@ Apex Armband ------- -.. toctree:: - :maxdepth: 1 - ../submodules/armband/docs/development/overview/index - ../submodules/armband/docs/development/requirements/index - ../submodules/armband/docs/release/installation/index - ../submodules/armband/docs/release/configguide/index - ../submodules/armband/docs/release/userguide/index - ../submodules/armband/docs/development/design/index - ../submodules/armband/docs/development/manuals/index +* :doc:`Armband Overview <armband:index>` +* :doc:`Installation Guide <armband:release/installation/index>` +* :doc:`User Guide <armband:release/userguide/index>` Availability diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst index 55ddacee1..771c9a77b 100644 --- a/docs/release/release-notes.rst +++ b/docs/release/release-notes.rst @@ -16,7 +16,7 @@ Project release notes: :ref:`Apex Release Notes <apex-releasenotes>` -:ref:`Armband Release Notes <armband-releasenotes>` +:ref:`Armband Release Notes <armband:armband-releasenotes>` :ref:`Auto Release Notes <auto-releasenotes>` diff --git a/docs/release/subrelease.rst b/docs/release/subrelease.rst index 1493e690a..fa4bd95bb 100644 --- a/docs/release/subrelease.rst +++ b/docs/release/subrelease.rst @@ -28,11 +28,9 @@ Daisy Fuel ----- -.. toctree:: - :maxdepth: 1 - ../submodules/fuel/docs/release/release-notes/index - ../submodules/fuel/docs/release/installation/index +* :ref:`Release Notes <fuel:fuel-release-notes-label>` +* :ref:`Installation <fuel:fuel-installation>` Joid ----- diff --git a/docs/submodules/armband b/docs/submodules/armband deleted file mode 160000 -Subproject 66db388e02fa09d6a233ed8844a6c91494cf279 diff --git a/docs/submodules/bottlenecks b/docs/submodules/bottlenecks -Subproject 4a94df533b4ae139af5e222e29375c19c7ace01 +Subproject b183d7d424e312c585de2b40be0716a8996562f diff --git a/docs/submodules/clover b/docs/submodules/clover -Subproject ee2169ee4b8fb3539ad173fbc1557b54b2f2216 +Subproject 8541bdcde5fdabf7689d2609adac982683b0755 diff --git a/docs/submodules/container4nfv b/docs/submodules/container4nfv -Subproject 4782abb8492b88cde19bf11fac42d0f501fb5d3 +Subproject 1fa07ef952a6b0e12487901919cec52b9d9b973 diff --git a/docs/submodules/dovetail b/docs/submodules/dovetail -Subproject cd4962c9ca223f8b4287dc2123ac40a8652a102 +Subproject a017201e115d27c86a00959e7baedbb0c95f058 diff --git a/docs/submodules/fuel b/docs/submodules/fuel deleted file mode 160000 -Subproject ec817180eece7be6e161e4633e08f41ea94cb90 diff --git a/docs/submodules/functest b/docs/submodules/functest -Subproject 6c65f82b3571550229566be3c6b949074101850 +Subproject af258063fb4453a6daba2bef59738f59c76d0f7 diff --git a/docs/submodules/nfvbench b/docs/submodules/nfvbench -Subproject c0ef57f8ec086c07053d529510992c869c30c9d +Subproject e59c1b065700f776f92111cb29bdd28a0504adb diff --git a/docs/submodules/sdnvpn b/docs/submodules/sdnvpn -Subproject 2147aa5c54101fa3bf58f2551315fc454c7dc2b +Subproject 3dcc7e7801c39053e08bdc6c45402267d31ae56 diff --git a/docs/submodules/sfc b/docs/submodules/sfc -Subproject 6b956361494a573dfcd7e1440b8183e77be94ee +Subproject 471a2422aa270ebcee562ee7389adffa868f872 diff --git a/docs/submodules/storperf b/docs/submodules/storperf -Subproject 790e601173040de7c5224b7ac81b8c78cd5d77c +Subproject 518988ca97031ef0e64e15db5ec2d8f2b86d49e diff --git a/docs/submodules/vswitchperf b/docs/submodules/vswitchperf -Subproject 80b86f4e073dc6c9ca53704adc6b22c665e9f95 +Subproject bc569ef41ec4120ee63bfa43c2b647cd96957cc |