Merge branch '10.1' into 10.2

2 files changed, 40 insertions, 2 deletions

diff --git a/man/mysqld_multi.1 b/man/mysqld_multi.1
index fdb073a68bf..6a52116fffe 100644
--- a/man/mysqld_multi.1
+++ b/man/mysqld_multi.1
@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "22/3/2016" "MariaDB 10\&.2" "MariaDB Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "7 December 2016" "MariaDB 10\&.2" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -419,6 +419,21 @@ Be more verbose\&.
 .sp
 Display version information and exit\&.
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqld_multi: wsrep-new-cluster option
+.\" wsrep-new-cluster option: mysqld_multi
+\fB\-\-wsrep\-new\-cluster\fR
+.sp
+Bootstrap a cluster\&.
+.RE
 .PP
 Some notes about
 \fBmysqld_multi\fR:
@@ -653,7 +668,7 @@ user       = jani
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2016 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff --git a/man/mysqldump.1 b/man/mysqldump.1
index a734d5eeb70..ebd3b1fc896 100644
--- a/man/mysqldump.1
+++ b/man/mysqldump.1
@@ -753,6 +753,29 @@ suppresses date printing\&
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: dump-slave option
+.\" dump-slave option: mysqldump
+\fB\-\-dump\-slave[=\fR\fB\fIvalue\fR\fR\fB]\fR
+.sp
+Used for producing a dump file from a replication slave server that can be used to set up another slave server 
+with the same master\&. Causes the binary log position and filename of the master to be appended to the dumped 
+data output\&. Setting the value to 1 (the default) will print it as a CHANGE MASTER command in the dumped data 
+output; if set to 2, that command will be prefixed with a comment symbol\&. This option will turn 
+\-\-lock\-all\-tables on, unless \-\-single-transaction is specified too (in which case a global read lock is only 
+taken a short time at the beginning of the dump \- don't forget to read about \-\-single-transaction below)\&. In 
+all cases any action on logs will happen at the exact moment of the dump\&. Option automatically turns 
+\-\-lock\-tables off\&. Using this option causes mysqldump to stop the slave SQL thread before beginning the dump, 
+and restart it again after completion\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: events option
 .\" events option: mysqldump
 \fB\-\-events\fR,