summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorChristopher Price <christopher.price@ericsson.com>2015-12-28 14:55:57 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-28 14:55:57 +0000
commit522f1f294b964f004bf1225f63e5d6583158913c (patch)
tree2b11f463a40da0fda996a54f151e7cf4433156df /docs
parent300d3d820d4af1a69117bab1343a30d470b06441 (diff)
parent3ddf53e524497918c2b0d8529fdd43596a054a44 (diff)
Merge "Updated the config guide templates"
Diffstat (limited to 'docs')
-rw-r--r--docs/configguide/abstract.rst6
-rw-r--r--docs/configguide/index.rst12
-rw-r--r--docs/configguide/introduction.rst3
-rw-r--r--docs/userguide/userguide.rst32
4 files changed, 44 insertions, 9 deletions
diff --git a/docs/configguide/abstract.rst b/docs/configguide/abstract.rst
index 20403308d..ddade5548 100644
--- a/docs/configguide/abstract.rst
+++ b/docs/configguide/abstract.rst
@@ -1,5 +1,11 @@
+
Abstract
--------
+This document desribes how to configure the Brahmaputra release of OPNFV.
+The release includes four installers Apex, Compass4nfv, Fuel and JOID.
+
+Intended for *******
+
We write something about the doc for the title page.
diff --git a/docs/configguide/index.rst b/docs/configguide/index.rst
index 70f16e2d2..a3db3fbdb 100644
--- a/docs/configguide/index.rst
+++ b/docs/configguide/index.rst
@@ -4,7 +4,7 @@
contain the root `toctree` directive.
OPNFV Configuration Guide
-================================================
+=========================
abstract.rst
@@ -17,12 +17,14 @@ Contents:
introduction.rst
configoptions.rst
-Installation Description
-========================
+Installer Configuration
+=======================
+ installerconfig.rst
-Feature Description
-===================
+
+Feature Configuration
+=====================
../../sdnvpn/docs/configguide/configguide.rst
diff --git a/docs/configguide/introduction.rst b/docs/configguide/introduction.rst
index 093a93609..7d904d2c1 100644
--- a/docs/configguide/introduction.rst
+++ b/docs/configguide/introduction.rst
@@ -2,6 +2,7 @@
Scope
=====
+
Using this guide
----------------
@@ -9,6 +10,6 @@ Using this guide
Pre-requisites
--------------
-The OPNFV Config Guide needs work...
+
diff --git a/docs/userguide/userguide.rst b/docs/userguide/userguide.rst
index efcaa8ce1..b129b5d2e 100644
--- a/docs/userguide/userguide.rst
+++ b/docs/userguide/userguide.rst
@@ -1,4 +1,30 @@
-Introduction
----------------
-The OPNFV User Guide needs work...
+
+OPNFV User Guide
+================
+
+abstact.rst
+
+????????????????
+================
+
+Table of content
+
+introduction.rst
+
+configuration-overview.rst
+
+General system usage
+====================
+Openstack.rst
+Opendaylight.rst
+onos.rst
+xxx.rst
+xxx.rst
+
+Using Brahmaputra features
+==========================
+projectxyz.rst
+
+
+