From d747b96acb16684df770dad30d6a4029fc37d8ee Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Wed, 3 Apr 2013 15:35:29 +0100
Subject: [PATCH] Update the descriptions for the installers. Remove references
 to "one click".

---
 .../pages/download/linux/linux_oneclick.inc   |  6 +++---
 templates/pages/download/macosx.html          | 13 ++++++------
 templates/pages/download/snapshots.html       | 21 -------------------
 templates/pages/download/windows.html         |  8 +++----
 4 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/templates/pages/download/linux/linux_oneclick.inc b/templates/pages/download/linux/linux_oneclick.inc
index 9b4b0e99..bcd5e578 100644
--- a/templates/pages/download/linux/linux_oneclick.inc
+++ b/templates/pages/download/linux/linux_oneclick.inc
@@ -1,8 +1,8 @@
 <h2>Graphical installer</h2>
 <p>
-One click installers are available for 32 and 64 bit Linux distributions
+Installers are available for 32 and 64 bit Linux distributions
 and include PostgreSQL, pgAdmin and the StackBuilder utility for installation
-of additional packages. The PostgreSQL 8.3 and 8.4 installers have been
+of additional packages. The PostgreSQL 8.4 installers have been
 tested with a number of Linux distributions and should work on Ubuntu 6.06
 and above, Fedora 6 and above, CentOS/RedHat Enterprise Linux 4 and above
 and others. The 9.0 and later installers have only been tested on more
@@ -14,6 +14,6 @@ the installer from EnterpriseDB for all supported versions.
 </p>
 
 <p>
-<i>Note:</i> The one click installers do not integrate with
+<i>Note:</i> The installers do not integrate with
 platform-specific packaging systems.
 </p>
diff --git a/templates/pages/download/macosx.html b/templates/pages/download/macosx.html
index c7b8cf49..9da5e903 100644
--- a/templates/pages/download/macosx.html
+++ b/templates/pages/download/macosx.html
@@ -17,14 +17,15 @@ There are several other installers available for PostgreSQL on Mac OS X,
 which is the recommended way to install.
 </p>
 
-<h2>One click installer</h2>
+<h2>Graphical installer</h2>
 
 <p>
-A one click installer is available for for Mac OS X that includes PostgreSQL,
-pgAdmin, PL/Java and the PL/pgSQL debugger plugin. The installer for
-PostgreSQL 8.3 and 8.4 supports Mac OS X 10.4 and above on Intel and PPC. For
-PostgreSQL 9.0 and later, Mac OS X 10.5 and above are supported for 32 and
-64-bit Intel CPUs.
+An installer is available for Mac OS X that includes PostgreSQL,
+pgAdmin and the StackBuilder utility for installation of additional packages. 
+The installer for PostgreSQL 8.4 supports Mac OS X 10.4 and above on Intel 
+and PPC. For PostgreSQL 9.0 and 9.1, Mac OS X 10.5 and above are supported,
+on 32 and 64-bit Intel CPUs, and PostgreSQL 9.2 and later support 
+Mac OS X 10.6 and above on 32 and 64-bit Intel CPUs.
 </p>
 
 <p>
diff --git a/templates/pages/download/snapshots.html b/templates/pages/download/snapshots.html
index 9d3fe136..009d8534 100644
--- a/templates/pages/download/snapshots.html
+++ b/templates/pages/download/snapshots.html
@@ -71,25 +71,4 @@ Typically only Beta and Release Candidate packages are available in
 the PPA repository.
 </p>
 
-
-<h2>One click installer</h2>
-<p>
-One click installers are available for 32 and 64 bit Linux distributions,
-Mac OS X and Windows and include PostgreSQL, pgAdmin and the PL/pgSQL
-debugger plugin.
-</p>
-
-<p>
-Typically only Beta and Release Candidate packages are available in
-the installer distribution.
-</p>
-
-<p><b>Note: The one click installers do not integrate with platform-specific packaging systems on Linux. If you need
-RPM packages for CentOS, Fedora or RHEL please use the packages above.</b></p>
-
-<p>
-<a href="http://www.enterprisedb.com/products/pgdevdownload.do">Download</a>
-the one click installer for all platforms.
-</p>
-
 {%endblock%}
diff --git a/templates/pages/download/windows.html b/templates/pages/download/windows.html
index ccd3e4ea..8064cf12 100644
--- a/templates/pages/download/windows.html
+++ b/templates/pages/download/windows.html
@@ -4,18 +4,18 @@
 
 <h1>Windows installers</h1>
 
+<h2>Graphical installer</h2>
+
 <p>
-The Windows installers for PostgreSQL includes the PostgreSQL server,
+The graphical installer for PostgreSQL includes the PostgreSQL server,
 <a href="http://www.pgadmin.org">pgAdmin III</a>; a graphical tool
 for managing and developing your databases, and StackBuilder; a
 package manager that can be used to download and install additional
 PostgreSQL applications and drivers.
 </p>
 
-<h2>One click installer</h2>
-
 <p>
-The one click installer is designed to be as straightforward as possible
+The installer is designed to be as straightforward as possible
 and the fastest way to get up and running with PostgreSQL on Windows.
 </p>
 
-- 
2.39.5