Merge lp:~hrvojem/percona-server/doc-111-5.6 into lp:percona-server/5.6

[Hrvoje Matijakovic]

[Hrvoje Matijakovic (hrvojem)]

self-approved (already reviewed and approved by AlexeyB for PXC)

review: Approve

=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst	2014-07-30 10:04:25 +0000
+++ doc/source/installation/apt_repo.rst	2014-09-23 15:09:26 +0000
@@ -4,7 +4,7 @@
  Percona :program:`apt` Repository
 ===================================
 
-*Debian* and *Ubuntu* packages from *Percona* are signed with a key. Before using the repository, you should add the key to :program:`apt`. To do that, run the following commands: ::
+*Debian* and *Ubuntu* packages from *Percona* are signed with a key. Before using the repository, you should add the key to :program:`apt`. To do that, run the following commands as root: ::
 
   $ apt-key adv --keyserver keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A
 
@@ -17,6 +17,10 @@
 
   $ apt-get update
 
+After that you can install the server and client packages ::  
+
+  $ apt-get install percona-server-server-5.6 percona-server-client-5.6
+
 Supported Platforms
 ===================
 
@@ -40,14 +44,13 @@
  * 13.10 (saucy)
  * 14.04LTS (trusty)
 
-
-Percona `apt` Experimental repository
-=====================================
-
-Percona offers fresh beta builds from the experimental repository. To enable it add the following lines to your  :file:`/etc/apt/sources.list` , replacing ``VERSION`` with the name of your distribution: :: 
-
-  deb http://repo.percona.com/apt VERSION main experimental
-  deb-src http://repo.percona.com/apt VERSION main experimental
+Percona `apt` Testing repository
+=================================
+
+Percona offers pre-release builds from the testing repository. To enable it add the following lines to your  :file:`/etc/apt/sources.list` , replacing ``VERSION`` with the name of your distribution: :: 
+
+  deb http://repo.percona.com/apt VERSION main testing
+  deb-src http://repo.percona.com/apt VERSION main testing
 
 Apt-Pinning the packages
 ========================

=== modified file 'doc/source/installation/yum_repo.rst'
--- doc/source/installation/yum_repo.rst	2014-06-11 13:45:54 +0000
+++ doc/source/installation/yum_repo.rst	2014-09-23 15:09:26 +0000
@@ -6,37 +6,21 @@
 
 The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.
 
-The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_. You can also do the installation manually.
+The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_.
 
 Automatic Installation
 ======================
 
-Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::
+Execute the following command as a ``root`` user: ::
 
-  $ yum install http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
+  $ yum install http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
 
 You should see some output such as the following: ::
 
-  Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
+  Retrieving http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
   Preparing...                ########################################### [100%]
      1:percona-release        ########################################### [100%]
 
-The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
-
-Manual Installation
-===================
-
-To install the repository manually, place the following into a new file named :file:`/etc/yum.repos.d/Percona.repo`: ::
-
-  [percona]
-  name = CentOS $releasever - Percona
-  baseurl=http://repo.percona.com/centos/$releasever/os/$basearch/
-  enabled = 1
-  gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-percona
-  gpgcheck = 1
-
-Also, copy the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_  into a file named :file:`/etc/pki/rpm-gpg/RPM-GPG-KEY-percona`.
-
 Testing The Repository
 ======================
 
@@ -46,7 +30,7 @@
 
 You should see output similar to the following: ::
 
-  percona-release.x86_64                     0.0-1                         @/percona-release-0.0-1.x86_64
+  percona-release.noarch                     0.1-3                         @/percona-release-0.1-3.noarch
   ...
   Percona-Server-client-56.x86_64            5.6.15-rel63.0.519.rhel6      percona
   Percona-Server-devel-56.x86_64             5.6.15-rel63.0.519.rhel6      percona
@@ -54,7 +38,7 @@
   Percona-Server-shared-56.x86_64            5.6.15-rel63.0.519.rhel6      percona
   Percona-Server-test-56.x86_64              5.6.15-rel63.0.519.rhel6      percona
   ...
-  percona-xtrabackup.x86_64                  2.1.7-721.rhel6               percona
+  percona-xtrabackup.x86_64                  2.2.4-5004.el6                percona
 
 
 Supported Platforms
@@ -74,15 +58,10 @@
 
 * *Amazon Linux AMI* (works the same as *CentOS* 5)
 
-Percona `yum` Experimental repository
-=====================================
-
-Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::
-
- yum install http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
-
-.. note:: 
- This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6
+Percona `yum` Testing repository
+================================
+
+Percona offers pre-release builds from the testing repository. To subscribe to the testing repository, you'll need to enable the testing repository in :file:`/etc/yum.repos.d/percona-release.repo` (both ``$basearch`` and ``noarch``). **NOTE:** You'll need to install the Percona repository first if this hasn't been done already.
 
 .. rubric:: Footnotes