summaryrefslogtreecommitdiffstats
path: root/docs/userguide/general-system.rst
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2016-02-16 13:09:20 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-16 13:09:20 +0000
commitc807b19711297a5576e643922015719feec3707e (patch)
treed3e93d16f23223729fe2540831947d420b157596 /docs/userguide/general-system.rst
parent187cf6f0c6e973327319c12c6fb79b0bfe5b0565 (diff)
parent3d532bdb76f6892c7473bf85ddad4fbac642c00d (diff)
Merge "User guide updated for automated content inclusion." into stable/brahmaputra
Diffstat (limited to 'docs/userguide/general-system.rst')
-rw-r--r--docs/userguide/general-system.rst11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/userguide/general-system.rst b/docs/userguide/general-system.rst
index 055e561c2..1235c8f77 100644
--- a/docs/userguide/general-system.rst
+++ b/docs/userguide/general-system.rst
@@ -6,17 +6,20 @@
Using common platform components
================================
-This section outlines basic usage principans and methods for some of the commonly deployed
-components of suported OPNFV scenario's in Brahmaputra.
+This section outlines basic usage principals and methods for some of the commonly deployed
+components of supported OPNFV scenario's in Brahmaputra.
The subsections provide an outline of how these components are commonly used and how to address them
in an OPNFV deployment. The components derive from autonomous upstream communities and where possible
-this guide will provide direction ot the relevant documentation made available by those communities
+this guide will provide direction to the relevant documentation made available by those communities
to better help you navigate the OPNFV deployment.
+Common VIM components
+=====================
+
.. include:: ./openstack.rst
Common SDN components
----------------------
+=====================
.. include:: ./opendaylight.rst
.. include:: ./onos.rst