diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 14:27:41 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 14:27:41 +0200 |
commit | 5139502b0e20f667fdcccfeebc6a93b1effc407a (patch) | |
tree | 6255423ab23226e7825069908c2acc45d4245528 /rfc3195d.8 | |
parent | 8a28324ed4ee674b6f38ae02a96c3e5db3800b32 (diff) | |
parent | 3f36ac250f0a0d7b037b79b599694d0c7d13f039 (diff) | |
download | rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.tar.gz rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.tar.xz rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/rsyslog_ng_comparison.html
doc/status.html
msg.c
rsyslog.conf.5
rsyslog.h
rsyslogd.8
syslogd.c
Conflicts were due to patch being multiple times applied in CVS import.
Diffstat (limited to 'rfc3195d.8')
-rw-r--r-- | rfc3195d.8 | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ .\" Copyright 2005 Rainer Gerhards and Adiscon for the rsyslog modifications .\" Distributed under the GNU General Public License. .\" -.TH RSYSLOGD 8 "03 July 2007" "Version 1.14.2 (devel)" "Linux System Administration" +.TH RFC3195D 8 "02 April 2008" "Version 3.14.0" "Linux System Administration" .SH NAME rfc3195d \- RFC 3195 listener .SH SYNOPSIS |