Adopt the common verbiage other log.[ch] daemons use to describe '-d'.

Point out that dhcpd(8) -f is an alias for -d.

3 files changed, 20 insertions, 37 deletions

diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8
index 74094907179..f440a05515e 100644
--- a/sbin/dhclient/dhclient.8
+++ b/sbin/dhclient/dhclient.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dhclient.8,v 1.28 2017/02/02 20:01:38 jmc Exp $
+.\" $OpenBSD: dhclient.8,v 1.29 2017/02/15 19:36:24 krw Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .\" Enterprises.  To learn more about the Internet Software Consortium,
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
-.Dd $Mdocdate: February 2 2017 $
+.Dd $Mdocdate: February 15 2017 $
 .Dt DHCLIENT 8
 .Os
 .Sh NAME
@@ -89,13 +89,11 @@ Specify an alternate location to
 .Pa /etc/dhclient.conf
 for the configuration file.
 .It Fl d
-Forces
-.Nm
-to always run as a foreground process.
-By default,
+Do not daemonize.
+If this option is specified,
 .Nm
-runs in the foreground until it has configured the interface, and then
-will revert to running in the background.
+will run in the foreground and log to
+.Em stderr .
 .It Fl i Ar options
 .Nm
 will ignore any values provided by leases for the options specified.
diff --git a/usr.sbin/dhcpd/dhcpd.8 b/usr.sbin/dhcpd/dhcpd.8
index fba614ce584..73f8145c448 100644
--- a/usr.sbin/dhcpd/dhcpd.8
+++ b/usr.sbin/dhcpd/dhcpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcpd.8,v 1.27 2015/03/13 19:58:41 jmc Exp $
+.\"	$OpenBSD: dhcpd.8,v 1.28 2017/02/15 19:36:24 krw Exp $
 .\"
 .\" Copyright (c) 1995, 1996 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: March 13 2015 $
+.Dd $Mdocdate: February 15 2017 $
 .Dt DHCPD 8
 .Os
 .Sh NAME
@@ -194,28 +194,14 @@ in production, this option should be used
 .Em only
 for testing database files in a non-production environment.
 .It Fl d
-Force
+Do not daemonize.
+If this option is specified,
 .Nm
-to log to
-.Ar stderr .
-This can be useful for debugging, and also at sites where a complete log of
-all dhcp activity must be kept, but
-.Xr syslogd 8
-is not reliable or otherwise cannot be used.
-Normally,
-.Nm
-will log all output using the
-.Xr syslog 3
-function with the log facility set to
-.Dv LOG_DAEMON .
+will run in the foreground and log to
+.Em stderr .
 .It Fl f
-Run
-.Nm
-as a foreground process, rather than allowing it to run as a daemon in the
-background.
-This is useful when running
-.Nm
-under a debugger, or when running it out of inittab on System V systems.
+An alias for
+.Fl d .
 .It Fl L Ar leased_ip_table
 When an address is leased
 .Nm
diff --git a/usr.sbin/dhcrelay/dhcrelay.8 b/usr.sbin/dhcrelay/dhcrelay.8
index 97c774b39e8..1b9a79b91c0 100644
--- a/usr.sbin/dhcrelay/dhcrelay.8
+++ b/usr.sbin/dhcrelay/dhcrelay.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcrelay.8,v 1.15 2016/12/16 18:38:39 rzalamena Exp $
+.\"	$OpenBSD: dhcrelay.8,v 1.16 2017/02/15 19:36:24 krw Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: December 16 2016 $
+.Dd $Mdocdate: February 15 2017 $
 .Dt DHCRELAY 8
 .Os
 .Sh NAME
@@ -94,12 +94,11 @@ relay agent information sub-option value that
 should append on relayed packets.
 If this option is not specified it will use the interface number by default.
 .It Fl d
+Do not daemonize.
+If this option is specified,
 .Nm
-normally runs in the foreground until it has configured
-an interface, and then reverts to running in the background.
-This option forces
-.Nm
-to always run as a foreground process.
+will run in the foreground and log to
+.Em stderr .
 .It Fl i Ar interface
 The name of the network interface that
 .Nm