Merge "Renaming files in documentation guide"

diff --git a/docs/conf.py b/docs/conf.py
index e026b52..467836e 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,6 +48,7 @@ intersphinx_mapping['onap-cli'] = ('{}/onap-cli/en/%s'.format(doc_url) % branch,
 intersphinx_mapping['onap-oom-certservice'] = ('{}/onap-oom-platform-cert-service/en/%s'.format(doc_url) % branch, None)
 intersphinx_mapping['onap-ccsdk-cds'] = ('{}/onap-ccsdk-cds/en/%s'.format(doc_url) % branch, None)
 intersphinx_mapping['onap-ccsdk-apps'] = ('{}/onap-ccsdk-apps/en/%s'.format(doc_url) % branch, None)
+intersphinx_mapping['onap-ccsdk-oran'] = ('{}/onap-ccsdk-oran/en/%s'.format(doc_url) % branch, None)
 intersphinx_mapping['onap-sdnc-oam'] = ('{}/onap-sdnc-oam/en/%s'.format(doc_url) % branch, None)
 intersphinx_mapping['onap-ccsdk-platform-plugins'] = ('{}/onap-ccsdk-platform-plugins/en/%s'.format(doc_url) % branch, None)
 intersphinx_mapping['onap-ccsdk-dashboard'] = ('{}/onap-ccsdk-dashboard/en/%s'.format(doc_url) % branch, None)

diff --git a/docs/guides/active-projects/index.rst b/docs/guides/active-projects/index.rst
index 6b72b3a..9fc0633 100644 (file)
--- a/docs/guides/active-projects/index.rst
+++ b/docs/guides/active-projects/index.rst
@@ -44,6 +44,7 @@ All Active Projects
 | :ref:`onap-aaf-certservice <onap-aaf-certservice:master_index>`
 | :ref:`onap-ccsdk-cds <onap-ccsdk-cds:master_index>`
 | :ref:`onap-ccsdk-apps <onap-ccsdk-apps:master_index>`
+| :ref:`onap-ccsdk-oran <onap-ccsdk-oran:master_index>`
 | :ref:`onap-sdnc-oam <onap-sdnc-oam:master_index>`
 | :ref:`onap-ccsdk-platform-plugins <onap-ccsdk-platform-plugins:master_index>`
 | :ref:`onap-ccsdk-dashboard <onap-ccsdk-dashboard:master_index>`

diff --git a/docs/guides/onap-developer/developing/index.rst b/docs/guides/onap-developer/developing/index.rst
index e4bb6b1..0e14800 100644 (file)
--- a/docs/guides/onap-developer/developing/index.rst
+++ b/docs/guides/onap-developer/developing/index.rst
@@ -76,6 +76,7 @@ Common Controller Software Development Kit
 | :ref:`ccsdk platform plugins<onap-ccsdk-platform-plugins:master_index>`
 | :ref:`ccsdk apps<onap-ccsdk-apps:master_index>`
 | :ref:`ccsdk cds<onap-ccsdk-cds:master_index>`
+| :ref:`ccsdk oran<onap-ccsdk-oran:master_index>`
 
 Data Collection, Analysis, and Events
 -------------------------------------

diff --git a/docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst b/docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst
index b23a90f..9e06c43 100644 (file)
--- a/docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst
+++ b/docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst
@@ -8,9 +8,9 @@ Service Instantiation
 
 **Pre-requisites**
 
-- the Service has been designed and distributed (see: Service Design)
+- The Service has been designed and distributed (see: :ref:`Service Design <doc_guide_user_des_ser-des>`)
 - pre-instantiation operations have been performed
-  (see: pre instantiation section)
+  (see: :ref:`pre instantiation section <doc_guide_user_pre_ser-inst>`)
 
 **Possible Tools to perform Service Instantiation**
 
@@ -41,7 +41,7 @@ Service Instantiation
   ONAP will collect and assign all required parameters/values by itself.
 
 
-   Note: **Macro** method is not (yet) available via ONAP VID
+  .. Note:: **Macro** method is not (yet) available via ONAP VID
    nor via extAPI/NBI
 
 With "A La Carte" method

diff --git a/docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst b/docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst
index 822118f..a020f9a 100644 (file)
--- a/docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst
+++ b/docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst
@@ -8,9 +8,9 @@ VNF Instantiation
 
 **Pre-requisites**
 
-- the VNF is part of a Service Model (see: Service Design)
+- The VNF is part of a Service Model (see: :ref:`Service Design <doc_guide_user_des_ser-des>`)
 
-   Note: in ONAP SDC tool, VNF is named "VF"
+  .. Note:: In ONAP SDC tool, VNF is named "VF"
 
 
 **Possible methods with ONAP to instantiate a VNF**