Merge "Add the doc directory for tosca parsers"

diff --git a/docs/conf.py b/docs/conf.py
index 791569e..95c2a8c 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,7 +41,6 @@ extensions = [
     'sphinxcontrib.seqdiag',
     'sphinx.ext.ifconfig',
     'sphinx.ext.todo',
-    'sphinxcontrib.httpdomain',
     'sphinxcontrib.plantuml',
     'sphinxcontrib.swaggerdoc'
 ]

diff --git a/docs/guides/onap-developer/architecture/index.rst b/docs/guides/onap-developer/architecture/index.rst
index 412cf8e..8e9fadf 100644 (file)
--- a/docs/guides/onap-developer/architecture/index.rst
+++ b/docs/guides/onap-developer/architecture/index.rst
@@ -75,13 +75,13 @@ Common Services
    :titlesonly:
 
    ../../../submodules/aaf/authz.git/docs/architecture.rst
-   ../../../submodules/aai/aai-common.git/docs/architecture.rst
+   AAI - Active and Available Inventory <../../../submodules/aai/aai-common.git/docs/platform/architecture.rst>
    AAI ESR UI <../../../submodules/aai/esr-gui.git/docs/platform/architecture.rst>
    AAI ESR Server <../../../submodules/aai/esr-server.git/docs/platform/architecture.rst>
    ../../../submodules/aai/sparky-be.git/docs/architecture.rst
    ../../../submodules/aai/sparky-fe.git/docs/architecture.rst
    ../../../submodules/dmaap/messagerouter/messageservice.git/docs/architecture.rst
-   ../../../submodules/msb/apigateway.git/docs/architecture.rst
+   MSB - Microservices Bus <../../../submodules/msb/apigateway.git/docs/platform/architecture.rst>
    ../../../submodules/msb/discovery.git/docs/architecture.rst
    ../../../submodules/msb/java-sdk.git/docs/architecture.rst
    ../../../submodules/msb/swagger-sdk.git/docs/architecture.rst

diff --git a/docs/requirements.txt b/docs/requirements.txt
index fa752e6..85c7da1 100644 (file)
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -5,7 +5,6 @@ docutils
 setuptools
 six
 sphinx_rtd_theme
-sphinxcontrib-httpdomain
 sphinxcontrib-blockdiag
 sphinxcontrib-seqdiag
 sphinxcontrib-swaggerdoc

diff --git a/docs/submodules/aai/sparky-be.git b/docs/submodules/aai/sparky-be.git
index efd1049..559158d 160000 (submodule)
--- a/docs/submodules/aai/sparky-be.git
+++ b/docs/submodules/aai/sparky-be.git
@@ -1 +1 @@
-Subproject commit efd104965f09ccfedc9efb5692cbd7a0e04ef6ce
+Subproject commit 559158d0731400894fd0fce10566328c6f39061d

diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
index b7d8b97..8bf853a 160000 (submodule)
--- a/docs/submodules/appc.git
+++ b/docs/submodules/appc.git
@@ -1 +1 @@
-Subproject commit b7d8b97e10c62ef446b28fc071bb7536a248a304
+Subproject commit 8bf853a39145e5b226c1f410584803353582fc43

diff --git a/docs/submodules/ccsdk/platform/plugins.git b/docs/submodules/ccsdk/platform/plugins.git
index 810ab2d..de5d4b4 160000 (submodule)
--- a/docs/submodules/ccsdk/platform/plugins.git
+++ b/docs/submodules/ccsdk/platform/plugins.git
@@ -1 +1 @@
-Subproject commit 810ab2d67c10b820309d7c913083c17c029e59d1
+Subproject commit de5d4b4c2fa42066a0e5afca4a7ff6e3a101c6d0

diff --git a/docs/submodules/ccsdk/storage/pgaas.git b/docs/submodules/ccsdk/storage/pgaas.git
index c24f030..464f57c 160000 (submodule)
--- a/docs/submodules/ccsdk/storage/pgaas.git
+++ b/docs/submodules/ccsdk/storage/pgaas.git
@@ -1 +1 @@
-Subproject commit c24f03065f4e8e13490f49433a0baa2d5fbca304
+Subproject commit 464f57c18c0bf4f599e2f294a31b93d737dfb82a

diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git
index cf89814..60ad596 160000 (submodule)
--- a/docs/submodules/cli.git
+++ b/docs/submodules/cli.git
@@ -1 +1 @@
-Subproject commit cf89814911f9bc760c4b203b36783aa773503aaa
+Subproject commit 60ad596d8150ae73171ddb8d1c395130f94104b2

diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git
index 312e7f3..ee67201 160000 (submodule)
--- a/docs/submodules/integration.git
+++ b/docs/submodules/integration.git
@@ -1 +1 @@
-Subproject commit 312e7f3db1dd2664a4320e9be087965c00bfe44e
+Subproject commit ee67201ca1d8c15d476366a6e2df660ed43781b7

diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git
index bcfe1e3..4ac607c 160000 (submodule)
--- a/docs/submodules/oom.git
+++ b/docs/submodules/oom.git
@@ -1 +1 @@
-Subproject commit bcfe1e3218b2108a8cee9764d00fc4f19aeffcd3
+Subproject commit 4ac607ce48b745cb6f6657205cc5c2a3d472a1b0

diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git
index 381e7a2..864482e 160000 (submodule)
--- a/docs/submodules/policy/engine.git
+++ b/docs/submodules/policy/engine.git
@@ -1 +1 @@
-Subproject commit 381e7a284bfa5dfb6dd2325b573f6f3e5f349019
+Subproject commit 864482e6b06877f21d0e79c148d2b1e8ff3d1524

diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git
index 2b39251..ff3619e 160000 (submodule)
--- a/docs/submodules/portal.git
+++ b/docs/submodules/portal.git
@@ -1 +1 @@
-Subproject commit 2b39251bbfdb1f2240bad8a293cb1f7c72137b6c
+Subproject commit ff3619ea67dd2f008b2378f59511f3a22ce23177

diff --git a/docs/submodules/sdnc/northbound.git b/docs/submodules/sdnc/northbound.git
index fc28d58..60c0d0d 160000 (submodule)
--- a/docs/submodules/sdnc/northbound.git
+++ b/docs/submodules/sdnc/northbound.git
@@ -1 +1 @@
-Subproject commit fc28d589c244def23b88d27b7e88fa32950b0d52
+Subproject commit 60c0d0d645cad9d0fa6286ee3fb6c90cd782764e

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index c917537..9502c18 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit c91753756d54b6cc0e4a6b48a6c9e012b3be8c56
+Subproject commit 9502c1827ddfc4807befa873ee117cc3cf8681e2

diff --git a/docs/templates/sections/apiexample/httpdomain.rst b/docs/templates/sections/apiexample/httpdomain.rst
deleted file mode 100644 (file)
index f06d006..0000000
--- a/docs/templates/sections/apiexample/httpdomain.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
-Sphinx httpdomain directive
-===========================
-
-.. http:get:: path
-
-   For more information see `<https://pythonhosted.org/sphinxcontrib-httpdomain>`_
-

diff --git a/docs/templates/sections/offeredapis.rst b/docs/templates/sections/offeredapis.rst
index b1b8f41..f5032b4 100644 (file)
--- a/docs/templates/sections/offeredapis.rst
+++ b/docs/templates/sections/offeredapis.rst
@@ -23,4 +23,3 @@ Here are several examples:
    apiexample/swaggerv2doc.rst
    apiexample/swagger2markup.rst
    apiexample/worddoc2rst.rst
-   apiexample/httpdomain.rst

diff --git a/docs/templates/sections/release-notes.rst b/docs/templates/sections/release-notes.rst
index b568bee..9b6688c 100644 (file)
--- a/docs/templates/sections/release-notes.rst
+++ b/docs/templates/sections/release-notes.rst
@@ -1,4 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
 
 Release Notes
 =============

diff --git a/etc/requirements.txt b/etc/requirements.txt
index fa752e6..85c7da1 100644 (file)
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -5,7 +5,6 @@ docutils
 setuptools
 six
 sphinx_rtd_theme
-sphinxcontrib-httpdomain
 sphinxcontrib-blockdiag
 sphinxcontrib-seqdiag
 sphinxcontrib-swaggerdoc