From: Sofia Wallin <sofia.wallin@ericsson.com>
Date: Mon, 3 Apr 2017 23:51:21 +0000 (+0000)
Subject: Merge "Editorial suggestions to installation.introduction. JOID project name is capit... 
X-Git-Tag: opnfv-5.0.0~3780
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4145f41c0f9f62669326c8069024a0047641ee51;hp=79561c8ecec0b1bbb934efbb3696c3ae65609568;p=opnfvdocs.git

Merge "Editorial suggestions to installation.introduction. JOID project name is capitalized. Clarified that Pharos specification only applies to physical deployments."
---

diff --git a/docs/index.rst b/docs/index.rst
index 48c72a6cd..ad4028a5c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -35,7 +35,7 @@ Testing Documentation
    testing/testing-dev
 
 
-Development Documentation
+Developer Documentation
 --------------------------
 
 .. toctree::
diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index c85db7713..b9bef1db2 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -63,6 +63,11 @@ description documents provided:
 - :ref:`os-nosdn-lxd-noha <os-nosdn-lxd-noha>`
 - :ref:`k8-nosdn-nofeature-noha <k8-nosdn-nofeature-noha>`
 - :ref:`k8-nosdn-lb-noha <k8-nosdn-lb-noha>`
+- `os-nosdn-ovs-ha <http://docs.opnfv.org/en/stable-danube/submodules/ovsnfv/docs/release/scenarios/os-nosdn-ovs-ha/index.html>`_
+- :ref:`os-nosdn-ovs-noha <os-nosdn-ovs-noha>`
+- :ref:`os-nosdn-ovs <os-nosdn-ovs>`
+- `os-odl_l3-ovs-ha <http://docs.opnfv.org/en/stable-danube/submodules/ovsnfv/docs/release/scenarios/os-odl_l3-ovs-ha/index.html>`_
+- :ref:`os-odl_l3-ovs-noha <os-odl_l3-ovs-noha>`
 
 
 Installation Procedure
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index cb4c429ae..6471a56de 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -42,8 +42,6 @@ Project release notes:
 
 :ref:`Opera Release Notes <opera-releasenotes>`
 
-:ref:`ONOSFW Release Notes <onosfw-releasenotes>`
-
 :ref:`Parser Release Notes <parser-releasenotes>`
 
 :ref:`QTIP Release Notes <qtip-releasenotes>`
diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index 1d3912315..fbde6ce63 100644
--- a/docs/release/userguide.introduction.rst
+++ b/docs/release/userguide.introduction.rst
@@ -66,7 +66,6 @@ Feature Configuration Guides
 - :ref:`Parser Configuration Guide <parser-configguide>`
 - :ref:`Promise Configuration Guide <promise-configguide>`
 - :ref:`SFC Configuration Guide <sfc-configguide>`
-- :ref:`ONOSFW Configuration Guide <onosfw-configguide>`
 
 
 Feature User Guides
@@ -81,5 +80,4 @@ Feature User Guides
 - :ref:`Parser User Guide <parser-userguide>`
 - :ref:`Promise User Guide <promise-userguide>`
 - :ref:`SFC User Guide <sfc-userguide>`
-- :ref:`ONOSFW User Guide <onosfw-userguide>`
 
diff --git a/docs/submodules/apex b/docs/submodules/apex
index 418533f4c..fdd855aea 160000
--- a/docs/submodules/apex
+++ b/docs/submodules/apex
@@ -1 +1 @@
-Subproject commit 418533f4c431a7435435e090a6a8415080556148
+Subproject commit fdd855aea7f7dddc63ce2571ec2389d1f3cadfdf
diff --git a/docs/submodules/releng b/docs/submodules/releng
index ed99c6b49..908d962be 160000
--- a/docs/submodules/releng
+++ b/docs/submodules/releng
@@ -1 +1 @@
-Subproject commit ed99c6b49f48373eb2709e2dfdb4663cee2174e6
+Subproject commit 908d962bedf027631bc0209c4d2c06830d6c8659