MDEV-7680: Update man pages

50775094 · iangilfillan · Sergei Golubchik · 6dd41145 · 50775094 · 50775094
Commit 50775094 authored Sep 09, 2015 by iangilfillan Committed by Sergei Golubchik Oct 09, 2015
53 changed files
--- a/man/aria_chk.1
+++ b/man/aria_chk.1
@@ -241,5 +241,4 @@ Read this file after the global files are read.
 .SH "SEE ALSO"
 \fBmyisamchk(1)\fR
 .PP
-For more information, please refer to the MariaDB Knowledge Base,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which is available online at http://mariadb.com/kb/
--- a/man/aria_dump_log.1
+++ b/man/aria_dump_log.1
@@ -50,5 +50,6 @@ Only read default options from the given file #.
 Read this file after the global files are read.
 .PP
 .SH "SEE ALSO"
-For more information, please refer to the MariaDB Knowledge Base,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which is available online at http://mariadb.com/kb/
+.SH AUTHOR
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/aria_ftdump.1
+++ b/man/aria_ftdump.1
@@ -25,5 +25,4 @@ Be verbose.
 .SH "SEE ALSO"
 \fBmyisam_ftdump(1)\fR
 .PP
-For more information, please refer to the MariaDB Knowledge Base,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which is available online at http://mariadb.com/kb/
--- a/man/aria_pack.1
+++ b/man/aria_pack.1
@@ -72,5 +72,4 @@ Read this file after the global files are read.
 .SH "SEE ALSO"
 \fBmyisampack(1)\fR
 .PP
-For more information, please refer to the MariaDB Knowledge Base,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which is available online at http://mariadb.com/kb/
--- a/man/aria_read_log.1
+++ b/man/aria_read_log.1
@@ -104,5 +104,4 @@ Read this file after the global files are read.
 .SH "SEE ALSO"
 \fBmyisamlog(1)\fR
 .PP
-For more information, please refer to the MariaDB Knowledge Base,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which is available online at http://mariadb.com/kb/
--- a/man/comp_err.1
+++ b/man/comp_err.1
 '\" t
-.\"     Title: \fBcomp_err\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -20,7 +13,7 @@
 .\" -----------------------------------------------------------------
 .\" comp_err
 .SH "NAME"
-comp_err \- compile MySQL error message file
+comp_err \- compile MariaDB error message file
 .SH "SYNOPSIS"
 .HP \w'\fBcomp_err\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
 \fBcomp_err [\fR\fB\fIoptions\fR\fR\fB]\fR
@@ -33,11 +26,11 @@ file that is used by
 \fBmysqld\fR
 to determine the error messages to display for different error codes\&.
 \fBcomp_err\fR
-normally is run automatically when MySQL is built\&. It compiles the
+normally is run automatically when MariaDB is built\&. It compiles the
 errmsg\&.sys
 file from the plaintext file located at
 sql/share/errmsg\&.txt
-in MySQL source distributions\&.
+in MariaDB source distributions\&.
 .PP
 \fBcomp_err\fR
 also generates
@@ -254,7 +247,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -263,8 +256,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/innochecksum.1
+++ b/man/innochecksum.1
 '\" t
-.\"     Title: \fBinnochecksum\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -69,7 +62,7 @@ supports the following options\&. For options that refer to page numbers, the nu
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-c\fR
+\fB\-c, --count\fR
 .sp
 Print a count of the number of pages in the file\&.
 .RE
@@ -82,7 +75,7 @@ Print a count of the number of pages in the file\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-d\fR
+\fB\-d, --debug\fR
 .sp
 Debug mode; prints checksums for each page\&.
 .RE
@@ -95,7 +88,7 @@ Debug mode; prints checksums for each page\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-e \fR\fB\fInum\fR\fR
+\fB\-e \fR\fB\fInum\fB, --end-page=#\fR\fR
 .sp
 End at this page number\&.
 .RE
@@ -108,7 +101,7 @@ End at this page number\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-p \fR\fB\fInum\fR\fR
+\fB\-p \fR\fB\fInum\fB, --page-num=#\fR\fR
 .sp
 Check only this page number\&.
 .RE
@@ -121,7 +114,7 @@ Check only this page number\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-s \fR\fB\fInum\fR\fR
+\fB\-s \fR\fB\fInum\fB, --start-page\fR\fR
 .sp
 Start at this page number\&.
 .RE
@@ -134,14 +127,27 @@ Start at this page number\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-v\fR
+\fB\-u, --skip-corrupt\fR\fR
+.sp
+Skip corrupt pages\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-v, --verbose\fR
 .sp
 Verbose mode; print a progress indicator every five seconds\&.
 .RE
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -150,8 +156,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/make_win_bin_dist.1
+++ b/man/make_win_bin_dist.1
 '\" t
-.\"     Title: \fBmake_win_bin_dist\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMAKE_WIN_BIN_DIST" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMAKE_WIN_BIN_DIST" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -169,7 +162,7 @@ directories)\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -178,8 +171,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/msql2mysql.1
+++ b/man/msql2mysql.1
 '\" t
-.\"     Title: \fBmsql2mysql\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -60,7 +53,7 @@ utility to make the function name substitutions\&. See
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -69,8 +62,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/my_print_defaults.1
+++ b/man/my_print_defaults.1
 '\" t
-.\"     Title: \fBmy_print_defaults\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -87,7 +80,9 @@ Display a help message and exit\&.
 \fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR,
 \fB\-c \fR\fB\fIfile_name\fR\fR
 .sp
-Read only the given option file\&.
+Read only the given option file\&. If no extension is given, default extension(.ini or .cnf) will 
+be used\&. \fB\-\-config-file\fR is deprecated, use \fB\-\-defaults\-file\fR instead\&. If \fB\-\-defaults\-file\fR is 
+the first option, then read this file only, do not read global or per\-user config files; should be the first option.
 .RE
 .sp
 .RS 4
@@ -126,7 +121,8 @@ string is
 \fB\-\-extra\-file=\fR\fB\fIfile_name\fR\fR,
 \fB\-e \fR\fB\fIfile_name\fR\fR
 .sp
-Read this option file after the global option file but (on Unix) before the user option file\&.
+Read this option file after the global option file but (on Unix) before the user option 
+file\&. Should be the first option\&. \fB\-\-extra\-file\fR is deprecated, use  \fB\-\-defaults\-extra\-file\fR\&.
 .RE
 .sp
 .RS 4
@@ -153,12 +149,27 @@ In addition to the groups named on the command line, read groups that have the g
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" my_print_defaults: --mysqld option
+.\" mysqld option: my_print_defaults
+\fB\-\-mysqld\fR
+.sp
+Read the same set of groups that the mysqld binary does.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" my_print_defaults: no-defaults option
 .\" no-defaults option: my_print_defaults
 \fB\-\-no\-defaults\fR,
 \fB\-n\fR
 .sp
-Return an empty string\&.
+Return an empty string (useful for scripts)\&.
 .RE
 .sp
 .RS 4
@@ -195,7 +206,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -204,8 +215,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/myisam_ftdump.1
+++ b/man/myisam_ftdump.1
 '\" t
-.\"     Title: \fBmyisam_ftdump\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -242,7 +235,7 @@ Verbose mode\&. Print more output about what the program does\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -251,8 +244,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/myisamchk.1
+++ b/man/myisamchk.1
--- a/man/myisamlog.1
+++ b/man/myisamlog.1
 '\" t
-.\"     Title: \fBmyisamlog\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -225,7 +218,7 @@ Display version information\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -234,8 +227,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/myisampack.1
+++ b/man/myisampack.1
 '\" t
-.\"     Title: \fBmyisampack\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -72,7 +65,7 @@ if the table might be updated by the server during the packing process\&. It is
 .sp -1
 .IP \(bu 2.3
 .\}
-After packing a table, it becomes read only\&. This is generally intended (such as when accessing packed tables on a CD)\&. Allowing writes to a packed table is on our TODO list, but with low priority\&.
+After packing a table, it becomes read only\&. This is generally intended (such as when accessing packed tables on a CD)\&.
 .RE
 .PP
 Invoke
@@ -832,7 +825,7 @@ option to
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -841,8 +834,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql-stress-test.pl.1
+++ b/man/mysql-stress-test.pl.1
 '\" t
-.\"     Title: \fBmysql-stress-test.pl\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/31/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL
-.\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "03/31/2010" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -28,7 +21,7 @@ mysql-stress-test.pl \- server stress test program
 .PP
 The
 \fBmysql\-stress\-test\&.pl\fR
-Perl script performs stress\-testing of the MySQL server\&. (MySQL 5\&.0 and up only)
+Perl script performs stress\-testing of the MariaDB server\&.
 .PP
 \fBmysql\-stress\-test\&.pl\fR
 requires a version of Perl that has been built with threads support\&.
@@ -250,7 +243,7 @@ The TCP/IP port number to use for connecting to the server\&. The default is 330
 \fB\-\-server\-socket=\fR\fB\fIfile_name\fR\fR
 .sp
 For connections to
-localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&. The default if
+localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&. The default is
 /tmp/mysql\&.sock\&.
 .RE
 .sp
@@ -266,7 +259,7 @@ localhost, the Unix socket file to use, or, on Windows, the name of the named pi
 .\" server-user option: mysql-stress-test.pl
 \fB\-\-server\-user=\fR\fB\fIuser_name\fR\fR
 .sp
-The MySQL user name to use when connecting to the server\&. The default is
+The MariaDB user name to use when connecting to the server\&. The default is
 root\&.
 .RE
 .sp
@@ -489,7 +482,7 @@ Verbose mode\&. Print more information about what the program does\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2007, 2010, Oracle and/or its affiliates
+Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2015 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
@@ -498,8 +491,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql-test-run.pl.1
+++ b/man/mysql-test-run.pl.1
--- a/man/mysql.1
+++ b/man/mysql.1
 '\" t
-.\"     Title: \fBmysql\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -2985,7 +2978,7 @@ Section\ \&21.9.11, \(lqControlling Automatic Reconnection Behavior\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -3000,8 +2993,6 @@ Bug#25946
 \%http://bugs.mysql.com/bug.php?id=25946
 .RE
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql.server.1
+++ b/man/mysql.server.1
 '\" t
-.\"     Title: \fBmysql.server\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -20,35 +13,33 @@
 .\" -----------------------------------------------------------------
 .\" mysql.server
 .SH "NAME"
-mysql.server \- MySQL server startup script
+mysql.server \- MariaDB server startup script
 .SH "SYNOPSIS"
 .HP \w'\fBmysql\ {start|stop}\fR\ 'u
 \fBmysql {start|stop}\fR
 .SH "DESCRIPTION"
 .PP
-MySQL distributions on Unix include a script named
+MariaDB distributions on Unix include a script named
-\fBmysql\&.server\fR\&. It can be used on systems such as Linux and Solaris that use System V\-style run directories to start and stop system services\&. It is also used by the Mac OS X Startup Item for MySQL\&.
+\fBmysql\&.server\fR\&. It can be used on systems such as Linux and Solaris that use System V\-style run directories to start and stop system services\&. It is also used by the Mac OS X Startup Item for MariaDB\&.
 .PP
 \fBmysql\&.server\fR
 can be found in the
 support\-files
-directory under your MySQL installation directory or in a MySQL source distribution\&.
+directory under your MariaDB installation directory or in a MariaDB source distribution\&.
 .PP
 If you use the Linux server RPM package (MySQL\-server\-\fIVERSION\fR\&.rpm), the
 \fBmysql\&.server\fR
 script will be installed in the
 /etc/init\&.d
 directory with the name
-mysql\&. You need not install it manually\&. See
+mysql\&. You need not install it manually\&.
-Section\ \&2.6.1, \(lqInstalling MySQL from RPM Packages on Linux\(rq, for more information on the Linux RPM packages\&.
 .PP
 Some vendors provide RPM packages that install a startup script under a different name such as
 \fBmysqld\fR\&.
 .PP
-If you install MySQL from a source distribution or using a binary distribution format that does not install
+If you install MariaDB from a source distribution or using a binary distribution format that does not install
 \fBmysql\&.server\fR
-automatically, you can install it manually\&. Instructions are provided in
+automatically, you can install it manually\&.
-Section\ \&2.13.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
 .PP
 \fBmysql\&.server\fR
 reads options from the
@@ -58,8 +49,7 @@ and
 sections of option files\&. For backward compatibility, it also reads
 [mysql_server]
 sections, although you should rename such sections to
-[mysql\&.server]
+[mysql\&.server]&.
-when using MySQL 5\&.1\&.
 .PP
 \fBmysql\&.server\fR
 supports the following options\&.
@@ -76,7 +66,7 @@ supports the following options\&.
 .\" basedir option: mysql.server
 \fB\-\-basedir=\fR\fB\fIpath\fR\fR
 .sp
-The path to the MySQL installation directory\&.
+The path to the MariaDB installation directory\&.
 .RE
 .sp
 .RS 4
@@ -91,7 +81,7 @@ The path to the MySQL installation directory\&.
 .\" datadir option: mysql.server
 \fB\-\-datadir=\fR\fB\fIpath\fR\fR
 .sp
-The path to the MySQL data directory\&.
+The path to the MariaDB data directory\&.
 .RE
 .sp
 .RS 4
@@ -106,7 +96,7 @@ The path to the MySQL data directory\&.
 .\" pid-file option: mysql.server
 \fB\-\-pid\-file=\fR\fB\fIfile_name\fR\fR
 .sp
-The path name of the file in which the server should write its process ID\&.
+The path name of the file in which the server should write its process ID\&. If not provided, the default, "host_name.pid" is used.
 .RE
 .sp
 .RS 4
@@ -123,7 +113,7 @@ The path name of the file in which the server should write its process ID\&.
 .sp
 How long in seconds to wait for confirmation of server startup\&. If the server does not start within this time,
 \fBmysql\&.server\fR
-exits with an error\&. The default value is 900\&. A value of 0 means not to wait at all for startup\&. Negative values mean to wait forever (no timeout)\&. This option was added in MySQL 5\&.1\&.17\&. Before that, a value of 900 is always used\&.
+exits with an error\&. The default value is 900\&. A value of 0 means not to wait at all for startup\&. Negative values mean to wait forever (no timeout)\&.
 .RE
 .sp
 .RS 4
@@ -176,7 +166,7 @@ The login user name to use for running
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -185,8 +175,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_client_test.1
+++ b/man/mysql_client_test.1
 '\" t
-.\"     Title: \fBmysql_client_test\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/31/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "03/31/2010" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -33,7 +26,7 @@ mysql_client_test_embedded \- test client API for embedded server
 .PP
 The
 \fBmysql_client_test\fR
-program is used for testing aspects of the MySQL client API that cannot be tested using
+program is used for testing aspects of the MariaDB client API that cannot be tested using
 \fBmysqltest\fR
 and its test language\&.
 \fBmysql_client_test_embedded\fR
@@ -128,7 +121,7 @@ The database to use\&.
 \fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
 \fB\-#[\fR\fB\fIdebug_options\fR\fR\fB]\fR
 .sp
-Write a debugging log if MySQL is built with debugging support\&. The default
+Write a debugging log if MariaDB is built with debugging support\&. The default
 \fIdebug_options\fR
 value is
 \'d:t:o,/tmp/mysql_client_test\&.trace\'\&.
@@ -165,7 +158,7 @@ library\&.
 \fB\-\-host=\fR\fB\fIhost_name\fR\fR,
 \fB\-h \fR\fB\fIhost_name\fR\fR
 .sp
-Connect to the MySQL server on the given host\&.
+Connect to the MariaDB server on the given host\&.
 .RE
 .sp
 .RS 4
@@ -304,7 +297,7 @@ may optionally behave in a different way than if called manually, for example by
 \fB\-\-user=\fR\fB\fIuser_name\fR\fR,
 \fB\-u \fR\fB\fIuser_name\fR\fR
 .sp
-The MySQL user name to use when connecting to the server\&.
+The MariaDB user name to use when connecting to the server\&.
 .RE
 .sp
 .RS 4
@@ -326,7 +319,7 @@ mysql\-test/var\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2007, 2010, Oracle and/or its affiliates
+Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2015 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
@@ -335,8 +328,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_config.1
+++ b/man/mysql_config.1
 '\" t
-.\"     Title: \fBmysql_config\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -27,7 +20,7 @@ mysql_config \- get compile options for compiling clients
 .SH "DESCRIPTION"
 .PP
 \fBmysql_config\fR
-provides you with useful information for compiling your MySQL client and connecting it to MySQL\&.
+provides you with useful information for compiling your MariaDB client and connecting it to MariaDB\&.
 .PP
 \fBmysql_config\fR
 supports the following options\&.
@@ -63,7 +56,7 @@ for more portable options that contain only include paths\&.
 .\" include option: mysql_config
 \fB\-\-include\fR
 .sp
-Compiler options to find MySQL include files\&.
+Compiler options to find MariaDB include files\&.
 .RE
 .sp
 .RS 4
@@ -81,7 +74,7 @@ Compiler options to find MySQL include files\&.
 \fB\-\-libmysqld\-libs\fR,
 \fB\-\-embedded\fR
 .sp
-Libraries and options required to link with the MySQL embedded server\&.
+Libraries and options required to link with the MariaDB embedded server\&.
 .RE
 .sp
 .RS 4
@@ -96,7 +89,7 @@ Libraries and options required to link with the MySQL embedded server\&.
 .\" libs option: mysql_config
 \fB\-\-libs\fR
 .sp
-Libraries and options required to link with the MySQL client library\&.
+Libraries and options required to link with the MariaDB client library\&.
 .RE
 .sp
 .RS 4
@@ -111,7 +104,7 @@ Libraries and options required to link with the MySQL client library\&.
 .\" libs_r option: mysql_config
 \fB\-\-libs_r\fR
 .sp
-Libraries and options required to link with the thread\-safe MySQL client library\&.
+Libraries and options required to link with the thread\-safe MariaDB client library\&.
 .RE
 .sp
 .RS 4
@@ -126,7 +119,7 @@ Libraries and options required to link with the thread\-safe MySQL client librar
 .\" plugindir option: mysql_config
 \fB\-\-plugindir\fR
 .sp
-The default plugin directory path name, defined when configuring MySQL\&. This option was added in MySQL 5\&.1\&.24\&.
+The default plugin directory path name, defined when configuring MariaDB\&.
 .RE
 .sp
 .RS 4
@@ -141,7 +134,7 @@ The default plugin directory path name, defined when configuring MySQL\&. This o
 .\" port option: mysql_config
 \fB\-\-port\fR
 .sp
-The default TCP/IP port number, defined when configuring MySQL\&.
+The default TCP/IP port number, defined when configuring MariaDB\&.
 .RE
 .sp
 .RS 4
@@ -156,7 +149,7 @@ The default TCP/IP port number, defined when configuring MySQL\&.
 .\" socket option: mysql_config
 \fB\-\-socket\fR
 .sp
-The default Unix socket file, defined when configuring MySQL\&.
+The default Unix socket file, defined when configuring MariaDB\&.
 .RE
 .sp
 .RS 4
@@ -171,7 +164,7 @@ The default Unix socket file, defined when configuring MySQL\&.
 .\" variable option: mysql_config
 \fB\-\-variable=VAR\fR
 .sp
-Path to MySQL include, library and plugin directories\&. \fBVAR\fR is one of
+Path to MariaDB include, library and plugin directories\&. \fBVAR\fR is one of
 `pkgincludedir`, `pkglibdir` and `plugindir`, respectively\&.
 .RE
 .sp
@@ -187,7 +180,7 @@ Path to MySQL include, library and plugin directories\&. \fBVAR\fR is one of
 .\" version option: mysql_config
 \fB\-\-version\fR
 .sp
-Version number for the MySQL distribution\&.
+Version number for the MariaDB distribution\&.
 .RE
 .PP
 If you invoke
@@ -219,7 +212,7 @@ Options:
 .PP
 You can use
 \fBmysql_config\fR
-within a command line to include the value that it displays for a particular option\&. For example, to compile a MySQL client program, use
+within a command line to include the value that it displays for a particular option\&. For example, to compile a MariaDB client program, use
 \fBmysql_config\fR
 as follows:
 .sp
@@ -240,7 +233,7 @@ this way, be sure to invoke it within backtick (\(lq`\(rq) characters\&. That te
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -249,8 +242,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_convert_table_format.1
+++ b/man/mysql_convert_table_format.1
 '\" t
-.\"     Title: \fBmysql_convert_table_format\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -100,7 +93,7 @@ Continue even if errors occur\&.
 .\" host option: mysql_convert_table_format
 \fB\-\-host=\fR\fB\fIhost_name\fR\fR
 .sp
-Connect to the MySQL server on the given host\&.
+Connect to the MariaDB server on the given host\&.
 .RE
 .sp
 .RS 4
@@ -115,10 +108,9 @@ Connect to the MySQL server on the given host\&.
 .\" password option: mysql_convert_table_format
 \fB\-\-password=\fR\fB\fIpassword\fR\fR
 .sp
-The password to use when connecting to the server\&. Note that the password value is not optional for this option, unlike for other MySQL programs\&.
+The password to use when connecting to the server\&. Note that the password value is not optional for this option, unlike for other MariaDB programs\&.
 .sp
-Specifying a password on the command line should be considered insecure\&. See
+Specifying a password on the command line should be considered insecure\&. You can use an option file to avoid giving the password on the command line\&.
-Section\ \&5.3.2.2, \(lqEnd-User Guidelines for Password Security\(rq\&. You can use an option file to avoid giving the password on the command line\&.
 .RE
 .sp
 .RS 4
@@ -181,7 +173,7 @@ if this option is not given\&.
 .\" user option: mysql_convert_table_format
 \fB\-\-user=\fR\fB\fIuser_name\fR\fR
 .sp
-The MySQL user name to use when connecting to the server\&.
+The MariaDB user name to use when connecting to the server\&.
 .RE
 .sp
 .RS 4
@@ -216,7 +208,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -225,8 +217,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_find_rows.1
+++ b/man/mysql_find_rows.1
 '\" t
-.\"     Title: \fBmysql_find_rows\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -151,7 +144,7 @@ Start output from this row\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -160,8 +153,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_fix_extensions.1
+++ b/man/mysql_fix_extensions.1
 '\" t
-.\"     Title: \fBmysql_fix_extensions\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -61,7 +54,7 @@ shell> \fBmysql_fix_extensions \fR\fB\fIdata_dir\fR\fR
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -70,8 +63,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_install_db.1
+++ b/man/mysql_install_db.1
 '\" t
-.\"     Title: \fBmysql_install_db\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -20,14 +13,14 @@
 .\" -----------------------------------------------------------------
 .\" mysql_install_db
 .SH "NAME"
-mysql_install_db \- initialize MySQL data directory
+mysql_install_db \- initialize MariaDB data directory
 .SH "SYNOPSIS"
 .HP \w'\fBmysql_install_db\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
 \fBmysql_install_db [\fR\fB\fIoptions\fR\fR\fB]\fR
 .SH "DESCRIPTION"
 .PP
 \fBmysql_install_db\fR
-initializes the MySQL data directory and creates the system tables that it contains, if they do not exist\&.
+initializes the MariaDB data directory and creates the system tables that it contains, if they do not exist\&.
 .PP
 To invoke
 \fBmysql_install_db\fR, use the following syntax:
@@ -42,7 +35,7 @@ shell> \fBmysql_install_db [\fR\fB\fIoptions\fR\fR\fB]\fR
 .RE
 .\}
 .PP
-Because the MySQL server,
+Because the MariaDB server,
 \fBmysqld\fR, needs to access the data directory when it runs later, you should either run
 \fBmysql_install_db\fR
 from the same account that will be used for running
@@ -81,7 +74,7 @@ with the
 and
 \fB\-\-skip\-grant\-tables\fR
 options (see
-Section\ \&2.3.2, \(lqTypical configure Options\(rq)\&. If MySQL was configured with the
+Section\ \&2.3.2, \(lqTypical configure Options\(rq)\&. If MariaDB was configured with the
 \fB\-\-disable\-grant\-options\fR
 option,
 \fB\-\-bootstrap\fR
@@ -113,7 +106,7 @@ option file groups\&.
 .\" basedir option: mysql_install_db
 \fB\-\-basedir=\fR\fB\fIpath\fR\fR
 .sp
-The path to the MySQL installation directory\&.
+The path to the MariaDB installation directory\&.
 .RE
 .sp
 .RS 4
@@ -124,13 +117,27 @@ The path to the MySQL installation directory\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql_install_db: force option
+.\" mysql_install_db: builddir option
-.\" force option: mysql_install_db
+.\" builddir option: mysql_install_db
-\fB\-\-force\fR
+\fB\-\-builddir=\fIpath\fR
 .sp
-Cause
+If using \fB--srcdir\fR with out-of-directory builds, you will need to set this 
-\fBmysql_install_db\fR
+to the location of the build directory where built files reside.\&.
-to run even if DNS does not work\&. In that case, grant table entries that normally use host names will use IP addresses\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_install_db: cross-bootstrap option
+.\" cross-bootstrap option: mysql_install_db
+\fB\-\-cross\-bootstrap\fR
+.sp
+For internal use. Used when building the MariaDB system tables on a different host than the target.\&.
 .RE
 .sp
 .RS 4
@@ -148,7 +155,102 @@ to run even if DNS does not work\&. In that case, grant table entries that norma
 \fB\-\-datadir=\fR\fB\fIpath\fR\fR,
 \fB\-\-ldata=\fR\fB\fIpath\fR\fR
 .sp
-The path to the MySQL data directory\&.
+The path to the MariaDB data directory\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: defaults-extra-file option
+.\" defaults-extra-file option: mysqlcheck
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
+.sp
+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&.
+Must be given as first option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: defaults-file option
+.\" defaults-file option: mysqlcheck
+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR
+.sp
+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&.
+Must be given as first option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_install_db: force option
+.\" force option: mysql_install_db
+\fB\-\-force\fR
+.sp
+Cause
+\fBmysql_install_db\fR
+to run even if DNS does not work\&. In that case, grant table entries that normally use host names will use IP addresses\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: help option
+.\" help option: mysqlcheck
+\fB\-\-help\fR
+.sp
+Display a help message and exit\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: no-defaults option
+.\" no-defaults option: mysqlcheck
+\fB\-\-no\-defaults\fR
+.sp
+Do not read default options from any option file\&. This must be given as the first argument\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: print-defaults option
+.\" print-defaults option: mysqlcheck
+\fB\-\-print\-defaults\fR
+.sp
+Print the program argument list and exit\&.
+This must be given as the first argument\&.
 .RE
 .sp
 .RS 4
@@ -163,7 +265,7 @@ The path to the MySQL data directory\&.
 .\" rpm option: mysql_install_db
 \fB\-\-rpm\fR
 .sp
-For internal use\&. This option is used by RPM files during the MySQL installation process\&.
+For internal use\&. This option is used by RPM files during the MariaDB installation process\&.
 .RE
 .sp
 .RS 4
@@ -195,7 +297,7 @@ Use IP addresses rather than host names when creating grant table entries\&. Thi
 .sp
 For internal use\&. The directory under which
 \fBmysql_install_db\fR
-looks for support files such as the error message file and the file for populating the help tables\&. This option was added in MySQL 5\&.1\&.14\&.
+looks for support files such as the error message file and the file for populating the help tables\&.4\&.
 .RE
 .sp
 .RS 4
@@ -252,7 +354,7 @@ For internal use\&. This option is used for creating Windows distributions\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -261,8 +363,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_plugin.1
+++ b/man/mysql_plugin.1
 '\" t
-.\"     Title: \fBmysql_plugin\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 01/16/2013
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.5
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_PLUGIN\FR" "1" "01/16/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_PLUGIN\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -29,7 +22,7 @@
 .\" -----------------------------------------------------------------
 .\" mysql_plugin
 .SH "NAME"
-mysql_plugin \- configure MySQL server plugins
+mysql_plugin \- configure MariaDB server plugins
 .SH "SYNOPSIS"
 .HP \w'\fBmysql_plugin\ [\fR\fB\fIoptions\fR\fR\fB]\ \fR\fB\fIplugin\fR\fR\fB\ {ENABLE|DISABLE}\fR\ 'u
 \fBmysql_plugin [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIplugin\fR\fR\fB {ENABLE|DISABLE}\fR
@@ -37,15 +30,13 @@ mysql_plugin \- configure MySQL server plugins
 .PP
 The
 \fBmysql_plugin\fR
-utility enables MySQL administrators to manage which plugins a MySQL server loads\&. It provides an alternative to manually specifying the
+utility enables MariaDB administrators to manage which plugins a MariaDB server loads\&. It provides an alternative to manually specifying the
 \fB\-\-plugin\-load\fR
 option at server startup or using the
 INSTALL PLUGIN
 and
 UNINSTALL PLUGIN
 statements at runtime\&.
-\fBmysql_plugin\fR
-is available as of MySQL 5\&.5\&.16\&.
 .PP
 Depending on whether
 \fBmysql_plugin\fR
@@ -53,12 +44,11 @@ is invoked to enable or disable plugins, it inserts or deletes rows in the
 mysql\&.plugin
 table that serves as a plugin registry\&. (To perform this operation,
 \fBmysql_plugin\fR
-invokes the MySQL server in bootstrap mode\&. This means that the server must not already be running\&.) For normal server startups, the server loads and enables plugins listed in
+invokes the MariaDB server in bootstrap mode\&. This means that the server must not already be running\&.) For normal server startups, the server loads and enables plugins listed in
 mysql\&.plugin
 automatically\&. For additional control over plugin activation, use
 \fB\-\-\fR\fB\fIplugin_name\fR\fR
-options named for specific plugins, as described in
+options named for specific plugins\&.
-Section\ \&5.1.8.1, \(lqInstalling and Uninstalling Plugins\(rq\&.
 .PP
 Each invocation of
 \fBmysql_plugin\fR
@@ -150,7 +140,7 @@ An error occurs if
 \fBmysql_plugin\fR
 cannot find the configuration file or plugin library file, or if
 \fBmysql_plugin\fR
-cannot start the MySQL server\&.
+cannot start the MariaDB server\&.
 .PP
 \fBmysql_plugin\fR
 supports the following options, which can be specified on the command line or in the
@@ -163,8 +153,7 @@ recognizes the
 \fB\-\-basedir\fR,
 \fB\-\-datadir\fR, and
 \fB\-\-plugin\-dir\fR
-options and ignores others\&. For information about option files, see
+options and ignores others\&.
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .PP
 mysql_plugin Options
 .sp
@@ -268,7 +257,7 @@ server\&.
 Do not read values from the configuration file\&. This option enables an administrator to skip reading defaults from the configuration file\&.
 .sp
 With
-\fBmysql_plugin\fR, this option need not be given first on the command line, unlike most other MySQL programs that support
+\fBmysql_plugin\fR, this option need not be given first on the command line, unlike most other MariaDB programs that support
 \fB\-\-no\-defaults\fR\&.
 .RE
 .sp
@@ -334,7 +323,7 @@ to print the defaults for
 if they are found in the configuration file\&. If no value for a variable is found, nothing is shown\&.
 .sp
 With
-\fBmysql_plugin\fR, this option need not be given first on the command line, unlike most other MySQL programs that support
+\fBmysql_plugin\fR, this option need not be given first on the command line, unlike most other MariaDB programs that support
 \fB\-\-print\-defaults\fR\&.
 .RE
 .sp
@@ -372,7 +361,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved., 2013-2015 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
@@ -381,8 +370,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Oracle Corporation (http://dev.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_secure_installation.1
+++ b/man/mysql_secure_installation.1
 '\" t
-.\"     Title: \fBmysql_secure_installation\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -20,13 +13,13 @@
 .\" -----------------------------------------------------------------
 .\" mysql_secure_installation
 .SH "NAME"
-mysql_secure_installation \- improve MySQL installation security
+mysql_secure_installation \- improve MariaDB installation security
 .SH "SYNOPSIS"
 .HP \w'\fBmysql_secure_installation\fR\ 'u
 \fBmysql_secure_installation\fR
 .SH "DESCRIPTION"
 .PP
-This program enables you to improve the security of your MySQL installation in the following ways:
+This program enables you to improve the security of your MariaDB installation in the following ways:
 .sp
 .RS 4
 .ie n \{\
@@ -96,7 +89,7 @@ The script will prompt you to determine which actions to perform\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -105,8 +98,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_setpermission.1
+++ b/man/mysql_setpermission.1
 '\" t
-.\"     Title: \fBmysql_setpermission\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -27,14 +20,13 @@ mysql_setpermission \- interactively set permissions in grant tables
 .SH "DESCRIPTION"
 .PP
 \fBmysql_setpermission\fR
-is a Perl script that was originally written and contributed by Luuk de Boer\&. It interactively sets permissions in the MySQL grant tables\&.
+is a Perl script that was originally written and contributed by Luuk de Boer\&. It interactively sets permissions in the MariaDB grant tables\&.
 \fBmysql_setpermission\fR
 is written in Perl and requires that the
 DBI
 and
 DBD::mysql
-Perl modules be installed (see
+Perl modules be installed\&.
-Section\ \&2.15, \(lqPerl Installation Notes\(rq)\&.
 .PP
 Invoke
 \fBmysql_setpermission\fR
@@ -53,9 +45,9 @@ shell> \fBmysql_setpermission [\fR\fB\fIoptions\fR\fR\fB]\fR
 \fIoptions\fR
 should be either
 \fB\-\-help\fR
-to display the help message, or options that indicate how to connect to the MySQL server\&. The account used when you connect determines which permissions you have when attempting to modify existing permissions in the grant tables\&.
+to display the help message, or options that indicate how to connect to the MariaDB server\&. The account used when you connect determines which permissions you have when attempting to modify existing permissions in the grant tables\&.
 .PP
-\fBmysql_setpermissions\fR
+\fBmysql_setpermission\fR
 also reads options from the
 [client]
 and
@@ -94,7 +86,7 @@ Display a help message and exit\&.
 .\" host option: mysql_setpermission
 \fB\-\-host=\fR\fB\fIhost_name\fR\fR
 .sp
-Connect to the MySQL server on the given host\&.
+Connect to the MariaDB server on the given host\&.
 .RE
 .sp
 .RS 4
@@ -109,10 +101,9 @@ Connect to the MySQL server on the given host\&.
 .\" password option: mysql_setpermission
 \fB\-\-password=\fR\fB\fIpassword\fR\fR
 .sp
-The password to use when connecting to the server\&. Note that the password value is not optional for this option, unlike for other MySQL programs\&.
+The password to use when connecting to the server\&. Note that the password value is not optional for this option, unlike for other MariaDB programs\&.
 .sp
-Specifying a password on the command line should be considered insecure\&. See
+Specifying a password on the command line should be considered insecure\&. You can use an option file to avoid giving the password on the command line\&.
-Section\ \&5.3.2.2, \(lqEnd-User Guidelines for Password Security\(rq\&. You can use an option file to avoid giving the password on the command line\&.
 .RE
 .sp
 .RS 4
@@ -158,12 +149,12 @@ localhost, the Unix socket file to use\&.
 .\" user option: mysql_setpermission
 \fB\-\-user=\fR\fB\fIuser_name\fR\fR
 .sp
-The MySQL user name to use when connecting to the server\&.
+The MariaDB user name to use when connecting to the server\&.
 .RE
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -172,8 +163,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_tzinfo_to_sql.1
+++ b/man/mysql_tzinfo_to_sql.1
 '\" t
-.\"     Title: \fBmysql_tzinfo_to_sql\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -36,8 +29,7 @@ zoneinfo
 database (the set of files describing time zones)\&. Examples of such systems are Linux, FreeBSD, Solaris, and Mac OS X\&. One likely location for these files is the
 /usr/share/zoneinfo
 directory (/usr/share/lib/zoneinfo
-on Solaris)\&. If your system does not have a zoneinfo database, you can use the downloadable package described in
+on Solaris)\&.
-Section\ \&9.6, \(lqMySQL Server Time Zone Support\(rq\&.
 .PP
 \fBmysql_tzinfo_to_sql\fR
 can be invoked several ways:
@@ -113,7 +105,7 @@ After running
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -122,8 +114,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_upgrade.1
+++ b/man/mysql_upgrade.1
--- a/man/mysql_waitpid.1
+++ b/man/mysql_waitpid.1
 '\" t
-.\"     Title: \fBmysql_waitpid\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -120,7 +113,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -129,8 +122,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_zap.1
+++ b/man/mysql_zap.1
 '\" t
-.\"     Title: \fBmysql_zap\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -116,7 +109,7 @@ Test mode\&. Display information about each process but do not kill it\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -125,8 +118,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysqlaccess.1
+++ b/man/mysqlaccess.1
 '\" t
-.\"     Title: \fBmysqlaccess\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -27,7 +20,7 @@ mysqlaccess \- client for checking access privileges
 .SH "DESCRIPTION"
 .PP
 \fBmysqlaccess\fR
-is a diagnostic tool that Yves Carlier has provided for the MySQL distribution\&. It checks the access privileges for a host name, user name, and database combination\&. Note that
+is a diagnostic tool written by Yves Carlier\&. It checks the access privileges for a host name, user name, and database combination\&. Note that
 \fBmysqlaccess\fR
 checks access using only the
 user,
@@ -197,9 +190,8 @@ Display some examples that show how to use
 .\" old_server option: mysqlaccess
 \fB\-\-old_server\fR
 .sp
-Assume that the server is an old MySQL server (before MySQL 3\&.21) that does not yet know how to handle full
+Connect to a very old MySQL server (before MySQL 3\&.21) that does not know how to handle full
-WHERE
+WHERE clauses\&.
-clauses\&.
 .RE
 .sp
 .RS 4
@@ -287,7 +279,7 @@ Display the release notes\&.
 \fB\-\-rhost=\fR\fB\fIhost_name\fR\fR,
 \fB\-H \fR\fB\fIhost_name\fR\fR
 .sp
-Connect to the MySQL server on the given host\&.
+Connect to the MariaDB server on the given host\&.
 .RE
 .sp
 .RS 4
@@ -396,7 +388,7 @@ The user name to use in the access privileges\&.
 Display version information and exit\&.
 .RE
 .PP
-If your MySQL distribution is installed in some nonstandard location, you must change the location where
+If your MariaDB distribution is installed in some non\-standard location, you must change the location where
 \fBmysqlaccess\fR
 expects to find the
 \fBmysql\fR
@@ -423,7 +415,7 @@ error will occur when you run
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -432,8 +424,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysqladmin.1
+++ b/man/mysqladmin.1
--- a/man/mysqlbinlog.1
+++ b/man/mysqlbinlog.1
--- a/man/mysqlbug.1
+++ b/man/mysqlbug.1
 '\" t
-.\"     Title: \fBmysqlbug\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -26,10 +19,12 @@ mysqlbug \- generate bug report
 \fBmysqlbug\fR
 .SH "DESCRIPTION"
 .PP
-This program enables you to generate a bug report and send it to Oracle Corporation\&. It is a shell script and runs on Unix\&.
+To report MariaDB bugs, see https://mariadb.com/kb/en/mariadb/reporting-bugs/ - the mysqlbug program has now been deprecated by Oracle, and was never useful for MariaDB.
+Originally, the program enabled you to generate a bug report and send it to Oracle Corporation\&. It is a shell script and runs on Unix\&.
 .PP
-The normal way to report bugs is to visit
+The normal way to report MySQL bugs is to visit
-\m[blue]\fB\%http://bugs.mysql.com/\fR\m[], which is the address for our bugs database\&. This database is public and can be browsed and searched by anyone\&. If you log in to the system, you can enter new reports\&. If you have no Web access, you can generate a bug report by using the
+\m[blue]\fB\%http://bugs.mysql.com/\fR\m[], which is the address for MySQL's bugs database\&. This database is public and can be browsed and searched by anyone\&. If you log in to the system, you can enter new reports\&. If you have no Web access, you can generate a bug report by using the
 \fBmysqlbug\fR
 script\&.
 .PP
@@ -62,7 +57,7 @@ will send the report by email\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -71,8 +66,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysqlcheck.1
+++ b/man/mysqlcheck.1
--- a/man/mysqld.8
+++ b/man/mysqld.8
 '\" t
-.\"     Title: \fBmysqld\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -53,7 +46,7 @@ Chapter\ \&2, Installing and Upgrading MySQL\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -62,8 +55,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysqld_multi.1
+++ b/man/mysqld_multi.1
 '\" t
-.\"     Title: \fBmysqld_multi\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -728,7 +721,7 @@ Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -737,8 +730,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysqld_safe.1
+++ b/man/mysqld_safe.1
 '\" t
-.\"     Title: \fBmysqld_safe\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -31,34 +24,10 @@ mysqld_safe \- MySQL server startup script
 \fBmysqld_safe\fR
 is the recommended way to start a
 \fBmysqld\fR
-server on Unix and NetWare\&.
+server on Unix\&.
 \fBmysqld_safe\fR
-adds some safety features such as restarting the server when an error occurs and logging runtime information to an error log file\&. Descriptions of error logging and NetWare\-specific behaviors are given later in this section\&.
+adds some safety features such as restarting the server when an error occurs and logging runtime information to an error log file\&. Descriptions of error logging is given later in this section\&.
-.if n \{\
 .sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-In MySQL 5\&.1\&.20 (only), the default error logging behavior with
-\fBmysqld_safe\fR
-is to write errors to
-syslog
-on systems that support the
-\fBlogger\fR
-program\&. This differs from the default behavior of writing an error log file for other versions\&.
-.PP
-\fBIn 5\&.1\&.20, logging to \fR\fBsyslog\fR\fB may fail to operate correctly in some cases; if so, use \fR\fB\fB\-\-skip\-syslog\fR\fR\fB to use the default log file or \fR\fB\fB\-\-log\-error=\fR\fB\fIfile_name\fR\fR\fR\fB to specify a log file name explicitly\&.\fR
-.sp .5v
-.RE
-.PP
 \fBmysqld_safe\fR
 tries to start an executable named
 \fBmysqld\fR\&. To override the default behavior and specify explicitly the name of the server you want to run, specify a
@@ -75,8 +44,7 @@ should look for the server\&.
 Many of the options to
 \fBmysqld_safe\fR
 are the same as the options to
-\fBmysqld\fR\&. See
+\fBmysqld\fR\&.
-Section\ \&5.1.2, \(lqServer Command Options\(rq\&.
 .PP
 Options unknown to
 \fBmysqld_safe\fR
@@ -84,8 +52,7 @@ are passed to
 \fBmysqld\fR
 if they are specified on the command line, but ignored if they are specified in the
 [mysqld_safe] or [mariadb_safe]
-groups of an option file\&. See
+groups of an option file\&.
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .PP
 \fBmysqld_safe\fR
 reads all options from the
@@ -117,11 +84,10 @@ also reads
 [safe_mysqld]
 sections, although you should rename such sections to
 [mysqld_safe]
-in MySQL 5\&.1 installations\&.
+in current installations\&.
 .PP
 \fBmysqld_safe\fR
-supports the options in the following list\&. It also reads option files and supports the options for processing them described at
+supports the options in the following list\&. It also reads option files and supports the options for processing them.
-Section\ \&4.2.3.3.1, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -150,7 +116,7 @@ Display a help message and exit\&.
 .\" basedir option: mysqld_safe
 \fB\-\-basedir=\fR\fB\fIpath\fR\fR
 .sp
-The path to the MySQL installation directory\&.
+The path to the MariaDB installation directory\&.
 .RE
 .sp
 .RS 4
@@ -263,7 +229,7 @@ Section\ \&5.2.2, \(lqThe Error Log\(rq\&.
 .sp
 The name of the server program (in the
 ledir
-directory) that you want to start\&. This option is needed if you use the MySQL binary distribution but have the data directory outside of the binary distribution\&. If
+directory) that you want to start\&. This option is needed if you use the MariaDB binary distribution but have the data directory outside of the binary distribution\&. If
 \fBmysqld_safe\fR
 cannot find the server, use the
 \fB\-\-ledir\fR
@@ -444,7 +410,7 @@ on systems that support the
 program\&.
 \-\-skip\-syslog
 suppresses the use of
-syslog; messages are written to an error log file\&. These options were added in MySQL 5\&.1\&.20\&.
+syslog; messages are written to an error log file\&.
 .RE
 .sp
 .RS 4
@@ -808,7 +774,7 @@ file in the data directory\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 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
@@ -817,8 +783,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysqldump.1
+++ b/man/mysqldump.1
--- a/man/mysqldumpslow.1
+++ b/man/mysqldumpslow.1
--- a/man/mysqlhotcopy.1
+++ b/man/mysqlhotcopy.1
--- a/man/mysqlimport.1
+++ b/man/mysqlimport.1
--- a/man/mysqlshow.1
+++ b/man/mysqlshow.1
--- a/man/mysqlslap.1
+++ b/man/mysqlslap.1
--- a/man/mysqltest.1
+++ b/man/mysqltest.1
--- a/man/ndbd.8
+++ b/man/ndbd.8
--- a/man/ndbd_redo_log_reader.1
+++ b/man/ndbd_redo_log_reader.1
--- a/man/ndbmtd.8
+++ b/man/ndbmtd.8
--- a/man/perror.1
+++ b/man/perror.1
--- a/man/replace.1
+++ b/man/replace.1
--- a/man/resolve_stack_dump.1
+++ b/man/resolve_stack_dump.1
--- a/man/resolveip.1
+++ b/man/resolveip.1