diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:53:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:53:12 +0200 |
| commit | 2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7 (patch) | |
| tree | ba1953678dcacb485e76f6df408b87e0c7e929b1 /rsyslog.conf.5 | |
| parent | c34ef852ee583de6e335f02d78f917b7d4da8062 (diff) | |
| parent | 2f8fb81bd4cfcc69049b767139389af023d1eef6 (diff) | |
| download | rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.gz rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.xz rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/status.html
rsyslog.conf.5
syslogd.c
Diffstat (limited to 'rsyslog.conf.5')
| -rw-r--r-- | rsyslog.conf.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rsyslog.conf.5 b/rsyslog.conf.5 index e15a4549..4fa98ef2 100644 --- a/rsyslog.conf.5 +++ b/rsyslog.conf.5 @@ -17,7 +17,7 @@ .\" along with this program; if not, write to the Free Software .\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. .\" -.TH RSYSLOG.CONF 5 "04 April 2008" "Version 3.15.0" "Linux System Administration" +.TH RSYSLOG.CONF 5 "07 April 2008" "Version 3.15.1" "Linux System Administration" .SH NAME rsyslog.conf \- rsyslogd(8) configuration file .SH DESCRIPTION |