Merge lp:~hrvojem/percona-xtrabackup/bug919203 into lp:percona-xtrabackup/2.0

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

OK to merge.

review: Approve

=== modified file 'doc/source/faq.rst'
--- doc/source/faq.rst	2012-01-19 09:47:03 +0000
+++ doc/source/faq.rst	2012-01-23 07:14:24 +0000
@@ -56,6 +56,6 @@
 In most of the cases this is due to not having install the required libraries (and version) by |xtrabackup|. Installing the *GCC* suite with the supporting libraries and recompiling |xtrabackup| will solve the issue. See :doc:`installation/compiling_xtrabackup` for instructions on the procedure.
 
 How innobackupex handles the ibdata/ib_log files on restore if they aren't in mysql datadir?
-===========================================================================================
+============================================================================================
 
 In case the ibdata and ib_log files are located in different directories outside of the datadir, you will have to put them in their proper place after the logs have been applied.

=== modified file 'doc/source/innobackupex/incremental_backups_innobackupex.rst'
--- doc/source/innobackupex/incremental_backups_innobackupex.rst	2011-07-28 05:29:04 +0000
+++ doc/source/innobackupex/incremental_backups_innobackupex.rst	2012-01-23 07:14:24 +0000
@@ -82,7 +82,7 @@
 
 Then, the first incremental backup can be applied to the base backup, by issuing: ::
 
-  innobackupex --apply-log BASE-DIR --incremental-dir=INCREMENTAL-DIR-1
+  innobackupex --apply-log --redo-only BASE-DIR --incremental-dir=INCREMENTAL-DIR-1
 
 You should see an output similar to the previous one but with corresponding |LSN|: ::