Update docs OAM architecture diagram

in addtion some editorial changes were made
and the doc framework was updated and meanwhile
broken links corrected.

IssueID: OAM-171
Change-Id: Ib72a5d9c4781c6725470705b40908ed90ab365fb
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>
diff --git a/.gitignore b/.gitignore
index 803ce49..e8588c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,7 @@
 .settings/
 target-ide/
 release.properties
-.vsCode
+.vscode
 
 # data models in scp/oam/modeling
 *.yang
diff --git a/docs/abbreviations.rst b/docs/abbreviations.rst
index bcdc719..d0b45e9 100644
--- a/docs/abbreviations.rst
+++ b/docs/abbreviations.rst
@@ -7,346 +7,518 @@
 
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | **Abbreviation** | **Description**                                                                                                                                                              |
-+==================+==============================================================================================================================================================================+
+|                  |                                                                                                                                                                              |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | AAF              | `Application Authorization Framework <https://wiki.onap.org/display/DW/Application+Authorization+Framework+Project>`__                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | A&AI             | `Active & Available Inventory <https://wiki.onap.org/display/DW/Active+and+Available+Inventory+Project>`__                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | AAA              | `Authentication,Authorization and Accounting <https://en.wikipedia.org/wiki/AAA_(computer_security)>`__                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | AID              | Architecture Integration Document                                                                                                                                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | APPC             | `ApplicationController <https://wiki.onap.org/display/DW/Application+Controller+Project>`__                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | BPEL             | Business Process Execution Language                                                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | BPMN             | `Business Process Model and Notation or Business Process Management Notation <https://en.wikipedia.org/wiki/Business_Process_Model_and_Notation>`__                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | BRMS             | Business Rules Management System                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | BSS              | Business Support System                                                                                                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CCSDK            | Common Controller SDK project                                                                                                                                                |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CDAP             | `Cask Data Application Platform <https://cdap.io/>`__                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CDS              | Controller Design Studio                                                                                                                                                     |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CI/CD            | Continuous Integration / Continuous Delivery                                                                                                                                 |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CL               | Control Loop                                                                                                                                                                 |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CLAMP            | Closed Loop Automation Management Platform (project)                                                                                                                         |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CLI              | `Command Line Interface (project) <https://wiki.onap.org/display/DW/Command+Line+Interface+Project>`__                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CMA              | Change Management Application (within ONAP)                                                                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CNF              | Cloud Native network Function.                                                                                                                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | COE              | Container Orchestration Engine                                                                                                                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CPE              | Customer Premise Equipment                                                                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | CSAR             | `Cloud Service ARchive (link) <http://openbaton.github.io/documentation/tosca-CSAR-onboarding/>`__                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DAO              | `Data Access Object <https://en.wikipedia.org/wiki/Data_access_object>`__                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DCAE             | `Data Collection Analytics & Events <https://wiki.onap.org/pages/viewpage.action?pageId=6592895>`__                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DDoS             | Distributed Denial-of-Service attack                                                                                                                                         |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DG               | Directed Graph                                                                                                                                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DG Builder       | Directed Graph Builder                                                                                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DMaaP            | `Data Movement as a Platform <https://wiki.onap.org/display/DW/DMaaP>`__                                                                                                     |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DME              | `Direct Messaging Engine (common service within ONAP) <https://wiki.onap.org/display/DW/Common+Services>`__                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DNS              | Domain Name System                                                                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | DPDK             | Data Plane Development Kit                                                                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | EELF             | `Event and Error-Logging Framework <https://wiki.onap.org/display/DW/Common+Services>`__                                                                                     |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | EMS              | `Element Management System <https://en.wikipedia.org/wiki/Element_management_system>`__                                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ESR              | `External System Register <https://wiki.onap.org/pages/viewpage.action?pageId=5734948>`__                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ETSI             | `European Telecommunications Standards Institute <http://www.etsi.org/technologies-clusters/technologies/689-network-functions-virtualisation>`__                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | EUAG             | `ONAP End User Advisory Group <https://wiki.lfnetworking.org/pages/viewpage.action?pageId=2916362>`__                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | FCAPS            | Fault Configuration Accounting Performance Security                                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | GBP              | `Group-Based Policy <https://wiki.openstack.org/wiki/GroupBasedPolicy>`__                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| GNFC             | `Generic Network Function Controller <https://wiki.onap.org/download/attachments/45300148/ONAP_GNF_ControllersSOL003.pptx?version=1&modificationDate=1548619943000&api=v2>`__ |
+| GNFC             | `Generic Network Function Controller <https://wiki.onap.org/download/attachments/45300148/ONAP_GNF_ControllersSOL003.pptx?version=1&modificationDate=1548619943000&api=v2>`__|
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | GUI              | `Graphical User Interface <https://en.wikipedia.org/wiki/Graphical_user_interface>`__                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | HAS              | `Homing and Allocation Service <https://wiki.onap.org/pages/viewpage.action?pageId=16005528>`__                                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | HDFS             | Hadoop Distributed File System                                                                                                                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | HPA              | Hardware Platform Awareness                                                                                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| HTTP             | HyperText Transfer Protocol                                                                                                                                                |
+| HTTP             | HyperText Transfer Protocol                                                                                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | HV VES           | `High Volume Virtual function Event Stream <https://wiki.onap.org/display/DW/High+Volume+VES+Collector>`__                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | IAM/IDAM         | Identity and Access Management                                                                                                                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ICE              | Incubation and Certification Environment                                                                                                                                     |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | IDS              | `Intrusion Detection System <https://en.wikipedia.org/wiki/Intrusion_detection_system>`__                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | IETF             | `Internet Engineering Task Force <http://www.ietf.org>`__                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | IKE              | `Internet Key Exchange <https://en.wikipedia.org/wiki/Internet_Key_Exchange>`__                                                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | IPS              | `Intrusion Prevention System <https://en.wikipedia.org/wiki/Intrusion_detection_system>`__                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | IPSEC            | `Internet Protocol Security <https://en.wikipedia.org/wiki/IPsec>`__                                                                                                         |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | JAR              | `Java Archive <https://en.wikipedia.org/wiki/JAR_(file_format)>`__                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | JSC              | `Java Service Container <https://wiki.onap.org/display/DW/Common+Services>`__                                                                                                |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | JSON             | JavaScript Object Notation                                                                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | LCM              | Life Cycle Management                                                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | LFN CVC          | `Linux Foundation Networking Compliance/Verification Committee <https://wiki.onap.org/display/DW/LFN+CVC+Testing+in+VNFSDK>`__                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | LFN CVP          | `Linux Foundation Networking Compliance/Verification Program <https://wiki.onap.org/display/DW/LFN+CVC+Testing+in+VNFSDK>`__                                                 |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | LRM              | Local Resource Monitor                                                                                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | M0               | Release Kick-off milestone. See also Release Lifecycle                                                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | M1               | Release Planning milestone. See also Release Lifecycle                                                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | M2               | Release Functionality Freeze milestone.  See also Release Lifecycle                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | M3               | Release API Freeze milestone.  See also Release Lifecycle                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | M4               | Release Code Freeze milestone.  See also Release Lifecycle                                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MACD             | (Vendor specific) Move Add Change Delete/Disconnect                                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MANO             | MANagement and Organization of NFV                                                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MD-SAL           | Model Driven Service Abstraction Layer                                                                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MR               | Message Router (a Common Service of ONAP)                                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MOP              | Method of Procedure                                                                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MOTS             | Mechanized Operations Tracking System                                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MSB              | Microservice Bus                                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MSO              | `Master Service Orchestrator <https://wiki.onap.org/pages/viewpage.action?pageId=1015834>`__                                                                                 |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | MVP              | `Minimum Viable Product <https://en.wikipedia.org/wiki/Minimum_viable_product>`__                                                                                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NAI              | Network Artificial Intelligence                                                                                                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NANCSP           | Network Cloud Service Provider                                                                                                                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NBI              | North Bound Interface                                                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NEP              | Network Equipment Provider                                                                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NETCONF          | `Network Configuration Protocol <https://en.wikipedia.org/wiki/NETCONF>`__                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NFV              | `Network Function Virtualization <https://en.wikipedia.org/wiki/Network_function_virtualization>`__                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NFVI             | Network Functions Virtualization Infrastructure                                                                                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NOD              | Network On Demand                                                                                                                                                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NS               | Network Services                                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | NS               | (Vendor Specific) New Start                                                                                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | O-CU             | O-RAN Centralized Unit                                                                                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | O-DU             | O-RAN Distributed Unit                                                                                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | O-RAN            | `O-RAN Alliance, Operator Defined Next Generation Radio Access Networks Alliance <https://www.o-ran.org>`__                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | O-RAN-SC         | `O-RAN Software Community <https://o-ran-sc.org>`__                                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | O-RU             | O-RAN Radio Unit                                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OAM              | Operation and Maintenance                                                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OA&M             | Operations, Administration and Management                                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OMF              | Operational Management Framework (of ONAP)                                                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OMSA             | ONAP Microservice Architecture                                                                                                                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ONAP             | `Open Network Automation Platform <https://wiki.onap.org/display/DW/Developer+Wiki>`__                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OOF              | ONAP Optimization Framework                                                                                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ODL              | `OpenDaylight <https://www.opendaylight.org/>`__                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OOM              | `ONAP Operations Manager <https://wiki.onap.org/display/DW/OOM+User+Guide>`__                                                                                                |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OPNFV            | `Open Platform for NFV Project <https://www.opnfv.org>`__                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OSAM             | `Open Source Access Manager <https://wiki.onap.org/display/DW/OpenSource+Access+Manager+%28OSAM%29+Use+Case>`__                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OSC              | O-RAN Software Community or Optical Supervisory Channel                                                                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | OSS              | Operations Support System                                                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PAP              | Policy Administration Point (ONAP)                                                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PCE              | Path Computation and Element (ONAP)                                                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PCI              | Physical Cell ID                                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | pCPE             | physical Customer Premise Equipment                                                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PDP-x            | Policy Decision Point - XACML (ONAP)                                                                                                                                         |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PDP-d            | Policy Decision Point - Drools (ONAP)                                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PO               | Platform Orchestrator                                                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PoC              | Proof of Concept                                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | POMBA            | `Post Orchestration Model Based Audit <https://wiki.onap.org/display/DW/POMBA>`__                                                                                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PNDA             | `Open source Platform for Network Data Analytics <https://wiki.onap.org/display/DW/Integrating+PNDA>`__                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | PNF              | Physical Network Function                                                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | RCA              | Root Cause Analysis                                                                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | RCT              | Reference Connection Tool                                                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | REST             | `Representational State Transfer <https://en.wikipedia.org/wiki/Representational_state_transfer>`__                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | RESTCONF         | A protocol based on HTTP for configuring data defined in YANG                                                                                                                |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | RO               | Resource Orchestrator                                                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | RPC              | Remote Procedure Call                                                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | S3P              | `Stability, Security, Scalability, Performance <https://wiki.onap.org/pages/viewpage.action?pageId=16003367>`__                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SDC              | Service Design and Creation (component of ONAP for visual modeling and design)                                                                                               |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SDN              | `Software-defined networking <https://en.wikipedia.org/wiki/Software-defined_networking>`__                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SDN-C            | `SDN-Controller <https://wiki.onap.org/display/DW/SDN+Controller+Development+Guide>`__                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SDN-R            | `SDN-Radio <https://wiki.onap.org/display/DW/SDN-R>` __                                                                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SDN-GP           | Software Defined Network - Global Platform                                                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SEBA             | SDN-Enabled Broadband Access, see also                                                                                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SLA              | Service Level Agreement                                                                                                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SLI              | Service Logic Interpreter                                                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SME              | Subject Matter Expert                                                                                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SMTP             | Simple Mail Transfer Protocol                                                                                                                                                |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SNMP             | Simple Network Management Protocol                                                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SO               | `Service Orchestrator (project) <https://wiki.onap.org/display/DW/Service+Orchestrator+Project>`__                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SOT              | Source Of Truth                                                                                                                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SR-IOV           | `Single-Root Input/Output Virtualization <https://en.wikipedia.org/wiki/Single-root_input/output_virtualization>`__                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SSL              | `Secure Sockets Layer <https://en.wikipedia.org/wiki/Transport_Layer_Security>`__                                                                                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | SUPP             | (Vendor Specific) short for supplement, changing a connection before activation                                                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Swagger          | legacy name for the OpenAPI Specification                                                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | TCP              | Transmission Control Protocol                                                                                                                                                |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | TEM              | Telecom Electronics Manufacturer                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | TLS              | `Transport Layer Security <https://en.wikipedia.org/wiki/Transport_Layer_Security>`__                                                                                        |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | TOSCA            | `Topology and Orchestration Specification for Cloud Applications <https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=tosca>`__                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | TPS              | Transactions Per Second                                                                                                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | TSC              | Technical Steering Committee                                                                                                                                                 |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| U-UI             | `Use case User Interface <https://wiki.onap.org/display/DW/Usecase+UI+Project>`__                                                                                             |
+| U-UI             | `Use case User Interface <https://wiki.onap.org/display/DW/Usecase+UI+Project>`__                                                                                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | UI               | `User Interface <https://en.wikipedia.org/wiki/User_interface>`__                                                                                                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | UX               | `User Experience <https://en.wikipedia.org/wiki/User_experience>`__                                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | vCE              | virtual CE (Customer Edge) router (an example VNF)                                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | vCPE             | Virtual Customer Premise Equipment                                                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | vDNS             | Virtual Domain Name Server (an example VNF)                                                                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VDU              | `Virtualization Deployment Unit <https://wiki.onap.org/display/DW/Comparison+of+Current+R3+Clean+Version+with+IFA011+v2.5.1>`__                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VES              | `Virtual function Event Stream <https://wiki.opnfv.org/download/attachments/6819329/OPNVF%20VES.pptx?version=4&modificationDate=1466395653000&api=v2>`__                     |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | vF               | Virtual Firewall (an example VNF)                                                                                                                                            |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VF               | Virtual Function                                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VFC              | `Virtual Function Controller <https://wiki.onap.org/display/DW/Virtual+Function+Controller+Project>`__                                                                       |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VFC              | Virtual Function Component (Resource Onboarding)                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | vfModule         | Virtual Function Module                                                                                                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VID              | Virtual Instantiation Deployment                                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VID              | `Virtual Infrastructure Deployment (Project) <https://wiki.onap.org/display/DW/Virtual+Infrastructure+Deployment+Project>`__                                                 |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VIM              | Virtualized Infrastructure Manager                                                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VLAN             | Virtual Local Area Network                                                                                                                                                   |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VM               | Virtual Machine                                                                                                                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VNF              | `Virtual Network Function <http://searchsdn.techtarget.com/definition/virtual-network-functions>`__                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VNFC             | Virtual Network Function Component                                                                                                                                           |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VNFD             | `VNF Descriptor <https://wiki.onap.org/pages/viewpage.action?pageId=8226059>`__                                                                                              |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VNFM             | VNF Manager                                                                                                                                                                  |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VNO              | Virtual Network Operator                                                                                                                                                     |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | vPE              | virtual PE (Provider Edge) router (an example of a VNF)                                                                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VPP              | `Vector Packet Processing <https://wiki.fd.io/view/VPP/What_is_VPP%3F>`__                                                                                                    |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VSP              | Vendor Software Product (from SDC Demo Guide)                                                                                                                                |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VTP              | `VNF Test Platform <https://wiki.onap.org/pages/viewpage.action?pageId=43386304>`__                                                                                          |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | VVP              | `VNF Validation Program <https://wiki.onap.org/display/DW/VNF+Validation+Program+Project>`__                                                                                 |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | WAR              | `Web application Archive <https://en.wikipedia.org/wiki/WAR_(file_format)>`__                                                                                                |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | xNF              | The combination of PNF and VNF; Network Function                                                                                                                             |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | YANG             | Yet Another Next Generation - a Data Modeling Language for the Network Configuration Protocol (NETCONF)                                                                      |
+|                  |                                                                                                                                                                              |
 +------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/connect.rst b/docs/connect.rst
index c93c1f9..7572fb9 100644
--- a/docs/connect.rst
+++ b/docs/connect.rst
@@ -34,8 +34,8 @@
 By right-clicking on an element, an action menu opens. The menu allows
 to mount, unmount, view the details, edit and remove the element.
 Additionally, it links to several applications like
-`Fault <../pnfFault/README.md>`__ and
-`Configure <../pnfConfig/README.md>`__, which will be filtered to
+`Fault <fault.rst>`__ and
+`Configure <config.rst>`__, which will be filtered to
 display information relevant to the selected element.
 
 Connection Status Log
diff --git a/docs/index.rst b/docs/index.rst
index 3ce7271..a7339a6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,10 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. SPDX-License-Identifier: CC-BY-4.0
-.. Copyright (C) 2019 highstreet technologies and others
-
-.. _oam:
-
-.. OAM Operation and Maintenance master
+.. Copyright (C) 2021 highstreet technologies and others
 
 OAM Operation and Maintenance
 =============================
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 28c2ace..8f19a85 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -20,7 +20,7 @@
 * Create helm deployment for SMO
 * Feature split for starting devicemanagers
 * Seed coder for an YANG linter
-* Please see also Release Notes of `ONAP SDNC <https://onap-doc.readthedocs.io/projects/onap-sdnc-oam/en/frankfurt/release-notes.html#release-notes>`_ and `ONAP OOM <https://onap-doc.readthedocs.io/projects/onap-oom/en/frankfurt/release-notes.html#release-notes>`_
+* Please see also Release Notes of `ONAP SDNC, DCAE, DMaaP, OOM <https://onap-doc.readthedocs.io/en/frankfurt/release/index.html>`_
 
 Version 2.0.3, 2020-04-08
 -------------------------
diff --git a/docs/sdnr_Docker_Image_configuration.rst b/docs/sdnr_Docker_Image_configuration.rst
index 4a02088..2c3c795 100644
--- a/docs/sdnr_Docker_Image_configuration.rst
+++ b/docs/sdnr_Docker_Image_configuration.rst
@@ -46,7 +46,7 @@
 |                  |                     |                                                                                                                         |
 |                  |                     | Devicemanager configuration is provided via *$ODL\_HOME/etc/devicemanager.properties*                                   |
 |                  |                     |                                                                                                                         |
-|                  |                     | See  `SDN-R WT Service Configuration parameters <sdnr_WT_Service_Configuration_parameters.html>`__			   |
+|                  |                     | See  `SDN-R WT Service Configuration parameters <sdnr_WT_Service_Configuration_parameters.rst>`__			   |
 +------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------+
 | SDNRNORTHBOUND   | true\|\ **false**   | Set true to activate sdnr oofpci service.                                                                               |
 +------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/sdnr_WT_Service_Configuration_parameters.rst b/docs/sdnr_WT_Service_Configuration_parameters.rst
index a27e511..779aa2f 100644
--- a/docs/sdnr_WT_Service_Configuration_parameters.rst
+++ b/docs/sdnr_WT_Service_Configuration_parameters.rst
@@ -14,7 +14,7 @@
    -  `devicemonitor <#SDN-RWTServiceConfigurationparameters-d>`__
 
 Backgrounds regarding the container inter structure is described
-in \ `SDN-R Docker Image configuration <sdnr_Docker_Image_configuration.html>`__.
+in \ `SDN-R Docker Image configuration <sdnr_Docker_Image_configuration.rst>`__.
 
 The configuration information of sdnr wireless transport parameters are
 in a single file.