summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release/configguide/installerconfig.rst4
-rw-r--r--docs/release/installation/architecture.rst2
-rw-r--r--docs/release/release-notes/index.rst2
-rw-r--r--docs/release/release-notes/release-notes.rst29
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst4
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst4
-rw-r--r--docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst4
-rw-r--r--docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst4
-rw-r--r--docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst4
-rw-r--r--docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst4
-rw-r--r--docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst4
-rw-r--r--docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst4
-rw-r--r--docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst4
13 files changed, 5 insertions, 68 deletions
diff --git a/docs/release/configguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst
index 0cbb00f6..25719777 100644
--- a/docs/release/configguide/installerconfig.rst
+++ b/docs/release/configguide/installerconfig.rst
@@ -7,5 +7,5 @@
Apex configuration
==================
-.. include:: ../installationprocedure/introduction.rst
-.. include:: ../installationprocedure/baremetal.rst
+.. include:: ../installation/introduction.rst
+.. include:: ../installation/baremetal.rst
diff --git a/docs/release/installation/architecture.rst b/docs/release/installation/architecture.rst
index e2c0bb7e..079c26d5 100644
--- a/docs/release/installation/architecture.rst
+++ b/docs/release/installation/architecture.rst
@@ -160,7 +160,7 @@ issues per scenario. The following scenarios correspond to a supported
+-------------------------+-------------+---------------+
| os-odl-bgpvpn-noha | SDNVPN | Yes |
+-------------------------+-------------+---------------+
-| os-odl-sfc-ha | SFC | Yes |
+| os-odl-sfc-ha | SFC | No |
+-------------------------+-------------+---------------+
| os-odl-sfc-noha | SFC | Yes |
+-------------------------+-------------+---------------+
diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst
index a87e2612..3fe94631 100644
--- a/docs/release/release-notes/index.rst
+++ b/docs/release/release-notes/index.rst
@@ -1,4 +1,4 @@
-.. _apex-release-notes:
+.. _apex-releasenotes:
************************
OPNFV Apex Release Notes
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index a2369e38..4be2e651 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -2,11 +2,6 @@
OPNFV Release Notes for the Euphrates release of OPNFV Apex deployment tool
===========================================================================
-
-.. contents:: Table of Contents
- :backlinks: none
-
-
Abstract
========
@@ -19,28 +14,6 @@ License
All Apex and "common" entities are protected by the Apache 2.0 License
( http://www.apache.org/licenses/ )
-
-Version History
-===============
-
-
-+-------------+-----------+-----------------+----------------------+
-| **Date** | **Ver.** | **Authors** | **Comment** |
-| | | | |
-+-------------+-----------+-----------------+----------------------+
-| 2017-08-28 | 5.0 | Tim Rozet | Updates for Euphrates|
-+-------------+-----------+-----------------+----------------------+
-| 2017-03-30 | 4.0 | Tim Rozet | Updates for Danube |
-+-------------+-----------+-----------------+----------------------+
-| 2016-09-20 | 2.1.0 | Tim Rozet | More updates for |
-| | | | Colorado |
-+-------------+-----------+-----------------+----------------------+
-| 2016-08-11 | 2.0.0 | Dan Radez | Updates for Colorado |
-+-------------+-----------+-----------------+----------------------+
-| 2015-09-17 | 1.0.0 | Dan Radez | Rewritten for |
-| | | | RDO Manager update |
-+-------------+-----------+-----------------+----------------------+
-
Important Notes
===============
@@ -89,7 +62,7 @@ Release Data
| **Release designation** | 5.0.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release date** | 2017-09-17 |
+| **Release date** | 2017-10-20 |
| | |
+--------------------------------------+--------------------------------------+
| **Purpose of the delivery** | OPNFV Euphrates release |
diff --git a/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst b/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst
index 4d8870bb..0aa72ba0 100644
--- a/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst
+++ b/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst b/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst
index 33a855d1..6889f7d9 100644
--- a/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst
+++ b/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst b/docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst
index cc5fee3b..39083850 100644
--- a/docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst
+++ b/docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and DPDK enabled Open vSwitch.
-.. contents::
- :depth: 3
- :local:
-
Introduction
============
diff --git a/docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst b/docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst
index b85f6e2b..be0f37d3 100644
--- a/docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst
+++ b/docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and DPDK enabled Open vSwitch.
-.. contents::
- :depth: 3
- :local:
-
Introduction
============
diff --git a/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst b/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst
index 1319f427..6437ce1b 100644
--- a/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst
+++ b/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and performance options enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst b/docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst
index 331d3b11..b75c4355 100644
--- a/docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst
+++ b/docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst
@@ -6,10 +6,6 @@ This document provides scenario level details for Euphrates 1.0 of
deployment with the OpenDaylight SDN controller and only CSIT relevant
features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst b/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst
index 1036f774..e5561a79 100644
--- a/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst
+++ b/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with the OpenDaylight SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst b/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst
index 490cfbd9..f04e7c02 100644
--- a/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst
+++ b/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with the OpenDaylight SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
index c0f96ab7..a838e4b1 100644
--- a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
+++ b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with the OVN SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============