Merge lp:~hrvojem/percona-xtrabackup/bug1239791-2.2 into lp:percona-xtrabackup/2.2

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/doc/source/innobackupex/streaming_backups_innobackupex.rst'
--- storage/innobase/xtrabackup/doc/source/innobackupex/streaming_backups_innobackupex.rst	2013-08-30 09:55:04 +0000
+++ storage/innobase/xtrabackup/doc/source/innobackupex/streaming_backups_innobackupex.rst	2013-12-04 13:13:00 +0000
@@ -12,9 +12,9 @@
 
 |innobackupex| starts |xtrabackup| in :option:`--log-stream` mode in a child process, and redirects its log to a temporary file. It then uses |xbstream| to stream all of the data files to ``STDOUT``, in a special ``xbstream`` format. See :doc:`../xbstream/xbstream` for details. After it finishes streaming all of the data files to ``STDOUT``, it stops xtrabackup and streams the saved log file too.
 
-When compression is enabled, |xtrabackup| compresses all output data, including the transaction log file and meta data files, using the specified compression algorithm. The only currently supported algorithm is 'quicklz'. The resulting files have the qpress archive format, i.e. every \*.qp file produced by xtrabackup is essentially a one-file qpress archive and can be extracted and uncompressed by the `qpress file archiver <http://www.quicklz.com/>`_ which is available from `Percona Software repositories <http://www.percona.com/doc/percona-xtrabackup/2.1/installation.html#using-percona-software-repositories>`_. New algorithms (gzip, bzip2, etc.) may be added later with minor efforts.
+When compression is enabled, |xtrabackup| compresses all output data, except the meta and non-InnoDB files which are not compressed, using the specified compression algorithm. The only currently supported algorithm is ``quicklz``. The resulting files have the qpress archive format, i.e. every \*.qp file produced by xtrabackup is essentially a one-file qpress archive and can be extracted and uncompressed by the `qpress file archiver <http://www.quicklz.com/>`_ which is available from :ref:`Percona Software repositories <installation>`.
 
-Using |xbstream| as a stream option, backups can be copied and compressed in parallel which can significantly speed up the backup process. In case backups were both compressed and encrypted, they'll need to decrypted first in order to be uncompressed. 
+Using |xbstream| as a stream option, backups can be copied and compressed in parallel which can significantly speed up the backup process. In case backups were both compressed and encrypted, they'll need to decrypted first in order to be uncompressed.
 
 Examples using xbstream
 =======================

=== modified file 'storage/innobase/xtrabackup/doc/source/installation.rst'
--- storage/innobase/xtrabackup/doc/source/installation.rst	2013-08-30 09:55:04 +0000
+++ storage/innobase/xtrabackup/doc/source/installation.rst	2013-12-04 13:13:00 +0000
@@ -1,3 +1,5 @@
+.. _installation:
+
 ===============================================
  Installing |Percona XtraBackup| from Binaries
 ===============================================