summaryrefslogtreecommitdiff
path: root/usr.sbin/syslogd
diff options
context:
space:
mode:
authorperry <perry@NetBSD.org>1996-01-02 17:41:46 +0000
committerperry <perry@NetBSD.org>1996-01-02 17:41:46 +0000
commit07c1c767bae24a4cc81ff9231da8317072d2f764 (patch)
tree05e231f790e739c4cc63d60915a8d6dfd883edf5 /usr.sbin/syslogd
parent7f907c1899f3cc47d035ca1b9cc9ce5a0915cab2 (diff)
Merge/sync with 4.4lite2. Fixed HISTORY line for syslog.conf.5. Note
that the claim in the HISTORY line for syslogd.8 that it appeared in 4.3BSD is probably bogus -- I remember it being a lot older.
Diffstat (limited to 'usr.sbin/syslogd')
-rw-r--r--usr.sbin/syslogd/syslog.conf.518
-rw-r--r--usr.sbin/syslogd/syslogd.810
2 files changed, 15 insertions, 13 deletions
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index e7ca2002dcb..e3b88b930bf 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1990, 1991, 1993
+.\" The Regents of the University of California. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -29,10 +29,10 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" from: @(#)syslog.conf.5 5.3 (Berkeley) 5/10/91
-.\" $Id: syslog.conf.5,v 1.3 1995/06/20 22:43:19 jtc Exp $
+.\" from: @(#)syslog.conf.5 8.1 (Berkeley) 6/9/93
+.\" $NetBSD: syslog.conf.5,v 1.4 1996/01/02 17:41:46 perry Exp $
.\"
-.Dd May 10, 1991
+.Dd June 9, 1993
.Dt SYSLOG.CONF 5
.Os
.Sh NAME
@@ -225,6 +225,8 @@ the level of ``err'' or higher, not at the level of ``crit'' or higher.
.Xr syslogd 8
.Sh HISTORY
The
-.Nm syslog.conf
-file format is
-.Ud .
+.Nm
+file appeared in
+.Bx 4.3 ,
+along with
+.Xr syslogd 8 .
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index ba243494400..35e2a9e4e0c 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1983, 1986, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1983, 1986, 1991, 1993
+.\" The Regents of the University of California. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -29,10 +29,10 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" from: @(#)syslogd.8 6.10 (Berkeley) 3/16/91
-.\" $Id: syslogd.8,v 1.2 1993/08/01 07:23:26 mycroft Exp $
+.\" from: @(#)syslogd.8 8.1 (Berkeley) 6/6/93
+.\" $NetBSD: syslogd.8,v 1.3 1996/01/02 17:41:48 perry Exp $
.\"
-.Dd March 16, 1991
+.Dd June 6, 1993
.Dt SYSLOGD 8
.Os BSD 4.2
.Sh NAME