From 2a9bcc60861dba2dff69af6371164f2f8765f352 Mon Sep 17 00:00:00 2001 From: iangilfillan Date: Thu, 17 Sep 2015 14:45:28 +0200 Subject: MDEV-7680: mysqld man page --- man/mysqld.8 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'man') diff --git a/man/mysqld.8 b/man/mysqld.8 index 5f63015cf4d..f9632e020ea 100644 --- a/man/mysqld.8 +++ b/man/mysqld.8 @@ -11,18 +11,18 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.\" mysqld: MySQL server -.\" MySQL server: mysqld +.\" mysqld: MariaDB server +.\" MariaDB server: mysqld .SH "NAME" -mysqld \- the MySQL server +mysqld \- the MariaDB server .SH "SYNOPSIS" .HP \w'\fBmysqld\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u \fBmysqld [\fR\fB\fIoptions\fR\fR\fB]\fR .SH "DESCRIPTION" .PP -\fBmysqld\fR, also known as MySQL Server, is the main program that does most of the work in a MySQL installation\&. MySQL Server manages access to the MySQL data directory that contains databases and tables\&. The data directory is also the default location for other information such as log files and status files\&. +\fBmysqld\fR, also known as MariaDB Server, is the main program that does most of the work in a MariaDB installation\&. MariaDB Server manages access to the MariaDB data directory that contains databases and tables\&. The data directory is also the default location for other information such as log files and status files\&. .PP -When MySQL server starts, it listens for network connections from client programs and manages access to databases on behalf of those clients\&. +When MariaDB server starts, it listens for network connections from client programs and manages access to databases on behalf of those clients\&. .PP The \fBmysqld\fR @@ -38,11 +38,10 @@ shell> \fBmysqld \-\-verbose \-\-help\fR .RE .\} .PP -MySQL Server also has a set of system variables that affect its operation as it runs\&. System variables can be set at server startup, and many of them can be changed at runtime to effect dynamic server reconfiguration\&. MySQL Server also has a set of status variables that provide information about its operation\&. You can monitor these status variables to access runtime performance characteristics\&. +MariaDB Server also has a set of system variables that affect its operation as it runs\&. System variables can be set at server startup, and many of them can be changed at runtime to effect dynamic server reconfiguration\&. MariaDB Server also has a set of status variables that provide information about its operation\&. You can monitor these status variables to access runtime performance characteristics\&. .PP -For a full description of MySQL Server command options, system variables, and status variables, see -Section\ \&5.1, \(lqThe MySQL Server\(rq\&. For information about installing MySQL and setting up the initial configuration, see -Chapter\ \&2, Installing and Upgrading MySQL\&. +For a full description of MariaDB Server command options, system variables, and status variables, see +the MariaDB Knowledge Base\&. .SH "COPYRIGHT" .br .PP -- cgit v1.2.1