Merge "Consolidated ccsdk references"

diff --git a/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst b/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst
index 4a7300d..15d71d4 100644 (file)
--- a/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst
+++ b/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst
@@ -390,23 +390,15 @@ Download the DOC repository.
 
    git clone http://gerrit.onap.org/r/doc
 
-Change directory to docs & install requirements.
-
-.. code-block:: bash
-
-   cd doc
-   sudo pip install -r etc/requirements.txt
-
 Update submodules, build documentation using tox & then open using any browser.
 
 .. code-block:: bash
 
    cd doc
-   git submodule update --depth 1 --init
-   tox -edocs
+   tox -elocal
    firefox docs/_build/html/index.html
 
-.. note:: Make sure to run `tox -edocs` and not just `tox`.
+.. note:: Make sure to run `tox -elocal` and not just `tox`.
 
 
 

diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git
index 9fd6717..59c0e4f 160000 (submodule)
--- a/docs/submodules/cli.git
+++ b/docs/submodules/cli.git
@@ -1 +1 @@
-Subproject commit 9fd6717a47ffacf5f40447172140521717b3a6f5
+Subproject commit 59c0e4f513607e8363b9c9133a5043475d750a9f

diff --git a/docs/submodules/modeling/modelspec.git b/docs/submodules/modeling/modelspec.git
index 49d2cac..d650571 160000 (submodule)
--- a/docs/submodules/modeling/modelspec.git
+++ b/docs/submodules/modeling/modelspec.git
@@ -1 +1 @@
-Subproject commit 49d2cac0a82887b73f167aba3ff32dea09019534
+Subproject commit d650571280c041e0602dd93ff407dd16092a320e

diff --git a/docs/submodules/msb/apigateway.git b/docs/submodules/msb/apigateway.git
index 84f80b1..ddf80e2 160000 (submodule)
--- a/docs/submodules/msb/apigateway.git
+++ b/docs/submodules/msb/apigateway.git
@@ -1 +1 @@
-Subproject commit 84f80b1dcc9a3fabbbe39384e53b8dc9d9f5081f
+Subproject commit ddf80e22433f6e5d49923fd1523ca49369a2f583

diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git
index 8a10850..0cfd9d0 160000 (submodule)
--- a/docs/submodules/multicloud/framework.git
+++ b/docs/submodules/multicloud/framework.git
@@ -1 +1 @@
-Subproject commit 8a1085087f4a7f117d597d8fa46718899111d542
+Subproject commit 0cfd9d031bf80a39e6677291b3a407eefc400013

diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git
index 19c2c34..8169b84 160000 (submodule)
--- a/docs/submodules/policy/engine.git
+++ b/docs/submodules/policy/engine.git
@@ -1 +1 @@
-Subproject commit 19c2c34100895f894f0f2ab82da0b990f679223c
+Subproject commit 8169b8491fb2512e78764cf3f3b1e2f1ad4a2fba

diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
index 66c1d31..ce889ad 160000 (submodule)
--- a/docs/submodules/sdc.git
+++ b/docs/submodules/sdc.git
@@ -1 +1 @@
-Subproject commit 66c1d3145ea007362a6e885bfefc15d99596b4ea
+Subproject commit ce889adae3f91a8296bf41ce5804a51483242b2a

diff --git a/docs/submodules/sdc/sdc-workflow-designer.git b/docs/submodules/sdc/sdc-workflow-designer.git
index 250bec4..29660c6 160000 (submodule)
--- a/docs/submodules/sdc/sdc-workflow-designer.git
+++ b/docs/submodules/sdc/sdc-workflow-designer.git
@@ -1 +1 @@
-Subproject commit 250bec44553d15dc5dd3772340e2bb18ec004ae7
+Subproject commit 29660c673b5a54ea93238cdd94c14f8ee7c7d8ce

diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git
index 08f2e4b..5afd798 160000 (submodule)
--- a/docs/submodules/sdnc/oam.git
+++ b/docs/submodules/sdnc/oam.git
@@ -1 +1 @@
-Subproject commit 08f2e4b41472eacaae9c8da516bddc3aedc7344a
+Subproject commit 5afd798760522289162f0681b8dcc09280cb4b4b

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index 23bd47f..104aefb 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit 23bd47fc28519d8976d8ea95ccbdbb298c5902bb
+Subproject commit 104aefb5d0fce75ee5c5ec4f4de1a6954925b5b6

diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git
index 6d9717b..7cf4fbb 160000 (submodule)
--- a/docs/submodules/usecase-ui.git
+++ b/docs/submodules/usecase-ui.git
@@ -1 +1 @@
-Subproject commit 6d9717b1696fd6594360dd9253ea7515e6174370
+Subproject commit 7cf4fbbe3644624dd5a8c640ab6041ab6a734e3f

diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git
index 6d223e9..8f612e9 160000 (submodule)
--- a/docs/submodules/vid.git
+++ b/docs/submodules/vid.git
@@ -1 +1 @@
-Subproject commit 6d223e9f110391e69e09aa733901e85db22dd984
+Subproject commit 8f612e9dc8b0cccffa5a3629430c61101030aa88

diff --git a/tox.ini b/tox.ini
index b9b1dcc..a352018 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,16 @@ commands =
     echo "Generated docs available in {toxinidir}/docs/_build/html"
 whitelist_externals = echo
 
+[testenv:local]
+deps = -r{toxinidir}/etc/requirements.txt
+commands =
+    git submodule update --depth 1 --init
+    sphinx-build -j 4 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+    echo "Generated docs available in {toxinidir}/docs/_build/html"
+whitelist_externals =
+    echo
+    git
+
 [testenv:docs-linkcheck]
 deps = -r{toxinidir}/etc/requirements.txt
 commands = sphinx-build -j 4 -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck