Fixed paths to match standard

Change-Id: I733d34eb8bbdf0201b06a21d0ceeda50a06dd49f
Signed-off-by: mbeierl <mark.beierl@dell.com>

diff --git a/docs/index.rst b/docs/index.rst
index 60e9c21..93bf62e 100644 (file)
--- 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 (file)
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
similarity index 94%
rename from docs/release/userguide/index.rst
rename to docs/testing/user/index.rst
index e2f076a..e9054dc 100644 (file)
--- 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
similarity index 98%
rename from docs/release/installation/installation.rst
rename to docs/testing/user/installation.rst
index ae3b3f8..0effb2f 100755 (executable)
--- 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
similarity index 100%
rename from docs/release/userguide/introduction.rst
rename to docs/testing/user/introduction.rst

diff --git a/docs/release/userguide/test-usage.rst b/docs/testing/user/test-usage.rst
similarity index 100%
rename from docs/release/userguide/test-usage.rst
rename to docs/testing/user/test-usage.rst