summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/architecture.rst2
-rwxr-xr-xdocs/conf.py2
-rw-r--r--docs/conf.yaml2
-rw-r--r--docs/deployment.rst4
-rw-r--r--docs/tox.ini8
5 files changed, 8 insertions, 10 deletions
diff --git a/docs/architecture.rst b/docs/architecture.rst
index 26a8c63b52..d5ad9be5d6 100644
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -21,8 +21,6 @@ In this release CPS is no longer a stand alone component and is released along w
Project page describing eventual scope and ambition is here:
`Configuration Persistence Service Project <https://wiki.onap.org/display/DW/Configuration+Persistence+Service+Project>`_
-This page reflects the state for Istanbul-R9 release.
-
.. image:: _static/star.png
:class: float-left
diff --git a/docs/conf.py b/docs/conf.py
index 84dac1ea21..6c1f8f75de 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@ from docutils.parsers.rst import directives
from docs_conf.conf import *
#change 'latest' to relevant branch-name once branch has been created
-branch = 'latest'
+branch = 'jakarta'
doc_url = 'https://docs.onap.org/projects'
master_doc = 'index'
diff --git a/docs/conf.yaml b/docs/conf.yaml
index 8425e089e7..70727b70ed 100644
--- a/docs/conf.yaml
+++ b/docs/conf.yaml
@@ -21,5 +21,5 @@ project_cfg: onap
project: onap
# Change this to ReleaseBranchName to modify the header
-default-version: latest
+default-version: jakarta
#
diff --git a/docs/deployment.rst b/docs/deployment.rst
index 3f5943ceb0..f07113d6f0 100644
--- a/docs/deployment.rst
+++ b/docs/deployment.rst
@@ -282,5 +282,5 @@ exhaustive.
CPS-Core Docker Installation
============================
-CPS-Core can also be installed in a docker environment. Latest `docker-compose <https://github.com/onap/cps/blob/master/docker-compose/docker-compose.yml>`_ is included in the repo to start all the relevant services.
-The latest instructions are covered in the `README <https://github.com/onap/cps/blob/master/docker-compose/README.md>`_.
+CPS-Core can also be installed in a docker environment. `docker-compose <https://github.com/onap/cps/blob/jakarta/docker-compose/docker-compose.yml>`_ is included in the repo to start all the relevant services.
+The instructions are covered in the `README <https://github.com/onap/cps/blob/jakarta/docker-compose/README.md>`_.
diff --git a/docs/tox.ini b/docs/tox.ini
index 4e9449e241..ac8cf640a4 100644
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -6,8 +6,8 @@ skipsdist = true
[testenv:docs]
basepython = python3
deps = -r{toxinidir}/requirements-docs.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt?h=jakarta
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=jakarta
commands =
sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
echo "Generated docs available in {toxinidir}/_build/html"
@@ -19,8 +19,8 @@ whitelist_externals =
[testenv:docs-linkcheck]
basepython = python3
deps = -r{toxinidir}/requirements-docs.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt?h=jakarta
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=jakarta
commands = echo "Link Checking not enforced"
#commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck
whitelist_externals = echo