summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopherPrice <christopher.price@ericsson.com>2016-02-22 19:53:54 +0100
committerMark D. Gray <mark.d.gray@intel.com>2016-02-23 11:17:23 +0000
commit67a5d606ecf520cc2fc11d35540b8c0fce4d56db (patch)
tree2e282490a4925fc9e06588611e7cb71610992edd
parent7b34b916dfa5f0eaebc3a58acb8c565201455530 (diff)
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> (cherry picked from commit e2a47bd00369ee30a4ffed6c446f0c76faf662e4)
-rwxr-xr-xdocs/configguide/featureconfig.rst (renamed from docs/configguide/installation.rst)1
-rw-r--r--docs/configguide/index.rst7
-rwxr-xr-xdocs/index.rst1
-rwxr-xr-xdocs/release/NEWS.rst1
-rw-r--r--docs/release/index.rst4
-rwxr-xr-xdocs/userguide/featureusage.rst (renamed from docs/userguide/quickstart.rst)2
-rw-r--r--docs/userguide/index.rst7
7 files changed, 12 insertions, 11 deletions
diff --git a/docs/configguide/installation.rst b/docs/configguide/featureconfig.rst
index ae67a94..1cbb56e 100755
--- 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
--- 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
--- 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
--- 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
--- 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
index d8cbe60..a26e2e9 100755
--- 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
--- 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
+