Adjusted the document structure

Adjusted the document structure in accordance to the docs teams directives.
I have also adjusted some of the files names and the licence text to get consistency.

Change-Id: I3503b3026c8035af4058dc41dbe7afefcc1a4e5b
Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>

10 files changed, 29 insertions, 42 deletions

diff --git a/docs/Colorado/installationprocedure/index.rst b/docs/Colorado/installationprocedure/index.rst
deleted file mode 100644
index 9088eb59..00000000
--- a/docs/Colorado/installationprocedure/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-*********************************************
-OPNFV(Colorado) ONOSFW config instructions
-*********************************************
-
-.. toctree::
-   :numbered:
-   :maxdepth: 4
-
-   installation.instruction.rst
-
-Revision: _sha1_
-
-:Author: Lucius(lukai1@huawei.com)
-
-Build date: |today|
diff --git a/docs/Colorado/design/index.rst b/docs/design/index.rst
index e3123080..e3123080 100644
--- a/docs/Colorado/design/index.rst
+++ b/docs/design/index.rst
diff --git a/docs/Colorado/installationprocedure/installation.instruction.rst b/docs/installationprocedure/feature.configuration.rst
index 129fd33b..129fd33b 100644
--- a/docs/Colorado/installationprocedure/installation.instruction.rst
+++ b/docs/installationprocedure/feature.configuration.rst
diff --git a/docs/installationprocedure/index.rst b/docs/installationprocedure/index.rst
new file mode 100644
index 00000000..3320215c
--- /dev/null
+++ b/docs/installationprocedure/index.rst
@@ -0,0 +1,15 @@
+***********************
+Configuration of ONOSFW
+***********************
+
+.. toctree::
+   :numbered:
+   :maxdepth: 4
+
+   feature.configuration.rst
+
+Revision: _sha1_
+
+:Author: Lucius(lukai1@huawei.com)
+
+Build date: |today|
diff --git a/docs/Colorado/release/index.rst b/docs/release/index.rst
index e3b0bdb2..e3b0bdb2 100644
--- a/docs/Colorado/release/index.rst
+++ b/docs/release/index.rst
diff --git a/docs/Colorado/release/onos-release.rst b/docs/release/onos-release.rst
index 540dd597..540dd597 100644
--- a/docs/Colorado/release/onos-release.rst
+++ b/docs/release/onos-release.rst
diff --git a/docs/Colorado/scenario description/index.rst b/docs/releasenotes/index.rst
index e39d0220..942fcf4f 100644
--- a/docs/Colorado/scenario description/index.rst
+++ b/docs/releasenotes/index.rst
@@ -6,7 +6,7 @@ ONOSFW Release Notes
    :numbered:
    :maxdepth: 4
 
-   scenario-description.rst
+   release.notes.rst
 
 Revision: _sha1_
 
diff --git a/docs/Colorado/scenario description/scenario-description.rst b/docs/releasenotes/scenario-description.rst
index 9c167c70..4e2e2724 100644
--- a/docs/Colorado/scenario description/scenario-description.rst
+++ b/docs/releasenotes/scenario-description.rst
@@ -1,6 +1,6 @@
-=========================================
-OPNFV Colorado release note for onosfw
-=========================================
+========================
+Release notes for onosfw
+========================
 
 .. contents:: Table of Contents
    :backlinks: none
@@ -13,18 +13,9 @@ This document describes the testing scenario of onosfw project, including ONOS b
 
 License
 =======
-
-<<<<<<< HEAD:docs/Colorado/scenario description/scenario-description.rst
-OPNFV Colorado release note for onosfw Docs
-=======
-OPNFV Colorado release note for onosfw Docs
->>>>>>> 061216d... DOCS-84:docs/Colorado/scenario description/scenario-description.rst
-(c) by Lucius (HUAWEI)
-
-OPNFV Colorado release note for onosfw Docs
-are licensed under a Creative Commons Attribution 4.0 International License.
-You should have received a copy of the license along with this.
-If not, see <http://creativecommons.org/licenses/by/4.0/>.
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) Lucius (HUAWEI)
 
 Version history
 ===============
diff --git a/docs/Colorado/userguide/feature.usage.rst b/docs/userguide/feature.userguide.rst
index 6c20843e..26943f2d 100644
--- a/docs/Colorado/userguide/feature.usage.rst
+++ b/docs/userguide/feature.userguide.rst
@@ -1,6 +1,6 @@
-==========================
-ONOSFW User Guide Manaully
-==========================
+=================
+ONOSFW User Guide
+=================
 
 .. contents:: Table of Contents
    :backlinks: none
@@ -14,13 +14,9 @@ This document describes the user guide instruction for onosfw project, including
 License
 =======
 
-ONOSFW User Guide Manaully Docs
-(c) by Lucius (HUAWEI)
-
-ONOSFW User Guide Manaully Docs
-are licensed under a Creative Commons Attribution 4.0 International License.
-You should have received a copy of the license along with this.
-If not, see <http://creativecommons.org/licenses/by/4.0/>.
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) Lucius (HUAWEI)
 
 Version history
 ===============
diff --git a/docs/Colorado/userguide/index.rst b/docs/userguide/index.rst
index 990b9077..5f7c67bb 100644
--- a/docs/Colorado/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -6,7 +6,7 @@ ONOSFW User Guide
    :numbered:
    :maxdepth: 4
 
-   feature.usage.rst
+   feature.userguide.rst
 
 Revision: _sha1_