50 files changed, 30 insertions, 24 deletions
diff --git a/docs/design/index.rst b/docs/development/design/index.rst
index 963002a0..963002a0 100644
--- a/docs/design/index.rst
+++ b/docs/development/design/index.rst
diff --git a/docs/design/inspector-design-guideline.rst b/docs/development/design/inspector-design-guideline.rst
index 4add8c0f..4add8c0f 100644
--- a/docs/design/inspector-design-guideline.rst
+++ b/docs/development/design/inspector-design-guideline.rst
diff --git a/docs/design/notification-alarm-evaluator.rst b/docs/development/design/notification-alarm-evaluator.rst
index d1bf787a..d1bf787a 100644
--- a/docs/design/notification-alarm-evaluator.rst
+++ b/docs/development/design/notification-alarm-evaluator.rst
diff --git a/docs/design/performance-profiler.rst b/docs/development/design/performance-profiler.rst
index f834a915..f834a915 100644
--- a/docs/design/performance-profiler.rst
+++ b/docs/development/design/performance-profiler.rst
diff --git a/docs/design/port-data-plane-status.rst b/docs/development/design/port-data-plane-status.rst
index 06cfc3c6..06cfc3c6 100644
--- a/docs/design/port-data-plane-status.rst
+++ b/docs/development/design/port-data-plane-status.rst
diff --git a/docs/design/report-host-fault-to-update-server-state-immediately.rst b/docs/development/design/report-host-fault-to-update-server-state-immediately.rst
index 2f6ce145..2f6ce145 100644
--- a/docs/design/report-host-fault-to-update-server-state-immediately.rst
+++ b/docs/development/design/report-host-fault-to-update-server-state-immediately.rst
diff --git a/docs/design/rfe-port-status-update.rst b/docs/development/design/rfe-port-status-update.rst
index d87d7d7b..d87d7d7b 100644
--- a/docs/design/rfe-port-status-update.rst
+++ b/docs/development/design/rfe-port-status-update.rst
diff --git a/docs/index.rst b/docs/development/index.rst
index a8349970..71974fe6 100755..100644
--- a/docs/index.rst
+++ b/docs/development/index.rst
@@ -11,14 +11,11 @@ Doctor
    :maxdepth: 2
    :numbered:
 
-   ./installationprocedure/index.rst
    ./design/index.rst
-   ./manuals/index.rst
    ./requirements/index.rst
-   ./scenarios/index.rst
-   ./userguide/index.rst
+   ./manuals/index.rst
+   ./overview/functest_scenario/index.rst
 
 Indices
 =======
 * :ref:`search`
-
diff --git a/docs/manuals/get-valid-server-state.rst b/docs/development/manuals/get-valid-server-state.rst
index 824ea3c2..824ea3c2 100644
--- a/docs/manuals/get-valid-server-state.rst
+++ b/docs/development/manuals/get-valid-server-state.rst
diff --git a/docs/manuals/index.rst b/docs/development/manuals/index.rst
index 05831b2b..05831b2b 100644
--- a/docs/manuals/index.rst
+++ b/docs/development/manuals/index.rst
diff --git a/docs/manuals/mark-host-down_manual.rst b/docs/development/manuals/mark-host-down_manual.rst
index 3815205d..3815205d 100644
--- a/docs/manuals/mark-host-down_manual.rst
+++ b/docs/development/manuals/mark-host-down_manual.rst
diff --git a/docs/scenarios/functest/doctor-scenario-in-functest.rst b/docs/development/overview/functest_scenario/doctor-scenario-in-functest.rst
index b3d73d5c..b3d73d5c 100644
--- a/docs/scenarios/functest/doctor-scenario-in-functest.rst
+++ b/docs/development/overview/functest_scenario/doctor-scenario-in-functest.rst
diff --git a/docs/scenarios/functest/images/LICENSE b/docs/development/overview/functest_scenario/images/LICENSE
index f2b47d20..21a2d03d 100644
--- a/docs/scenarios/functest/images/LICENSE
+++ b/docs/development/overview/functest_scenario/images/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+Copyright 2017 Open Platform for NFV Project, Inc. and its contributors
 
 Open Platform for NFV Project Documentation License
 ===================================================
diff --git a/docs/scenarios/functest/images/figure-p1.png b/docs/development/overview/functest_scenario/images/figure-p1.png
index e963d8bd..e963d8bd 100755
--- a/docs/scenarios/functest/images/figure-p1.png
+++ b/docs/development/overview/functest_scenario/images/figure-p1.png
diff --git a/docs/requirements/01-intro.rst b/docs/development/requirements/01-intro.rst
index ed666cd1..ed666cd1 100644
--- a/docs/requirements/01-intro.rst
+++ b/docs/development/requirements/01-intro.rst
diff --git a/docs/requirements/02-use_cases.rst b/docs/development/requirements/02-use_cases.rst
index 0a1f6413..0a1f6413 100644
--- a/docs/requirements/02-use_cases.rst
+++ b/docs/development/requirements/02-use_cases.rst
diff --git a/docs/requirements/03-architecture.rst b/docs/development/requirements/03-architecture.rst
index b7417691..b7417691 100644
--- a/docs/requirements/03-architecture.rst
+++ b/docs/development/requirements/03-architecture.rst
diff --git a/docs/requirements/04-gaps.rst b/docs/development/requirements/04-gaps.rst
index b8ff7f2e..b8ff7f2e 100644
--- a/docs/requirements/04-gaps.rst
+++ b/docs/development/requirements/04-gaps.rst
diff --git a/docs/requirements/05-implementation.rst b/docs/development/requirements/05-implementation.rst
index 84979772..84979772 100644
--- a/docs/requirements/05-implementation.rst
+++ b/docs/development/requirements/05-implementation.rst
diff --git a/docs/requirements/06-summary.rst b/docs/development/requirements/06-summary.rst
index 61bf3f47..61bf3f47 100644
--- a/docs/requirements/06-summary.rst
+++ b/docs/development/requirements/06-summary.rst
diff --git a/docs/requirements/07-annex.rst b/docs/development/requirements/07-annex.rst
index c3a7899d..c3a7899d 100644
--- a/docs/requirements/07-annex.rst
+++ b/docs/development/requirements/07-annex.rst
diff --git a/docs/requirements/99-references.rst b/docs/development/requirements/99-references.rst
index 0fd3a36a..0fd3a36a 100644
--- a/docs/requirements/99-references.rst
+++ b/docs/development/requirements/99-references.rst
diff --git a/docs/requirements/glossary.rst b/docs/development/requirements/glossary.rst
index 2c82b37f..2c82b37f 100644
--- a/docs/requirements/glossary.rst
+++ b/docs/development/requirements/glossary.rst
diff --git a/docs/requirements/images/LICENSE b/docs/development/requirements/images/LICENSE
index f2b47d20..21a2d03d 100644
--- a/docs/requirements/images/LICENSE
+++ b/docs/development/requirements/images/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+Copyright 2017 Open Platform for NFV Project, Inc. and its contributors
 
 Open Platform for NFV Project Documentation License
 ===================================================
diff --git a/docs/requirements/images/figure1.png b/docs/development/requirements/images/figure1.png
index 267ddddc..267ddddc 100644
--- a/docs/requirements/images/figure1.png
+++ b/docs/development/requirements/images/figure1.png
diff --git a/docs/requirements/images/figure10.png b/docs/development/requirements/images/figure10.png
index d3268018..d3268018 100755
--- a/docs/requirements/images/figure10.png
+++ b/docs/development/requirements/images/figure10.png
diff --git a/docs/requirements/images/figure11.png b/docs/development/requirements/images/figure11.png
index b5fe0f8c..b5fe0f8c 100755
--- a/docs/requirements/images/figure11.png
+++ b/docs/development/requirements/images/figure11.png
diff --git a/docs/requirements/images/figure12.png b/docs/development/requirements/images/figure12.png
index 2d394629..2d394629 100755
--- a/docs/requirements/images/figure12.png
+++ b/docs/development/requirements/images/figure12.png
diff --git a/docs/requirements/images/figure13.png b/docs/development/requirements/images/figure13.png
index 5f8227a5..5f8227a5 100755
--- a/docs/requirements/images/figure13.png
+++ b/docs/development/requirements/images/figure13.png
diff --git a/docs/requirements/images/figure14.png b/docs/development/requirements/images/figure14.png
index b65ca9ae..b65ca9ae 100755
--- a/docs/requirements/images/figure14.png
+++ b/docs/development/requirements/images/figure14.png
diff --git a/docs/requirements/images/figure2.png b/docs/development/requirements/images/figure2.png
index 9a3b166d..9a3b166d 100644
--- a/docs/requirements/images/figure2.png
+++ b/docs/development/requirements/images/figure2.png
diff --git a/docs/requirements/images/figure3.png b/docs/development/requirements/images/figure3.png
index ee04dfae..ee04dfae 100755
--- a/docs/requirements/images/figure3.png
+++ b/docs/development/requirements/images/figure3.png
diff --git a/docs/requirements/images/figure4.png b/docs/development/requirements/images/figure4.png
index 9eff177a..9eff177a 100755
--- a/docs/requirements/images/figure4.png
+++ b/docs/development/requirements/images/figure4.png
diff --git a/docs/requirements/images/figure5a.png b/docs/development/requirements/images/figure5a.png
index d347b412..d347b412 100755
--- a/docs/requirements/images/figure5a.png
+++ b/docs/development/requirements/images/figure5a.png
diff --git a/docs/requirements/images/figure5b.png b/docs/development/requirements/images/figure5b.png
index 75a43669..75a43669 100755
--- a/docs/requirements/images/figure5b.png
+++ b/docs/development/requirements/images/figure5b.png
diff --git a/docs/requirements/images/figure5c.png b/docs/development/requirements/images/figure5c.png
index 4fb2ba03..4fb2ba03 100755
--- a/docs/requirements/images/figure5c.png
+++ b/docs/development/requirements/images/figure5c.png
diff --git a/docs/requirements/images/figure6.png b/docs/development/requirements/images/figure6.png
index cf0d2be9..cf0d2be9 100755
--- a/docs/requirements/images/figure6.png
+++ b/docs/development/requirements/images/figure6.png
diff --git a/docs/requirements/images/figure7.png b/docs/development/requirements/images/figure7.png
index b88a2e65..b88a2e65 100755
--- a/docs/requirements/images/figure7.png
+++ b/docs/development/requirements/images/figure7.png
diff --git a/docs/requirements/images/figure8.png b/docs/development/requirements/images/figure8.png
index 907a0b30..907a0b30 100755
--- a/docs/requirements/images/figure8.png
+++ b/docs/development/requirements/images/figure8.png
diff --git a/docs/requirements/images/figure9.png b/docs/development/requirements/images/figure9.png
index 61501c4d..61501c4d 100755
--- a/docs/requirements/images/figure9.png
+++ b/docs/development/requirements/images/figure9.png
diff --git a/docs/requirements/index.rst b/docs/development/requirements/index.rst
index fcbfb88e..fcbfb88e 100644
--- a/docs/requirements/index.rst
+++ b/docs/development/requirements/index.rst
diff --git a/docs/installationprocedure/feature.configuration.rst b/docs/release/configguide/feature.configuration.rst
index 3ddc409c..3ddc409c 100644
--- a/docs/installationprocedure/feature.configuration.rst
+++ b/docs/release/configguide/feature.configuration.rst
diff --git a/docs/installationprocedure/index.rst b/docs/release/configguide/index.rst
index b74b91f8..ad89030b 100644
--- a/docs/installationprocedure/index.rst
+++ b/docs/release/configguide/index.rst
@@ -1,9 +1,9 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-**************************
-Doctor Configuration Guide
-**************************
+*************************
+Doctor Installation Guide
+*************************
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/release/index.rst b/docs/release/index.rst
new file mode 100644
index 00000000..6b0b43c5
--- /dev/null
+++ b/docs/release/index.rst
@@ -0,0 +1,19 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 OPNFV.
+
+
+======
+Doctor
+======
+
+.. toctree::
+   :maxdepth: 2
+   :numbered:
+
+   ./installation/index.rst
+   ./userguide/index.rst
+
+Indices
+=======
+* :ref:`search`
diff --git a/docs/scenarios/index.rst b/docs/release/installation/index.rst
index 3732e027..eff14e58 100644
--- a/docs/scenarios/index.rst
+++ b/docs/release/installation/index.rst
@@ -1,12 +1,12 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-===============
-Doctor scenario
-===============
+********************
+Doctor Release Notes
+********************
 
 .. toctree::
     :maxdepth: 2
     :numbered:
 
-   ./functest/doctor-scenario-in-functest.rst
+    releasenotes.rst
diff --git a/docs/releasenotes/releasenotes.rst b/docs/release/installation/releasenotes.rst
index efb7b08c..efb7b08c 100644
--- a/docs/releasenotes/releasenotes.rst
+++ b/docs/release/installation/releasenotes.rst
diff --git a/docs/releasenotes/releasenotes_colorado.rst b/docs/release/installation/releasenotes_colorado.rst
index 505fbdb5..505fbdb5 100644
--- a/docs/releasenotes/releasenotes_colorado.rst
+++ b/docs/release/installation/releasenotes_colorado.rst
diff --git a/docs/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst
index 4ae521bd..4ae521bd 100644
--- a/docs/userguide/feature.userguide.rst
+++ b/docs/release/userguide/feature.userguide.rst
diff --git a/docs/userguide/index.rst b/docs/release/userguide/index.rst
index c6830fd1..c6830fd1 100644
--- a/docs/userguide/index.rst
+++ b/docs/release/userguide/index.rst
diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
deleted file mode 100644
index 6fa37f6a..00000000
--- a/docs/releasenotes/index.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-
-**************************
-OPNFV Doctor Release Notes
-**************************
-
-.. toctree::
-
-    releasenotes.rst