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/rsyslog.conf.5 | |
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/rsyslog.conf.5')
-rw-r--r-- | tools/rsyslog.conf.5 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 index dd80fca0..eb498537 100644 --- a/tools/rsyslog.conf.5 +++ b/tools/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 "07 April 2008" "Version 3.17.0" "Linux System Administration" +.TH RSYSLOG.CONF 5 "11 July 2008" "Version 3.18.0" "Linux System Administration" .SH NAME rsyslog.conf \- rsyslogd(8) configuration file .SH DESCRIPTION @@ -372,7 +372,7 @@ To escape: .sp 0 \\ = \\\\ --> '\\' is used to escape (as in C) .sp 0 -$template TraditionalFormat,%timegenerated% %HOSTNAME% %syslogtag%%msg%\n" +$template TraditionalFormat,"%timegenerated% %HOSTNAME% %syslogtag%%msg%\n" Properties can be accessed by the property replacer (see there for details). |