Merge pull request #173 from hrvojem/2.2-xb-bug1427484

Fixes LP Bug #1446490 and Bug #1427484 (2.2)

storage/innobase/xtrabackup/doc/source/innobackupex/encrypted_backups_innobackupex.rst

@@ -4,7 +4,7 @@
  Encrypted Backups
 ===================
 
-|Percona XtraBackup| has implemented support for encrypted backups. This feature was introduced in |Percona XtraBackup| 2.1. It can be used to encrypt/decrypt local or streaming backup with |xbstream| option (streaming tar backups are not supported) in order to add another layer of protection to the backups. Encryption is done with the ``libgcrypt`` library.
+|Percona XtraBackup| has implemented support for encrypted backups. It can be used to encrypt/decrypt local or streaming backup with |xbstream| option (streaming tar backups are not supported) in order to add another layer of protection to the backups. Encryption is done with the ``libgcrypt`` library.
 
 .. note:: 
 
@@ -67,11 +67,11 @@ Backups can be decrypted with :ref:`xbcrypt`. Following one-liner can be used to
 
   $ for i in `find . -iname "*\.xbcrypt"`; do xbcrypt -d --encrypt-key-file=/root/secret_key --encrypt-algo=AES256 < $i > $(dirname $i)/$(basename $i .xbcrypt) && rm $i; done
 
-In |Percona XtraBackup| 2.1.4 new :option:`innobackupex --decrypt` option has been implemented that can be used to decrypt the backups: ::
+|Percona XtraBackup| :option:`innobackupex --decrypt` option has been implemented that can be used to decrypt the backups: ::
 
   $ innobackupex --decrypt=AES256 --encrypt-key="GCHFLrDFVx6UAsRb88uLVbAVWbK+Yzfs" /data/backups/2015-03-18_08-31-35/
 
-Use of the :option:`innobackupex --decrypt` will remove the original encrypted files and leave the results in the same location.
+Prior to |Percona XtraBackup| 2.2.10 :option:`innobackupex --decrypt` would remove the original encrypted files and leave the results in the same location. After version 2.2.10 |Percona XtraBackup| doesn't automatically remove the encrypted files. In order to clean up the backup directory users should remove the :file:`*.xbcrypt` files.
 
 .. note::
 

storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst

@@ -49,7 +49,7 @@ Options
 
 .. option:: --decompress
 
-   Decompresses all files with the .qp extension in a backup previously made with the --compress option. The :option:`innobackupex --parallel` option will allow multiple files to be decrypted and/or decompressed simultaneously. In order to decompress, the qpress utility MUST be installed and accessable within the path. This process will remove the original compressed/encrypted files and leave the results in the same location.
+   Decompresses all files with the .qp extension in a backup previously made with the --compress option. The :option:`innobackupex --parallel` option will allow multiple files to be decrypted and/or decompressed simultaneously. In order to decompress, the qpress utility MUST be installed and accessible within the path. This process will remove the original compressed/encrypted files and leave the results in the same location. **NOTE:** After version 2.2.10 Percona XtraBackup doesn't automatically remove the compressed files. In order to clean up the backup directory users should remove the ``*.qp`` files manually.
 
 .. option:: --decrypt=ENCRYPTION-ALGORITHM
 

storage/innobase/xtrabackup/doc/source/innobackupex/privileges.rst

@@ -8,7 +8,7 @@ Privileges refers to the operations that a system user is permitted to do in the
 
 Permissions are those which permits a user to perform operations on the system, like reading, writing or executing on a certain directory or start/stop a system service. **They are set at a system level and only apply to system users**.
 
-Whether |xtrabackup| or |innobackupex| is used, there are two actors involved: the user invoking the program - *a system user* - and the user performing action in the database server - *a database user*. Note that these are different users in different places, even tough they may have the same username.
+Whether |xtrabackup| or |innobackupex| is used, there are two actors involved: the user invoking the program - *a system user* - and the user performing action in the database server - *a database user*. Note that these are different users in different places, even though they may have the same username.
 
 All the invocations of |innobackupex| and |xtrabackup| in this documentation assumes that the system user has the appropriate permissions and you are providing the relevant options for connecting the database server - besides the options for the action to be performed - and the database user has adequate privileges.