Merge "Jira: DAISY-36 Add Daisy doc links for E release"

diff --git a/docs/featureprojects.rst b/docs/featureprojects.rst
index ceda3d8..ad60461 100644 (file)
--- a/docs/featureprojects.rst
+++ b/docs/featureprojects.rst
@@ -87,6 +87,16 @@ Copper
    ../submodules/copper/docs/development/manuals/index
 
 
+Daisy4NFV
+---------
+.. toctree::
+   :maxdepth: 1
+
+   ../submodules/daisy/docs/development/design/index
+   ../submodules/daisy/docs/release/configguide/index
+   ../submodules/daisy/docs/release/installation/index
+
+
 Doctor
 ------
 .. toctree::

diff --git a/docs/how-to-use-docs/addendum.rst b/docs/how-to-use-docs/addendum.rst
index d36cd5a..90ab1c7 100644 (file)
--- a/docs/how-to-use-docs/addendum.rst
+++ b/docs/how-to-use-docs/addendum.rst
@@ -76,4 +76,5 @@ The merge job name is **docs-merge-rtd-{branch}**.
 Once the patch is merged, jenkins will automatically trigger building of
 the new documentation. This might take about 15 minutes while readthedocs
 builds the documentatation. The newly built documentation shall show up
-as appropriate placed in docs.opnfv.org/{branch}/path-to-file.
\ No newline at end of file
+as appropriate placed in docs.opnfv.org/{branch}/path-to-file.
+

diff --git a/docs/pre-hook.sh b/docs/pre-hook.sh
index cdfc4f6..6574cdc 100755 (executable)
--- a/docs/pre-hook.sh
+++ b/docs/pre-hook.sh
@@ -21,6 +21,7 @@ get_repo_names() {
     echo "bottlenecks"
     echo "compass4nfv"
     echo "copper"
+    echo "daisy"
     echo "doctor"
     echo "fastpathmetrics"
     echo "fuel"

diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index 3c2e89d..cc43aa1 100644 (file)
--- 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 98d1fbd..2eb74d7 100644 (file)
--- 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 4976186..075fcbd 100644 (file)
--- 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::