Merge pull request #3006 from EnterpriseDB/release/2022-08-04a

Release: 2022-08-04a
EnterpriseDB · Aug 4, 2022 · a38696c · a38696c
2 parents 55ff29a + 339ba13
commit a38696c
Show file tree

Hide file tree

Showing 103 changed files with 379 additions and 134 deletions.
diff --git a/install_template/config.yaml b/install_template/config.yaml
@@ -530,43 +530,43 @@ products:
     platforms:
       - name: CentOS 7
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: CentOS 7
         arch: ppc64le
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: AlmaLinux 8 or Rocky Linux 8
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: RHEL 7 or OL 7
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: RHEL 8 or OL 8
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: RHEL 8
         arch: ppc64le
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: Ubuntu 18.04
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: Ubuntu 20.04
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: Debian 10
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: SLES 12
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: SLES 12
         arch: ppc64le
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: SLES 15
         arch: x86_64
-        supported versions: [3.1]
+        supported versions: [3.2]
       - name: SLES 15
         arch: ppc64le
-        supported versions: [3.1]
+        supported versions: [3.2]
   - name: Postgres Enterprise Manager server
     platforms:
       - name: CentOS 7

diff --git a/install_template/deploy.mjs b/install_template/deploy.mjs
@@ -312,16 +312,24 @@ const moveDoc = async (product, platform, version) => {
       (ctx) => `pem/8/installing_pem_agent/installing_on_linux/${fmtArchPath(ctx)}/pem_agent_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "Postgres Enterprise Manager agent", version: 8}, platform: {name: "Ubuntu 20.04"}}, 
       (ctx) => `pem/8/installing_pem_agent/installing_on_linux/${fmtArchPath(ctx)}/pem_agent_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "PostGIS", version: 3.1}, platform: {name: "SLES 12"}}, 
-      (ctx) => `postgis/3.1/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_sles12_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "PostGIS", version: 3.1}, platform: {name: "SLES 15"}}, 
-      (ctx) => `postgis/3.1/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_sles15_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "PostGIS", version: 3.1}, platform: {name: "Ubuntu 20.04"}}, 
-      (ctx) => `postgis/3.1/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "PostGIS", version: 3.1}, platform: {name: "Ubuntu 18.04"}}, 
-      (ctx) => `postgis/3.1/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
-    when({product: {name: "PostGIS", version: 3.1}, platform: {name: "Debian 10"}}, 
-      (ctx) => `postgis/3.1/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_deb10_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "AlmaLinux 8 or Rocky Linux 8"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_other_linux8_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "RHEL 7 or OL 7"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_rhel7_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "RHEL 8 or OL 8"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_rhel_8_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "RHEL 8"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_rhel8_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "SLES 12"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_sles12_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "SLES 15"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_sles15_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "Ubuntu 20.04"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "Ubuntu 18.04"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
+    when({product: {name: "PostGIS", version: 3.2}, platform: {name: "Debian 10"}}, 
+      (ctx) => `postgis/3.2/01a_installing_postgis/installing_on_linux/${fmtArchPath(ctx)}/postgis_deb10_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "Replication Server", version: 7}, platform: {name: "SLES 12"}}, 
       (ctx) => `eprs/7/03_installation/03_installing_rpm_package/${fmtArchPath(ctx)}/eprs_sles12_${fmtArchFilename(ctx)}.mdx`),
     when({product: {name: "Replication Server", version: 7}, platform: {name: "SLES 15"}}, 

diff --git a/install_template/templates/products/postgis/base.njk b/install_template/templates/products/postgis/base.njk
@@ -1,17 +1,17 @@
 {% extends "platformBase/" + platformBaseTemplate + '.njk' %}
-{% set packageName %}edb-as14-postgis3{% endset %}
+{% set packageName %}edb-as14-postgis32{% endset %}
 {% block installCommand %}
 ```shell
 # If you are using EDB Postgres Advanced Server 13 or 14, use this format 
 # of the command:
-apt-get install edb-as14-postgis32
+{{ packageManager }} install edb-as14-postgis32
 # Where `14` is the version of EDB Postgres Advanced Server. Replace `14` 
 # with `13` if that is the version of EDB Postgres Advanced Server you 
 # are using.
 
 # If you are using  EDB Postgres Advanced Server 11 or 12, use this format 
 # of the command:
-apt-get install edb-as12-postgis-3.2
+{{ packageManager }} install edb-as12-postgis-3.2
 
 # Where `12` is the version of EDB Postgres Advanced Server. Replace `12` 
 # with `11` if that is the version of EDB Postgres Advanced Server you 

diff --git a/..._inst_linux/installing_epas_using_edb_repository/x86_amd64/epas_centos7_x86.mdx b/..._inst_linux/installing_epas_using_edb_repository/x86_amd64/epas_centos7_x86.mdx
@@ -24,6 +24,8 @@ sed -i "s@<username>:<password>@USERNAME:PASSWORD@" /etc/yum.repos.d/edb.repo
 
 #  Install the EPEL repository:
 yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
+
 ```
 
 ## Install the package

diff --git a/...nstalling_pgbouncer_on_a_windows_host.mdx → ...nstalling_pgbouncer_on_a_windows_host.mdx b/...nstalling_pgbouncer_on_a_windows_host.mdx → ...nstalling_pgbouncer_on_a_windows_host.mdx
diff --git a/.../pgbouncer/1.16/01_installation/index.mdx → .../pgbouncer/1.17/01_installation/index.mdx b/.../pgbouncer/1.16/01_installation/index.mdx → .../pgbouncer/1.17/01_installation/index.mdx
diff --git a/...tall_on_linux/ibm_power_ppc64le/index.mdx → ...tall_on_linux/ibm_power_ppc64le/index.mdx b/...tall_on_linux/ibm_power_ppc64le/index.mdx → ...tall_on_linux/ibm_power_ppc64le/index.mdx
diff --git a/...m_power_ppc64le/pgbouncer_rhel8_ppcle.mdx → ...m_power_ppc64le/pgbouncer_rhel8_ppcle.mdx b/...m_power_ppc64le/pgbouncer_rhel8_ppcle.mdx → ...m_power_ppc64le/pgbouncer_rhel8_ppcle.mdx
diff --git a/..._power_ppc64le/pgbouncer_sles12_ppcle.mdx → ..._power_ppc64le/pgbouncer_sles12_ppcle.mdx b/..._power_ppc64le/pgbouncer_sles12_ppcle.mdx → ..._power_ppc64le/pgbouncer_sles12_ppcle.mdx
diff --git a/..._power_ppc64le/pgbouncer_sles15_ppcle.mdx → ..._power_ppc64le/pgbouncer_sles15_ppcle.mdx b/..._power_ppc64le/pgbouncer_sles15_ppcle.mdx → ..._power_ppc64le/pgbouncer_sles15_ppcle.mdx
diff --git a/...1_installation/install_on_linux/index.mdx → ...1_installation/install_on_linux/index.mdx b/...1_installation/install_on_linux/index.mdx → ...1_installation/install_on_linux/index.mdx
diff --git a/...tion/install_on_linux/x86_amd64/index.mdx → ...tion/install_on_linux/x86_amd64/index.mdx b/...tion/install_on_linux/x86_amd64/index.mdx → ...tion/install_on_linux/x86_amd64/index.mdx
diff --git a/...linux/x86_amd64/pgbouncer_centos7_x86.mdx → ...linux/x86_amd64/pgbouncer_centos7_x86.mdx b/...linux/x86_amd64/pgbouncer_centos7_x86.mdx → ...linux/x86_amd64/pgbouncer_centos7_x86.mdx
diff --git a/...n_linux/x86_amd64/pgbouncer_deb10_x86.mdx → ...n_linux/x86_amd64/pgbouncer_deb10_x86.mdx b/...n_linux/x86_amd64/pgbouncer_deb10_x86.mdx → ...n_linux/x86_amd64/pgbouncer_deb10_x86.mdx
diff --git a/.../x86_amd64/pgbouncer_other_linux8_x86.mdx → .../x86_amd64/pgbouncer_other_linux8_x86.mdx b/.../x86_amd64/pgbouncer_other_linux8_x86.mdx → .../x86_amd64/pgbouncer_other_linux8_x86.mdx
diff --git a/...n_linux/x86_amd64/pgbouncer_rhel7_x86.mdx → ...n_linux/x86_amd64/pgbouncer_rhel7_x86.mdx b/...n_linux/x86_amd64/pgbouncer_rhel7_x86.mdx → ...n_linux/x86_amd64/pgbouncer_rhel7_x86.mdx
diff --git a/...n_linux/x86_amd64/pgbouncer_rhel8_x86.mdx → ...n_linux/x86_amd64/pgbouncer_rhel8_x86.mdx b/...n_linux/x86_amd64/pgbouncer_rhel8_x86.mdx → ...n_linux/x86_amd64/pgbouncer_rhel8_x86.mdx
diff --git a/..._linux/x86_amd64/pgbouncer_sles12_x86.mdx → ..._linux/x86_amd64/pgbouncer_sles12_x86.mdx b/..._linux/x86_amd64/pgbouncer_sles12_x86.mdx → ..._linux/x86_amd64/pgbouncer_sles12_x86.mdx
diff --git a/..._linux/x86_amd64/pgbouncer_sles15_x86.mdx → ..._linux/x86_amd64/pgbouncer_sles15_x86.mdx b/..._linux/x86_amd64/pgbouncer_sles15_x86.mdx → ..._linux/x86_amd64/pgbouncer_sles15_x86.mdx
diff --git a/...inux/x86_amd64/pgbouncer_ubuntu18_x86.mdx → ...inux/x86_amd64/pgbouncer_ubuntu18_x86.mdx b/...inux/x86_amd64/pgbouncer_ubuntu18_x86.mdx → ...inux/x86_amd64/pgbouncer_ubuntu18_x86.mdx
diff --git a/...inux/x86_amd64/pgbouncer_ubuntu20_x86.mdx → ...inux/x86_amd64/pgbouncer_ubuntu20_x86.mdx b/...inux/x86_amd64/pgbouncer_ubuntu20_x86.mdx → ...inux/x86_amd64/pgbouncer_ubuntu20_x86.mdx
diff --git a/...ocs/docs/pgbouncer/1.16/01a_upgrading.mdx → ...ocs/docs/pgbouncer/1.17/01a_upgrading.mdx b/...ocs/docs/pgbouncer/1.16/01a_upgrading.mdx → ...ocs/docs/pgbouncer/1.17/01a_upgrading.mdx
diff --git a/...uncer/1.16/02_configuration_and_usage.mdx → ...uncer/1.17/02_configuration_and_usage.mdx b/...uncer/1.16/02_configuration_and_usage.mdx → ...uncer/1.17/02_configuration_and_usage.mdx
diff --git a/...docs/pgbouncer/1.16/03_uninstallation.mdx → ...docs/pgbouncer/1.17/03_uninstallation.mdx b/...docs/pgbouncer/1.16/03_uninstallation.mdx → ...docs/pgbouncer/1.17/03_uninstallation.mdx
diff --git a/...s/docs/pgbouncer/1.16/images/EDB_logo.png → ...s/docs/pgbouncer/1.17/images/EDB_logo.png b/...s/docs/pgbouncer/1.16/images/EDB_logo.png → ...s/docs/pgbouncer/1.17/images/EDB_logo.png
diff --git a/...cs/docs/pgbouncer/1.16/images/add-ons.png → ...cs/docs/pgbouncer/1.17/images/add-ons.png b/...cs/docs/pgbouncer/1.16/images/add-ons.png → ...cs/docs/pgbouncer/1.17/images/add-ons.png
diff --git a/...s/docs/pgbouncer/1.16/images/edb_logo.svg → ...s/docs/pgbouncer/1.17/images/edb_logo.svg b/...s/docs/pgbouncer/1.16/images/edb_logo.svg → ...s/docs/pgbouncer/1.17/images/edb_logo.svg
diff --git a/....16/images/pg_advanced_server_details.png → ....17/images/pg_advanced_server_details.png b/....16/images/pg_advanced_server_details.png → ....17/images/pg_advanced_server_details.png
diff --git a/...images/pgbouncer_configuration_window.png → ...images/pgbouncer_configuration_window.png b/...images/pgbouncer_configuration_window.png → ...images/pgbouncer_configuration_window.png
diff --git a/...mages/pgbouncer_installation_complete.png → ...mages/pgbouncer_installation_complete.png b/...mages/pgbouncer_installation_complete.png → ...mages/pgbouncer_installation_complete.png
diff --git a/...bouncer/1.16/images/pgbouncer_welcome.png → ...bouncer/1.17/images/pgbouncer_welcome.png b/...bouncer/1.16/images/pgbouncer_welcome.png → ...bouncer/1.17/images/pgbouncer_welcome.png
diff --git a/...gbouncer/1.16/images/ready_to_install.png → ...gbouncer/1.17/images/ready_to_install.png b/...gbouncer/1.16/images/ready_to_install.png → ...gbouncer/1.17/images/ready_to_install.png
diff --git a/...1.16/images/sb_installation_directory.png → ...1.17/images/sb_installation_directory.png b/...1.16/images/sb_installation_directory.png → ...1.17/images/sb_installation_directory.png
diff --git a/...docs/pgbouncer/1.16/images/sbp_add-on.png → ...docs/pgbouncer/1.17/images/sbp_add-on.png b/...docs/pgbouncer/1.16/images/sbp_add-on.png → ...docs/pgbouncer/1.17/images/sbp_add-on.png
diff --git a/...1.16/images/sbp_installation_complete.png → ...1.17/images/sbp_installation_complete.png b/...1.16/images/sbp_installation_complete.png → ...1.17/images/sbp_installation_complete.png
diff --git a/...er/1.16/images/sbp_language_selection.png → ...er/1.17/images/sbp_language_selection.png b/...er/1.16/images/sbp_language_selection.png → ...er/1.17/images/sbp_language_selection.png
diff --git a/...cer/1.16/images/sbp_selected_packages.png → ...cer/1.17/images/sbp_selected_packages.png b/...cer/1.16/images/sbp_selected_packages.png → ...cer/1.17/images/sbp_selected_packages.png
diff --git a/...er/1.16/images/sbp_start_installation.png → ...er/1.17/images/sbp_start_installation.png b/...er/1.16/images/sbp_start_installation.png → ...er/1.17/images/sbp_start_installation.png
diff --git a/...ocs/pgbouncer/1.16/images/sbp_welcome.png → ...ocs/pgbouncer/1.17/images/sbp_welcome.png b/...ocs/pgbouncer/1.16/images/sbp_welcome.png → ...ocs/pgbouncer/1.17/images/sbp_welcome.png
diff --git a/...docs/pgbouncer/1.16/images/uninstall1.png → ...docs/pgbouncer/1.17/images/uninstall1.png b/...docs/pgbouncer/1.16/images/uninstall1.png → ...docs/pgbouncer/1.17/images/uninstall1.png
diff --git a/...docs/pgbouncer/1.16/images/uninstall2.png → ...docs/pgbouncer/1.17/images/uninstall2.png b/...docs/pgbouncer/1.16/images/uninstall2.png → ...docs/pgbouncer/1.17/images/uninstall2.png
diff --git a/product_docs/docs/pgbouncer/1.16/index.mdx → product_docs/docs/pgbouncer/1.17/index.mdx b/product_docs/docs/pgbouncer/1.16/index.mdx → product_docs/docs/pgbouncer/1.17/index.mdx
diff --git a/product_docs/docs/pgbouncer/1.17/pgbouncer_rel_notes/08_11700_rel_notes.mdx b/product_docs/docs/pgbouncer/1.17/pgbouncer_rel_notes/08_11700_rel_notes.mdx
@@ -0,0 +1,9 @@
+---
+title: "Version 1.17.0.0"
+---
+
+EDB PgBouncer 1.17.0.0 includes the following upstream merge and security fix:
+
+| Type         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| ------------ |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Upstream merge | Merged with community PgBouncer 1.17.0.0. See the community [Release Notes](https://www.pgbouncer.org/changelog.html#pgbouncer-117x) for details.                                                                                                                                                                                                                                                                                                                                                                                         |
diff --git a/...gbouncer_rel_notes/09_11610_rel_notes.mdx → ...gbouncer_rel_notes/09_11610_rel_notes.mdx b/...gbouncer_rel_notes/09_11610_rel_notes.mdx → ...gbouncer_rel_notes/09_11610_rel_notes.mdx
diff --git a/...gbouncer_rel_notes/10_11601_rel_notes.mdx → ...gbouncer_rel_notes/10_11601_rel_notes.mdx b/...gbouncer_rel_notes/10_11601_rel_notes.mdx → ...gbouncer_rel_notes/10_11601_rel_notes.mdx
diff --git a/...ouncer/1.16/pgbouncer_rel_notes/index.mdx → ...ouncer/1.17/pgbouncer_rel_notes/index.mdx b/...ouncer/1.16/pgbouncer_rel_notes/index.mdx → ...ouncer/1.17/pgbouncer_rel_notes/index.mdx
@@ -8,6 +8,7 @@ The EDB PgBouncer documentation describes the latest version of EDB PgBouncer 1.
 
 | Version                        | Release date | Upstream merges                                                                   | 
 | ------------------------------ | ------------ | --------------------------------------------------------------------------------- | 
+| [1.17.0.0](09_11700_rel_notes) | 2022 Aug 04  | Upstream [1.17.0.0](https://www.pgbouncer.org/changelog.html#pgbouncer-117x)  
 | [1.16.1.0](09_11610_rel_notes) | 2021 Dec 11  | Upstream [1.16.1.0](https://www.pgbouncer.org/changelog.html#pgbouncer-116x)      | 
 | [1.16.0.1](10_11601_rel_notes) | 2021 Jun 10  | Upstream [1.16.0.1](https://www.pgbouncer.org/changelog.html#pgbouncer-116x)        | 
 
diff --git a/...cs/pgbouncer/1.16/supported_platforms.mdx → ...cs/pgbouncer/1.17/supported_platforms.mdx b/...cs/pgbouncer/1.16/supported_platforms.mdx → ...cs/pgbouncer/1.17/supported_platforms.mdx
diff --git a/product_docs/docs/postgis/3.1/01_release_notes/index.mdx b/product_docs/docs/postgis/3.1/01_release_notes/index.mdx
diff --git a/product_docs/docs/postgis/3.2/01_release_notes/index.mdx b/product_docs/docs/postgis/3.2/01_release_notes/index.mdx
@@ -0,0 +1,25 @@
+---
+title: "Release notes"
+navigation:
+- rel_notes321
+- rel_notes32
+- rel_notes315
+- rel_notes314
+- rel_notes312
+---
+The EDB PostGIS documentation describes the latest version of EDB PostGIS 3.2, 
+including minor releases and patches. These release notes 
+cover what was new in each release. 
+
+|         Version          | Release date |
+| ------------------------ | ------------ |
+| [3.2.1](rel_notes321)    | 2022 Aug 04  |
+| [3.2.0](rel_notes32)     | 2022 Dec 01  |
+| [3.1.5](rel_notes315) | 2022 Aug 03 |
+| [3.1.4](rel_notes314) | 2021 Dec 01 |
+| [3.1.2](rel_notes312) | 2021 Jun 24|
+
+
+
+
+
diff --git a/.../3.1/01_release_notes/11_rel_notes312.mdx → ...gis/3.2/01_release_notes/rel_notes312.mdx b/.../3.1/01_release_notes/11_rel_notes312.mdx → ...gis/3.2/01_release_notes/rel_notes312.mdx
@@ -1,5 +1,5 @@
 ---
-title: "3.1.2"
+title: "Version 3.1.2"
 ---
 EDB PostGIS is a PostgreSQL extension that allows you to store geographic information systems (GIS) objects in an EDB Posgres Advanced Server database.
 

diff --git a/.../3.1/01_release_notes/10_rel_notes314.mdx → ...gis/3.2/01_release_notes/rel_notes314.mdx b/.../3.1/01_release_notes/10_rel_notes314.mdx → ...gis/3.2/01_release_notes/rel_notes314.mdx
@@ -1,5 +1,5 @@
 ---
-title: "3.1.4"
+title: "Version 3.1.4"
 ---
 EDB PostGIS is a PostgreSQL extension that allows you to store geographic information systems (GIS) objects in an EDB Postgres Advanced Server database.
 

diff --git a/product_docs/docs/postgis/3.2/01_release_notes/rel_notes315.mdx b/product_docs/docs/postgis/3.2/01_release_notes/rel_notes315.mdx
@@ -0,0 +1,12 @@
+---
+title: "Version 3.1.5"
+---
+EDB PostGIS is a PostgreSQL extension that allows you to store geographic information systems (GIS) objects in an EDB Postgres Advanced Server database.
+
+New features, enhancements, bug fixes, and other changes in PostGIS 3.1.5 include:
+
+| Type            | Description                                                                                                                                      |
+| --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Upstream merges | Merged with community PostGIS 3.1.5. See the community [Release Notes](https://postgis.net/docs/manual-3.1/release_notes.html#idm41935) for details. |
+
+https://postgis.net/docs/manual-3.1/release_notes.html#idm41935
diff --git a/product_docs/docs/postgis/3.2/01_release_notes/rel_notes32.mdx b/product_docs/docs/postgis/3.2/01_release_notes/rel_notes32.mdx
@@ -0,0 +1,10 @@
+---
+title: "Version 3.2.0"
+---
+EDB PostGIS is a PostgreSQL extension that allows you to store geographic information systems (GIS) objects in an EDB Postgres Advanced Server database.
+
+New features, enhancements, bug fixes, and other changes in PostGIS 3.2.0 include:
+
+| Type            | Description                                                                                                                                      |
+| --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Upstream merges | Merged with community PostGIS 3.2.0. See the community [Release Notes](https://postgis.net/docs/release_notes.html#idm43376) for details. |
diff --git a/product_docs/docs/postgis/3.2/01_release_notes/rel_notes321.mdx b/product_docs/docs/postgis/3.2/01_release_notes/rel_notes321.mdx
@@ -0,0 +1,10 @@
+---
+title: "Version 3.2.1"
+---
+EDB PostGIS is a PostgreSQL extension that allows you to store geographic information systems (GIS) objects in an EDB Postgres Advanced Server database.
+
+New features, enhancements, bug fixes, and other changes in PostGIS 3.2.1 include:
+
+| Type            | Description                                                                                                                                      |
+| --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Upstream merges | Merged with community PostGIS 3.2.1. See the community [Release Notes](https://postgis.net/docs/release_notes.html#idm43522) for details. |
diff --git a/...tgis/3.1/01a_installing_postgis/index.mdx → ...tgis/3.2/01a_installing_postgis/index.mdx b/...tgis/3.1/01a_installing_postgis/index.mdx → ...tgis/3.2/01a_installing_postgis/index.mdx
diff --git a/...ling_on_linux/ibm_power_ppc64le/index.mdx → ...ling_on_linux/ibm_power_ppc64le/index.mdx b/...ling_on_linux/ibm_power_ppc64le/index.mdx → ...ling_on_linux/ibm_power_ppc64le/index.mdx
@@ -3,6 +3,7 @@ title: "Installing PostGIS on IBM Power (ppc64le)"
 navTitle: "IBM Power (ppc64le)"
 navigation:
 - postgis_rhel8_ppcle
+- postgis_rhel7_ppcle
 - postgis_sles15_ppcle
 - postgis_sles12_ppcle
 ---

diff --git a/...ibm_power_ppc64le/postgis_rhel8_ppcle.mdx → ...ibm_power_ppc64le/postgis_rhel8_ppcle.mdx b/...ibm_power_ppc64le/postgis_rhel8_ppcle.mdx → ...ibm_power_ppc64le/postgis_rhel8_ppcle.mdx
@@ -38,7 +38,18 @@ dnf -qy module disable postgresql
 ## Install the package
 
 ```shell
-dnf -y install edb-as14-postgis3
+# If you are using EDB Postgres Advanced Server 13 or 14, use this format
+# of the command:
+dnf install edb-as14-postgis32
+# Where `14` is the version of EDB Postgres Advanced Server. Replace `14`
+# with `13` if that is the version of EDB Postgres Advanced Server you
+# are using.
+
+# If you are using  EDB Postgres Advanced Server 11 or 12, use this format
+# of the command:
+dnf install edb-as12-postgis-3.2
+
+# Where `12` is the version of EDB Postgres Advanced Server. Replace `12`
+# with `11` if that is the version of EDB Postgres Advanced Server you
+# are using.
 ```
-
-Where `14` is the version of EDB Postgres Advanced Server. Replace `14` with the version of EDB Postgres Advanced Server you are using.
diff --git a/...bm_power_ppc64le/postgis_sles12_ppcle.mdx → ...bm_power_ppc64le/postgis_sles12_ppcle.mdx b/...bm_power_ppc64le/postgis_sles12_ppcle.mdx → ...bm_power_ppc64le/postgis_sles12_ppcle.mdx
@@ -39,8 +39,18 @@ zypper refresh
 ## Install the package
 
 ```shell
-dnf -y install edb-as14-postgis3
+# If you are using EDB Postgres Advanced Server 13 or 14, use this format
+# of the command:
+zypper install edb-as14-postgis32
+# Where `14` is the version of EDB Postgres Advanced Server. Replace `14`
+# with `13` if that is the version of EDB Postgres Advanced Server you
+# are using.
+
+# If you are using  EDB Postgres Advanced Server 11 or 12, use this format
+# of the command:
+zypper install edb-as12-postgis-3.2
+
+# Where `12` is the version of EDB Postgres Advanced Server. Replace `12`
+# with `11` if that is the version of EDB Postgres Advanced Server you
+# are using.
 ```
-
-Where `14` is the version of EDB Postgres Advanced Server. Replace `14` with the version of EDB Postgres Advanced Server you are using.
-
diff --git a/...bm_power_ppc64le/postgis_sles15_ppcle.mdx → ...bm_power_ppc64le/postgis_sles15_ppcle.mdx b/...bm_power_ppc64le/postgis_sles15_ppcle.mdx → ...bm_power_ppc64le/postgis_sles15_ppcle.mdx
@@ -38,7 +38,18 @@ zypper refresh
 ## Install the package
 
 ```shell
-dnf -y install edb-as14-postgis3
+# If you are using EDB Postgres Advanced Server 13 or 14, use this format
+# of the command:
+zypper install edb-as14-postgis32
+# Where `14` is the version of EDB Postgres Advanced Server. Replace `14`
+# with `13` if that is the version of EDB Postgres Advanced Server you
+# are using.
+
+# If you are using  EDB Postgres Advanced Server 11 or 12, use this format
+# of the command:
+zypper install edb-as12-postgis-3.2
+
+# Where `12` is the version of EDB Postgres Advanced Server. Replace `12`
+# with `11` if that is the version of EDB Postgres Advanced Server you
+# are using.
 ```
-
-Where `14` is the version of EDB Postgres Advanced Server. Replace `14` with the version of EDB Postgres Advanced Server you are using.
diff --git a/...ing_postgis/installing_on_linux/index.mdx → ...ing_postgis/installing_on_linux/index.mdx b/...ing_postgis/installing_on_linux/index.mdx → ...ing_postgis/installing_on_linux/index.mdx
@@ -25,6 +25,7 @@ For platform-specific install instructions, see:
 
 - Linux on IBM Power (ppc64le):
   - [RHEL 8](ibm_power_ppc64le/postgis_rhel8_ppcle)
+  - [RHEL 7](ibm_power_ppc64le/postgis_rhel7_ppcle)
 
   - [SLES 15](ibm_power_ppc64le/postgis_sles15_ppcle)
   - [SLES 12](ibm_power_ppc64le/postgis_sles12_ppcle)

diff --git a/...s/installing_on_linux/x86_amd64/index.mdx → ...s/installing_on_linux/x86_amd64/index.mdx b/...s/installing_on_linux/x86_amd64/index.mdx → ...s/installing_on_linux/x86_amd64/index.mdx
diff --git a/..._on_linux/x86_amd64/postgis_deb10_x86.mdx → ..._on_linux/x86_amd64/postgis_deb10_x86.mdx b/..._on_linux/x86_amd64/postgis_deb10_x86.mdx → ..._on_linux/x86_amd64/postgis_deb10_x86.mdx
@@ -36,7 +36,18 @@ apt-get update
 ## Install the package
 
 ```shell
-dnf -y install edb-as14-postgis3
+# If you are using EDB Postgres Advanced Server 13 or 14, use this format
+# of the command:
+apt-get install edb-as14-postgis32
+# Where `14` is the version of EDB Postgres Advanced Server. Replace `14`
+# with `13` if that is the version of EDB Postgres Advanced Server you
+# are using.
+
+# If you are using  EDB Postgres Advanced Server 11 or 12, use this format
+# of the command:
+apt-get install edb-as12-postgis-3.2
+
+# Where `12` is the version of EDB Postgres Advanced Server. Replace `12`
+# with `11` if that is the version of EDB Postgres Advanced Server you
+# are using.
 ```
-
-Where `14` is the version of EDB Postgres Advanced Server. Replace `14` with the version of EDB Postgres Advanced Server you are using.
diff --git a/...ux/x86_amd64/postgis_other_linux8_x86.mdx → ...ux/x86_amd64/postgis_other_linux8_x86.mdx b/...ux/x86_amd64/postgis_other_linux8_x86.mdx → ...ux/x86_amd64/postgis_other_linux8_x86.mdx
@@ -35,7 +35,18 @@ dnf -qy module disable postgresql
 ## Install the package
 
 ```shell
-dnf -y install edb-as14-postgis3
+# If you are using EDB Postgres Advanced Server 13 or 14, use this format
+# of the command:
+dnf install edb-as14-postgis32
+# Where `14` is the version of EDB Postgres Advanced Server. Replace `14`
+# with `13` if that is the version of EDB Postgres Advanced Server you
+# are using.
+
+# If you are using  EDB Postgres Advanced Server 11 or 12, use this format
+# of the command:
+dnf install edb-as12-postgis-3.2
+
+# Where `12` is the version of EDB Postgres Advanced Server. Replace `12`
+# with `11` if that is the version of EDB Postgres Advanced Server you
+# are using.
 ```
-
-Where `14` is the version of EDB Postgres Advanced Server. Replace `14` with the version of EDB Postgres Advanced Server you are using.
diff --git a/..._on_linux/x86_amd64/postgis_rhel7_x86.mdx → ..._on_linux/x86_amd64/postgis_rhel7_x86.mdx b/..._on_linux/x86_amd64/postgis_rhel7_x86.mdx → ..._on_linux/x86_amd64/postgis_rhel7_x86.mdx
@@ -32,7 +32,18 @@ subscription-manager repos --enable "rhel-*-optional-rpms" --enable "rhel-*-extr
 ## Install the package
 
 ```shell
-dnf -y install edb-as14-postgis3
+# If you are using EDB Postgres Advanced Server 13 or 14, use this format
+# of the command:
+yum install edb-as14-postgis32
+# Where `14` is the version of EDB Postgres Advanced Server. Replace `14`
+# with `13` if that is the version of EDB Postgres Advanced Server you
+# are using.
+
+# If you are using  EDB Postgres Advanced Server 11 or 12, use this format
+# of the command:
+yum install edb-as12-postgis-3.2
+
+# Where `12` is the version of EDB Postgres Advanced Server. Replace `12`
+# with `11` if that is the version of EDB Postgres Advanced Server you
+# are using.
 ```
-
-Where `14` is the version of EDB Postgres Advanced Server. Replace `14` with the version of EDB Postgres Advanced Server you are using.
-Original file line number
+Diff line change
@@ Expand Up @@
     #  Install the EPEL repository:
     yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
     ```
     ## Install the package
@@ Expand Down @@