From 332f2fb7f56483e266e7fbc046c96576cb58ac39 Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 16 Jul 2020 12:54:52 -0400 Subject: [PATCH] Update PostgreSQL versions used to build user guides. Also add version ranges to indicate that a user guide is accurate for a range of PostgreSQL versions even if it was built for a specific version. --- doc/xml/release.xml | 10 ++++++++++ doc/xml/user-guide-index.xml | 6 +++--- doc/xml/user-guide.xml | 32 +++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 7dfb51b10..70fb4fca5 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -189,6 +189,16 @@ + + + + + +

Update versions used to build user guides.

+ +

Also add version ranges to indicate that a user guide is accurate for a range of versions even if it was built for a specific version.

+ + diff --git a/doc/xml/user-guide-index.xml b/doc/xml/user-guide-index.xml index 0fa5b1e67..8f4975106 100644 --- a/doc/xml/user-guide-index.xml +++ b/doc/xml/user-guide-index.xml @@ -7,9 +7,9 @@ Available User Guides - {[os-debian-title]} / PostgreSQL {[os-debian-pg-version]} - {[os-centos7-title]} / PostgreSQL {[os-centos7-pg-version]} - {[os-centos6-title]} / PostgreSQL {[os-centos6-pg-version]} + {[os-debian-title]} / PostgreSQL {[os-debian-pg-version-min]}-{[os-debian-pg-version-max]} + {[os-centos7-title]} / PostgreSQL {[os-centos7-pg-version-min]}-{[os-centos7-pg-version-max]} + {[os-centos6-title]} / PostgreSQL {[os-centos6-pg-version-min]}-{[os-centos6-pg-version-max]} diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml index 8f6362ef1..750eecc1b 100644 --- a/doc/xml/user-guide.xml +++ b/doc/xml/user-guide.xml @@ -1,6 +1,6 @@ - + The {[project]} User Guide demonstrates how to quickly and easily setup {[project]} for your {[postgres]} database. Step-by-step instructions lead the user through all the important features of the fastest, most reliable {[postgres]} backup and restore solution. @@ -16,9 +16,17 @@ RHEL & CentOS 7 - 10 + 12 + 12 + 13 + 9.5 - 9.6 + 9.2 + 9.5 + + 10 + 9.6 + 11 none @@ -58,18 +66,28 @@ resource/fake-cert {[host-repo-path]}/doc/{[fake-cert-path-relative]} + {[os-debian-pg-version]} + {[os-debian-pg-version-min]} + {[os-debian-pg-version-max]} + {[os-centos6-pg-version]} + {[os-centos6-pg-version-min]} + {[os-centos6-pg-version-max]} + {[os-centos7-pg-version]} + {[os-centos7-pg-version-min]} + {[os-centos7-pg-version-max]} + my $version = '{[pg-version]}'; $version =~ s/\.//g; return $version; hot_standby replica - 11 + 13 9.6 - 10 + 11 my $version = '{[pg-version-upgrade]}'; $version =~ s/\.//g; return $version; /usr/lib/postgresql/{[pg-version]}/bin @@ -305,7 +323,7 @@ # Install PostgreSQL RUN RELEASE_CODENAME=`lsb_release -c | awk '{print $2}'` && \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ '${RELEASE_CODENAME?}'-pgdg main' | \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ '${RELEASE_CODENAME?}'-pgdg main 13' | \ tee -a /etc/apt/sources.list.d/pgdg.list && \ wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - && \ apt-get update && \ @@ -698,7 +716,7 @@

This user guide is intended to be followed sequentially from beginning to end — each section depends on the last. For example, the Backup section relies on setup that is performed in the Quick Start section. Once is up and running then skipping around is possible but following the user guide in order is recommended the first time through.

-

Although the examples are targeted at {[user-guide-os]} and {[pg-version]}, it should be fairly easy to apply this guide to any Unix distribution and version. The only OS-specific commands are those to create, start, stop, and drop clusters. The commands will be the same on any Unix system though the location to install the executable may vary. +

Although the examples are targeted at {[user-guide-os]} and {[pg-version-min]}-{[pg-version-max]}, it should be fairly easy to apply this guide to any Unix distribution and version. The only OS-specific commands are those to create, start, stop, and drop clusters. The commands will be the same on any Unix system though the location to install the executable may vary. Configuration information and documentation for PostgreSQL can be found in the Manual.