Update to new docs folders and names.

JIRA: COPPER-1
Remove trailing whitespace

Change-Id: I6291106ca6133034cdee6551df1b7b075ea5ee69
Signed-off-by: blsaws <bryan.sullivan@att.com>
(cherry picked from commit f845679c6e99e9a8b48a4f9ad01a6647383aa62e)

13 files changed, 45 insertions, 24 deletions

diff --git a/docs/design/featureconfig_link.rst b/docs/design/featureconfig_link.rst
index 20ab6a9..6af66f7 100644
--- a/docs/design/featureconfig_link.rst
+++ b/docs/design/featureconfig_link.rst
@@ -1,2 +1,2 @@
 .. include::
-   ../configguide/featureconfig.rst
+   ../installationprocedure/feature.configuration.rst
diff --git a/docs/design/featureusage_link.rst b/docs/design/featureusage_link.rst
index 135cf01..c3ac10b 100644
--- a/docs/design/featureusage_link.rst
+++ b/docs/design/featureusage_link.rst
@@ -1,2 +1,2 @@
 .. include::
-   ../userguide/featureusage.rst
+   ../userguide/feature.usage.rst
diff --git a/docs/design/index.rst b/docs/design/index.rst
index 0f0d20a..637278b 100644
--- a/docs/design/index.rst
+++ b/docs/design/index.rst
@@ -12,6 +12,7 @@ OPNFV Copper Project
    :maxdepth: 4
 
    introduction.rst
+   releasenotes_link.rst
    definitions.rst
    usecases.rst
    architecture.rst
diff --git a/docs/design/introduction.rst b/docs/design/introduction.rst
index 5f604c0..ad1f5f5 100644
--- a/docs/design/introduction.rst
+++ b/docs/design/introduction.rst
@@ -97,21 +97,3 @@ For that reason, the Copper project will initially focus on more specific
 configuration requirements as fulfilled by specific configuration capabilities,
 and how those requirements and capabilities are expressed in VNF and service
 design and packaging, or as generic poicies for the NFVI.
-
-Copper Release 1 Scope
-----------------------
-OPNFV Brahmaputra was the initial OPNFV release for Copper, and achieved the
-goals:
-  * Add the OpenStack Congress service to OPNFV, through at least one installer
-    project, through post-install configuration.
-  * Provide basis tests scripts and tools to exercise the Congress service
-
-Copper Release 2 Scope
-----------------------
-OPNFV Colorado includes the additional features:
-  * Congress support in the the OPNFV CI/CD pipeline for the JOID and Apex
-    installers, through the following projects being upstreamed to OpenStack:
-    * For JOID, a JuJu Charm for Congress
-    * For Apex, a Puppet Module for Congress
-  * Congress use case tests integrated into Functest and as manual tests
-  * Further enhancements of Congress test tools
diff --git a/docs/design/postinstall_link.rst b/docs/design/postinstall_link.rst
index ab2038f..ca8d99c 100644
--- a/docs/design/postinstall_link.rst
+++ b/docs/design/postinstall_link.rst
@@ -1,2 +1,2 @@
 .. include::
-   ../configguide/postinstall.rst
+   ../installationprocedure/installation.instruction.rst
diff --git a/docs/design/releasenotes_link.rst b/docs/design/releasenotes_link.rst
new file mode 100644
index 0000000..6ee81a3
--- /dev/null
+++ b/docs/design/releasenotes_link.rst
@@ -0,0 +1,2 @@
+.. include::
+   ../releasenotes/release.notes.rst
diff --git a/docs/configguide/featureconfig.rst b/docs/installationprocedure/feature.configuration.rst
index fce0044..fce0044 100644
--- a/docs/configguide/featureconfig.rst
+++ b/docs/installationprocedure/feature.configuration.rst
diff --git a/docs/configguide/index.rst b/docs/installationprocedure/index.rst
index f39e084..9b5d02f 100644
--- a/docs/configguide/index.rst
+++ b/docs/installationprocedure/index.rst
@@ -6,5 +6,5 @@ OPNFV Copper Configuration Guide
    :numbered:
    :maxdepth: 4
 
-   featureconfig.rst
-   postinstall.rst
+   feature.configuration.rst
+   installation.instruction.rst
diff --git a/docs/configguide/postinstall.rst b/docs/installationprocedure/installation.instruction.rst
index b80bb2f..b80bb2f 100644
--- a/docs/configguide/postinstall.rst
+++ b/docs/installationprocedure/installation.instruction.rst
diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
new file mode 100644
index 0000000..f33c7fc
--- /dev/null
+++ b/docs/releasenotes/index.rst
@@ -0,0 +1,9 @@
+**************************
+OPNFV Copper Rekease Notes
+**************************
+
+.. toctree::
+   :numbered:
+   :maxdepth: 4
+
+   release.notes.rst
diff --git a/docs/releasenotes/release.notes.rst b/docs/releasenotes/release.notes.rst
new file mode 100644
index 0000000..c62ae74
--- /dev/null
+++ b/docs/releasenotes/release.notes.rst
@@ -0,0 +1,27 @@
+.. This work is licensed under a
+.. Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) OPNFV
+
+Release Notes
+=============
+
+Copper Release 1 Scope
+----------------------
+OPNFV Brahmaputra was the initial OPNFV release for Copper, and achieved the
+goals:
+  * Add the OpenStack Congress service to OPNFV, through at least one installer
+    project, through post-install configuration.
+  * Provide basis tests scripts and tools to exercise the Congress service
+
+Copper Release 2 Scope
+----------------------
+OPNFV Colorado includes the additional features:
+  * Congress support in the the OPNFV CI/CD pipeline for the JOID and Apex
+    installers, through the following projects being upstreamed to OpenStack:
+
+    * For JOID, a JuJu Charm for Congress
+    * For Apex, a Puppet Module for Congress
+
+  * Congress use case tests integrated into Functest and as manual tests
+  * Further enhancements of Congress test tools
diff --git a/docs/userguide/featureusage.rst b/docs/userguide/feature.usage.rst
index 4570106..4570106 100644
--- a/docs/userguide/featureusage.rst
+++ b/docs/userguide/feature.usage.rst
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index dce8b75..73f3126 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -6,4 +6,4 @@ OPNFV Copper Configuration Guide
    :numbered:
    :maxdepth: 4
 
-   featureusage.rst
+   feature.usage.rst