some updates to reflect reality; prompted by a diff from Daniel Bolgheroni

ok ajacoutot

1 files changed, 34 insertions, 49 deletions

diff --git a/share/man/man8/rc.conf.8 b/share/man/man8/rc.conf.8
index cd28b521649..5efd777825d 100644
--- a/share/man/man8/rc.conf.8
+++ b/share/man/man8/rc.conf.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rc.conf.8,v 1.19 2011/07/08 17:43:58 sthen Exp $
+.\"	$OpenBSD: rc.conf.8,v 1.20 2012/03/17 14:46:40 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Ian F. Darwin
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 8 2011 $
+.Dd $Mdocdate: March 17 2012 $
 .Dt RC.CONF 8
 .Os
 .Sh NAME
@@ -35,7 +35,9 @@
 .Nm rc.conf.local
 .Nd system daemon configuration database
 .Sh DESCRIPTION
-This file contains a series of Bourne-shell syntax assignments
+The file
+.Nm rc.conf
+contains a series of Bourne shell syntax assignments
 that are used to configure the system daemons.
 It is not read by the kernel, but is sourced by various other files
 in the
@@ -43,87 +45,70 @@ in the
 series in order to set shell variables used therein
 to control the behaviour of the scripts.
 .Pp
-It is advisable to leave the
-.Pa /etc/rc.conf
-file untouched, and instead create and edit a new
-.Pa /etc/rc.conf.local
+It is advisable to leave
+.Nm rc.conf
+untouched, and instead create and edit a new
+.Nm rc.conf.local
 file.
 Variables set in this file will override variables previously set in
-.Pa /etc/rc.conf .
+.Nm rc.conf .
 .Pp
-There are four sections in this file.
-The first is used to turn features on or off.
+Some variables are used to turn features on or off.
 For example, whether the system runs the
-.Nm dhcpd
-daemon is determined by the line in this section
+.Xr dhcpd 8
+daemon is determined by the following line:
 .Bd -literal -offset indent
-dhcpd_flags=NO		# for normal use: ""
+dhcpd_flags=NO			# for normal use: ""
 .Ed
 .Pp
-If this line is edited to contain some valid dhcpd daemon command-line
-flags, such as
+To run the dhcpd daemon,
+add the following line to
+.Nm rc.conf.local :
 .Bd -literal -offset indent
-dhcpd_flags="-A abandoned"	# for normal use: ""
+dhcpd_flags=""			# for normal use: ""
 .Ed
 .Pp
+If instead some options are specified,
 then the dhcpd daemon will be started with those options.
-.Pp
-The second section contains some other programs that can either be run or not,
-but that don't need options.
-They can be set to YES or NO.
-For example, the line
+For example:
 .Bd -literal -offset indent
-nfs_server=NO
+dhcpd_flags="-A abandoned"	# for normal use: ""
 .Ed
 .Pp
-prevents the NFS server daemons from starting.
-To run NFS, just change this line's value from NO to YES,
-.Sy and
-also make whatever changes are needed for the server
-to have something to do (set up the
-.Xr exports 5
-file etc.).
-.Pp
-The third section contains values that parameterize servers started by
-one of the first two sections, and are ignored if the corresponding
-server is not running.
-For example, if
-.Nm nfs_server ,
-is enabled, then the line
+Other variables specify a simple YES or NO,
+or simply determine the location of a file.
+For example, the location of the ruleset for
+.Xr pf 4
+is given thus:
 .Bd -literal -offset indent
-nfsd_flags="-tun 4"
+pf_rules=/etc/pf.conf           # Packet filter rules file
 .Ed
 .Pp
-provides command-line arguments for the NFS server.
-.Pp
-This particular line instructs
-.Xr nfsd 8
-to start four copies of the server.
-On a busy file server, 8 (or more) copies are recommended.
-.Pp
-The fourth section contains the
+Finally there is the
 .Va pkg_scripts
 variable, responsible for starting and stopping
 .Xr rc.d 8
 scripts installed by packages in the specified order.
-For example, the following line
+For example:
 .Bd -literal -offset indent
 pkg_scripts="dbus_daemon cupsd"
 .Ed
 .Pp
-will run
+This will run
 .Pa /etc/rc.d/dbus_daemon
 then
 .Pa /etc/rc.d/cupsd
 with the
 .Va start
-argument at boot time and in reverse order with the
+argument at boot time,
+and in reverse order with the
 .Va stop
 argument at shutdown.
 .Sh SEE ALSO
 .Xr init 8 ,
 .Xr intro 8 ,
-.Xr rc 8
+.Xr rc 8 ,
+.Xr rc.d 8
 .Sh HISTORY
 The
 .Nm