Merge "Fix links to new intersphinx format."

diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git
index d2f8381..d7c1a1b 160000 (submodule)
--- a/docs/submodules/aaf/authz.git
+++ b/docs/submodules/aaf/authz.git
@@ -1 +1 @@
-Subproject commit d2f8381eeef23535e17b770022060a5ba06eedba
+Subproject commit d7c1a1b6c4218e3f470f86e4ff67fdcdc86f0ea5

diff --git a/docs/submodules/aaf/certservice.git b/docs/submodules/aaf/certservice.git
index 1740a80..bba2a7e 160000 (submodule)
--- a/docs/submodules/aaf/certservice.git
+++ b/docs/submodules/aaf/certservice.git
@@ -1 +1 @@
-Subproject commit 1740a80eab8ebb9598b7e9a19632a17491811be2
+Subproject commit bba2a7ea69330b5e259ee3ac76bd7938a7b3f05f

diff --git a/docs/submodules/aai/aai-common.git b/docs/submodules/aai/aai-common.git
index de009c0..6915f57 160000 (submodule)
--- a/docs/submodules/aai/aai-common.git
+++ b/docs/submodules/aai/aai-common.git
@@ -1 +1 @@
-Subproject commit de009c01c943e90028d4f690ba256c715137e9cc
+Subproject commit 6915f57d07f466a6dd54be693b2af2cec9b8e0c1

diff --git a/docs/submodules/aai/esr-gui.git b/docs/submodules/aai/esr-gui.git
index c54138e..37690e1 160000 (submodule)
--- a/docs/submodules/aai/esr-gui.git
+++ b/docs/submodules/aai/esr-gui.git
@@ -1 +1 @@
-Subproject commit c54138edc1b392ed89f147270ad680014f0dd2d6
+Subproject commit 37690e1d995c19a32bfbe149ceb8446897865001

diff --git a/docs/submodules/aai/esr-server.git b/docs/submodules/aai/esr-server.git
index 9c4476f..53506ce 160000 (submodule)
--- a/docs/submodules/aai/esr-server.git
+++ b/docs/submodules/aai/esr-server.git
@@ -1 +1 @@
-Subproject commit 9c4476fcee5490ac20a61beee6ea388c1d0f1808
+Subproject commit 53506cec0c9e2366e1a7bc81a554eac278b0b254

diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
index 2706a51..9ad0d91 160000 (submodule)
--- a/docs/submodules/appc.git
+++ b/docs/submodules/appc.git
@@ -1 +1 @@
-Subproject commit 2706a51d340e612730210adb5a521b6e01fde46d
+Subproject commit 9ad0d913dc0e3188d3af153c606d47faf834d11e

diff --git a/docs/submodules/appc/deployment.git b/docs/submodules/appc/deployment.git
index 8ea8220..cc4386a 160000 (submodule)
--- a/docs/submodules/appc/deployment.git
+++ b/docs/submodules/appc/deployment.git
@@ -1 +1 @@
-Subproject commit 8ea82209ecd629658cac834e52405402625e1241
+Subproject commit cc4386a0a36a6c24f4f3639bb9ffb3b58d2056e8

diff --git a/docs/submodules/ccsdk/cds.git b/docs/submodules/ccsdk/cds.git
index 6e7cbbb..340b97f 160000 (submodule)
--- a/docs/submodules/ccsdk/cds.git
+++ b/docs/submodules/ccsdk/cds.git
@@ -1 +1 @@
-Subproject commit 6e7cbbbc4668c9d37d44bab6625ab7275043eb72
+Subproject commit 340b97f14af71fbf2a35dd996cab7a60e4e791de

diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git
index d2e5008..5523a23 160000 (submodule)
--- a/docs/submodules/clamp.git
+++ b/docs/submodules/clamp.git
@@ -1 +1 @@
-Subproject commit d2e5008edc93220a1117df5c864d828fbae9cc8d
+Subproject commit 5523a23a5d8a66f690fc2dec7975cb8bfb8db975

diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git
index 2bb3344..80abcef 160000 (submodule)
--- a/docs/submodules/cli.git
+++ b/docs/submodules/cli.git
@@ -1 +1 @@
-Subproject commit 2bb3344c6b3ec9bd77d1491d5beb579bdabc62f2
+Subproject commit 80abcefc5fb61361f9b28a34077f75ce68058db6

diff --git a/docs/submodules/dcaegen2.git b/docs/submodules/dcaegen2.git
index 0fbf888..119b023 160000 (submodule)
--- a/docs/submodules/dcaegen2.git
+++ b/docs/submodules/dcaegen2.git
@@ -1 +1 @@
-Subproject commit 0fbf888a2d6acfc67f7e555fdaec485ecb8c6ff9
+Subproject commit 119b02361f6eb3d9f34202d2ae4c2dab467dfadd

diff --git a/docs/submodules/dmaap/datarouter.git b/docs/submodules/dmaap/datarouter.git
index 3d3b9de..5906de2 160000 (submodule)
--- a/docs/submodules/dmaap/datarouter.git
+++ b/docs/submodules/dmaap/datarouter.git
@@ -1 +1 @@
-Subproject commit 3d3b9def088b171329dc47fd7a1c471d25aafc06
+Subproject commit 5906de2465975e42e4983abe411f30fa16050fdf

diff --git a/docs/submodules/externalapi/nbi.git b/docs/submodules/externalapi/nbi.git
index cdad547..c663b50 160000 (submodule)
--- a/docs/submodules/externalapi/nbi.git
+++ b/docs/submodules/externalapi/nbi.git
@@ -1 +1 @@
-Subproject commit cdad547b1c20e69fb3bd7df50971742809b276ec
+Subproject commit c663b5011fd9564a70f51a674ec5f3c34bdc9d90

diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git
index 287b75a..151f6bd 160000 (submodule)
--- a/docs/submodules/integration.git
+++ b/docs/submodules/integration.git
@@ -1 +1 @@
-Subproject commit 287b75a69965d90e56dee2e6006fde931f9942d6
+Subproject commit 151f6bd9846696668cdf395706dfc567442823e4

diff --git a/docs/submodules/modeling/etsicatalog.git b/docs/submodules/modeling/etsicatalog.git
index ac2f763..f226026 160000 (submodule)
--- a/docs/submodules/modeling/etsicatalog.git
+++ b/docs/submodules/modeling/etsicatalog.git
@@ -1 +1 @@
-Subproject commit ac2f763bcf8ed41d9f2867a33b29860318854502
+Subproject commit f2260263c4b8170aebae0ccc02bf4300d530dd70

diff --git a/docs/submodules/msb/apigateway.git b/docs/submodules/msb/apigateway.git
index 4099f57..3ba6d41 160000 (submodule)
--- a/docs/submodules/msb/apigateway.git
+++ b/docs/submodules/msb/apigateway.git
@@ -1 +1 @@
-Subproject commit 4099f574f7e2495ee2d98ef46e6270cde8d10d49
+Subproject commit 3ba6d415c7dfcde1f81473a452b08e26aad7fc75

diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git
index 502b610..8d2d1c9 160000 (submodule)
--- a/docs/submodules/multicloud/k8s.git
+++ b/docs/submodules/multicloud/k8s.git
@@ -1 +1 @@
-Subproject commit 502b61039dbdc9089768a49b87163e654d8cbfb7
+Subproject commit 8d2d1c91442bf52b35a23ae0f49badb58a0b56cd

diff --git a/docs/submodules/music.git b/docs/submodules/music.git
index ced536d..d99c6d9 160000 (submodule)
--- a/docs/submodules/music.git
+++ b/docs/submodules/music.git
@@ -1 +1 @@
-Subproject commit ced536da6f83f8ab0978411877c86acf12006382
+Subproject commit d99c6d9edac3ac8b5e9ba7284fbc65f40f02b97d

diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git
index 9f66ece..f69c491 160000 (submodule)
--- a/docs/submodules/oom.git
+++ b/docs/submodules/oom.git
@@ -1 +1 @@
-Subproject commit 9f66ecee20e4fde39ced729b856e68af1ab31bb6
+Subproject commit f69c491ed06b017fe439ff8ff48ac896e93d0f52

diff --git a/docs/submodules/oom/offline-installer.git b/docs/submodules/oom/offline-installer.git
index 12e752b..add0093 160000 (submodule)
--- a/docs/submodules/oom/offline-installer.git
+++ b/docs/submodules/oom/offline-installer.git
@@ -1 +1 @@
-Subproject commit 12e752ba35476f48b0253b1dd2a8a1ebe020da0e
+Subproject commit add0093a314f7d9a6b91b57004d44ce21a98f64e

diff --git a/docs/submodules/optf/has.git b/docs/submodules/optf/has.git
index f42e4ce..e115e18 160000 (submodule)
--- a/docs/submodules/optf/has.git
+++ b/docs/submodules/optf/has.git
@@ -1 +1 @@
-Subproject commit f42e4ce17b9ea2d5ff77b116a5510d751dd54131
+Subproject commit e115e18c5326576f2d5636eb253c4ed2cc5781fe

diff --git a/docs/submodules/optf/osdf.git b/docs/submodules/optf/osdf.git
index 6818ed3..d4a0085 160000 (submodule)
--- a/docs/submodules/optf/osdf.git
+++ b/docs/submodules/optf/osdf.git
@@ -1 +1 @@
-Subproject commit 6818ed34f11989ea133f2f872056aa60bffe604b
+Subproject commit d4a0085a8f75c62912d19613459ad1bc3dce3e73

diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git
index addcca2..663156e 160000 (submodule)
--- a/docs/submodules/policy/engine.git
+++ b/docs/submodules/policy/engine.git
@@ -1 +1 @@
-Subproject commit addcca22d6243a4904df9d20c1467c31c764eaaa
+Subproject commit 663156eea876121cecc341e642100d11c1e20f9e

diff --git a/docs/submodules/policy/parent.git b/docs/submodules/policy/parent.git
index f17e306..afa8f83 160000 (submodule)
--- a/docs/submodules/policy/parent.git
+++ b/docs/submodules/policy/parent.git
@@ -1 +1 @@
-Subproject commit f17e30686cc8d09db568e1c581d8b4b2924fa39f
+Subproject commit afa8f83e956647dff10134cc3575e8e8173061c9

diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git
index 3cd8582..328da2e 160000 (submodule)
--- a/docs/submodules/portal.git
+++ b/docs/submodules/portal.git
@@ -1 +1 @@
-Subproject commit 3cd858263d731f456a31051a51d915b55403377c
+Subproject commit 328da2e4cf0c4155a4d29718cb5f57628d7a5277

diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
index 550d742..79ec043 160000 (submodule)
--- a/docs/submodules/sdc.git
+++ b/docs/submodules/sdc.git
@@ -1 +1 @@
-Subproject commit 550d742c66b6eb3813e4574a2583c9659bea0aa0
+Subproject commit 79ec04301a726e8c48f1275877cb852d2d74adc0

diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git
index 2caba46..cfddfad 160000 (submodule)
--- a/docs/submodules/sdnc/oam.git
+++ b/docs/submodules/sdnc/oam.git
@@ -1 +1 @@
-Subproject commit 2caba46b0ee035f703585904a2ade401e048784d
+Subproject commit cfddfad6cdbe087a0b75c5df73cf059dbe2d700f

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index 39315bf..761567e 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit 39315bf63770c66718e629d268c4f67183bcf17b
+Subproject commit 761567ec1de6e322c419f47f00a66a691f58a7af

diff --git a/docs/submodules/so/libs.git b/docs/submodules/so/libs.git
index d379bff..b5b101b 160000 (submodule)
--- a/docs/submodules/so/libs.git
+++ b/docs/submodules/so/libs.git
@@ -1 +1 @@
-Subproject commit d379bffefe7acf79d4aff05967cb754e61619eac
+Subproject commit b5b101b0c0cb8b914aeadaae55fb34a800e02db5

diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git
index 95b95b8..5da7091 160000 (submodule)
--- a/docs/submodules/usecase-ui.git
+++ b/docs/submodules/usecase-ui.git
@@ -1 +1 @@
-Subproject commit 95b95b80d566be8f995dd0c9673202933037d072
+Subproject commit 5da70916a3eb0295daf5e715b3ee69aa082e41ad

diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git
index c186495..551f3ad 160000 (submodule)
--- a/docs/submodules/vfc/nfvo/lcm.git
+++ b/docs/submodules/vfc/nfvo/lcm.git
@@ -1 +1 @@
-Subproject commit c186495de0d47d1d9bc2f3d957633f31275f51b7
+Subproject commit 551f3ad639cf9f705905e57f11465428b0eca59c

diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git
index 20f99e5..87be3e5 160000 (submodule)
--- a/docs/submodules/vid.git
+++ b/docs/submodules/vid.git
@@ -1 +1 @@
-Subproject commit 20f99e58b7db96c4f467ac4f7ccc0bc2a1db03ee
+Subproject commit 87be3e57618838a5284303759c5ec432a319c5c6

diff --git a/docs/templates/sections/release-notes.rst b/docs/templates/sections/release-notes.rst
index 238b70b..980d59a 100644 (file)
--- a/docs/templates/sections/release-notes.rst
+++ b/docs/templates/sections/release-notes.rst
@@ -1,4 +1,5 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. This work is licensed under a Creative Commons Attribution 4.0
+   International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) ONAP Project and its contributors
 
@@ -6,6 +7,13 @@
 <project> Release Notes
 ***********************
 
+.. note::
+   * The release note needs to be updated for each ONAP release
+   * Except the section "Release data" all other sections are optional and should be
+     applied where applicable
+   * Only the current release is to be documented in this document
+   * This note needs to be removed before publishing the final result
+
 Abstract
 ========
 
@@ -14,25 +22,26 @@ This document provides the release notes for the ``<releasename>`` release.
 Summary
 =======
 
-<Give a high level description of your project with regards to this specific release>
+<Give a high level description of your project with regards to this
+specific release>
 
 
 Release Data
 ============
 
 +--------------------------------------+--------------------------------------+
-| **Project**                          |                                      |
+| **Project**                          | <project name>                       |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Docker images**                    | make sure you include all docker     |
+| **Docker images**                    |  make sure you include all docker    |
 |                                      |  images including the                |
 |                                      |  release version                     |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              |                                      |
+| **Release designation**              | <release name followed by version>   |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     |                                      |
+| **Release date**                     | <DD/MM/YYYY>                         |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -41,6 +50,15 @@ New features
 
 <Describe new features or other new additions>
 
+**Bug fixes**
+
+- `CIMAN-65 <https://jira.onap.org/browse/CIMAN-65>`_ and a sentence explaining
+  what this defect is addressing.
+
+**Known Issues**
+
+- `CIMAN-65 <https://jira.onap.org/browse/CIMAN-65>`_ and two to three sentences
+  explaining what this issue is.
 
 Deliverables
 ------------
@@ -59,18 +77,34 @@ Known Limitations, Issues and Workarounds
 System Limitations
 ------------------
 
+Any known system limitations.
+
 
 Known Vulnerabilities
 ---------------------
 
+Results of know vulnerabilities analysis in used modules.
+
 
 Workarounds
 -----------
 
+Any known workarounds.
+
 
 Security Notes
 --------------
 
+**Fixed Security Issues**
+
+List of security issues fixed in this release including CVEs and OJSI
+tickets.
+
+**Known Security Issues**
+
+List of new security issues that are left unfixed in this release including
+CVEs and OJSI tickets.
+
 
 Test Results
 ============

diff --git a/tools/warnstats.sh b/tools/warnstats.sh
index 338898a..675884c 100755 (executable)
--- a/tools/warnstats.sh
+++ b/tools/warnstats.sh
@@ -33,6 +33,7 @@
 ###
 ### CHANGELOG (LATEST ON TOP)
 ###
+### 1.6.1 (2020-04-21) - fixed a problem with duplicates in rst filenames
 ### 1.6.0 (2020-04-03) - extended detection of docs pathes in case they are not
 ###                      below the submodules directory
 ### 1.5.0 (2020-03-23) - doc8 test now executed for every rst file. result is
@@ -47,10 +48,10 @@
 ###                      no real onap projects/modules but directories which
 ###                      contain additional documentation in rst format).
 ### 1.3.1 (2020-03-10) - fixed minor typo in usage message
-### 1.3.0 (2020-03-09) - initial release
+### 1.3.0 (2020-03-09) - initially released to the community
 ###
 
-script_version="1.6.0 (2020-04-03)"
+script_version="1.6.1 (2020-04-21)"
 doc8_dir=$(pwd)/doc8_results
 logfile=$1;
 doc8_command="doc8 --verbose"; #add options if required
@@ -217,7 +218,8 @@ do
 
     # extract rst file name from line and do some formatting to use it later as an array name
     #echo "DBUG line: $line";
-    rstfile=$(echo "$line" | grep -oP "[\w -]*\.rst");
+    rstfile=$(echo "$line" | sed -r 's:, other instance in.*::');
+    rstfile=$(echo -e "${rstfile}" | grep -oP "[\w -]*\.rst");
     rstfile=$(echo -e ${rstfile} | tr '[:blank:]' '_');
     #echo "DBUG rst-file: $rstfile";