Adjust code after branching silicon

Signed-off-by: Luis Gomez <ecelgp@gmail.com>
Change-Id: Ic4debf4e778e877e728359cec4d43c4ca0ec33e4

diff --git a/.gitreview b/.gitreview
index 02c75c4f96be0e110b287ef01fabce7053ac4cea..2e02abac43029c842eea25ca03f01d901f479c41 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=git.opendaylight.org
 port=29418
 project=docs.git
-defaultbranch=master
+defaultbranch=stable/silicon

diff --git a/docs/conf.py b/docs/conf.py
index 082c43918a00026bbeca27e4ddcc49c5577d445b..b216868c5033f009162a6e2f5df50073bf726e10 100755 (executable)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,30 +13,29 @@
 from docs_conf.conf import *
 
 # Append to intersphinx_mapping
-intersphinx_mapping['controller'] = ('https://docs.opendaylight.org/projects/controller/en/v2.0.3/', None)
-intersphinx_mapping['infrautils'] = ('https://docs.opendaylight.org/projects/infrautils/en/v1.8.0/', None)
-intersphinx_mapping['mdsal'] = ('https://docs.opendaylight.org/projects/mdsal/en/v6.0.4/', None)
+intersphinx_mapping['aaa'] = ('https://docs.opendaylight.org/projects/aaa/en/latest/', None)
+intersphinx_mapping['controller'] = ('https://docs.opendaylight.org/projects/controller/en/v3.0.6/', None)
+intersphinx_mapping['infrautils'] = ('https://docs.opendaylight.org/projects/infrautils/en/v1.9.5/', None)
+intersphinx_mapping['mdsal'] = ('https://docs.opendaylight.org/projects/mdsal/en/v7.0.5/', None)
+intersphinx_mapping['netconf'] = ('https://docs.opendaylight.org/projects/netconf/en/latest/', None)
 intersphinx_mapping['odl-integration-test'] = ('https://docs.opendaylight.org/projects/integration-test/en/latest/', None)
 intersphinx_mapping['odl-integration-packaging'] = ('https://docs.opendaylight.org/projects/integration-packaging/en/latest/', None)
 intersphinx_mapping['odl-releng-builder'] = ('https://docs.opendaylight.org/projects/releng-builder/en/latest/', None)
 intersphinx_mapping['opflex'] = ('https://docs.opendaylight.org/projects/opflex/en/latest/', None)
 
 # Projects that have stable/branches
-intersphinx_mapping['aaa'] = ('https://docs.opendaylight.org/projects/aaa/en/latest/', None)
-intersphinx_mapping['bgpcep'] = ('https://docs.opendaylight.org/projects/bgpcep/en/latest/', None)
-intersphinx_mapping['daexim'] = ('https://docs.opendaylight.org/projects/daexim/en/latest/', None)
-intersphinx_mapping['genius'] = ('https://docs.opendaylight.org/projects/genius/en/latest/', None)
-intersphinx_mapping['integration-distribution'] = ('https://docs.opendaylight.org/projects/integration-distribution/en/latest/', None)
-intersphinx_mapping['jsonrpc'] = ('https://docs.opendaylight.org/projects/jsonrpc/en/latest/', None)
-intersphinx_mapping['lispflowmapping'] = ('https://docs.opendaylight.org/projects/lispflowmapping/en/latest/', None)
-intersphinx_mapping['netconf'] = ('https://docs.opendaylight.org/projects/netconf/en/latest/', None)
-intersphinx_mapping['netvirt'] = ('https://docs.opendaylight.org/projects/netvirt/en/latest/', None)
-intersphinx_mapping['openflowplugin'] = ('https://docs.opendaylight.org/projects/openflowplugin/en/latest/', None)
-intersphinx_mapping['ovsdb'] = ('https://docs.opendaylight.org/projects/ovsdb/en/latest/', None)
-intersphinx_mapping['transportpce'] = ('https://docs.opendaylight.org/projects/transportpce/en/latest/', None)
+intersphinx_mapping['bgpcep'] = ('https://docs.opendaylight.org/projects/bgpcep/en/stable-silicon/', None)
+intersphinx_mapping['daexim'] = ('https://docs.opendaylight.org/projects/daexim/en/stable-silicon/', None)
+intersphinx_mapping['integration-distribution'] = ('https://docs.opendaylight.org/projects/integration-distribution/en/stable-silicon/', None)
+intersphinx_mapping['jsonrpc'] = ('https://docs.opendaylight.org/projects/jsonrpc/en/stable-silicon/', None)
+intersphinx_mapping['lispflowmapping'] = ('https://docs.opendaylight.org/projects/lispflowmapping/en/stable-silicon/', None)
+intersphinx_mapping['openflowplugin'] = ('https://docs.opendaylight.org/projects/openflowplugin/en/stable-silicon/', None)
+intersphinx_mapping['ovsdb'] = ('https://docs.opendaylight.org/projects/ovsdb/en/stable-silicon/', None)
+intersphinx_mapping['transportpce'] = ('https://docs.opendaylight.org/projects/transportpce/en/stable-silicon/', None)
 
 # OpenDaylight Documentation Releases
-intersphinx_mapping['odl-silicon'] = ('https://docs.opendaylight.org/en/latest/', None)
+intersphinx_mapping['odl-phosphorus'] = ('https://docs.opendaylight.org/en/latest/', None)
+intersphinx_mapping['odl-silicon'] = ('https://docs.opendaylight.org/en/stable-silicon/', None)
 intersphinx_mapping['odl-aluminium'] = ('https://docs.opendaylight.org/en/stable-aluminium/', None)
 intersphinx_mapping['odl-magnesium'] = ('https://docs.opendaylight.org/en/stable-magnesium/', None)
 intersphinx_mapping['odl-sodium'] = ('https://docs.opendaylight.org/en/stable-sodium/', None)

diff --git a/docs/developer-guides/index.rst b/docs/developer-guides/index.rst
index f7c8665e61bf5fdce53bb74a50406274a03a6fb3..8ef8168a3580ea1b56a2627fe4c02d8834c9d184 100644 (file)
--- a/docs/developer-guides/index.rst
+++ b/docs/developer-guides/index.rst
@@ -33,7 +33,6 @@ Project-specific Developer Guides
 
 * :doc:`InfraUtils Documentation <infrautils:index>`
 * :doc:`JSON RPC Documentation <jsonrpc:index>`
-* :doc:`NetVirt Documentation <netvirt:index>`
 * :doc:`OVSDB Documentation <ovsdb:index>`
 * :doc:`TransportPCE Documentation <transportpce:index>`
 

diff --git a/docs/index.rst b/docs/index.rst
index 5d5314c2f81cbd9256b2f8a23fcd852e291b16c5..59786e394e61671b276cdbc17a4729e3b069dd63 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -57,8 +57,6 @@ Managed Projects
 Self-Managed Projects
 ~~~~~~~~~~~~~~~~~~~~~
 
-* :doc:`Genius Documentation <genius:index>`
-* :doc:`NetVirt Documentation <netvirt:index>`
 * :doc:`TransportPCE Documentation <transportpce:index>`
 
 

diff --git a/docs/user-guide/index.rst b/docs/user-guide/index.rst
index 91f0d0bb855cf4399c1f0bb9bee67a8848c58be3..59809ce4a993d05268a0d5d1b573fcaf5eceef98 100644 (file)
--- a/docs/user-guide/index.rst
+++ b/docs/user-guide/index.rst
@@ -18,7 +18,6 @@ Project-specific User Guides
 ----------------------------
 
 * :doc:`JSON RPC Documentation <jsonrpc:index>`
-* :doc:`NetVirt Documentation <netvirt:index>`
 * :doc:`OVSDB Documentation <ovsdb:index>`
 
 .. toctree::
@@ -30,4 +29,4 @@ Project-specific User Guides
 .. toctree::
    :hidden:
 
-   netconf-user-guide
\ No newline at end of file
+   netconf-user-guide