summaryrefslogtreecommitdiffstats
path: root/usr.sbin/newsyslog
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2014-06-05 15:21:25 +0000
committerbdrewery <bdrewery@FreeBSD.org>2014-06-05 15:21:25 +0000
commitc2e2f22c39a3af34517cf2315846784fa0152bf9 (patch)
tree0e056e1e0dce040d37918d19ec59887aada30dc3 /usr.sbin/newsyslog
parent6f5c5395e9e213b5ff6a372a655235871d992b67 (diff)
downloadFreeBSD-src-c2e2f22c39a3af34517cf2315846784fa0152bf9.zip
FreeBSD-src-c2e2f22c39a3af34517cf2315846784fa0152bf9.tar.gz
MFC r266463:
- Include /etc/newsyslog.conf.d/* and /usr/local/etc/newsyslog.conf.d/* by default for newsyslog(8).
Diffstat (limited to 'usr.sbin/newsyslog')
-rw-r--r--usr.sbin/newsyslog/newsyslog.810
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 87f60ac..e6d79a4 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -17,7 +17,7 @@
.\" the suitability of this software for any purpose. It is
.\" provided "as is" without express or implied warranty.
.\"
-.Dd January 31, 2011
+.Dd May 19, 2014
.Dt NEWSYSLOG 8
.Os
.Sh NAME
@@ -261,10 +261,16 @@ If additional command line arguments are given,
will only examine log files that match those arguments; otherwise, it
will examine all files listed in the configuration file.
.Sh FILES
-.Bl -tag -width /etc/newsyslog.confxxxx -compact
+.Bl -tag -width /usr/local/etc/newsyslog.conf.d -compact
.It Pa /etc/newsyslog.conf
.Nm
configuration file
+.It Pa /etc/newsyslog.conf.d
+Each file in this directory will be included by the default
+.Pa newsyslog.conf .
+.It Pa /usr/local/etc/newsyslog.conf.d
+Each file in this directory will be included by the default
+.Pa newsyslog.conf .
.El
.Sh COMPATIBILITY
Previous versions of the
OpenPOWER on IntegriCloud