MDEV-7680: Update man pages

1 files changed, 16 insertions, 28 deletions

diff --git a/man/mysql.server.1 b/man/mysql.server.1
index dc965921f6f..ba206cb985c 100644
--- a/man/mysql.server.1
+++ b/man/mysql.server.1
@@ -1,13 +1,6 @@
 '\" 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
-\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\&.
+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 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
-Section\ \&2.6.1, \(lqInstalling MySQL from RPM Packages on Linux\(rq, for more information on the Linux RPM packages\&.
+mysql\&. You need not install it manually\&.
 .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
-Section\ \&2.13.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
+automatically, you can install it manually\&.
 .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]
-when using MySQL 5\&.1\&.
+[mysql\&.server]&.
 .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,
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).