summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2017-03-30 16:27:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-30 16:27:04 +0000
commit4bc89326b54f044c5858c21c451f78c9d2d1c831 (patch)
tree2ba436d04681bf9ad126ab52b4df853075dd9432
parent584a47b71c3f4406feb2ab3282db8b372ae8f080 (diff)
parent1fa6135982a7c0a9499640df3262a37282a3701c (diff)
Merge "Updated Fuel and Multisite"
-rw-r--r--docs/release/release-notes.rst2
-rw-r--r--docs/release/userguide.introduction.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index 3c84e7f9f..d892b0d79 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -30,6 +30,8 @@ Project release notes:
:ref:`FDS Release Notes <fds-releasenotes>`
+:ref:`Fuel Release Notes <fuel-releasenotes>`
+
:ref:`Functest Release Notes <functest-releasenotes>`
:ref:`IPV6 Release Notes <ipv6-releasenotes>`
diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index 1a383cb2a..743567416 100644
--- a/docs/release/userguide.introduction.rst
+++ b/docs/release/userguide.introduction.rst
@@ -63,7 +63,6 @@ Feature Configuration Guides
- :ref:`Doctor Configuration Guide <doctor-configguide>`
- :ref:`IPv6 Configuration Guide <ipv6-configguide>`
- :ref:`KVMforNFV Configuration Guide <kvmfornfv-configguide>`
-- :ref:`Multisite Configuration Guide <multisite-configguide>`
- :ref:`Netready Configuration Guide <netready-configguide>`
- :ref:`ONOSFW Configuration Guide <onosfw-configguide>`
- :ref:`Parser Configuration Guide <parser-configguide>`
@@ -79,7 +78,6 @@ Feature User Guides
- :ref:`Domino User Guide <domino-userguide>`
- :ref:`IPv6 User Guide <ipv6-userguide>`
- :ref:`KVMforNFV User Guide <kvmfornfv-userguide>`
-- :ref:`Multisite User Guide <multisite-userguide>`
- :ref:`Netready User Guide <netready-userguide>`
- :ref:`ONOSFW User Guide <onosfw-userguide>`
- :ref:`Parser User Guide <parser-userguide>`