From cfe0798d1002836cf853c5bef2215610e01ef45a Mon Sep 17 00:00:00 2001
From: JohnKeeney <john.keeney@est.tech>
Date: Fri, 30 Jun 2023 17:02:45 +0100
Subject: [PATCH] Docs: Update release notes

Issue-ID: NONRTRIC-883
Change-Id: I2b693c21f8aa5f63ada055947b7e29d235474d56
Signed-off-by: JohnKeeney <john.keeney@est.tech>
---
 docs/conf.py               |  2 +-
 docs/developer-guide.rst   |  8 ++++----
 docs/release-notes.rst     | 25 +++++++++++++++++++++++++
 docs/requirements-docs.txt |  1 +
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 9a38b22..e6e3992 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -20,7 +20,7 @@ from docs_conf.conf import *
 #branch configuration
 
 branch = 'h-release'
-onapbranch = 'latest'
+onapbranch = 'london'
 
 linkcheck_ignore = [
     'http://localhost.*',
diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
index d3bb426..a30d93f 100644
--- a/docs/developer-guide.rst
+++ b/docs/developer-guide.rst
@@ -1,14 +1,14 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. SPDX-License-Identifier: CC-BY-4.0
-.. Copyright (C) 2021 Nordix
+.. Copyright (C) 2021-2023 Nordix
 
 ===============
 Developer Guide
 ===============
 
-This document provides a quickstart for developers of the Non-RT RIC A1 Policy Managent Service.
+This document provides a quickstart for developers of the Non-RT RIC A1 Policy Management Service.
 
-The A1 Policy Management Service is implemented in ONAP. For documentation see `ONAP CCSDK documentation <https://docs.onap.org/projects/onap-ccsdk-oran/en/latest/index.html>`_.
+The A1 Policy Management Service is implemented in ONAP. For documentation see `ONAP CCSDK documentation <https://docs.onap.org/projects/onap-ccsdk-oran/en/london/index.html>`_.
 and `wiki <https://wiki.onap.org/pages/viewpage.action?pageId=84672221>`_.
 
 Kubernetes deployment
@@ -18,7 +18,7 @@ Non-RT RIC can be also deployed in a Kubernetes cluster, `it/dep repository <htt
 hosts deployment and integration artifacts. Instructions and helm charts to deploy the Non-RT-RIC functions in the
 OSC NONRTRIC integrated test environment can be found in the *./nonrtric* directory.
 
-For more information on installation of NonRT-RIC in Kubernetes, see `Deploy NONRTRIC in Kubernetes <https://wiki.o-ran-sc.org/display/RICNR/Deploy+NONRTRIC+in+Kubernetes>`_.
+For more information on installation of Non RT-RIC in Kubernetes, see `Deploy NONRTRIC in Kubernetes <https://wiki.o-ran-sc.org/display/RICNR/Deploy+NONRTRIC+in+Kubernetes>`_.
 
 For more information see `Integration and Testing documentation on the O-RAN-SC wiki <https://docs.o-ran-sc.org/projects/o-ran-sc-it-dep/en/latest/index.html>`_.
 
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 7141ad2..cd76455 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -59,6 +59,9 @@ Version history A1 Policy Management Service (A1 Policy Agent)
 | 2023-02-10 | 2.5.1    | Yennifer Chacon  | G Maintenance      |
 |            |          |                  | Release            |
 +------------+----------+------------------+--------------------+
+| 2023-06-16 | 2.6.0    | John Keeney      | H Release          |
+|            |          |                  |                    |
++------------+----------+------------------+--------------------+
 
 Release Data
 ============
@@ -273,4 +276,26 @@ G Maintenance Release
 +-----------------------------+---------------------------------------------------+
 | **Purpose of the delivery** | Update springboot version                         |
 |                             |                                                   |
++-----------------------------+---------------------------------------------------+
+
+H Release
+---------
++-----------------------------+---------------------------------------------------+
+| **Project**                 | Non-RT RIC A1 Policy Management Service           |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Repo/commit-ID**          | nonrtric/plt/a1policymanagementservice            |
+|                             | 03913aa30c8d82576ac5adda68f68c4246f34fe7          |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Release designation**     | H                                                 |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Release date**            | 2023-06-16                                        |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Purpose of the delivery** | nonrtric-plt-a1policymanagementservice:2.6.0      |
+|                             |   Numerous security/vulnerability updates         |
+|                             |   Added support for fine-grained authorisation    |
+|                             |   Numerous bug fix & stability improvements       |
 +-----------------------------+---------------------------------------------------+
\ No newline at end of file
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index 3ecb51e..21e0971 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -2,6 +2,7 @@ tox
 Sphinx
 doc8
 docutils < 0.17
+urllib3~=1.26.15
 setuptools
 six
 sphinx_rtd_theme
-- 
2.16.6