summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authoragardner <agardner@linuxfoundation.org>2017-03-30 15:16:55 -0400
committeragardner <agardner@linuxfoundation.org>2017-03-30 15:20:57 -0400
commit6c80ac7ca497424ec867c86e43159b3e7f5800c0 (patch)
treeb6fdb91d72b96943e31303d37a8ce8d939282503 /docs
parent6c3c84ccb889bac0a2581e10bff88e5639f64c55 (diff)
bring danube branch up to date with master
Gerrit doesn't like merge commits eg: this wont work git merge origin/master --no-commit git commit -sv git review stable/danube So I took the diff git diff origin/stable/danube..master and checked out the files that were changed git checkout origin/master -- featureconfig.rst normally you should checkout the change sets and resolve the merge conflitcs, but in this case we dont care. Change-Id: I2a02e8ae7237825911f22663a5c65cdb9f5c5e4f Signed-off-by: agardner <agardner@linuxfoundation.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/development/overview/feature.overview.rst1
-rw-r--r--docs/development/overview/index.rst11
-rw-r--r--docs/release/configguide/featureconfig.rst (renamed from docs/release/installation/featureconfig.rst)9
-rw-r--r--docs/release/configguide/index.rst14
-rw-r--r--docs/release/index.rst20
-rw-r--r--docs/release/installation/index.rst22
-rw-r--r--docs/release/userguide/feature.userguide.rst1
-rw-r--r--docs/release/userguide/index.rst5
8 files changed, 53 insertions, 30 deletions
diff --git a/docs/development/overview/feature.overview.rst b/docs/development/overview/feature.overview.rst
index 4ef8d16..7980459 100644
--- a/docs/development/overview/feature.overview.rst
+++ b/docs/development/overview/feature.overview.rst
@@ -1,5 +1,6 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV
==================
Domino Description
diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst
index 84b729f..6790b6c 100644
--- a/docs/development/overview/index.rst
+++ b/docs/development/overview/index.rst
@@ -1,11 +1,12 @@
-.. _domino-overview:
-
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV
+
+.. _domino-overview:
-*****************
-Domino User Guide
-*****************
+***********************
+Domino Project Overview
+***********************
.. toctree::
:maxdepth: 3
diff --git a/docs/release/installation/featureconfig.rst b/docs/release/configguide/featureconfig.rst
index e47e0c0..6d2056c 100644
--- a/docs/release/installation/featureconfig.rst
+++ b/docs/release/configguide/featureconfig.rst
@@ -1,14 +1,7 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV
-.. image:: ../etc/opnfv-logo.png
- :height: 40
- :width: 200
- :alt: OPNFV
- :align: left
-.. these two pipes are to seperate the logo from the first title
-|
-|
Domino Configuration
====================
Domino Server and Clients can be configured via (i) passing command line options
diff --git a/docs/release/configguide/index.rst b/docs/release/configguide/index.rst
new file mode 100644
index 0000000..c240a91
--- /dev/null
+++ b/docs/release/configguide/index.rst
@@ -0,0 +1,14 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV
+
+.. _domino-configguide:
+
+**************************
+Domino Configuration Guide
+**************************
+
+.. toctree::
+ :maxdepth: 2
+
+ featureconfig.rst
diff --git a/docs/release/index.rst b/docs/release/index.rst
new file mode 100644
index 0000000..eb21134
--- /dev/null
+++ b/docs/release/index.rst
@@ -0,0 +1,20 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV
+
+
+======
+Domino
+======
+
+.. toctree::
+ :maxdepth: 2
+ :numbered:
+
+ ./installation/index.rst
+ ./configguide/index.rst
+ ./userguide/index.rst
+
+Indices
+=======
+* :ref:`search`
diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst
index a8a0a0a..db9f506 100644
--- a/docs/release/installation/index.rst
+++ b/docs/release/installation/index.rst
@@ -1,23 +1,15 @@
-.. _domino-installation:
-
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV
+
+.. _domino-installation:
-.. image:: ../etc/opnfv-logo.png
- :height: 40
- :width: 200
- :alt: OPNFV
- :align: left
-|
-|
-**********************
-Installation procedure
-**********************
-Colorado 1.0
-------------
+*******************************
+Domino Installation Instruction
+*******************************
.. toctree::
:maxdepth: 2
+ :numbered:
installation.instructions.rst
- featureconfig.rst
diff --git a/docs/release/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst
index 6187a22..8705a77 100644
--- a/docs/release/userguide/feature.userguide.rst
+++ b/docs/release/userguide/feature.userguide.rst
@@ -1,5 +1,6 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV
========================================
Domino API Usage Guidelines and Examples
diff --git a/docs/release/userguide/index.rst b/docs/release/userguide/index.rst
index 510fb38..7372cb3 100644
--- a/docs/release/userguide/index.rst
+++ b/docs/release/userguide/index.rst
@@ -1,7 +1,8 @@
-.. _domino-userguide:
-
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV
+
+.. _domino-userguide:
*****************
Domino User Guide