summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopherPrice <christopher.price@ericsson.com>2016-02-25 09:51:47 +0100
committerChristopher Price <christopher.price@ericsson.com>2016-02-25 13:07:31 +0000
commitde86b2f52503b94bd43447f5af4d12f281da5382 (patch)
treedcfbf4f09c79349b756b65e345e0dd9c93491fcf
parente2ef5534ead7a48240b0b99da1cf3f6a22e7ceaa (diff)
Final editorials on release morning. Comment here!
Change-Id: Ifbd43732a5282e63d9699dfc08b8e5b072c3b040 Signed-off-by: ChristopherPrice <christopher.price@ericsson.com> (cherry picked from commit 9a79923a96c78bdf809fae01d99320d391e64b75)
-rw-r--r--docs/images/brahmaputrafeaturematrix.jpgbin61195 -> 62966 bytes
-rw-r--r--docs/scenario/featurematrix.rst10
-rw-r--r--docs/userguide/introduction.rst4
3 files changed, 12 insertions, 2 deletions
diff --git a/docs/images/brahmaputrafeaturematrix.jpg b/docs/images/brahmaputrafeaturematrix.jpg
index 7678fad16..0d2a12279 100644
--- a/docs/images/brahmaputrafeaturematrix.jpg
+++ b/docs/images/brahmaputrafeaturematrix.jpg
Binary files differ
diff --git a/docs/scenario/featurematrix.rst b/docs/scenario/featurematrix.rst
index ce8c24b6c..cc9c4d347 100644
--- a/docs/scenario/featurematrix.rst
+++ b/docs/scenario/featurematrix.rst
@@ -11,6 +11,16 @@ in the Brahmaputra release of OPNFV.
.. image:: ../images/brahmaputrafeaturematrix.jpg
:alt: OPNFV Brahmaputra Feature Matrix
+The table above provides an overview of which scenarios will support certain feature capabilities.
+The table does not indicate if the feature or scenario has limitations, refer to the
+`Configuration Guide <http://artifacts.opnfv.org/opnfvdocs/brahmaputra/docs/configguide/configoptions.html#opnfv-scenarios>`_
+for details on the state of each scenario and further information.
+
+Feature development in the Brahmaputra release has often consisted of the development of specific
+requirements and the further integration and validation of those requirements. This results in some
+features only being supported on the platform when a specific scenario is deployed, providing the
+capabilities necessary to run the feature.
+
Scenario Naming
^^^^^^^^^^^^^^^
diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst
index f2958eea9..17d2030e0 100644
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@@ -17,8 +17,8 @@ include different source components or configurations. Scenarios are designed t
enable specific features and capabilities in the platform that can be leveraged by the
OPNFV user community.
-OPNFV Scenarios
-===============
+OPNFV Features
+==============
Each OPNFV scenario provides unique features and capabilities, it is important to
ensure you have a scenario deployed on your infrastructure that provides the right capabilities