Permalink
Browse files

Restructure download sections to be clearer

In particular, split up the linux instructions into different pages
for different distributions, since they are very differnt, and in
general try to include more detail.

There are still some OSes that definitely need more info, but this
is more than we had before...
  • Loading branch information...
1 parent af69d6a commit b282714a097f767b258e469fb80225b638864a19 @mhagander mhagander committed Jul 1, 2012
View
@@ -79,6 +79,20 @@ pre {
font-size: 1.0em;
}
+div#pgContentWrap code {
+ font-size: 1.2em;
+ padding: 1em;
+ margin: 2ex 0 2ex 2ex;
+ background: #F7F7F7;
+ border: 1px solid #CFCFCF;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ border-radius: 8px;
+ display: block;
+ overflow: auto;
+}
+
strong, b {
font-weight: bold;
}
View
@@ -8,6 +8,7 @@ div.tblBasic h2 {
div.tblBasic table {
background: #F5F5F5 url(/media/img/layout/nav_tbl_top_lft.png) top left no-repeat;
+ margin-left: 2ex;
margin-bottom: 15px;
}
View
@@ -22,7 +22,10 @@
{'title': 'Licence', 'link':'/about/licence/'},
],
'download': [
- {'title': 'Downloads', 'link':'/download/'},
+ {'title': 'Downloads', 'link':'/download/', 'submenu': [
+ {'title': 'Binary', 'link':'/download/'},
+ {'title': 'Source', 'link':'/ftp/source/'}
+ ]},
{'title': 'Software Catalogue', 'link':'/download/product-categories/'},
{'title': 'pgFoundry', 'link':'http://pgfoundry.org/'},
{'title': 'File Browser', 'link':'/ftp/'},
@@ -7,57 +7,88 @@ <h1>Downloads</h1>
<h2>PostgreSQL Core Distribution</h2>
-<p>The core of the PostgreSQL object-relational database management system is available in several source and binary formats.
-The full package includes:</p>
-
-<ul>
- <li>The core server with full documentation (html, man)</li>
- <li>Several command line tools (e.g. psql, pg_ctl, pg_dump, pg_restore)</li>
- <li>C library (libpq) and embedded C processor (ecpg)</li>
- <li>Several server-side procedural languages (e.g. plpgsql, pltcl, plperl)</li>
- <li>Several popular add-on packages (e.g. metaphone, pgcrypto and other useful enhancements)</li>
-</ul>
-
-<p>In addition, some 'one click' installers include additional packages such as pgAdmin and PostGIS.</p>
+<p>
+The core of the PostgreSQL object-relational database management system
+is available in several source and binary formats.
+</p>
<h3>Binary packages</h3>
-<p>Pre-built binary packages are available for a number of different operating systems:</p>
-
-<div align="center">
-<a href="/download/freebsd">FreeBSD</a> &middot; <a href="/download/linux">Linux</a> &middot; <a href="/download/openbsd">OpenBSD</a> &middot; <a href="/download/macosx">Mac OS X</a> &middot; <a href="/download/solaris">Solaris</a> &middot; <a href="/download/windows">Windows</a>
-</div>
-
-<h3>Source code</h3>
-
-<p>You can download the <a href="/ftp/source/">source code</a> from a mirror site using our File Browser</a>
-
-<h3>Beta/RC Releases and Development snapshots (unstable)</h3>
-
-<p>There are source code and binary <a href="/download/snapshots">packages</a> of beta and release candidates, and of
-the current development code available for testing and evaluation of new features. Note that these builds should
- be used <b>for testing purposes only</b>, and not for production systems.</p>
-
-<h3>3rd party distributions</h3>
-
+<p>
+Pre-built binary packages are available for a number of different operating
+systems:
+</p>
<ul>
- <li><a href="http://www.openscg.org/postgresql">Java PostgreSQL Server Bundles</a> provide an integrated download of the latest &amp; greatest versions of PostgreSQL &amp; OpenJDK with Tomcat, JBoss or Resin. Built by the <a href="http://www.openscg.com">Open Source Computing Group</a>.</li>
- <li>'LAPP', 'MAPP' and 'WAPP' (Linux/Mac/Windows + Apache + PHP + PostgreSQL) stacks are available from <a href="http://bitnami.org/article/apache-php-and-postgresql-all-in-one">BitNami</a>. Sponsored by <a href="http://bitrock.com">BitRock</a>.</li>
+ <li>BSD
+ <ul>
+ <li><a href="/download/freebsd/">FreeBSD</a></li>
+ <li><a href="/download/openbsd/">OpenBSD</a></li>
+ </ul>
+ </li>
+ <li>Linux
+ <ul>
+ <li><a href="/download/linux/redhat/">RedHat/CentOS/Fedora/Scientific</a> families Linux</li>
+ <li><a href="/download/linux/debian/">Debian</a> GNU/Linux</li>
+ <li><a href="/download/linux/ubuntu/">Ubuntu</a> Linux</li>
+ <li><a href="/download/linux/suse/">SuSE</a> and OpenSuSE</li>
+ <li><a href="/download/linux/">Other</a> Linux</li>
+ </ul>
+ </li>
+ <li><a href="/download/macosx/">Mac OS X</a></li>
+ <li><a href="/download/solaris/">Solaris</a></li>
+ <li><a href="/download/windows/">Windows</a></li>
</ul>
-<h3>Live CDs/Software appliances</h3>
-
-<p>Live CDs are bootable CD images that allow you to run and play with PostgreSQL and a selection of related tools and
-software, without installing anything on your PC. Software appliances are similarly pre-configured, but are designed to run in a virtual machine or be installed onto real hardware. Note that as complete operating systems, these distributions may not be updated immediately when new versions of PostgreSQL are released.</p>
-
-<ul>
- <li><a href="http://www.pglivecd.org">PostgreSQL Live CD</a> - a Fedora based PostgreSQL live CD,
- containing packages from the PostgreSQL Yum repository. Maintained by Devrim G&Uuml;ND&Uuml;Z at
- <a href="http://www.EnterpriseDB.com">EnterpriseDB</a> .</li>
-
- <li><a href="http://www.turnkeylinux.org/appliances/postgresql">TurnKey PostgreSQL</a> - An Ubuntu based live CD and software appliance featuring a Mac OS X-themed Web management interface and a Python configuration and installation console. Published by <a href="http://www.turnkeylinux.org/">TurnKey Linux</a>.</li>
+<h3>Source code</h3>
-</ul>
+<p>
+The source code can be found in the main <a href="/ftp/source">file browser</a>
+or you can access the source control repository directly
+at <a href="http://git.postgresql.org/gitweb/?p=postgresql.git;a=summary">git.postgresql.org</a>.
+Instructions for building from source can be found in the
+<a href="/docs/current/static/installation.html">documentation</a>.
+</p>
+
+<h3>Beta/RC Releases and development snapshots (unstable)</h3>
+
+<p>
+There are source code and binary <a href="/download/snapshots">packages</a>
+of beta and release candidates, and of the current development code available
+for testing and evaluation of new features. Note that these builds should
+be used <b>for testing purposes only</b>, and not for production systems.
+</p>
+
+<h2>3rd party distributions</h2>
+
+<h3>Live CD</h3>
+<p>
+<a href="http://www.pglivecd.org">PostgreSQL Live CD</a> is a Fedora based
+PostgreSQL live CD, containing packages from the PostgreSQL Yum repository.
+Live CDs are bootable CD images that allow you to run and test PostgreSQL
+and a selection of related tools and software, without installing anything
+on your PC.
+</p>
+
+<h3>Java PostgreSQL Server Bundles</h3>
+<p>
+Integrated <a href="http://www.openscg.org/postgresql">downloads</a> of the
+latest &amp; greatest versions of PostgreSQL &amp; OpenJDK with Tomcat,
+JBoss or Resin are available from OpenSCG.
+</p>
+
+<h3>Live CD and virtual machine appliance</h3>
+<p>
+<a href="http://www.turnkeylinux.org/appliances/postgresql">TurnKey PostgreSQL</a>
+is an Ubuntu based live CD and software appliance featuring a Mac OS X-themed
+Web management interface and a Python configuration and installation console.
+</p>
+
+<h3>Ready to run stacks</h3>
+<p>
+'LAPP', 'MAPP' and 'WAPP' (Linux/Mac/Windows + Apache + PHP + PostgreSQL)
+stacks are available from
+<a href="http://bitnami.org/tag/postgresql">BitNami</a>.
+</p>
<h2>Additional software</h2>
@@ -13,6 +13,4 @@ <h2>FreeBSD Ports</h2>
<p>A list of <a href="http://www.freebsd.org/cgi/ports.cgi?query=postgresql&stype=name&sektion=databases">PostgreSQL
packages</a> can be found using the Ports Search tool on the FreeBSD website.</p>
-<p><i>The FreeBSD PostgreSQL Ports are maintained by Palle Girgensohn.</i></p>
-
{%endblock%}
@@ -1,98 +1,44 @@
{%extends "base/page.html"%}
-{%block title%}Linux packages{%endblock%}
+{%block title%}Linux downloads (other){%endblock%}
{%block contents%}
-<h1>Linux packages</h1>
+<h1>Linux downloads (other)</h1>
<p>
-PostgreSQL is available integrated with the package management on most Linux platforms. When available,
-this is the recommended way to install PostgreSQL, since it provides proper integration with the
-operating system, including automatic patching and other management functionality.</p>
-<p>
-Should packages not be available for your distribution, or there are issues with your package manager,
-there are <a href="#oneclick">graphical installers</a> available. Finally, most Linux systems make it
-easy to <a href="/ftp/source/">build from source</a>.
+<b>Note!</b> These are the generic Linux download instructions. If you
+are using one of the major Linux distributions, you should read the
+distribution specific instructions:
</p>
-
<ul>
- <li>Cross-Platform Installers</li>
- <ul>
- <li><a href="#oneclick">Graphical installer</a></li>
- <li><a href="#multibinary">Binary Packages (RPM & DEB)</a></li>
- </ul>
-<br />
- <li>Platform-Specific Installers</li>
- <ul>
- <li><a href="#yum">Scientific Linux, RHEL, Fedora and CentOS Yum Repository</a></li>
- <li><a href="#debian">Debian apt</a></li>
- <li><a href="#ubuntu">Ubuntu apt</a></li>
- <li><a href="#gentoo">Gentoo Portage</a></li>
- <li><a href="#suse">SuSE RPM</a></li>
- </ul>
+ <li><a href="/download/linux/redhat/">RedHat/CentOS/Fedora/Scientific</a> families Linux</li>
+ <li><a href="/download/linux/debian/">Debian</a> GNU/Linux</li>
+ <li><a href="/download/linux/ubuntu/">Ubuntu</a> Linux</li>
+ <li><a href="/download/linux/suse/">SuSE</a> and OpenSuSE</li>
</ul>
-<h2><a name="oneclick">Graphical installer</a></h2>
-
-<p>One click installers are available for 32 and 64 bit Linux distributions and include PostgreSQL,
-pgAdmin and the StackBuilder utility for installing additional packages. The PostgreSQL 8.3 and 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/Red Hat Enterprise Linux 4 and above and others. The 9.0 and 9.1
-installers have only been tested on more recent distributions.</p>
+<h2>Generic linux distributions</h2>
<p>
-<a href="http://www.enterprisedb.com/products/pgdownload.do">Download</a> the packages from
-EnterpriseDB.
+PostgreSQL is available integrated with the package management on most
+Linux platforms. When available, this is the recommended way to install
+PostgreSQL, since it provides proper integration with the operating system,
+including automatic patching and other management functionality.
+</p>
+<p>
+Should packages not be available for your distribution, or there are
+issues with your package manager, there are graphical installers available.
+</p>
+<p>
+Finally, most Linux systems make it easy to build from source.
</p>
-<p><b>Note: The one click installers do not integrate with platform-specific packaging systems.</b></p>
-
-<p><i>The one click installers are maintained by Dave Page at <a href="http://www.enterprisedb.com">EnterpriseDB</a>.</i></p>
-
-<h2><a name="multibinary">Binary Packages (RPM & DEB)</a></h2>
-<p>Cross-distribution server binaries wrapped in RPM and DEB format for use with your native OS
-package manager. These packages allow for side-by-side versions of the database (i.e pg_upgrade compatible)
-without losing the power of the native package manager. The RPM has been tested on Fedora 6 and above,
-CentOS/Red Hat Enterprise Linux 4 and others. The DEB has been tested on Ubuntu 6.06 and above.</p>
-<p><a href="http://www.openscg.org/postgresql/packages">Download</a> the packages from OpenSCG.</p>
-<p><i>The multi-platform binary packages are maintained by <a href="http://www.openscg.org">OpenSCG</a></i></p>
-
-<h2><a name="yum">Scientific Linux, RHEL, Fedora and CentOS Yum Repository</a></h2>
-
-<p>RPMs for CentOS, Fedora and Red Hat Enterprise Linux are available from the <a href="http://yum.postgresql.org/">PostgreSQL
-Yum repository</a>. Platform-specific RPM packages of PostgreSQL are available as well as a variety of related projects
-such as <a href="http://www.pgadmin.org">pgAdmin</a> and <a href="http://www.postgis.org">PostGIS</a>.</p>
-
-<p>To setup your system to use the repository, please see the <b><a href="http://yum.postgresql.org/howtoyum.php">Yum HOWTO</a></b>.
-
-<p><i>The Yum repository is maintained by Devrim Gunduz.</i></p>
-
-<h2><a name="debian">Debian Apt</a></h2>
-
-<p><a href="http://www.debian.org">Debian</a> users may install PostgreSQL using the apt utility. For
-details on the use of apt on Debian, please see the documentation.</p>
-
-<p>A <a href="http://packages.debian.org/search?keywords=postgresql&searchon=names&suite=stable&section=all">list</a>
-of PostgreSQL Debian packages is available from the package search tool.</p>
-
-<p><i>The PostgreSQL packages for Debian are maintained by Martin Pitt.</i></p>
-
-<h2><a name="ubuntu">Ubuntu Apt</a></h2>
-
-<p><a href="http://www.ubuntu.com">Ubuntu</a> users may install PostgreSQL using the apt utility. For
-details on the use of apt on Ubuntu, please see the documentation.</p>
-
-<p><i>The PostgreSQL packages for Ubuntu are maintained by Martin Pitt.</i></p>
-
-<h2><a name="gentoo">Gentoo Portage</a></h2>
-
-<p><a href="http://www.gentoo.org">Gentoo</a> users may install PostgreSQL using the portage system. For
-details on the use of Gentoo's Portage, please see the documentation.</p>
-
-<h2><a name="suse">SUSE RPMs</a></h2>
-
-<p>RPMs for SUSE Linux and openSUSE are available from the <a href="https://build.opensuse.org/">openSUSE Build Service</a>
-in the project <i>server:database:postgresql</i>. Platform-specific RPM packages are available for PostgreSQL
-as well as a variety of related software. Use the <a href="http://software.opensuse.org/search">search facility</a> to find
-suitable packages. Documentation is also available there.</p>
+<h2>Integrated installation</h2>
+<p>
+For information about how to perform this installation, please consult
+the documentation for your Linux distribution.
+</p>
-<p><i>The PostgreSQL packages for SUSE are maintained by Reinhard Max.</i></p>
+<h2>Graphical installer</h2>
+{%include "pages/download/linux/linux_oneclick.inc" %}
+<h2>Build from source</h2>
+{%include "pages/download/linux/linux_source.inc" %}
{%endblock%}
@@ -0,0 +1,61 @@
+{%extends "base/page.html"%}
+{%block title%}Linux downloads (Debian){%endblock%}
+{%block contents%}
+
+<h1>Linux downloads (Debian)</h1>
+<p>
+PostgreSQL is available in all Debian versions by default. However, the
+stable versions of Debians "snapshot" a specific version of PostgreSQL
+that is then supported throughout the lifetime of that Debian version.
+Other versions are available in the Debian <i>backports</i> repositories.
+</p>
+<p>
+Should packages not be available for your distribution, or there are
+issues with your package manager, there are graphical installers available.
+</p>
+<p>
+Finally, most Linux systems make it easy to build from source.
+</p>
+
+<h2>Included in distribution</h2>
+<p>
+Debian includes PostgreSQL by default. To install PostgreSQL on
+Debian, use the <i>apt-get</i> (or other apt-driving) command:
+</p>
+<code>
+apt-get install postgresql-9.1
+</code>
+</p>
+<p>
+The repository contains many different packages including third party
+addons. The most command and important packages are (substitute the
+version number as required):
+</p>
+<ul>
+ <li>postgresql-client-9.1 - client libraries and client binaries</li>
+ <li>postgresql-9.1 - core database server</li>
+ <li>postgresql-contrib-9.1 - additional supplied modules</li>
+ <li>libpq-dev - libraries and headers for C language frontend development</li>
+ <li>postgresql-server-dev-9.1 - libraries and headers for C language backend development</li>
+ <li>pgadmin3 - pgAdmin III graphical administration utility</li>
+</ul>
+
+<h2>Debian backports</h2>
+<p>
+Newer versions of PostgreSQL for older versions of Debians are available
+in <a href="http://backports.debian.org/">Debian backports</a>. For
+information on how to enable and use the backports repository, please
+see the
+<a href="http://backports-master.debian.org/Instructions/">backports instructions</a> page at Debian.
+</p>
+<p>
+Once backports is enabled, you can install PostgreSQL the same way as with
+the builtin repositories.
+</p>
+
+<h2>Graphical installer</h2>
+{%include "pages/download/linux/linux_oneclick.inc" %}
+
+<h2>Build from source</h2>
+{%include "pages/download/linux/linux_source.inc" %}
+{%endblock%}
@@ -0,0 +1,18 @@
+<p>
+One click 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
+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
+recent distributions.
+</p>
+<p>
+<a href="http://www.enterprisedb.com/products/pgdownload.do">Download</a>
+the installer from EnterpriseDB for all supported versions.
+</p>
+
+<p>
+<i>Note:</i> The one click installers do not integrate with
+platform-specific packaging systems.
+</p>
@@ -0,0 +1,5 @@
+<p>
+The source code can be found in the main <a href="/ftp/source">file browser</a>.
+Instructions for building from source can be found in the
+<a href="/docs/current/static/installation.html">documentation</a>.
+</p>
Oops, something went wrong.

0 comments on commit b282714

Please sign in to comment.