diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-25 13:51:46 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-25 13:51:46 +0200 |
commit | b829284f37add946ac810b125e3bededa1206c96 (patch) | |
tree | 823089ac6fcd92ef11957ac89d9ccfc998fd768a /tools/rsyslogd.8 | |
parent | d45a286f2dee3c3d5aefef1ac16a02578c95f574 (diff) | |
parent | e39f202c75af187f96a1af07e60892a63e45cd3f (diff) | |
download | rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.gz rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.xz rsyslog-b829284f37add946ac810b125e3bededa1206c96.zip |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools/rsyslogd.8')
-rw-r--r-- | tools/rsyslogd.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index a1395d73..91f2016e 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -1,7 +1,7 @@ .\" Copyright 2004-2008 Rainer Gerhards and Adiscon for the rsyslog modifications .\" May be distributed under the GNU General Public License .\" -.TH RSYSLOGD 8 "07 April 2008" "Version 3.17.0" "Linux System Administration" +.TH RSYSLOGD 8 "11 July 2008" "Version 3.18.0" "Linux System Administration" .SH NAME rsyslogd \- reliable and extended syslogd .SH SYNOPSIS |