Merge lp:~hingo/drizzle/doc-7.1-installation into lp:~drizzle-trunk/drizzle/development

[Henrik Ingo]

Docs: Adds information about 7.1 packages and updates "tested on following distributions" section.

Sorry for the confusion and extra work: I previously posted a merge request with a branch where I had forgot to commit, so the diff was empty.

=== modified file 'docs/installing/redhat.rst'
--- docs/installing/redhat.rst	2012-02-08 21:33:04 +0000
+++ docs/installing/redhat.rst	2012-03-09 05:44:19 +0000
@@ -1,11 +1,21 @@
 Installing on RedHat and Fedora
 ===============================
 
-Using RPMs
-----------
-There is a custom RedHat/Fedora repository at
-http://rpm.drizzle.org/7-dev/ which includes everything needed
-to install or compile Drizzle on RedHat 5 and 6 as well as Fedora 13 - 14.
+The recommended way to install Drizzle on RedHat, CentOS and Fedora is to use
+`yum` to install Drizzle RPM packages.
+
+There is a custom RedHat/Fedora repository available which includes everything 
+needed to install or compile Drizzle on RedHat 5 and 6 as well as 
+Fedora 13 - 14. For Drizzle 7, the repositories are at
+
+http://rpm.drizzle.org/7-dev/ 
+
+and for Drizzle 7.1 at
+
+http://download.drizzle.org/7.1/
+
+EPEL repository (RedHat only)
+-----------------------------
 
 A pre-requisite of this repository in RedHat is that the
 `EPEL <http://fedoraproject.org/wiki/EPEL>`_ repository is also added to your
@@ -15,7 +25,8 @@
 
    The EPEL repository is not required in Fedora.
 
-To add the EPEL repository, run one of the following commands (choose from the i386(32-bit) or x86_64(64-bit) EPEL repository package).
+To add the EPEL repository, run one of the following commands (choose from the 
+i386(32-bit) or x86_64(64-bit) EPEL repository package).
 
 Install EPEL Repository on 32-bit Linux 5.X:
 
@@ -29,7 +40,28 @@
 
   sudo rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
 
-To add the Drizzle repository to your system you also need to create a /etc/yum.repos.d/drizzle.repo file with the following content:
+Install EPEL Repository on 32-bit Linux 6.X:
+
+.. code-block:: bash
+
+  sudo rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-5.noarch.rpm
+
+Install EPEL Repository on 64-bit Linux 6.X:
+
+.. code-block:: bash
+
+  sudo rpm -Uvh http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-5.noarch.rpm
+
+
+Adding the Drizzle 7 yum repository
+-----------------------------------
+
+.. note::
+
+    This section provides the repositories for Drizzle 7.
+
+To add the Drizzle repository to your system you also need to create a 
+/etc/yum.repos.d/drizzle.repo file with the following content:
 
 *RedHat*
 
@@ -43,11 +75,12 @@
 
    [drizzle-src]
    name=drizzle-src
-   baseurl=http://rpm.drizzle.org/7-dev/redhat/$releasever/SRPMS
+   baseurl=http://rpm.drizzle.org/7-dev/redhat/$releasever/source
    enabled=1
    gpgcheck=0
 
-**$releasever** uses RHEL 5 or RHEL 6, and **$basearch** is the architecture (i386 or x86_64).
+**$releasever** uses RHEL 5 or RHEL 6, and **$basearch** is the architecture 
+(i386 or x86_64).
 
 *Fedora*
 
@@ -61,17 +94,83 @@
 
    [drizzle-src]
    name=drizzle-src
-   baseurl=http://rpm.drizzle.org/7-dev/fedora/$releasever/SRPMS
-   enabled=1
-   gpgcheck=0
-
-**$releasever** uses the Fedora version (currently 13 or 14), and **$basearch** is the architecture (i386 or x86_64).
-
-You can then install Drizzle by running the following command:
-
-.. code-block:: bash
-
-   sudo yum install drizzle-server drizzle-client
-
-Note: On older versions of Fedora and RHEL, the packages are named drizzle7-server and drizzle7-client.
+   baseurl=http://rpm.drizzle.org/7-dev/fedora/$releasever/source
+   enabled=1
+   gpgcheck=0
+
+**$releasever** uses the Fedora version (currently 13 or 14), and **$basearch** 
+is the architecture (i386 or x86_64).
+
+You can then install Drizzle by running the following command:
+
+.. code-block:: bash
+
+   sudo yum install drizzle-server drizzle-client
+
+
+Adding the Drizzle 7.1 yum repository
+-------------------------------------
+
+.. note::
+
+    This section provides the repositories for Drizzle 7.1.
+
+To add the Drizzle repository to your system you also need to create a 
+/etc/yum.repos.d/drizzle.repo file with the following content:
+
+*RedHat*
+
+.. code-block:: ini
+
+   [drizzle]
+   name=drizzle
+   baseurl=http://download.drizzle.org/7.1/redhat/$releasever/$basearch/
+   enabled=1
+   gpgcheck=0
+
+   [drizzle-src]
+   name=drizzle-src
+   baseurl=http://download.drizzle.org/7.1/redhat/$releasever/source
+   enabled=1
+   gpgcheck=0
+
+**$releasever** uses RHEL 5 or RHEL 6, and **$basearch** is the architecture 
+(i386 or x86_64).
+
+*Fedora*
+
+.. code-block:: ini
+
+   [drizzle]
+   name=drizzle
+   baseurl=http://download.drizzle.org/7.1/fedora/$releasever/$basearch/
+   enabled=1
+   gpgcheck=0
+
+   [drizzle-src]
+   name=drizzle-src
+   baseurl=http://download.drizzle.org/7.1/fedora/$releasever/source
+   enabled=1
+   gpgcheck=0
+
+**$releasever** uses the Fedora version (currently 13 or 14), and **$basearch** 
+is the architecture (i386 or x86_64).
+
+.. note::
+
+    At the time of this writing, Fedora packages were not yet released for 
+    Drizzle 7.1 series.
+
+
+Installation
+------------
+
+You can then install Drizzle by running the following command:
+
+.. code-block:: bash
+
+   sudo yum install drizzle-server drizzle-client
+
+Note: In the Drizzle 7-stable repository, the packages are named 
+drizzle7-server and drizzle7-client.
 
 
=== modified file 'docs/installing/requirements.rst'
--- docs/installing/requirements.rst	2011-10-23 05:45:09 +0000
+++ docs/installing/requirements.rst	2012-03-09 05:44:19 +0000
@@ -10,13 +10,22 @@
 because the dependencies required by Drizzle can sometimes be too old or missing
 in some Linux distributions.
 
-Every build of Drizzle is currently tested on:
+Drizzle 7 was tested on:
  * Fedora 12 through 14
  * RedHat (or CentOS) 5 and 6
- * Debian Squeeze (6.0)
+ * Debian Squeeze 6.0
  * Ubuntu 10.04 and 10.10
  * Apple OS X 10.6.4
 
+Drizzle 7.1 was tested on
+ * Fedora 15
+ * RedHat and CentOS 5 and 6
+ * Debian Squeeze 6.0
+ * Ubuntu 10.04 through 11.10
+ * OpenSuse 11
+ * FreeBSD 8.0 and 8.1
+
+
 We recommend using these platforms with Drizzle. Older platforms may have various
 unforseen difficulties when compiling and/or installing.  Drizzle is tested on
 both 32bit and 64bit platforms but we recommend using a 64bit platform.
@@ -30,4 +39,8 @@
  * libuuid (part of the `E2fsprogs <http://e2fsprogs.sourceforge.net/>`_ project)
  * `zlib <http://www.zlib.net/>`_ 1.1.3-5 or higher
 
-Our repositories for RedHat/CentOS/Fedora and for Ubuntu will provide these where required.
+In addition, several optional plugins will depend on additional libraries, like 
+V8 for JavaScript, or clients for Memcache, Gearman, RabbitMQ, ZeroMQ...
+
+Our repositories for RedHat/CentOS/Fedora and for Ubuntu will provide these 
+when they are not part of the distribution repositories.
 
=== modified file 'docs/installing/ubuntu.rst'
--- docs/installing/ubuntu.rst	2011-10-23 05:45:09 +0000
+++ docs/installing/ubuntu.rst	2012-03-09 05:44:19 +0000
@@ -1,22 +1,39 @@
 Installing on Ubuntu
 =====================
 
+The preferred way of installing Drizzle on Ubuntu is to use the provided deb
+packages. 
+
+Ubuntu 11.04 Natty Narwhal and newer comes with Drizzle .deb files in the 
+standard Ubuntu repositories. You can install Drizzle without any further 
+configuration.
+
 Using DEBs
 ----------
 
-Ubuntu 11.04 Natty Narwhal has Drizzle .deb files in the standard Ubuntu repositories.
-For Ubuntu 10.04 LTS Lucid Lynx and Ubuntu 10.10 Maverick Meerkat there is a PPA available at
+For Ubuntu 10.04 LTS Lucid Lynx and Ubuntu 10.10 Maverick Meerkat there is a 
+PPA with Drizzle 7 binaries at
 https://launchpad.net/~drizzle-developers/+archive/ppa
 
 As a first step, run the following command: ::
 
 	sudo apt-get install python-software-properties
 
-To add the above PPA at command line: ::
+To add the PPA: ::
 
 	sudo apt-add-repository ppa:drizzle-developers/ppa
 	sudo apt-get update
 
-Then to install Drizzle, both the server and the client utilities: ::
+The same PPA is also used by drizzle-developers team to publish newer versions
+of Drizzle than what is included in Ubuntu at the time of release. For instance,
+at the moment when this was written, Drizzle 7.1.31-rc was available for Ubuntu 
+11.10 Oneiric, which by default includes Drizzle 7 packages. Hence you can
+use this PPA on any Ubuntu version to update to the newest available Drizzle
+version.
+
+Installing
+----------
+
+To install Drizzle, both the server and the client utilities: ::
 
 	sudo apt-get install drizzle