From 6e52631065b3ef01c9c3e4adb286f66c3d1abbfb Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Thu, 19 Sep 2013 22:24:39 +0200
Subject: MDEV-4979 mysqld_safe section in my.cnf doesn't have mariadb
 equivalent

read also [mariadb_safe] section.
modify the manpage accordingly (and remove a netware-specific option from it)
---
 man/mysqld_safe.1 | 42 ++++--------------------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

(limited to 'man')

diff --git a/man/mysqld_safe.1 b/man/mysqld_safe.1
index 7cd68e01c7d..25848aecb9c 100644
--- a/man/mysqld_safe.1
+++ b/man/mysqld_safe.1
@@ -83,15 +83,15 @@ Options unknown to
 are passed to
 \fBmysqld\fR
 if they are specified on the command line, but ignored if they are specified in the
-[mysqld_safe]
-group of an option file\&. See
+[mysqld_safe] or [mariadb_safe]
+groups of an option file\&. See
 Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
 .PP
 \fBmysqld_safe\fR
 reads all options from the
 [mysqld],
-[server], and
-[mysqld_safe]
+[server],
+[mysqld_safe], and [mariadb_safe]
 sections in option files\&. For example, if you specify a
 [mysqld]
 section like this,
@@ -146,40 +146,6 @@ Display a help message and exit\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysqld_safe: autoclose option
-.\" autoclose option: mysqld_safe
-\fB\-\-autoclose\fR
-.sp
-(NetWare only) On NetWare,
-\fBmysqld_safe\fR
-provides a screen presence\&. When you unload (shut down) the
-\fBmysqld_safe\fR
-NLM, the screen does not by default go away\&. Instead, it prompts for user input:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-*<NLM has terminated; Press any key to close the screen>*
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-If you want NetWare to close the screen automatically instead, use the
-\fB\-\-autoclose\fR
-option to
-\fBmysqld_safe\fR\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 .\" mysqld_safe: basedir option
 .\" basedir option: mysqld_safe
 \fB\-\-basedir=\fR\fB\fIpath\fR\fR
-- 
cgit v1.2.1