summaryrefslogtreecommitdiffstats
path: root/docs/release
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2017-08-01 10:27:02 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-01 10:27:02 +0000
commit5de2bfa1eb84af4a8866954ef656ed23b637efac (patch)
tree83ff371d08c286d78a65489d1856a0df5ede1148 /docs/release
parent76ded841ebdeaa1717dcee8da8356e9c6538dec7 (diff)
parent9f53151847a0ac958b4a036d0c570ca97811df4f (diff)
Merge "Jira: DAISY-36 Add Daisy doc links for E release"
Diffstat (limited to 'docs/release')
-rw-r--r--docs/release/installation.introduction.rst1
-rw-r--r--docs/release/release-notes.rst2
-rw-r--r--docs/release/subrelease.rst8
3 files changed, 11 insertions, 0 deletions
diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index 3c2e89dd9..cc43aa199 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -84,6 +84,7 @@ The instructions for each toolchain can be found in these links:
- :ref:`Apex installation instruction <apex-installation>`
- :ref:`Compass4nfv installation instruction <compass4nfv-installation>`
+- :ref:`Daisy installation instruction <daisy-installation>`
- :ref:`Fuel installation instruction <fuel-installation>`
- :ref:`JOID installation instruction <joid-installation>`
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index 98d1fbd8e..2eb74d723 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -24,6 +24,8 @@ Project release notes:
:ref:`Copper Release Notes <copper-releasenotes>`
+:ref:`Daisy Release Notes <daisy-releasenotes>`
+
:ref:`Doctor Release Notes <doctor-releasenotes>`
:ref:`FDS Release Notes <fds-releasenotes>`
diff --git a/docs/release/subrelease.rst b/docs/release/subrelease.rst
index 4976186a4..075fcbde1 100644
--- a/docs/release/subrelease.rst
+++ b/docs/release/subrelease.rst
@@ -18,6 +18,14 @@ Compass
../submodules/compass4nfv/docs/releasenotes/index
../submodules/compass4nfv/docs/installationprocedure/index
+Daisy
+-------
+.. toctree::
+ :maxdepth: 1
+
+ ../submodules/daisy/docs/release/release-notes/index
+ ../submodules/daisy/docs/release/installation/index
+
Fuel
-----
.. toctree::