22 files changed, 130 insertions, 91 deletions
diff --git a/.gitreview b/.gitreview
index c088dd69b..c1e7543e4 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=gerrit.onap.org
 port=29418
 project=doc.git
+defaultbranch=dublin
diff --git a/docs/_static/css/ribbon.css b/docs/_static/css/ribbon.css
index 6008cb1a0..d5748c91a 100644
--- a/docs/_static/css/ribbon.css
+++ b/docs/_static/css/ribbon.css
@@ -4,7 +4,7 @@
   overflow: hidden;
   white-space: nowrap;
   position: fixed;
-  top: 25px;
+  top: 70px;
   right: -50px;
   -webkit-transform: rotate(45deg);
      -moz-transform: rotate(45deg);
diff --git a/docs/_templates/navbar.html b/docs/_templates/navbar.html
new file mode 100644
index 000000000..41f5c8181
--- /dev/null
+++ b/docs/_templates/navbar.html
@@ -0,0 +1,76 @@
+<div id="navbar" class="{{ theme_navbar_class }} navbar-default {% if theme_navbar_fixed_top|tobool -%} navbar-fixed-top{%- endif -%}">
+  <!-- Outdated version warning banner -->
+  {% if version_status == 'unsupported' %}
+    <div id="unsupported_warning" >
+      This document is for a release of ONAP that is no longer supported.
+    </div>
+    <style>
+      body {
+        padding-top: 110px;
+      }
+    </style>
+  {% elif version_status == 'deprecated' %}
+    <div id="deprecated_warning" >
+      This document is for a deprecated release of ONAP and will receive only security updates.
+    </div>
+    <style>
+      body {
+        padding-top: 110px;
+      }
+    </style>
+  {% else %}
+    <style>
+      body {
+        padding-top: 60px;
+     }
+    </style>
+  {% endif %}
+    <div class="container">
+      <div class="navbar-header">
+        <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="{{ pathto(master_doc) }}">
+          {%- block sidebarlogo %}
+            {%- if logo %}<span><img src="{{ pathto('_static/' + logo, 1) }}"></span>{%- endif %}
+          {%- endblock %}
+          {% if theme_navbar_title -%}{{ theme_navbar_title|e }}{%- else -%}{{ project|e }}{%- endif -%}
+        </a>
+        <span class="navbar-text navbar-version pull-left"><b>{{ version|e }}</b></span>
+      </div>
+
+        <div class="collapse navbar-collapse nav-collapse">
+          <ul class="nav navbar-nav">
+            {% if theme_navbar_links %}
+              {%- for link in theme_navbar_links %}
+                <li><a href="{{ pathto(*link[1:]) }}">{{ link[0] }}</a></li>
+              {%- endfor %}
+            {% endif %}
+            {% block navbartoc %}
+              {% include "globaltoc.html" %}
+              {% if theme_navbar_pagenav %}
+                {% include "navbartoc.html" %}
+              {% endif %}
+            {% endblock %}
+            {% if theme_navbar_sidebarrel %}
+              {% block sidebarrel %}
+                {% include "relations.html" %}
+              {% endblock %}
+            {% endif %}
+            {% block navbarextra %}
+            {% endblock %}
+            {% if theme_source_link_position == "nav" %}
+              <li class="hidden-sm">{% include "sourcelink.html" %}</li>
+            {% endif %}
+          </ul>
+
+          {% block navbarsearch %}
+            {% include "navbarsearchbox.html" %}
+          {% endblock %}
+        </div>
+    </div>
+  </div>
+
diff --git a/docs/_templates/relations.html b/docs/_templates/relations.html
new file mode 100644
index 000000000..c701ed0c0
--- /dev/null
+++ b/docs/_templates/relations.html
@@ -0,0 +1,16 @@
+<center>
+<div class="btn-group" role="group" aria-label="...">
+    {% if prev %}
+    <a class="btn btn-default" href="{{ prev.link|e }}">Prev Page</a>
+    {% else %}
+    <button type="button" class="btn btn-default disabled">Prev Page</button>
+    {% endif %}
+
+    {% if next %}
+    <a class="btn btn-default" href="{{ next.link|e }}">Next Page</a>
+    {% else %}
+    <button type="button" class="btn btn-default disabled">Next Page</button>
+    {% endif %}
+</div>
+</center>
+
diff --git a/docs/conf.py b/docs/conf.py
index 5cab846ce..79b64b202 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,35 +1,22 @@
-# -*- coding: utf-8 -*-
+#Copyright (c) 2017 Open Network Automation Platform and contributors
 #
-# ONAP documentation build configuration file, created by
-# sphinx-quickstart on Wed Jul 19 16:25:31 2017.
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
 #
-# This file is execfile()d with the current directory set to its
-# containing dir.
+#         http://www.apache.org/licenses/LICENSE-2.0
 #
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-import os
-import shlex
-#import sphinx_bootstrap_theme
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+#Unless required by applicable law or agreed to in writing,
+#software distributed under the License is distributed on an
+#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+#either express or implied. See the License for the specific
+#language governing permissions and limitations under the License.
 
-# -- General configuration ------------------------------------------------
+import sphinx_bootstrap_theme
+from docs_conf.conf import *
 
-# If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.5.3'
 
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
+#Sphinx Extensions
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
@@ -47,81 +34,42 @@ extensions = [
     'sphinxcontrib.swaggerdoc'
 ]
 
-# Font path for seqdiag
+# Extension Configuration
 seqdiag_fontpath = '/usr/share/fonts/truetype/dejavu/DejaVuSansCondensed.ttf'
 nwdiag_fontpath =  '/usr/share/fonts/truetype/dejavu/DejaVuSansCondensed.ttf'
 
-# Add any paths that contain templates here, relative to this directory.
+# Template Paths
 templates_path = ['_templates']
 
 # The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-# source_suffix = ['.rst', '.md']
 source_suffix = '.rst'
 
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
 # The master toctree document.
 master_doc = 'index'
 
 # General information about the project.
 project = u''
 copyright = u'2019 ONAP. Licensed under Creative Commons Attribution 4.0 International License'
-
-
 author = u'Open Network Automation Platform'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-# The short X.Y version.
-version = 'master branch'
-# The full version, including alpha/beta/rc tags.
-release = 'master branch'
+# Project version and release
+version = 'dublin'
+release = 'dublin'
 
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
+# The language for content autogenerated by Sphinx.
 language = None
 
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = [
 	'_build'
 	]
 
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+keep_warnings = True
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
@@ -129,21 +77,13 @@ todo_include_todos = True
 
 # -- Options for HTML output ----------------------------------------------
 
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#html_theme = 'classic'
-html_theme = 'sphinx_rtd_theme'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
+# The theme to use for HTML and HTML Help pages.
+html_theme = 'bootstrap'
 html_theme_options = {
-	'style_nav_header_background': 'white',
-	'sticky_navigation': False
+        'bootswatch_theme': "lumen",
+        'navbar_sidebarrel': False
 	}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
+html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -155,10 +95,6 @@ html_theme_options = {
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
 html_logo = '_static/logo_onap_2017.png'
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
 html_favicon = '_static/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
@@ -380,6 +316,12 @@ epub_exclude_files = ['search.html']
 # If false, no index is generated.
 #epub_use_index = True
 
+
+nitpicky = True
+html_context = {
+    'version_status': 'supported',
+    }
+
 # Patterns to ignore in linkcheck builder
 linkcheck_ignore = [
 	r'http://$',
diff --git a/docs/conf.yaml b/docs/conf.yaml
new file mode 100644
index 000000000..754d842f7
--- /dev/null
+++ b/docs/conf.yaml
@@ -0,0 +1 @@
+project_cfg: ONAP
diff --git a/docs/guides/onap-developer/how-to-use-docs/style-guide.rst b/docs/guides/onap-developer/how-to-use-docs/style-guide.rst
index 324688551..ddc3d5b07 100644
--- a/docs/guides/onap-developer/how-to-use-docs/style-guide.rst
+++ b/docs/guides/onap-developer/how-to-use-docs/style-guide.rst
@@ -106,6 +106,8 @@ Headings (Titles)
 -  Use descriptive titles for tables and figures titles. Do not
    number tables or figures. Do not (in general) add titles for screen shots.
 
+- <TO DO> Guidelines for heading levels and toctree directive
+
 Tasks
 ^^^^^
 -  Start task titles with an action word. Examples: Create, Add,
diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
-Subproject 25f856faedd92ba62e8348507f7baf8ef34f454
+Subproject dfc9d1aebb3150074729b4f0c035e0308d3aa01
diff --git a/docs/submodules/ccsdk/apps.git b/docs/submodules/ccsdk/apps.git
-Subproject 16a34aeeebad1775ea4a6675c19f041b273dcdf
+Subproject 441b7640a1797f9e340bfa4a176df72ecdd9f5e
diff --git a/docs/submodules/ccsdk/distribution.git b/docs/submodules/ccsdk/distribution.git
-Subproject 8d4467847a7992c1525555a3f43599b195a0bf0
+Subproject bbff2fb829fd3c5b301c061db22119c7cb1743f
diff --git a/docs/submodules/ccsdk/features.git b/docs/submodules/ccsdk/features.git
-Subproject 63c4144c0664db9ea526c0608a30b47de80eed8
+Subproject e9579499fa871c16ac729116714ece9b959acbc
diff --git a/docs/submodules/ccsdk/parent.git b/docs/submodules/ccsdk/parent.git
-Subproject 29e82cfb81e948500c99393fc09765af603730f
+Subproject c3819ef1275b3785978b728dec2bf9941461dfa
diff --git a/docs/submodules/dmaap/datarouter.git b/docs/submodules/dmaap/datarouter.git
-Subproject 3ebd2534167e73426d2b19efb05eaf9892f6f9d
+Subproject bb01feceff0527c8f63ad513d85975e5c4e2e52
diff --git a/docs/submodules/music.git b/docs/submodules/music.git
-Subproject d6e7b63cc580e7b3822be61fe92a493ad5e222a
+Subproject 0f4fd38d0414058a088335189fc7a8cafbad4cc
diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
-Subproject 02a3b49bec86eb0a434afb86e158ca2670cb718
+Subproject a04dc4d3bc12cdc77e04fad89fc369c869cdd61
diff --git a/docs/submodules/sdc/jtosca.git b/docs/submodules/sdc/jtosca.git
-Subproject 6018fb047963d151d77bf03f6f84446866a3089
+Subproject a0244589b50f80bc510b5d8dd4df02bb5870056
diff --git a/docs/submodules/sdc/sdc-tosca.git b/docs/submodules/sdc/sdc-tosca.git
-Subproject 45435cd6812c1118b7751163b46618c6329a1ac
+Subproject c6bdb4e477d0ad6b146ce811f32fc8356c12a22
diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git
-Subproject 186befdfa74d04794b27cbb3d73d8beb18d17c0
+Subproject b1df91894e7983ec1fc39c961d3a93e96fc236b
diff --git a/docs/submodules/so.git b/docs/submodules/so.git
-Subproject f9c309fb9e789225ccd6b02ec9ab4777bbd4021
+Subproject 3d58f194230268d439761e6062cca0481437ef7
diff --git a/docs/submodules/so/libs.git b/docs/submodules/so/libs.git
-Subproject 9a2470a315a0f31f79c49eeebc93a8e2bcb42c1
+Subproject f31f8ce722efcb2465d290cc3755c258ef2857a
diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git
-Subproject 4dc2c4df24d733db6176c738eb9a9ee35a11279
+Subproject 445056740d0f24e45d0c8f90cc024bbc090165b
diff --git a/etc/requirements.txt b/etc/requirements.txt
index fc22c1447..d1167b6e0 100644
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -1,5 +1,5 @@
 tox
-Sphinx==1.8.4
+Sphinx==1.8.5
 doc8
 docutils
 setuptools
@@ -12,3 +12,4 @@ sphinxcontrib-seqdiag
 sphinxcontrib-swaggerdoc
 sphinxcontrib-plantuml
 sphinx_bootstrap_theme>=0.4.11
+lfdocs-conf