Merge lp:~hrvojem/percona-xtrabackup/bug1181317 into lp:percona-xtrabackup/2.1

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

Since we are removing references to Windows, the following text in manindex.rst should be removed too?

"The *Windows* version is currently at alpha stage and it is available for previewing and testing purposes."

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'BUILD.txt'
--- BUILD.txt	2013-03-22 09:14:31 +0000
+++ BUILD.txt	2013-06-19 08:50:38 +0000
@@ -11,7 +11,8 @@
 In Debian-based distributions, you need to:
 
   $ apt-get install build-essential flex bison automake autoconf bzr \
-    libtool cmake libaio-dev mysql-client libncurses-dev zlib1g-dev
+    libtool cmake libaio-dev mysql-client libncurses-dev zlib1g-dev \
+    libgcrypt11-dev
 
 In RPM-based distributions, you need to:
 

=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2013-04-29 11:08:57 +0000
+++ doc/source/index.rst	2013-06-19 08:50:38 +0000
@@ -9,7 +9,7 @@
 
 *Percona* |XtraBackup| is an open-source hot backup utility for |MySQL| - based servers that doesn't lock your database during the backup.
 
-It can back up data from |InnoDB|, |XtraDB|, and |MyISAM| tables on unmodified |MySQL| 5.1, 5.5 and 5.6 servers, as well as |Percona Server| with |XtraDB|. For a high-level overview of many of its advanced features, including a feature comparison, please see :doc:`intro`.
+It can back up data from |InnoDB|, |XtraDB|, and |MyISAM| tables on |MySQL| 5.1 [#n-1]_, 5.5 and 5.6 servers, as well as |Percona Server| with |XtraDB|. For a high-level overview of many of its advanced features, including a feature comparison, please see :doc:`intro`.
 
 Whether it is a 24x7 highly loaded server or a low-transaction-volume environment, *Percona* |XtraBackup| is designed to make backups a seamless procedure without disrupting the performance of the server in a production environment. `Commercial support contracts are available <http://www.percona.com/mysql-support/>`_.
 
@@ -80,3 +80,7 @@
 
 * :ref:`search`
 
+.. rubric:: Footnotes
+
+.. [#n-1] Support for InnoDB 5.1 builtin has been removed in |Percona XtraBackup| 2.1
+

=== modified file 'doc/source/installation.rst'
--- doc/source/installation.rst	2012-11-29 16:23:29 +0000
+++ doc/source/installation.rst	2013-06-19 08:50:38 +0000
@@ -24,10 +24,3 @@
 |Percona| provides repositories for :program:`yum` (``RPM`` packages for *Red Hat Enterprise Linux* and compatible distributions such as *CentOS*, *Oracle Enterprise Linux*, *Amazon Linux AMI*, and *Fedora*) and :program:`apt` (:file:`.deb` packages for *Ubuntu* and *Debian*) for software such as |Percona Server|, |XtraDB|, |XtraBackup|, and |Percona Toolkit|. This makes it easy to install and update your software and its dependencies through your operating system's package manager.
 
 This is the recommend way of installing where possible.
-
-.. Installing on Windows
-.. =====================
-
-.. Currently the *Microsoft Windows* version is on **ALPHA** stage, binaries provided in the `download page <http://www.percona.com/downloads/XtraBackup/>`_ are for previewing and testing purposes, you should expect no stability in its functioning.
-
-.. Having this in mind, make sure that you have a *Perl* interpreter installed and the |MySQL| client is accessible via the *Windows* ``PATH`` variable. Unzip the |Xtrabackup| package and they are ready to be used.

=== modified file 'doc/source/manindex.rst'
--- doc/source/manindex.rst	2012-11-21 00:03:23 +0000
+++ doc/source/manindex.rst	2013-06-19 08:50:38 +0000
@@ -13,7 +13,7 @@
 
 Whether it is a 24x7 highly loaded server or a low-transaction-volume environment, *Percona* |XtraBackup| is designed to make backups a seamless procedure without disrupting the performance of the server in a production environment. `Commercial support contracts are available <http://www.percona.com/mysql-support/>`_.
 
-*Percona* |XtraBackup| is a combination of the |xtrabackup| *C* program, and the |innobackupex| *Perl* script. The |xtrabackup| program copies and manipulates |InnoDB| and |XtraDB| data files, and the *Perl* script enables enhanced functionality, such as interacting with a running |MySQL| server and backing up |MyISAM| tables. |XtraBackup| works with unmodified |MySQL| servers, as well as |Percona Server| with |XtraDB|. It runs on *Linux* and *FreeBSD*. The *Windows* version is currently at alpha stage and it is available for previewing and testing purposes. 
+*Percona* |XtraBackup| is a combination of the |xtrabackup| *C* program, and the |innobackupex| *Perl* script. The |xtrabackup| program copies and manipulates |InnoDB| and |XtraDB| data files, and the *Perl* script enables enhanced functionality, such as interacting with a running |MySQL| server and backing up |MyISAM| tables. |XtraBackup| works with unmodified |MySQL| servers, as well as |Percona Server| with |XtraDB|. It runs on *Linux* and *FreeBSD*. 
 
 Introduction
 ============