aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-06-22 12:08:39 +0000
committerGerrit Code Review <gerrit@onap.org>2023-06-22 12:08:39 +0000
commit17214c36aa714e0bb5e325d26c6838c1218305b0 (patch)
tree8cc8423144ca3ac945c1061379adea3684e27dd6
parenta6f69bae75b6183bcf3e45b030e8a94b7832998c (diff)
parentb75f52cc7dff354f2b6146ac15d745f42972fe1b (diff)
Merge "Prepare london doc" into londonlondon
-rw-r--r--.gitreview2
-rw-r--r--docs/conf.py8
-rw-r--r--docs/tox.ini6
3 files changed, 8 insertions, 8 deletions
diff --git a/.gitreview b/.gitreview
index 7019809e..37636d35 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
host=gerrit.onap.org
port=29418
project=ccsdk/apps.git
-defaultbranch=master \ No newline at end of file
+defaultbranch=london
diff --git a/docs/conf.py b/docs/conf.py
index 70937d74..ab16216c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
project = "onap"
-release = "master"
-version = "master"
+release = "london"
+version = "london"
author = "Open Network Automation Platform"
# yamllint disable-line rule:line-length
@@ -30,7 +30,7 @@ extensions = [
# Change to {releasename} after you have created the new 'doc' branch.
#
-branch = 'latest'
+branch = 'london'
intersphinx_mapping = {}
doc_url = 'https://docs.onap.org/projects'
@@ -53,4 +53,4 @@ def setup(app):
linkcheck_ignore = [
r'http://localhost:\d+/'
-] \ No newline at end of file
+]
diff --git a/docs/tox.ini b/docs/tox.ini
index b9d7eb44..c208028f 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?h=master
+ -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} {toxinidir}/_build/html
@@ -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