Minor polishing that was missed during the recent rc.subr(8) split:

* Avoid markup of "daemon" when not explicitly referring to the variable.
* Improve some wording, remove one typo and one useless .Pp.
Reminded by jmc@, ok jmc@ ajacoutot@

2 files changed, 17 insertions, 28 deletions

diff --git a/share/man/man8/rc.d.8 b/share/man/man8/rc.d.8
index 7a98de010d9..4b0c28823ce 100644
--- a/share/man/man8/rc.d.8
+++ b/share/man/man8/rc.d.8
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: rc.d.8,v 1.2 2011/02/24 07:06:35 ajacoutot Exp $
+.\" 	$OpenBSD: rc.d.8,v 1.3 2011/03/05 12:56:33 schwarze Exp $
 .\"
 .\" Copyright (c) 2011 Robert Nagy, Antoine Jacoutot, Ingo Schwarze
 .\" All rights reserved.
@@ -24,14 +24,14 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 24 2011 $
+.Dd $Mdocdate: March 5 2011 $
 .Dt RC.D 8
 .Os
 .Sh NAME
 .Nm rc.d
 .Nd daemon control scripts
 .Sh SYNOPSIS
-.Nm /etc/rc.d/ Ns Ar daemond action
+.Nm /etc/rc.d/ Ns Ar daemon action
 .Sh DESCRIPTION
 The
 .Pa /etc/rc.d
@@ -77,13 +77,9 @@ with the name of the actual script
 .Pp
 .Bl -tag -width daemon_flags -offset indent -compact
 .It Ar daemon Ns _flags
-Arguments to call
-.Nm daemon
-with.
+Arguments to call the daemon with.
 .It Ar daemon Ns _user
-User to run
-.Nm daemon
-as, using
+User to run the daemon as, using
 .Xr su 1 .
 .El
 .Pp
@@ -113,7 +109,9 @@ directory
 first appeared in
 .Ox 4.9 .
 .Sh BUGS
-Changing flag values will change the corresponding pattern used with
+Changing flag values in
+.Xr rc.conf.local 8
+will change the corresponding pattern used with
 .Xr pkill 1 ,
 so that
 .Ar stop
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 288c224e7a3..ca2590bf19c 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: rc.subr.8,v 1.8 2011/02/24 07:06:35 ajacoutot Exp $
+.\" 	$OpenBSD: rc.subr.8,v 1.9 2011/03/05 12:56:33 schwarze Exp $
 .\"
 .\" Copyright (c) 2011 Robert Nagy, Antoine Jacoutot, Ingo Schwarze
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 24 2011 $
+.Dd $Mdocdate: March 5 2011 $
 .Dt RC.SUBR 8
 .Os
 .Sh NAME
@@ -37,8 +37,7 @@
 .Nm rc_cmd
 .Ar action
 .Sh DESCRIPTION
-.Pp
-Apart from a few notable exceptions, rc scripts must follow the following
+Apart from a few notable exceptions, rc scripts must follow this
 naming policy:
 .Pp
 .Bl -enum -compact
@@ -54,7 +53,7 @@ have to be converted to
 .Pp
 Every script under
 .Pa /etc/rc.d
-follows the following pattern:
+follows this pattern:
 .Pp
 .Bl -enum -compact
 .It
@@ -176,18 +175,12 @@ without defining
 .Va daemon
 first.
 .It Va daemon_flags
-Arguments to call
-.Va daemon
-with.
+Arguments to call the daemon with.
 .It Va daemon_user
-User to run
-.Va daemon
-as, using
+User to run the daemon as, using
 .Xr su 1 .
 .It Va daemon_class
-Login class to run the
-.Va daemon
-with, using
+Login class to run the daemon with, using
 .Xr su 1 .
 This is a read only variable that gets set by
 .Nm rc.subr
@@ -220,8 +213,7 @@ Can be set to
 .Cm NO
 in an
 .Nm rc.d
-script to disable the reload action if the respective
-.Va daemon
+script to disable the reload action if the respective daemon
 does not support the
 .Dv SIGHUP
 signal to reload its configuration.
@@ -229,8 +221,7 @@ The same is possible, but almost never useful, for other actions.
 .It Va rcexec
 Holds the full
 .Xr su 1
-arguments used to run
-.Va daemon .
+arguments used to run the daemon.
 Defaults to:
 .Va su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c .
 .El