summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-25 13:51:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-25 13:51:46 +0200
commitb829284f37add946ac810b125e3bededa1206c96 (patch)
tree823089ac6fcd92ef11957ac89d9ccfc998fd768a /tools
parentd45a286f2dee3c3d5aefef1ac16a02578c95f574 (diff)
parente39f202c75af187f96a1af07e60892a63e45cd3f (diff)
downloadrsyslog-b829284f37add946ac810b125e3bededa1206c96.zip
rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.gz
rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.xz
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tools')
-rw-r--r--tools/rsyslog.conf.54
-rw-r--r--tools/rsyslogd.82
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5
index dd80fca..eb49853 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).
diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8
index a1395d7..91f2016 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