From cb5e24fc0e7bab88f4c8c3ae0a8e9ffa28ba9670 Mon Sep 17 00:00:00 2001 From: thmsdt Date: Mon, 26 Jun 2023 14:48:22 +0200 Subject: fix docs config files Issue-ID: DOC-811 Signed-off-by: thmsdt Change-Id: I33c1757630cffe2b6449fd74304cd8825b568229 --- .gitreview | 2 +- docs/conf.py | 7 +++---- docs/developer_info/instantiate/instantiation/index.rst | 1 - docs/developer_info/instantiate/instantiation/vid/index.rst | 9 --------- docs/tox.ini | 6 +++--- 5 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 docs/developer_info/instantiate/instantiation/vid/index.rst diff --git a/.gitreview b/.gitreview index 53fb5e5a9d..21adfcf8b3 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=gerrit.onap.org port=29418 project=so.git -defaultbranch=master +defaultbranch=london diff --git a/docs/conf.py b/docs/conf.py index 62a012aa0a..182e83d6b4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ project = "onap" -release = "master" -version = "master" +release = "london" +version = "london" doc_url = 'https://docs.onap.org/projects' @@ -32,11 +32,10 @@ extensions = [ # Change to {releasename} after you have created the new 'doc' branch. # -branch = 'latest' +branch = 'london' intersphinx_mapping = {} intersphinx_mapping['onap-usecase-ui'] = ('{}/onap-usecase-ui/en/%s'.format(doc_url) % branch, None) -intersphinx_mapping['onap-vid'] = ('{}/onap-vid/en/%s'.format(doc_url) % branch, None) doc_url = 'https://docs.onap.org/projects' master_doc = 'index' diff --git a/docs/developer_info/instantiate/instantiation/index.rst b/docs/developer_info/instantiate/instantiation/index.rst index 455bdf070e..26ed74db8c 100644 --- a/docs/developer_info/instantiate/instantiation/index.rst +++ b/docs/developer_info/instantiate/instantiation/index.rst @@ -21,7 +21,6 @@ Instantiate a Service: .. toctree:: :maxdepth: 2 - using ONAP VID Portal with "A La Carte" method <./vid/index.rst> using ONAP UUI Portal with "e2eServiceInstance" method <./uui/index.rst> using ONAP NBI REST API (TM Forum) <./nbi/index.rst> using ONAP SO REST API with "A La Carte" method <./so1/index.rst> diff --git a/docs/developer_info/instantiate/instantiation/vid/index.rst b/docs/developer_info/instantiate/instantiation/vid/index.rst deleted file mode 100644 index 8c7657db83..0000000000 --- a/docs/developer_info/instantiate/instantiation/vid/index.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 -.. International License. http://creativecommons.org/licenses/by/4.0 -.. Copyright 2019 ONAP Contributors. All rights reserved. - - -A La Carte mode Service Instantiation via ONAP VID Portal -========================================================= - -VID documentation, see :ref:`VID ` for details. diff --git a/docs/tox.ini b/docs/tox.ini index 833cd33adc..c8c0d93af3 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -8,7 +8,7 @@ basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=london commands = sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html echo "Generated docs available in {toxinidir}/_build/html" @@ -22,7 +22,7 @@ basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=london commands = echo "Link Checking not enforced" #commands = sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck allowlist_externals = echo @@ -32,7 +32,7 @@ basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=london commands = sphinx-build -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck -- cgit 1.2.3-korg