From ff3555cf1d29d4c9afd98c1e73aa6a9a2edd1db8 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Thu, 2 Mar 2023 10:59:38 +0530
Subject: [PATCH] Update release notes.

---
 docs/en_US/release_notes.rst      |  1 +
 docs/en_US/release_notes_6_21.rst |  3 ---
 docs/en_US/release_notes_7_0.rst  | 33 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 docs/en_US/release_notes_7_0.rst

diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index b6a9e1f53..23d9edf64 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_7_0
    release_notes_6_21
    release_notes_6_20
    release_notes_6_19
diff --git a/docs/en_US/release_notes_6_21.rst b/docs/en_US/release_notes_6_21.rst
index 4be740680..082e48110 100644
--- a/docs/en_US/release_notes_6_21.rst
+++ b/docs/en_US/release_notes_6_21.rst
@@ -26,8 +26,6 @@ New features
 Housekeeping
 ************
 
-  | `Issue #5011 <https://github.com/pgadmin-org/pgadmin4/issues/5011>`_ -  Added support for psycopg3 along with psycopg2.
-  | `Issue #5701 <https://github.com/pgadmin-org/pgadmin4/issues/5701>`_ -  Remove Bootstrap and jQuery usage.
 
 Bug fixes
 *********
@@ -44,7 +42,6 @@ Bug fixes
   | `Issue #5803 <https://github.com/pgadmin-org/pgadmin4/issues/5803>`_ -  Fix an issue where query tool is stripping spaces in grid cell.
   | `Issue #5810 <https://github.com/pgadmin-org/pgadmin4/issues/5810>`_ -  Fix an issue where sequence owner is remove on sequence edit.
   | `Issue #5822 <https://github.com/pgadmin-org/pgadmin4/issues/5822>`_ -  Do not allow to save invalid JSON in query tool JSON editor.
-  | `Issue #5833 <https://github.com/pgadmin-org/pgadmin4/issues/5833>`_ -  Fixed an issue where user MFA entry was not getting delete after deleting a user.
   | `Issue #5847 <https://github.com/pgadmin-org/pgadmin4/issues/5847>`_ -  Fixed an issue where pgAdmin failed to connect when the Postgres password included special characters.
   | `Issue #5872 <https://github.com/pgadmin-org/pgadmin4/issues/5872>`_ -  Handle MERGE operation in query tool explain introduced in PostgreSQL 15.
   | `Issue #5889 <https://github.com/pgadmin-org/pgadmin4/issues/5889>`_ -  Fixed an issue where the database server is not connected using a service file.
diff --git a/docs/en_US/release_notes_7_0.rst b/docs/en_US/release_notes_7_0.rst
new file mode 100644
index 000000000..f78ee7e23
--- /dev/null
+++ b/docs/en_US/release_notes_7_0.rst
@@ -0,0 +1,33 @@
+***********
+Version 7.0
+***********
+
+Release date: 2023-04-06
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.21.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 10, 11, 12, 13, 14 and 15
+
+**EDB Advanced Server**: 10, 11, 12, 13, 14 and 15
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 15.1
+
+
+New features
+************
+
+
+Housekeeping
+************
+
+  | `Issue #5011 <https://github.com/pgadmin-org/pgadmin4/issues/5011>`_ -  Added support for psycopg3 along with psycopg2.
+  | `Issue #5701 <https://github.com/pgadmin-org/pgadmin4/issues/5701>`_ -  Remove Bootstrap and jQuery usage.
+
+Bug fixes
+*********
+
+  | `Issue #5833 <https://github.com/pgadmin-org/pgadmin4/issues/5833>`_ -  Fixed an issue where user MFA entry was not getting delete after deleting a user.