summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Beierl <mark.beierl@dell.com>2017-03-31 07:19:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-31 07:19:14 +0000
commit902a4a4f915f0f186f66b566b1744667c7ee9572 (patch)
tree12931d1a0b3a14b53219f055cdfb386ad492e944
parent6eb2c8d8a8971ee3ae0693feebe509d4ec30a7a8 (diff)
parent77348164208df28ca8545e552cc9c06eefd05256 (diff)
Merge "Fixed paths to match standard"
-rw-r--r--docs/index.rst6
-rw-r--r--docs/release/installation/index.rst15
-rw-r--r--docs/testing/user/index.rst (renamed from docs/release/userguide/index.rst)1
-rwxr-xr-xdocs/testing/user/installation.rst (renamed from docs/release/installation/installation.rst)2
-rw-r--r--docs/testing/user/introduction.rst (renamed from docs/release/userguide/introduction.rst)0
-rw-r--r--docs/testing/user/test-usage.rst (renamed from docs/release/userguide/test-usage.rst)0
6 files changed, 5 insertions, 19 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 60e9c21..93bf62e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,7 +23,7 @@ StorPerf Installation Guide
:maxdepth: 5
:numbered: 5
- ./release/installation/installation.rst
+ ./user/installation.rst
******************************
StorPerf User Guide
@@ -34,8 +34,8 @@ StorPerf User Guide
:maxdepth: 5
:numbered: 5
- ./release/userguide/introduction.rst
- ./release/userguide/test-usage.rst
+ ./user/introduction.rst
+ ./user/test-usage.rst
Indices
diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst
deleted file mode 100644
index 10296dd..0000000
--- a/docs/release/installation/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _storperf-installation:
-
-.. This work is licensed under a Creative Commons Attribution 4.0 International
-.. License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) OPNFV, Dell EMC and others.
-
-======================
-StorPerf Installation Guide
-======================
-
-.. toctree::
- :maxdepth: 2
-
- installation.rst
diff --git a/docs/release/userguide/index.rst b/docs/testing/user/index.rst
index e2f076a..e9054dc 100644
--- a/docs/release/userguide/index.rst
+++ b/docs/testing/user/index.rst
@@ -13,4 +13,5 @@ StorPerf User Guide
:maxdepth: 2
introduction.rst
+ installation.rst
test-usage.rst
diff --git a/docs/release/installation/installation.rst b/docs/testing/user/installation.rst
index ae3b3f8..0effb2f 100755
--- a/docs/release/installation/installation.rst
+++ b/docs/testing/user/installation.rst
@@ -97,7 +97,7 @@ The tag for the latest stable Danube will be:
.. code-block:: bash
- docker pull opnfv/storperf:danube.0.1
+ docker pull opnfv/storperf:danube.1.0
Colorado
~~~~~~~~
diff --git a/docs/release/userguide/introduction.rst b/docs/testing/user/introduction.rst
index a40750f..a40750f 100644
--- a/docs/release/userguide/introduction.rst
+++ b/docs/testing/user/introduction.rst
diff --git a/docs/release/userguide/test-usage.rst b/docs/testing/user/test-usage.rst
index 2beae69..2beae69 100644
--- a/docs/release/userguide/test-usage.rst
+++ b/docs/testing/user/test-usage.rst