Merge "Add intersphinx for SXP and remove them from docs"
authorLuis Gomez <ecelgp@gmail.com>
Wed, 12 Sep 2018 16:57:10 +0000 (16:57 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 12 Sep 2018 16:57:10 +0000 (16:57 +0000)
1  2 
docs/conf.py
docs/developer-guide/index.rst
docs/index.rst
docs/user-guide/index.rst

diff --cc docs/conf.py
Simple merge
index ca0ff996f7b309297ce7d743ef6061466779d300,fdc12533cf071a0579e5945687e795a5b8ade9d4..13a66c1c419a0b6674bba03b405b4db13ae79a9a
@@@ -63,8 -65,9 +63,7 @@@ Project-specific Developer Guide
     p4plugin-developer-guide
     service-function-chaining
     snmp4sdn-developer-guide
-    sxp-developer-guide
     topology-processing-framework-developer-guide
 -   ttp-model-developer-guide
 -   ttp-cli-tools-developer-guide
     uni-manager-plug-in-developer-guide
     unified-secure-channel
     virtual-tenant-network-(vtn)
diff --cc docs/index.rst
index 4bb2f1857894762ef908d2c60be50037252739ea,6ad3bc8c9c9d5a426a86ce498a94a2ff47a87a07..d4761a02ad959ade153c9f1b6f5bbaf63eaec2e0
@@@ -83,5 -83,5 +83,4 @@@ OpenDaylight Contributor Guide
     user-guide/index
     developer-guide/index
     project-indexes/bgpcep-index
 -   project-indexes/daexim-index
     project-indexes/lispflowmapping-index
-    project-indexes/sxp-index
index 2a67ad1c769a1c71b7d41f91f5b460230e35853f,a2dae03ca03af9568a37f9047dc714a0fd625c38..1c6ddb5ba5d8da88fc67979fc197e5e40b093a48
@@@ -56,8 -59,8 +56,7 @@@ Project-specific User Guide
     service-function-chaining
     snmp-plugin-user-guide
     snmp4sdn-user-guide
-    sxp-user-guide
     tsdr-user-guide
 -   ttp-cli-tools-user-guide
     uni-manager-plug-in-project
     unified-secure-channel
     virtual-tenant-network-(vtn)