Merge "CPS-594: Exception when updating list node PATCH"

diff --git a/docs/index.rst b/docs/index.rst
index 3e6f141..ec9753f 100755 (executable)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -22,7 +22,6 @@ CPS-Core Documentation
    design.rst
    modeling.rst
    deployment.rst
-   cps-path.rst
    release-notes.rst
 
 ONAP DMI Plugin Documentation

diff --git a/docs/modeling.rst b/docs/modeling.rst
index 4e46e71..22c4b0b 100644 (file)
--- a/docs/modeling.rst
+++ b/docs/modeling.rst
@@ -50,4 +50,13 @@ Data
 
 Querying
 
-- **CPS Path** is used to query data nodes. The CPS Path is described in detail in :doc:`cps-path`.
+- **CPS Path** is used to query data nodes. The CPS Path is described in detail in the :doc:`cps-path` sub-page.
+
+CPS Path
+========
+
+.. toctree::
+   :maxdepth: 1
+
+   cps-path.rst
+

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index c791288..5a3d2f1 100644 (file)
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,16 +1 @@
-tox
-Sphinx
-doc8
-docutils
-setuptools
-six
-sphinx_bootstrap_theme
-lfdocs-conf~=0.7.5
-funcparserlib~=1.0.0a0
-sphinxcontrib.blockdiag~=2.0.0
-sphinxcontrib-needs<0.6.0
-sphinxcontrib.plantuml~=0.21
-sphinxcontrib.nwdiag~=2.0.0
-sphinxcontrib-seqdiag~=2.0.0
-sphinxcontrib-swaggerdoc~=0.1.7
-sphinx-rtd-theme~=1.0.0
+lfdocs-conf
\ No newline at end of file

diff --git a/docs/tox.ini b/docs/tox.ini
index edac8c3..4e9449e 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -6,6 +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
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
     echo "Generated docs available in {toxinidir}/_build/html"
@@ -16,7 +18,9 @@ whitelist_externals =
 
 [testenv:docs-linkcheck]
 basepython = python3
-#deps = -r{toxinidir}/requirements-docs.txt
+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
 commands = echo "Link Checking not enforced"
 #commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck
 whitelist_externals = echo