Merge "Final Misc Changs before D1"

5 files changed, 4 insertions, 65 deletions

diff --git a/docs/featureprojects.rst b/docs/featureprojects.rst
index 24b4e325b..6a4cd8193 100644
--- a/docs/featureprojects.rst
+++ b/docs/featureprojects.rst
@@ -59,20 +59,6 @@ Barometer
    ../submodules/barometer/docs/development/manuals/index
 
 
-Bottlenecks
------------
-.. toctree::
-   :maxdepth: 1
-
-   ../submodules/bottlenecks/docs/development/overview/index
-   ../submodules/bottlenecks/docs/development/requirements/index
-   ../submodules/bottlenecks/docs/release/installation/index
-   ../submodules/bottlenecks/docs/release/configguide/index
-   ../submodules/bottlenecks/docs/release/userguide/index
-   ../submodules/bottlenecks/docs/development/design/index
-   ../submodules/bottlenecks/docs/development/manuals/index
-
-
 Compass4Nfv
 -----------
 .. toctree::
@@ -129,20 +115,6 @@ Domino
    ../submodules/domino/docs/development/manuals/index
 
 
-Fds
----
-.. toctree::
-   :maxdepth: 1
-
-   ../submodules/fds/docs/development/overview/index
-   ../submodules/fds/docs/development/requirements/index
-   ../submodules/fds/docs/release/installation/index
-   ../submodules/fds/docs/release/configguide/index
-   ../submodules/fds/docs/release/userguide/index
-   ../submodules/fds/docs/development/design/index
-   ../submodules/fds/docs/development/manuals/index
-
-
 IPV6
 ----
 .. toctree::
@@ -281,19 +253,3 @@ SFC
    ../submodules/sfc/docs/release/userguide/index
    ../submodules/sfc/docs/development/design/index
    ../submodules/sfc/docs/development/manuals/index
-
-
-Vswitchperf
------------
-.. toctree::
-   :maxdepth: 1
-
-   ../submodules/vswitchperf/docs/development/overview/index
-   ../submodules/vswitchperf/docs/development/requirements/index
-   ../submodules/vswitchperf/docs/release/installation/index
-   ../submodules/vswitchperf/docs/release/configguide/index
-   ../submodules/vswitchperf/docs/release/userguide/index
-   ../submodules/vswitchperf/docs/development/design/index
-   ../submodules/vswitchperf/docs/development/manuals/index
-
-
diff --git a/docs/index.rst b/docs/index.rst
index 78c35e473..48c72a6cd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,5 @@
-.. note:: This page is still under development.
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. SPDX-License-Identifier: CC-BY-4.0
 
 OPNFV Documentation
 ===================
diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index 9296bd9f1..470715861 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -32,7 +32,7 @@ it is important to understand your required target platform capabilities before
 configuring your scenarios.
 
 An OPNFV installation requires either a physical, or virtual, infrastructure environment as defined
-in the `Pharos specification <https://wiki.opnfv.org/display/pharos/Pharos+Specification>`.
+in the `Pharos specification <https://wiki.opnfv.org/display/pharos/Pharos+Specification>`_.
 When configuring a physical infrastructure it is strongly advised to follow the Pharos configuration guidelines.
 
 
@@ -56,7 +56,6 @@ description documents provided:
 - :ref:`os-odl_l2-fdio-ha <os-odl_l2-fdio-ha>`
 - :ref:`os-odl_l2-fdio-noha <os-odl_l2-fdio-noha>`
 - :ref:`os-nosdn-fdio-noha <os-nosdn-fdio-noha>`
-- :ref:`os-nosdn-kvm-noha <>`
 - :ref:`os-odl-gluon-noha <gluon-scenario>`
 - :ref:`os-nosdn-openo-ha <opera-os-nosdn-openo-ha>`
 - :ref:`os-odl_l2-sfc-ha <os-odl_l2-sfc-ha>`
@@ -90,12 +89,4 @@ The basic deployment validation only addresses a small part of capabilities prov
 the platform and you may want to execute more exhaustive tests.  Some investigation will be required to
 select the right test suites to run on your platform.
 
-Many of the OPNFV test project provide user-guide documentation and installation instructions in :ref:`this document <testing-userguide>`
-
-Security Notes
-==============
-
-The following patches were applied to fix security issues discovered in OPNFV
-projects, during the Danube release cycle.
-
-- Links to security patches need to be added here.  (todo)
+Many of the OPNFV test project provide user-guide documentation and installation instructions in :ref:`this document <testing-userguide>`
\ No newline at end of file
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index 3bba1367a..9191b7556 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -26,8 +26,6 @@ Project release notes:
 
 :ref:`Doctor Release Notes <doctor-releasenotes>`
 
-:ref:`Domino Release Notes <domino-releasenotes>`
-
 :ref:`FDS Release Notes <fds-releasenotes>`
 
 :ref:`Fuel Release Notes <fuel-releasenotes>`
@@ -40,8 +38,6 @@ Project release notes:
 
 :ref:`KVMforNFV Release Notes <kvmfornfv-releasenotes>`
 
-:ref:`Multisite Release Notes <multisite-releasenotes>`
-
 :ref:`Netready Release Notes <netready-releasenotes>`
 
 :ref:`Opera Release Notes <opera-releasenotes>`
diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index 743567416..57a84e6df 100644
--- a/docs/release/userguide.introduction.rst
+++ b/docs/release/userguide.introduction.rst
@@ -58,16 +58,13 @@ OPNFV wiki page at http://wiki.opnfv.org, for more details.
 Feature Configuration Guides
 ============================
 
-- :ref:`Armband Configuration Guide <armband-configguide>`
 - :ref:`Copper Configuration Guide <copper-configguide>`
 - :ref:`Doctor Configuration Guide <doctor-configguide>`
 - :ref:`IPv6 Configuration Guide <ipv6-configguide>`
 - :ref:`KVMforNFV Configuration Guide <kvmfornfv-configguide>`
 - :ref:`Netready Configuration Guide <netready-configguide>`
-- :ref:`ONOSFW Configuration Guide <onosfw-configguide>`
 - :ref:`Parser Configuration Guide <parser-configguide>`
 - :ref:`Promise Configuration Guide <promise-configguide>`
-- :ref:`SDNVPN Configuration Guide <sdnvpn-configguide>`
 - :ref:`SFC Configuration Guide <sfc-configguide>`
 
 Feature User Guides
@@ -79,8 +76,6 @@ Feature User Guides
 - :ref:`IPv6 User Guide <ipv6-userguide>`
 - :ref:`KVMforNFV User Guide <kvmfornfv-userguide>`
 - :ref:`Netready User Guide <netready-userguide>`
-- :ref:`ONOSFW User Guide <onosfw-userguide>`
 - :ref:`Parser User Guide <parser-userguide>`
 - :ref:`Promise User Guide <promise-userguide>`
-- :ref:`SDNVPN User Guide <sdnvpn-userguide>`
 - :ref:`SFC User Guide <sfc-userguide>`