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 /rsyslog.conf.5 | |
| 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 '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 b49a2da4..1c47f535 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.17.0" "Linux System Administration" +.TH RSYSLOG.CONF 5 "07 April 2008" "Version 3.17.0" "Linux System Administration" .SH NAME rsyslog.conf \- rsyslogd(8) configuration file .SH DESCRIPTION |