Adjusting the filenames to incorporate the material into the composite docs.

ACTION: need to include Feature Configuration sections for ovs4nfv
Simona states the ovs4nfv docs may be ready and we should check from the opnfvdocs repo

Also adjusted the heading levels for readability.

Change-Id: Icd7616b7d9453490147fd361b013c3c8a3b5e79d
Signed-off-by: ChristopherPrice <christopher.price@ericsson.com>

diff --git a/docs/configguide/installation.rst b/docs/configguide/featureconfig.rst
similarity index 96%
rename from docs/configguide/installation.rst
rename to docs/configguide/featureconfig.rst
index ae67a94..1cbb56e 100755 (executable)
--- a/docs/configguide/installation.rst
+++ b/docs/configguide/featureconfig.rst
@@ -2,7 +2,6 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
 
-=============================
 Installing OVSNFV Fuel Plugin
 =============================
 

diff --git a/docs/configguide/index.rst b/docs/configguide/index.rst
index 6f84c19..70bb4a4 100644 (file)
--- a/docs/configguide/index.rst
+++ b/docs/configguide/index.rst
@@ -2,12 +2,13 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
 
-******************************
+==============================
 OVSNFV Guides and Installation
-******************************
+==============================
 
 .. toctree::
    :numbered:
    :maxdepth: 3
 
-   installation.rst
+   featureconfig.rst
+

diff --git a/docs/index.rst b/docs/index.rst
index 4721498..8b6fe79 100755 (executable)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,6 +7,7 @@
 ====================
 Open vSwitch for NFV
 ====================
+
 Welcome to OVSNFV's documentation!
 
 OVSNFV is an OPNFV collaborative development project.

diff --git a/docs/release/NEWS.rst b/docs/release/NEWS.rst
index a4c62ea..4e87aa0 100755 (executable)
--- a/docs/release/NEWS.rst
+++ b/docs/release/NEWS.rst
@@ -6,3 +6,4 @@ January 2016
 ============
 
 - Initial Release of OVSNFV Fuel Plugin.
+

diff --git a/docs/release/index.rst b/docs/release/index.rst
index b130db5..9af026a 100644 (file)
--- a/docs/release/index.rst
+++ b/docs/release/index.rst
@@ -2,9 +2,9 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
 
-***********
+===========
 OVSNFV News
-***********
+===========
 
 .. toctree::
    :numbered:

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/featureusage.rst
similarity index 97%
rename from docs/userguide/quickstart.rst
rename to docs/userguide/featureusage.rst
index d8cbe60..a26e2e9 100755 (executable)
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/featureusage.rst
@@ -2,7 +2,6 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
 
-============
 Open vSwitch
 ============
 
@@ -10,7 +9,6 @@ Open vSwtich (OVS) is a software switch commonly used in OpenStack deployments
 to replace Linux bridges as it offers advantages in terms of mobility, hardware
 integration and use by network controllers.
 
-================
 OPNFV Installers
 ================
 

diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index c2f593d..7181e5b 100644 (file)
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -2,12 +2,13 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
 
-******************************
+==============================
 OVSNFV Guides and Installation
-******************************
+==============================
 
 .. toctree::
    :numbered:
    :maxdepth: 3
 
-   quickstart.rst
+   featureusage.rst
+