From: Sofia Wallin <sofia.wallin@est.tech>
Date: Tue, 18 Aug 2020 12:36:55 +0000 (+0000)
Subject: Merge "Move cert-service documentation from aaf to oom/platform"
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=doc.git;a=commitdiff_plain;h=e7bd2b230298bf49c22ac13e4aa31c4b8264dce1;hp=1a16ca9a7e3a3dd948f741ff3d7ed4e800bfb6e5

Merge "Move cert-service documentation from aaf to oom/platform"
---

diff --git a/docs/guides/onap-user/design/pre-onboarding/index.rst b/docs/guides/onap-user/design/pre-onboarding/index.rst
index 43a82fb98..7279693d2 100644
--- a/docs/guides/onap-user/design/pre-onboarding/index.rst
+++ b/docs/guides/onap-user/design/pre-onboarding/index.rst
@@ -32,7 +32,7 @@ These steps are performed outside SDC.
 onboarding. The requirements are found in the following document.
 
 
-:ref:`Heat requirements<onap-vnfrqts-requirements:master_index>`
+:ref:`Heat requirements<onap-vnfrqts-requirements:heat_requirements>`
 
 #. Put the Heat, ENV, nested Heat, and other files used by get-file in templates
    in a directory on a host, which supports python.
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 720952391..84a7da754 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -10,6 +10,33 @@ Release Notes
 
 This document provides the release notes for the documentation project.
 
+Frankfurt Maintenance Release 6.0.1
+===================================
+
+Release data
+============
+
++--------------------------------------+--------------------------------------+
+| **Project**                          | Open Network Automation Platform     |
+|                                      | (ONAP)                               |
++--------------------------------------+--------------------------------------+
+| **Release name**                     | Frankfurt                            |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release version**                  | 6.0.1                                |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release date**                     | August 17th 2020                     |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+
+New features
+------------
+
+- no updates
+
+Frankfurt Release 6.0.0
+=======================
 
 Release Data
 ------------
diff --git a/docs/release/index.rst b/docs/release/index.rst
index 96ba91215..4b0bd166e 100644
--- a/docs/release/index.rst
+++ b/docs/release/index.rst
@@ -19,6 +19,16 @@ release notes and links to those release notes are provided below.
 Details on the specific items delivered in each releaese by each component is
 maintained in the component specific release notes.
 
+Frankfurt Releases
+==================
+
+The following releases are available for Frankfurt:
+  - `Frankfurt Mayor Release 6.0.0`_
+  - `Frankfurt Maintenance Release 6.0.1`_
+
+Frankfurt Maintenance Release 6.0.1
+===================================
+
 Release data
 ============
 
@@ -29,7 +39,43 @@ Release data
 | **Release name**                     | Frankfurt                            |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release version**                  | Frankfurt 6.0.0                      |
+| **Release version**                  | 6.0.1                                |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release date**                     | August 17th 2020                     |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+
+Frankfurt Maintenance Release 6.0.1 delivered a number of fixes and updates
+across the following projects:
+
+- AAF
+- OOM
+- CCSDK
+- CLAMP
+- DCAEGEN2
+- Integration
+- POLICY
+- SDC
+- SO
+- TEST
+
+Details on the specific Jira tickets addressed by each project can be found in the component specific Release Notes. Link can be found below in section `Project Specific Release Notes`_.
+
+Frankfurt Mayor Release 6.0.0
+=============================
+
+Release data
+============
+
++--------------------------------------+--------------------------------------+
+| **Project**                          | Open Network Automation Platform     |
+|                                      | (ONAP)                               |
++--------------------------------------+--------------------------------------+
+| **Release name**                     | Frankfurt                            |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release version**                  | 6.0.0                                |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Release date**                     | June 11th 2020                       |
@@ -41,6 +87,7 @@ Project Specific Release Notes
 ONAP releases are specified by a list of project artifact versions in the
 project repositories and docker container image versions listed in the OOM
 Helm charts.
+
 Each project provides detailed :ref:`release notes<doc-releaserepos>`
 and prepends to these if/when any updated versions the project team believes
 are compatible with a major release are made available.