summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2016-09-06 10:49:00 +0200
committerArturo Martin de Nicolas <Arturo.Martin-de-Nicolas@ericsson.com>2016-09-14 07:51:53 +0000
commit2acc1a461fd364c40ac489b9b060c989402ea321 (patch)
treef10172d3e1959503dd2d58f80a51d95c6244171c
parent1b54e075dae0a5861010f99f306a254d749d7f8d (diff)
Adjusted the docs structure according to directivescolorado.1.0
created subdirectory: docs/installationprocedure/images and copy both screenshots to this subdirectory. Updated according to comment Added a sub directory /installationprocedure and move the feature configuration to here Moved the abstract from the userguide/index.rst to the feature.userguide.rst Added a new index.rst in accordance to the new /installationprocedure Change-Id: Ie2acaddc1746fcee5baaca79713ea253c7d3f1b0 Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com> (cherry picked from commit d6e752f195525b396dad47ab339102120cd550e1)
-rw-r--r--docs/installationprocedure/feature.configuration.rst (renamed from docs/userguide/feature.configguide.rst)0
-rw-r--r--docs/installationprocedure/images/LICENSE (renamed from docs/userguide/images/LICENSE)0
-rwxr-xr-xdocs/installationprocedure/images/screenshot_promise.png (renamed from docs/userguide/images/screenshot_promise.png)bin101419 -> 101419 bytes
-rw-r--r--docs/installationprocedure/images/screenshot_promise_install.png (renamed from docs/userguide/images/screenshot_promise_install.png)bin77709 -> 77709 bytes
-rw-r--r--docs/installationprocedure/index.rst13
-rw-r--r--docs/userguide/feature.userguide.rst7
-rw-r--r--docs/userguide/index.rst4
7 files changed, 20 insertions, 4 deletions
diff --git a/docs/userguide/feature.configguide.rst b/docs/installationprocedure/feature.configuration.rst
index 48082c3..48082c3 100644
--- a/docs/userguide/feature.configguide.rst
+++ b/docs/installationprocedure/feature.configuration.rst
diff --git a/docs/userguide/images/LICENSE b/docs/installationprocedure/images/LICENSE
index 6a84dd4..6a84dd4 100644
--- a/docs/userguide/images/LICENSE
+++ b/docs/installationprocedure/images/LICENSE
diff --git a/docs/userguide/images/screenshot_promise.png b/docs/installationprocedure/images/screenshot_promise.png
index 4a0cbe3..4a0cbe3 100755
--- a/docs/userguide/images/screenshot_promise.png
+++ b/docs/installationprocedure/images/screenshot_promise.png
Binary files differ
diff --git a/docs/userguide/images/screenshot_promise_install.png b/docs/installationprocedure/images/screenshot_promise_install.png
index 2cb27d9..2cb27d9 100644
--- a/docs/userguide/images/screenshot_promise_install.png
+++ b/docs/installationprocedure/images/screenshot_promise_install.png
Binary files differ
diff --git a/docs/installationprocedure/index.rst b/docs/installationprocedure/index.rst
new file mode 100644
index 0000000..41bc079
--- /dev/null
+++ b/docs/installationprocedure/index.rst
@@ -0,0 +1,13 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+ .. (c) <optionally add copywriters name>
+
+**************************************
+Promise installation and configuration
+**************************************
+
+.. toctree::
+ :numbered:
+ :maxdepth: 2
+
+ feature.configuration.rst
diff --git a/docs/userguide/feature.userguide.rst b/docs/userguide/feature.userguide.rst
index ac035f4..5fcae54 100644
--- a/docs/userguide/feature.userguide.rst
+++ b/docs/userguide/feature.userguide.rst
@@ -1,6 +1,13 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
+Abstract
+========
+This user guide document provides the users with:
+
+1. Short description of Promise project and key features implemented in
+Colorado.
+
Promise description
===================
Promise is a resource reservation and management project to identify NFV related
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index 696b341..f6cb21c 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -4,13 +4,9 @@
==================
Promise user guide
==================
-This user guide document provides the users with:
-1. Short description of Promise project and key features implemented in Colorado
-2. Instructions to execute Promise test cases manually
.. toctree::
:maxdepth: 3
feature.userguide.rst
- feature.configguide.rst