Updates from Peter da Silva to match the recent syslogd changes.

Submitted by:	pds

1 files changed, 34 insertions, 3 deletions

diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index b19e75d72936..70bd0d818dfe 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -45,7 +45,11 @@ The
 file is the configuration file for the
 .Xr syslogd 8
 program.
-It consists of lines with two fields: the
+It consists of
+blocks of lines separated by
+.Em program
+specifications,
+with each line containing two fields: the
 .Em selector
 field which specifies the types of messages and priorities to which the
 line applies, and an
@@ -99,19 +103,40 @@ values specified to the
 .Xr syslog
 library routine.
 .Pp
+Each block of lines is separated from the previous block by a tag. The tag
+is a line beginning with
+.Em #!prog
+or
+.Em !prog
+(the former is for compatibility with the previous syslogd, if one is sharing
+syslog.conf files, for example)
+and each block will be associated with calls to syslog from that specific
+program.
+.Pp
 See
 .Xr syslog 3
 for a further descriptions of both the
 .Em facility
 and
 .Em level
-keywords and their significance.
+keywords and their significance. It's preferred that selections be made on
+.Em facility
+rather than
+.Em program ,
+since the latter can easily vary in a networked environment. In some cases,
+though, an appropriate
+.Em facility
+simply doesn't exist (for example,
+.Em ftpd
+logs under LOG_DAEMON along with a myriad other programs).
 .Pp
 If a received message matches the specified
 .Em facility
 and is of the specified
 .Em level
 .Em (or a higher level) ,
+and the first word in the message after the date matches the
+.Em program ,
 the action specified in the
 .Em action
 field will be taken.
@@ -133,8 +158,10 @@ by separating them with comma (``,'') characters.
 .Pp
 An asterisk (``*'') can be used to specify all
 .Em facilities
+all
+.Em levels
 or all
-.Em levels .
+.Em programs .
 .Pp
 The special
 .Em facility
@@ -207,6 +234,10 @@ mail.*							/var/log/maillog
 # Save mail and news errors of level err and higher in a
 # special file.
 uucp,news.crit						/var/log/spoolerr
+
+# Save ftpd transactions along with mail and news
+!ftpd
+*.*							/var/log/spoolerr
 .Ed
 .Sh FILES
 .Bl -tag -width /etc/syslog.conf -compact