update .readthedocs.yaml, conf.py, tox.ini

Issue-ID: DOC-811

Signed-off-by: thmsdt <thomas.kulik@telekom.de>
Change-Id: I17f70162b53e9f1c4b424481a1b612892ab35830
(cherry picked from commit 258ca721d952cffc919ad2265e97d73357abeeae)

diff --git a/.gitreview b/.gitreview
index 73a32ed..91abe96 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.onap.org
 port=29418
 project=ccsdk/features.git
-defaultbranch=master
+defaultbranch=london

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 3797dc8..f56b3b7 100644 (file)
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -3,18 +3,16 @@
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 # Required
-version: 2
-
-formats:
-  - htmlzip
 
+version: 2
 build:
-  image: latest
+  os: ubuntu-20.04
+  tools:
+    python: "3.8"
 
 python:
-  version: 3.7
   install:
-    - requirements: docs/requirements-docs.txt
+  - requirements: docs/requirements-docs.txt
 
 sphinx:
   configuration: docs/conf.py

diff --git a/docs/conf.py b/docs/conf.py
index a9c42b6..6bfe978 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,7 @@
 project = "onap"
-release = "master"
-version = "master"
+release = "london"
+version = "london"
+branch = 'london'
 
 author = "Open Network Automation Platform"
 # yamllint disable-line rule:line-length
@@ -30,8 +31,6 @@ extensions = [
 # Change to {releasename} after you have created the new 'doc' branch.
 #
 
-branch = 'latest'
-
 intersphinx_mapping = {}
 doc_url = 'https://docs.onap.org/projects'
 master_doc = 'index'

diff --git a/docs/guides/onap-user/abbreviations.rst b/docs/guides/onap-user/abbreviations.rst
index 89422fb..c57d538 100644 (file)
--- a/docs/guides/onap-user/abbreviations.rst
+++ b/docs/guides/onap-user/abbreviations.rst
@@ -628,9 +628,10 @@ Abbreviations
 | VM                                 | Virtual Machine                 |
 +------------------------------------+---------------------------------+
 | VNF                                | `Virtual Network                |
-|                                    | Function <http://searchsdn.tech |
-|                                    | target.com/definition/virtual-n |
-|                                    | etwork-functions>`__            |
+|                                    | Function <https://www.techtarge |
+|                                    | t.com/searchnetworking/         |
+|                                    | definition/virtual-network-     |
+|                                    | functions-VNF>`__               |
 +------------------------------------+---------------------------------+
 | VNFC                               | Virtual Network Function        |
 |                                    | Component                       |

diff --git a/docs/tox.ini b/docs/tox.ini
index 8e5325e..0822d28 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -17,7 +17,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 -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
 
@@ -26,6 +26,6 @@ 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 -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck