summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-07-25 13:40:41 +0800
committerZhijiang Hu <hu.zhijiang@zte.com.cn>2017-08-01 12:52:04 +0800
commit9f53151847a0ac958b4a036d0c570ca97811df4f (patch)
tree6b65b96e021ed6ad39de595c9d679e4c30d0c58b
parent99a0c2fd0a071ff88a512c8dd281f0542397b415 (diff)
Jira: DAISY-36 Add Daisy doc links for E release
Note: This PS also solve a trivial doc8 error below: Warning: rst validation (doc8) has failed, please fix the following error(s). docs/how-to-use-docs/addendum.rst:79: D005 No newline at end of file Change-Id: Ia1d677e8f893b1e228962e35d6b0da4a185db676 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
-rw-r--r--docs/featureprojects.rst10
-rw-r--r--docs/how-to-use-docs/addendum.rst3
-rwxr-xr-xdocs/pre-hook.sh1
-rw-r--r--docs/release/installation.introduction.rst1
-rw-r--r--docs/release/release-notes.rst2
-rw-r--r--docs/release/subrelease.rst8
6 files changed, 24 insertions, 1 deletions
diff --git a/docs/featureprojects.rst b/docs/featureprojects.rst
index ceda3d8e0..ad604618b 100644
--- 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 d36cd5a15..90ab1c768 100644
--- 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 cdfc4f683..6574cdcc3 100755
--- 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 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::