Cherry pick beijing improvements to master

Replicating changes made when finalizing Beijing branch
in the doc master branch.

Change-Id: Ib1da658aef8cb84f896c6abac23631579ec0b80c
Issue-ID: DOC-280
Signed-off-by: Rich Bennett <rb2745@att.com>

1 files changed, 62 insertions, 38 deletions

diff --git a/docs/release/releaserepos.rst b/docs/release/releaserepos.rst
index 71a163073..4b4586d49 100644
--- a/docs/release/releaserepos.rst
+++ b/docs/release/releaserepos.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
 .. Copyright 2017 AT&T Intellectual Property.  All rights reserved.
 
@@ -7,7 +8,8 @@
 
 Project Specific Release Notes
 ++++++++++++++++++++++++++++++
-Each project is listed below followed by the Gerrit repositories in which there are release notes.
+Each project is listed below followed by the Gerrit repositories in which
+there are release notes.
 
 Active and Available Inventory
 ------------------------------
@@ -16,7 +18,16 @@ Active and Available Inventory
    :maxdepth: 1
    :titlesonly:
 
-   aai/aai-common<../submodules/aai/aai-common.git/docs/release-notes.rst>
+   aai<../submodules/aai/aai-common.git/docs/release-notes.rst>
+
+Application Authorization Framework
+-----------------------------------
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   aaf<../submodules/aaf/authz.git/docs/sections/release-notes.rst>
 
 Application Controller
 ----------------------
@@ -34,26 +45,26 @@ Common Controller Software Development Kit
    :maxdepth: 1
    :titlesonly:
 
-   ccsdk/distribution<../submodules/ccsdk/distribution.git/docs/release-notes.rst>
-   ccsdk/platform/plugins<../submodules/ccsdk/platform/plugins.git/docs/release-notes.rst>
+   ccsdk<../submodules/ccsdk/distribution.git/docs/release-notes.rst>
 
-Closed Loop Automation Platform
--------------------------------
+Command Line Interface
+----------------------
 
 .. toctree::
    :maxdepth: 1
    :titlesonly:
 
-   clamp<../submodules/clamp.git/docs/release-notes.rst>
+   cli<../submodules/cli.git/docs/release-notes.rst>
 
-ONAP Command Line Interface
----------------------------
+Closed Loop Automation Platform
+-------------------------------
 
 .. toctree::
    :maxdepth: 1
    :titlesonly:
 
-   cli<../submodules/cli.git/docs/release-notes.rst>
+   clamp<../submodules/clamp.git/docs/release-notes.rst>
+
 
 Data Collection, Analysis, and Events
 -------------------------------------
@@ -80,10 +91,10 @@ Data Management as a Platform Message Router
    :maxdepth: 1
    :titlesonly:
 
-   dmaap/messagerouter/messageservice<../submodules/dmaap/messagerouter/messageservice.git/docs/release-notes/release-notes.rst>
+   dmaap<../submodules/dmaap/messagerouter/messageservice.git/docs/release-notes/release-notes.rst>
 
 External API / NBI
-------
+------------------
 
 .. toctree::
    :maxdepth: 1
@@ -98,10 +109,19 @@ Holmes
    :maxdepth: 1
    :titlesonly:
 
-   holmes/rule-management<../submodules/holmes/rule-management.git/docs/release-notes.rst>
+   holmes<../submodules/holmes/rule-management.git/docs/release-notes.rst>
 
-Logging Enhancements Project
-----------------------------
+Integration
+-----------
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   integration<../submodules/integration.git/docs/release-notes.rst>
+
+Logging Analytics
+-----------------
 
 .. toctree::
    :maxdepth: 1
@@ -126,7 +146,7 @@ Micro Services Bus
    :maxdepth: 1
    :titlesonly:
 
-   msb/apigateway<../submodules/msb/apigateway.git/docs/release-notes.rst>
+   msb<../submodules/msb/apigateway.git/docs/release-notes.rst>
 
 MultiVIM Cloud
 --------------
@@ -146,15 +166,23 @@ Music
 
    music<../submodules/music.git/docs/release-notes.rst>
 
-
-ONAP Operations Manager (experimental)
---------------------------------------
+ONAP Operations Manager
+-----------------------
 
 .. toctree::
    :maxdepth: 2
    :titlesonly:
 
-   OOM<../submodules/oom.git/docs/release-notes.rst>
+   oom<../submodules/oom.git/docs/release-notes.rst>
+
+Optimization Framework
+----------------------
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   optf<../submodules/optf/osdf.git/docs/sections/release-notes.rst>
 
 Policy Framework
 ----------------
@@ -163,7 +191,7 @@ Policy Framework
    :maxdepth: 1
    :titlesonly:
 
-   policy/engine<../submodules/policy/engine.git/docs/release-notes.rst>
+   policy<../submodules/policy/engine.git/docs/release-notes.rst>
 
 Portal Platform
 ---------------
@@ -182,29 +210,27 @@ Service Design & Creation
    :titlesonly:
 
    sdc<../submodules/sdc.git/docs/release-notes.rst>
-   sdc/sdc-workflow-designer<../submodules/sdc/sdc-workflow-designer.git/docs/release-notes.rst>
 
-Software Defined Network Controller
------------------------------------
+Service Orchestration
+---------------------
 
 .. toctree::
    :maxdepth: 1
    :titlesonly:
 
-   sdnc/oam<../submodules/sdnc/oam.git/docs/release-notes.rst>
+   so<../submodules/so.git/docs/release-notes.rst>
 
-Service Orchestration
----------------------
+Software Defined Network Controller
+-----------------------------------
 
 .. toctree::
    :maxdepth: 1
    :titlesonly:
 
-   so<../submodules/so.git/docs/release-notes.rst>
-   so/libs<../submodules/so/libs.git/docs/release-notes.rst>
+   sdnc<../submodules/sdnc/oam.git/docs/release-notes.rst>
 
-ONAP Use Case User Interface
-----------------------------
+Use Case User Interface
+-----------------------
 
 .. toctree::
    :maxdepth: 1
@@ -219,7 +245,7 @@ Virtual Function Controller
    :maxdepth: 1
    :titlesonly:
 
-   vfc/nfvo/lcm<../submodules/vfc/nfvo/lcm.git/docs/release-notes.rst>
+   vfc<../submodules/vfc/nfvo/lcm.git/docs/release-notes.rst>
 
 Virtual Infrastructure Deployment
 ---------------------------------
@@ -237,9 +263,7 @@ VNF Requirements
    :maxdepth: 1
    :titlesonly:
 
-   vnfrqts/requirements<../submodules/vnfrqts/requirements.git/docs/release-notes.rst>
-   vnfrqts/testcases<../submodules/vnfrqts/testcases.git/docs/release-notes.rst>
-   vnfrqts/usecases<../submodules/vnfrqts/usecases.git/docs/release-notes.rst>
+   vnfrqts<../submodules/vnfrqts/requirements.git/docs/release-notes.rst>
 
 VNF Software Development Kit
 ----------------------------
@@ -248,7 +272,7 @@ VNF Software Development Kit
    :maxdepth: 1
    :titlesonly:
 
-   vnfsdk/model<../submodules/vnfsdk/model.git/docs/release-notes.rst>
+   vnfsdk<../submodules/vnfsdk/model.git/docs/release-notes.rst>
 
 VNF Validation Project
 ----------------------
@@ -256,7 +280,7 @@ VNF Validation Project
    :maxdepth: 1
    :titlesonly:
 
-   vvp/documentation<../submodules/vvp/documentation.git/docs/release-notes.rst>
+   vvp<../submodules/vvp/documentation.git/docs/release-notes.rst>
 
 
 .. Not in / not used this release