diff --git a/docs/conf.py b/docs/conf.py
index 8f40e8b..3b28eb7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,4 +12,4 @@
 html_last_updated_fmt = '%d-%b-%y %H:%M'
 
 def setup(app):
-    app.add_stylesheet("css/ribbon_onap.css")
+    app.add_css_file("css/ribbon_onap.css")
diff --git a/docs/guides/onap-user/abbreviations.rst b/docs/guides/onap-user/abbreviations.rst
index 50ee3c2..d68cdf8 100644
--- a/docs/guides/onap-user/abbreviations.rst
+++ b/docs/guides/onap-user/abbreviations.rst
@@ -5,880 +5,342 @@
 Abbreviations
 =============
 
-+-------------------+-------------------+
-| **Abbreviation**  | **Description**   |
-+===================+===================+
-| AAF               | `Application      |
-|                   | Authorization     |
-|                   | Framework <https: |
-|                   | //wiki.onap.org/d |
-|                   | isplay/DW/Applica |
-|                   | tion+Authorizatio |
-|                   | n+Framework+Proje |
-|                   | ct>`__            |
-+-------------------+-------------------+
-| A&AI              | `Active &         |
-|                   | Available         |
-|                   | Inventory <https: |
-|                   | //wiki.onap.org/d |
-|                   | isplay/DW/Active+ |
-|                   | and+Available+Inv |
-|                   | entory+Project>`_ |
-|                   | _                 |
-+-------------------+-------------------+
-| AAA               | `Authentication,  |
-|                   | Authorization and |
-|                   | Accounting <https |
-|                   | ://en.wikipedia.o |
-|                   | rg/wiki/AAA_(comp |
-|                   | uter_security)>`_ |
-|                   | _                 |
-+-------------------+-------------------+
-| AID               | Architecture      |
-|                   | Integration       |
-|                   | Document          |
-+-------------------+-------------------+
-| APPC              | `Application      |
-|                   | Controller <https |
-|                   | ://wiki.onap.org/ |
-|                   | display/DW/Applic |
-|                   | ation+Controller+ |
-|                   | Project>`__       |
-+-------------------+-------------------+
-| BPEL              | Business Process  |
-|                   | Execution         |
-|                   | Language          |
-+-------------------+-------------------+
-| BPMN              | `Business Process |
-|                   | Model and         |
-|                   | Notation or       |
-|                   | Business Process  |
-|                   | Management        |
-|                   | Notation <https:/ |
-|                   | /en.wikipedia.org |
-|                   | /wiki/Business_Pr |
-|                   | ocess_Model_and_N |
-|                   | otation>`__       |
-+-------------------+-------------------+
-| 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/d |
-|                   | isplay/DW/Command |
-|                   | +Line+Interface+P |
-|                   | roject>`__        |
-+-------------------+-------------------+
-| 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://op |
-|                   | enbaton.github.io |
-|                   | /documentation/to |
-|                   | sca-CSAR-onboardi |
-|                   | ng/>`__           |
-+-------------------+-------------------+
-| DAO               | `Data Access      |
-|                   | Object <https://e |
-|                   | n.wikipedia.org/w |
-|                   | iki/Data_access_o |
-|                   | bject>`__         |
-+-------------------+-------------------+
-| DCAE              | `Data Collection  |
-|                   | Analytics &       |
-|                   | Events <https://w |
-|                   | iki.onap.org/page |
-|                   | s/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/di |
-|                   | splay/DW/DMaaP>`_ |
-|                   | _                 |
-+-------------------+-------------------+
-| DME               | `Direct Messaging |
-|                   | Engine (common    |
-|                   | service within    |
-|                   | ONAP) <https://wi |
-|                   | ki.onap.org/displ |
-|                   | ay/DW/Common+Serv |
-|                   | ices>`__          |
-+-------------------+-------------------+
-| DNS               | Domain Name       |
-|                   | System            |
-+-------------------+-------------------+
-| DPDK              | Data Plane        |
-|                   | Development Kit   |
-+-------------------+-------------------+
-| EELF              | `Event and        |
-|                   | Error-Logging     |
-|                   | Framework <https: |
-|                   | //wiki.onap.org/d |
-|                   | isplay/DW/Common+ |
-|                   | Services>`__      |
-+-------------------+-------------------+
-| EMS               | `Element          |
-|                   | Management        |
-|                   | System <https://e |
-|                   | n.wikipedia.org/w |
-|                   | iki/Element_manag |
-|                   | ement_system>`__  |
-+-------------------+-------------------+
-| ESR               | `External System  |
-|                   | Register <https:/ |
-|                   | /wiki.onap.org/pa |
-|                   | ges/viewpage.acti |
-|                   | on?pageId=5734948 |
-|                   | >`__              |
-+-------------------+-------------------+
-| ETSI              | `European         |
-|                   | Telecommunication |
-|                   | s                 |
-|                   | Standards         |
-|                   | Institute <http:/ |
-|                   | /www.etsi.org/tec |
-|                   | hnologies-cluster |
-|                   | s/technologies/68 |
-|                   | 9-network-functio |
-|                   | ns-virtualisation |
-|                   | >`__              |
-+-------------------+-------------------+
-| EUAG              | `ONAP End User    |
-|                   | Advisory          |
-|                   | Group <https://wi |
-|                   | ki.lfnetworking.o |
-|                   | rg/pages/viewpage |
-|                   | .action?pageId=29 |
-|                   | 16362>`__         |
-+-------------------+-------------------+
-| FCAPS             | Fault             |
-|                   | Configuration     |
-|                   | Accounting        |
-|                   | Performance       |
-|                   | Security          |
-+-------------------+-------------------+
-| GBP               | `Group-Based      |
-|                   | Policy <https://w |
-|                   | iki.openstack.org |
-|                   | /wiki/GroupBasedP |
-|                   | olicy>`__         |
-+-------------------+-------------------+
-| GNFC              | `Genric Network   |
-|                   | Function          |
-|                   | Controller <https |
-|                   | ://wiki.onap.org/ |
-|                   | download/attachme |
-|                   | nts/45300148/ONAP |
-|                   | _GNF_ControllersS |
-|                   | OL003.pptx?versio |
-|                   | n=1&modificationD |
-|                   | ate=1548619943000 |
-|                   | &api=v2>`__       |
-+-------------------+-------------------+
-| GUI               | `Graphical User   |
-|                   | Interface <https: |
-|                   | //en.wikipedia.or |
-|                   | g/wiki/Graphical_ |
-|                   | user_interface>`_ |
-|                   | _                 |
-+-------------------+-------------------+
-| HAS               | `Homing and       |
-|                   | Allocation        |
-|                   | Service <https:// |
-|                   | wiki.onap.org/pag |
-|                   | es/viewpage.actio |
-|                   | n?pageId=16005528 |
-|                   | >`__              |
-+-------------------+-------------------+
-| HDFS              | Hadoop            |
-|                   | Distributed File  |
-|                   | System            |
-+-------------------+-------------------+
-| HPA               | Hardware Platform |
-|                   | Awareness         |
-+-------------------+-------------------+
-| HTTP              | HyperText         |
-|                   | Transfer          |
-|                   | Protococol        |
-+-------------------+-------------------+
-| HV VES            | `High Volume      |
-|                   | Virtual function  |
-|                   | Event             |
-|                   | Stream <https://w |
-|                   | iki.onap.org/disp |
-|                   | lay/DW/High+Volum |
-|                   | e+VES+Collector>` |
-|                   | __                |
-+-------------------+-------------------+
-| IAM/IDAM          | Identity and      |
-|                   | Access Management |
-+-------------------+-------------------+
-| ICE               | Incubation and    |
-|                   | Certification     |
-|                   | Environment       |
-+-------------------+-------------------+
-| IDS               | `Intrusion        |
-|                   | Detection         |
-|                   | System <https://e |
-|                   | n.wikipedia.org/w |
-|                   | iki/Intrusion_det |
-|                   | ection_system>`__ |
-+-------------------+-------------------+
-| IETF              | `Internet         |
-|                   | Engineering Task  |
-|                   | Force <http://www |
-|                   | .ietf.org>`__     |
-+-------------------+-------------------+
-| IKE               | `Internet Key     |
-|                   | Exchange <https:/ |
-|                   | /en.wikipedia.org |
-|                   | /wiki/Internet_Ke |
-|                   | y_Exchange>`__    |
-+-------------------+-------------------+
-| IPS               | `Intrusion        |
-|                   | Prevention        |
-|                   | System <https://e |
-|                   | n.wikipedia.org/w |
-|                   | iki/Intrusion_det |
-|                   | ection_system>`__ |
-+-------------------+-------------------+
-| IPSEC             | `Internet         |
-|                   | Protocol          |
-|                   | Security <https:/ |
-|                   | /en.wikipedia.org |
-|                   | /wiki/IPsec>`__   |
-+-------------------+-------------------+
-| JAR               | `Java             |
-|                   | Archive <https:// |
-|                   | en.wikipedia.org/ |
-|                   | wiki/JAR_(file_fo |
-|                   | rmat)>`__         |
-+-------------------+-------------------+
-| JSC               | `Java Service     |
-|                   | Container <https: |
-|                   | //wiki.onap.org/d |
-|                   | isplay/DW/Common+ |
-|                   | Services>`__      |
-+-------------------+-------------------+
-| JSON              | JavaScript Object |
-|                   | Notation          |
-+-------------------+-------------------+
-| LCM               | Life Cycle        |
-|                   | Management        |
-+-------------------+-------------------+
-| LFN CVC           | `Linux Foundation |
-|                   | Networking        |
-|                   | Compliance/Verifi |
-|                   | cation            |
-|                   | Committee <https: |
-|                   | //wiki.onap.org/d |
-|                   | isplay/DW/LFN+CVC |
-|                   | +Testing+in+VNFSD |
-|                   | K>`__             |
-+-------------------+-------------------+
-| LFN CVP           | `Linux Foundation |
-|                   | Networking        |
-|                   | Compliance/Verifi |
-|                   | cation            |
-|                   | Program <https:// |
-|                   | wiki.onap.org/dis |
-|                   | play/DW/LFN+CVC+T |
-|                   | esting+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 <htt |
-|                   | ps://wiki.onap.or |
-|                   | g/pages/viewpage. |
-|                   | action?pageId=101 |
-|                   | 5834>`__          |
-+-------------------+-------------------+
-| MVP               | `Minimum Viable   |
-|                   | Product <https:// |
-|                   | en.wikipedia.org/ |
-|                   | wiki/Minimum_viab |
-|                   | le_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 <h |
-|                   | ttps://en.wikiped |
-|                   | ia.org/wiki/Netwo |
-|                   | rk_function_virtu |
-|                   | alization>`__     |
-+-------------------+-------------------+
-| NFVI              | `network          |
-|                   | functions         |
-|                   | virtualization    |
-|                   | infrastructure <h |
-|                   | ttps://www.sdxcen |
-|                   | tral.com/nfv/defi |
-|                   | nitions/nfv-mano/ |
-|                   | >`__              |
-+-------------------+-------------------+
-| NOD               | Network On Demand |
-+-------------------+-------------------+
-| NS                | Network Services  |
-+-------------------+-------------------+
-| NS                | (Vendor Specific) |
-|                   | New Start         |
-+-------------------+-------------------+
-| 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>`_ |
-|                   | _                 |
-+-------------------+-------------------+
-| 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/pa |
-|                   | ges/viewpage.acti |
-|                   | on?pageId=1015843 |
-|                   | >`__              |
-+-------------------+-------------------+
-| OOF               | ONAP Optimization |
-|                   | Framework         |
-+-------------------+-------------------+
-| ODL               | `OpenDaylight <ht |
-|                   | tps://www.openday |
-|                   | light.org/>`__    |
-+-------------------+-------------------+
-| OOM               | `ONAP Operations  |
-|                   | Manager <https:// |
-|                   | wiki.onap.org/dis |
-|                   | play/DW/OOM+User+ |
-|                   | Guide>`__         |
-+-------------------+-------------------+
-| OPNFV             | `Open Platform    |
-|                   | for NFV           |
-|                   | Project <https:// |
-|                   | www.sdxcentral.co |
-|                   | m/nfv/definitions |
-|                   | /opnfv/>`__       |
-+-------------------+-------------------+
-| OSAM              | `Open Source      |
-|                   | Access            |
-|                   | Manager <https:// |
-|                   | wiki.onap.org/dis |
-|                   | play/DW/OpenSourc |
-|                   | e+Access+Manager+ |
-|                   | %28OSAM%29+Use+Ca |
-|                   | se>`__            |
-+-------------------+-------------------+
-| 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://wi |
-|                   | ki.onap.org/displ |
-|                   | ay/DW/POMBA>`__   |
-+-------------------+-------------------+
-| PNDA              | `Open source      |
-|                   | Platform for      |
-|                   | Network Data      |
-|                   | Analytics <https: |
-|                   | //wiki.onap.org/d |
-|                   | isplay/DW/Integra |
-|                   | ting+PNDA>`__     |
-+-------------------+-------------------+
-| PNF               | Physical Network  |
-|                   | Function          |
-+-------------------+-------------------+
-| RCA               | Root Cause        |
-|                   | Analysis          |
-+-------------------+-------------------+
-| RCT               | Reference         |
-|                   | Connection Tool   |
-+-------------------+-------------------+
-| REST              | `Representational |
-|                   | State             |
-|                   | Transfer <https:/ |
-|                   | /en.wikipedia.org |
-|                   | /wiki/Representat |
-|                   | ional_state_trans |
-|                   | fer>`__           |
-+-------------------+-------------------+
-| RESTCONF          | A protocol based  |
-|                   | on HTTP for       |
-|                   | configuring data  |
-|                   | defined in YANG   |
-+-------------------+-------------------+
-| RO                | Resource          |
-|                   | Orchestrator      |
-+-------------------+-------------------+
-| RPC               | Remote Procedure  |
-|                   | Call              |
-+-------------------+-------------------+
-| S3P               | `Stability,       |
-|                   | Security,         |
-|                   | Scalability,      |
-|                   | Performance <http |
-|                   | s://wiki.onap.org |
-|                   | /pages/viewpage.a |
-|                   | ction?pageId=1600 |
-|                   | 3367>`__          |
-+-------------------+-------------------+
-| SDC               | Service Design    |
-|                   | and Creation      |
-|                   | (component of     |
-|                   | ONAP for visual   |
-|                   | modeling and      |
-|                   | design)           |
-+-------------------+-------------------+
-| SDN               | `Software-defined |
-|                   | networking <https |
-|                   | ://en.wikipedia.o |
-|                   | rg/wiki/Software- |
-|                   | defined_networkin |
-|                   | g>`__             |
-+-------------------+-------------------+
-| SDN-C             | `SDN-Controller < |
-|                   | https://wiki.onap |
-|                   | .org/display/DW/S |
-|                   | DN+Controller+Dev |
-|                   | elopment+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/d |
-|                   | isplay/DW/Service |
-|                   | +Orchestrator+Pro |
-|                   | ject>`__          |
-+-------------------+-------------------+
-| SOT               | Source Of Truth   |
-+-------------------+-------------------+
-| SR-IOV            | `Single-Root      |
-|                   | Input/Output      |
-|                   | Virtualization <h |
-|                   | ttps://en.wikiped |
-|                   | ia.org/wiki/Singl |
-|                   | e-root_input/outp |
-|                   | ut_virtualization |
-|                   | >`__              |
-+-------------------+-------------------+
-| SSL               | `Secure Sockets   |
-|                   | Layer <https://en |
-|                   | .wikipedia.org/wi |
-|                   | ki/Transport_Laye |
-|                   | r_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_L |
-|                   | ayer_Security>`__ |
-+-------------------+-------------------+
-| TOSCA             | `Topology and     |
-|                   | Orchestration     |
-|                   | Specification for |
-|                   | Cloud             |
-|                   | Applications <htt |
-|                   | ps://www.oasis-op |
-|                   | en.org/committees |
-|                   | /tc_home.php?wg_a |
-|                   | bbrev=tosca>`__   |
-+-------------------+-------------------+
-| TPS               | Transactions Per  |
-|                   | Second            |
-+-------------------+-------------------+
-| TSC               | Technical         |
-|                   | Steering          |
-|                   | Committee         |
-+-------------------+-------------------+
-| U-UI              | `Usecase User     |
-|                   | Interface <https: |
-|                   | //wiki.onap.org/d |
-|                   | isplay/DW/Usecase |
-|                   | +UI+Project>`__   |
-+-------------------+-------------------+
-| UI                | `User             |
-|                   | Interface <https: |
-|                   | //en.wikipedia.or |
-|                   | g/wiki/User_inter |
-|                   | face>`__          |
-+-------------------+-------------------+
-| UX                | `User             |
-|                   | Experience <https |
-|                   | ://en.wikipedia.o |
-|                   | rg/wiki/User_expe |
-|                   | rience>`__        |
-+-------------------+-------------------+
-| vCE               | virtual CE        |
-|                   | (Customer Edge)   |
-|                   | router (an        |
-|                   | example VNF)      |
-+-------------------+-------------------+
-| vCPE              | Virtual Customer  |
-|                   | Premise Equipment |
-+-------------------+-------------------+
-| vDNS              | Virtual Domain    |
-|                   | Name Server (an   |
-|                   | example VNF)      |
-+-------------------+-------------------+
-| VDU               | `Virtualisation   |
-|                   | Deployment        |
-|                   | Unit <https://wik |
-|                   | i.onap.org/displa |
-|                   | y/DW/Comparison+o |
-|                   | f+Current+R3+Clea |
-|                   | n+Version+with+IF |
-|                   | A011+v2.5.1>`__   |
-+-------------------+-------------------+
-| VES               | `Virtual function |
-|                   | Event             |
-|                   | Stream <https://w |
-|                   | iki.opnfv.org/dow |
-|                   | nload/attachments |
-|                   | /6819329/OPNVF%20 |
-|                   | VES.pptx?version= |
-|                   | 4&modificationDat |
-|                   | e=1466395653000&a |
-|                   | pi=v2>`__         |
-+-------------------+-------------------+
-| vF                | Virtual Firewall  |
-|                   | (an example VNF)  |
-+-------------------+-------------------+
-| VF                | Virtual Function  |
-+-------------------+-------------------+
-| VFC               | `Virtual Function |
-|                   | Controller <https |
-|                   | ://wiki.onap.org/ |
-|                   | display/DW/Virtua |
-|                   | l+Function+Contro |
-|                   | ller+Project>`__  |
-+-------------------+-------------------+
-| VFC               | Virtual Function  |
-|                   | Component         |
-|                   | (Resource         |
-|                   | Onboarding)       |
-+-------------------+-------------------+
-| vfModule          | Virtual Function  |
-|                   | Module            |
-+-------------------+-------------------+
-| VID               | Virtual           |
-|                   | Instantiation     |
-|                   | Deployment        |
-+-------------------+-------------------+
-| VID               | `Virtual          |
-|                   | Infrastructure    |
-|                   | Deployment        |
-|                   | (Project) <https: |
-|                   | //wiki.onap.org/d |
-|                   | isplay/DW/Virtual |
-|                   | +Infrastructure+D |
-|                   | eployment+Project |
-|                   | >`__              |
-+-------------------+-------------------+
-| VIM               | Virtualized       |
-|                   | Infrastructure    |
-|                   | Manager           |
-+-------------------+-------------------+
-| VLAN              | Virtual Local     |
-|                   | Area Network      |
-+-------------------+-------------------+
-| VM                | Virtual Machine   |
-+-------------------+-------------------+
-| VNF               | `Virtual Network  |
-|                   | Function <http:// |
-|                   | searchsdn.techtar |
-|                   | get.com/definitio |
-|                   | n/virtual-network |
-|                   | -functions>`__    |
-+-------------------+-------------------+
-| VNFC              | Virtual Network   |
-|                   | Function          |
-|                   | Component         |
-+-------------------+-------------------+
-| VNFD              | `VNF              |
-|                   | Descriptor <https |
-|                   | ://wiki.onap.org/ |
-|                   | pages/viewpage.ac |
-|                   | tion?pageId=82260 |
-|                   | 59>`__            |
-+-------------------+-------------------+
-| 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/vie |
-|                   | w/VPP/What_is_VPP |
-|                   | %3F>`__           |
-+-------------------+-------------------+
-| VSP               | Vendor Software   |
-|                   | Product (from SDC |
-|                   | Demo Guide)       |
-+-------------------+-------------------+
-| VTP               | `VNF Test         |
-|                   | Platform <https:/ |
-|                   | /wiki.onap.org/pa |
-|                   | ges/viewpage.acti |
-|                   | on?pageId=4338630 |
-|                   | 4>`__             |
-+-------------------+-------------------+
-| VVP               | `VNF Validation   |
-|                   | Program <https:// |
-|                   | wiki.onap.org/dis |
-|                   | play/DW/VNF+Valid |
-|                   | ation+Program+Pro |
-|                   | ject>`__          |
-+-------------------+-------------------+
-| WAR               | `Web application  |
-|                   | Archive <https:// |
-|                   | en.wikipedia.org/ |
-|                   | wiki/WAR_(file_fo |
-|                   | rmat)>`__         |
-+-------------------+-------------------+
-| xNF               | The combination   |
-|                   | of PNF and VNF;   |
-|                   | Network Function  |
-+-------------------+-------------------+
-| YANG              | Yet Another Next  |
-|                   | Generation - a    |
-|                   | Data Modeling     |
-|                   | Language for the  |
-|                   | Network           |
-|                   | Configuration     |
-|                   | Protocol          |
-|                   | (NETCONF)         |
-+-------------------+-------------------+
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| **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             | `Genric 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 Protococol                                                                                                                                                |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| HV VES           | `High Volume Virtual function Event Stream <https:// iki.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 <https://www.sdxcentral.com/nfv/definitions/nfv-mano/>`__                                                                   |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| NOD              | Network On Demand                                                                                                                                                            |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| NS               | Network Services                                                                                                                                                             |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| NS               | (Vendor Specific) New Start                                                                                                                                                  |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 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>`__                                                                                                                          |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 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/pa ges/viewpage.action?pageId=1015843>`__                                                                           |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 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.sdxcentral.com/nfv/definitions/opnfv/>`__                                                                                        |
++------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 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             | `Usecase 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              | `Virtualisation 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/guides/onap-user/general.rst b/docs/guides/onap-user/general.rst
index 570930e..85814d5 100644
--- a/docs/guides/onap-user/general.rst
+++ b/docs/guides/onap-user/general.rst
@@ -38,8 +38,8 @@
 | Data type  | Possible Filter  | Example    |
 +============+==================+============+
 | Text       | Any characters   | Test,      |
-|            | or numbers,      | Tes\ *,    |
-|            | matches exactly  | *\ t       |
+|            | or numbers,      | Tes\ \*,   |
+|            | matches exactly  | \*\ t      |
 |            | unless a \* is   |            |
 |            | used. The \*     |            |
 |            | acts as a        |            |
diff --git a/docs/guides/onap-user/home.rst b/docs/guides/onap-user/home.rst
index 8885721..a756d81 100644
--- a/docs/guides/onap-user/home.rst
+++ b/docs/guides/onap-user/home.rst
@@ -25,6 +25,7 @@
 .. toctree::
    :maxdepth: 1
 
+   general
    applications
    installation
    faq