Merge lp:~hrvojem/percona-xtrabackup/doc-116-2.2 into lp:percona-xtrabackup/2.2

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/doc/source/conf.py'
--- storage/innobase/xtrabackup/doc/source/conf.py	2014-12-08 19:36:28 +0000
+++ storage/innobase/xtrabackup/doc/source/conf.py	2014-12-18 10:41:50 +0000
@@ -26,9 +26,8 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 
-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo', 
-              'sphinx.ext.coverage', 'sphinx.ext.ifconfig', 
-              'sphinx.ext.extlinks']
+extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo', 
+              'sphinx.ext.coverage', 'sphinx.ext.ifconfig']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

=== modified file 'storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst'
--- storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst	2013-08-01 08:54:47 +0000
+++ storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_compressed.rst	2014-12-18 10:41:50 +0000
@@ -30,7 +30,7 @@
 
   $ for bf in `find . -iname "*\.qp"`; do qpress -d $bf $(dirname $bf) && rm $bf; done
 
-In |Percona Xtrabackup| 2.1.4 new :option:`innobackupex --decompress` option has been implemented that can be used to decompress the backup: ::
+In |Percona XtraBackup| 2.1.4 new :option:`innobackupex --decompress` option has been implemented that can be used to decompress the backup: ::
 
   $ innobackupex --decompress /data/backup/2013-08-01_11-24-04/
 

=== modified file 'storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst'
--- storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst	2014-09-25 07:32:11 +0000
+++ storage/innobase/xtrabackup/doc/source/howtos/setting_up_replication.rst	2014-12-18 10:41:50 +0000
@@ -80,7 +80,7 @@
 
 .. code-block:: console
 
-   TheMaster$ rsync -avprP -e ssh /path/to/backupdir/$TIMESTAMP TheSlave:/path/to/mysql/
+   TheMaster$ rsync -avpP -e ssh /path/to/backupdir/$TIMESTAMP TheSlave:/path/to/mysql/
 
 After data has been copied you can back up the original or previously installed |MySQL| :term:`datadir` (**NOTE**: Make sure mysqld is shut down before you move the contents of its datadir, or move the snapshot into its datadir.):
 
@@ -193,7 +193,7 @@
 
 .. code-block:: console
 
-   TheSlave$ innobackupex --user=yourDBuser --password=MaGiCiGaM /
+   TheSlave$ innobackupex --user=yourDBuser --password=MaGiCiGaM \
              --slave-info /path/to/backupdir 
 
 By using the :option:`--slave-info` |Percona XtraBackup| creates additional file called :file:`xtrabackup_slave_info`.

=== modified file 'storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst'
--- storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2014-09-25 16:10:20 +0000
+++ storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2014-12-18 10:41:50 +0000
@@ -16,7 +16,7 @@
 
 .. option:: --close-files
 
-   Do not keep files opened. This option is passed directly to xtrabackup. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. Xtrabackup can produce inconsistent backups with this option enabled. Use at your own risk.
+   Do not keep files opened. This option is passed directly to xtrabackup. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. |Percona XtraBackup| can produce inconsistent backups with this option enabled. Use at your own risk.
 
 .. option:: --compact
 

=== modified file 'storage/innobase/xtrabackup/doc/source/intro.rst'
--- storage/innobase/xtrabackup/doc/source/intro.rst	2014-09-14 09:28:19 +0000
+++ storage/innobase/xtrabackup/doc/source/intro.rst	2014-12-18 10:41:50 +0000
@@ -1,5 +1,5 @@
 ==========================
- About Percona Xtrabackup
+ About Percona XtraBackup
 ==========================
 
 

=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst	2013-08-30 08:52:03 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/1.6/1.6.4.rst	2014-12-18 10:41:50 +0000
@@ -4,7 +4,7 @@
 
 Percona is glad to announce the release of Percona XtraBackup 1.6.4 on 19 December, 2011 (Downloads are available `here <http://www.percona.com/downloads/XtraBackup/XtraBackup-1.6.4/>`_ and from the :doc:`Percona Software Repositories </installation>`).
 
-This release is purely composed of bug fixes and is the current stable release of |Percona| |Xtrabackup|.
+This release is purely composed of bug fixes and is the current stable release of |Percona| |XtraBackup|.
 
 In this release we now compile the |xtrabackup| binary against more recent MySQL and Percona Server versions. We now build against: MySQL 5.1.59, MySQL 5.5.17, Percona Server 5.1.59-13.0 and Percona Server 5.5.16-22.0 and get all the InnoDB bug fixes each of these releases contain. Using `xtrabackup` to back up older MySQL or Percona Server releases is still supported.
 

=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst	2013-08-30 08:52:03 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.0/2.0.7.rst	2014-12-18 10:41:50 +0000
@@ -34,7 +34,7 @@
 
  Fixed couple of warnings found in |innobackupex| when all warnings have been made ``FATAL``. Bug fixed :bug:`1116177`.
 
- If there are thousands of tables and slow IO then |Xtrabackup| can spend a lot of time opening all the tablespaces. Optimization has been implemented and |Percona XtraBackup| now avoids loading non-relevant tablespaces when partial backup is being taken which speeds up the backup process. Bug fixed :bug:`1130145`.
+ If there are thousands of tables and slow IO then |xtrabackup| can spend a lot of time opening all the tablespaces. Optimization has been implemented and |Percona XtraBackup| now avoids loading non-relevant tablespaces when partial backup is being taken which speeds up the backup process. Bug fixed :bug:`1130145`.
 
  |Percona XtraBackup| didn't initialize per-thread data in the log copying thread which could cause |Percona XtraBackup| to crash. Bug fixed :bug:`1166888`.
 

=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst	2013-05-10 09:29:17 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.0-alpha1.rst	2014-12-18 10:41:50 +0000
@@ -11,7 +11,7 @@
 New features
 ------------
 
- |Percona Xtrabackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space.
+ |Percona XtraBackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space.
 
  |Percona XtraBackup| has implemented :ref:`encrypted_backups_ibk`. This feature can be used to encrypt/decrypt both local and streamed backups in order to add another layer of protection to the backups.
 

=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst	2013-05-14 06:09:45 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.1.rst	2014-12-18 10:41:50 +0000
@@ -9,7 +9,7 @@
 New features
 ------------
 
- |Percona Xtrabackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space. GA release now contains new :option:`innobackupex --rebuild-threads` that can be used to specify the number of threads started by XtraBackup when rebuilding secondary indexes on ``innobackupex --apply-log --rebuild-indexes``. This allows parallel processing of individual tables when rebuilding the index.  
+ |Percona XtraBackup| now has support for :ref:`compact_backups_ibk`. This feature can be used for taking the backups that will take less amount of disk space. GA release now contains new :option:`innobackupex --rebuild-threads` that can be used to specify the number of threads started by XtraBackup when rebuilding secondary indexes on ``innobackupex --apply-log --rebuild-indexes``. This allows parallel processing of individual tables when rebuilding the index.  
  
  |Percona XtraBackup| has implemented :ref:`encrypted_backups_ibk`. This feature can be used to encrypt/decrypt both local and streamed backups in order to add another layer of protection to the backups.
 

=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst	2013-05-22 11:21:52 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.1/2.1.3.rst	2014-12-18 10:41:50 +0000
@@ -4,7 +4,7 @@
 
 Percona is glad to announce the release of |Percona XtraBackup| 2.1.3 on May 22nd 2013. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.3/>`_ and :doc:`Percona Software Repositories </installation>`. 
 
-This release fixes a high priority bug. It's advised to upgrade your latest 2.1 version to 2.1.3 if you're using the |Percona Xtrabackup| with |Percona XtraDB Cluster|. This release is the latest stable release in the 2.1 series.
+This release fixes a high priority bug. It's advised to upgrade your latest 2.1 version to 2.1.3 if you're using the |Percona XtraBackup| with |Percona XtraDB Cluster|. This release is the latest stable release in the 2.1 series.
 
 Bugs Fixed
 ----------

=== modified file 'storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst'
--- storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst	2013-08-30 09:55:04 +0000
+++ storage/innobase/xtrabackup/doc/source/xtrabackup_bin/lru_dump.rst	2014-12-18 10:41:50 +0000
@@ -2,7 +2,7 @@
 LRU dump backup
 ================
 
-This feature reduces the warm up time by restoring buffer pool state from :file:`ib_lru_dump` file after restart. |Percona Xtrabackup| discovers :file:`ib_lru_dump` and backs it up automatically.
+This feature reduces the warm up time by restoring buffer pool state from :file:`ib_lru_dump` file after restart. |Percona XtraBackup| discovers :file:`ib_lru_dump` and backs it up automatically.
 
 .. image:: /_static/lru_dump.png
 

=== modified file 'storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst'
--- storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2014-09-10 11:42:45 +0000
+++ storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2014-12-18 10:41:50 +0000
@@ -19,7 +19,7 @@
 
 .. option:: --close-files
 
-   Do not keep files opened. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. Xtrabackup can produce inconsistent backups with this option enabled. Use at your own risk.
+   Do not keep files opened. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. |Percona XtraBackup| can produce inconsistent backups with this option enabled. Use at your own risk.
 
 .. option::  --compact