reorder syslog params descr to make sense, and minor tweaks, plus jmc@'s

input.
okay jmc@, schwarze@

1 files changed, 65 insertions, 60 deletions

diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index 80795a550da..a7114b45451 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslog.3,v 1.29 2013/03/11 13:26:35 jmc Exp $
+.\"	$OpenBSD: syslog.3,v 1.30 2013/06/01 16:57:51 espie Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  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: March 11 2013 $
+.Dd $Mdocdate: June 1 2013 $
 .Dt SYSLOG 3
 .Os
 .Sh NAME
@@ -149,10 +149,67 @@ The message is tagged with
 Priorities are encoded as a
 .Fa facility
 and a
-.Dq level .
-The facility describes the part of the system
-generating the message.
-The level is selected from the following
+.Fa level .
+The
+.Fa facility
+describes the part of the system
+generating the message:
+.Bl -tag -width LOG_AUTHPRIV
+.It Dv LOG_AUTH
+The authorization system:
+.Xr login 1 ,
+.Xr su 1 ,
+.Xr getty 8 ,
+etc.
+.It Dv LOG_AUTHPRIV
+The same as
+.Dv LOG_AUTH ,
+but logged to a file readable only by
+selected individuals.
+.It Dv LOG_CRON
+The cron daemon,
+.Xr cron 8 .
+.It Dv LOG_DAEMON
+System daemons, such as
+.Xr dhcpd 8 ,
+that are not provided for explicitly by other facilities.
+.It Dv LOG_FTP
+The file transfer protocol daemon,
+.Xr ftpd 8 .
+.It Dv LOG_KERN
+Messages generated by the kernel.
+These cannot be generated by any user processes.
+.It Dv LOG_LPR
+The line printer spooling system:
+.Xr lpr 1 ,
+.Xr lpc 8 ,
+.Xr lpd 8 ,
+etc.
+.It Dv LOG_MAIL
+The mail system.
+.It Dv LOG_NEWS
+The network news system.
+.It Dv LOG_SYSLOG
+Messages generated internally by
+.Xr syslogd 8 .
+.It Dv LOG_USER
+Messages generated by random user processes.
+This is the default facility identifier if none is specified.
+.It Dv LOG_UUCP
+The UUCP system.
+.It Dv LOG_LOCAL0
+Reserved for local use.
+Similarly for
+.Dv LOG_LOCAL1
+through
+.Dv LOG_LOCAL7 .
+.El
+.Pp
+The
+.Fa level
+(ORed with the
+.Fa facility )
+is selected from the following
 .Em ordered
 (high to low) list:
 .Bl -tag -width LOG_AUTHPRIV
@@ -180,7 +237,7 @@ normally of use only when debugging a program.
 .Pp
 The
 .Fn vsyslog_r
-is used the same way as
+function is used the same way as
 .Fn vsyslog
 except that it takes an additional pointer to a
 .Fa syslog_data
@@ -239,59 +296,7 @@ instantiations of daemons.
 The
 .Fa facility
 parameter encodes a default facility to be assigned to all messages
-that do not have an explicit facility encoded:
-.Bl -tag -width LOG_AUTHPRIV
-.It Dv LOG_AUTH
-The authorization system:
-.Xr login 1 ,
-.Xr su 1 ,
-.Xr getty 8 ,
-etc.
-.It Dv LOG_AUTHPRIV
-The same as
-.Dv LOG_AUTH ,
-but logged to a file readable only by
-selected individuals.
-.It Dv LOG_CRON
-The cron daemon,
-.Xr cron 8 .
-.It Dv LOG_DAEMON
-System daemons, such as
-.Xr dhcpd 8 ,
-that are not provided for explicitly by other facilities.
-.It Dv LOG_FTP
-The file transfer protocol daemon,
-.Xr ftpd 8 .
-.It Dv LOG_KERN
-Messages generated by the kernel.
-These cannot be generated by any user processes.
-.It Dv LOG_LPR
-The line printer spooling system:
-.Xr lpr 1 ,
-.Xr lpc 8 ,
-.Xr lpd 8 ,
-etc.
-.It Dv LOG_MAIL
-The mail system.
-.It Dv LOG_NEWS
-The network news system.
-.It Dv LOG_SYSLOG
-Messages generated internally by
-.Xr syslogd 8 .
-.It Dv LOG_USER
-Messages generated by random user processes.
-This is the default facility identifier if none is specified.
-.It Dv LOG_UUCP
-The
-.Tn UUCP
-system.
-.It Dv LOG_LOCAL0
-Reserved for local use.
-Similarly for
-.Dv LOG_LOCAL1
-through
-.Dv LOG_LOCAL7 .
-.El
+that do not have an explicit facility encoded.
 .Pp
 The
 .Fn openlog_r