diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-14 17:48:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-14 17:48:35 +0100 |
| commit | eb659a82ded377db65c3878d7170b7be1542d926 (patch) | |
| tree | a377c7a08a4cfa8912772ff0de6ec5675e77e24e /tools | |
| parent | 62ab1c20b3f40014efa9448bd45da4c333b225c2 (diff) | |
| parent | c0f5dd3fbf877799ac8fec4d00b2f2c69014b413 (diff) | |
| download | rsyslog-eb659a82ded377db65c3878d7170b7be1542d926.tar.gz rsyslog-eb659a82ded377db65c3878d7170b7be1542d926.tar.bz2 rsyslog-eb659a82ded377db65c3878d7170b7be1542d926.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/rsyslog.conf.5 | 8 | ||||
| -rw-r--r-- | tools/rsyslogd.8 | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 index 641ba9ba..fe9e083b 100644 --- a/tools/rsyslog.conf.5 +++ b/tools/rsyslog.conf.5 @@ -415,7 +415,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). @@ -487,7 +487,7 @@ A template that resembles traditional syslogd file output: .RS $template TraditionalFormat,"%timegenerated% %HOSTNAME% .sp 0 -%syslogtag%%msg:::drop-last-lf%\n" +%syslogtag%%msg:::drop-last-lf%\\n" .RE A template that tells you a little more about the message: @@ -495,7 +495,7 @@ A template that tells you a little more about the message: .RS $template precise,"%syslogpriority%,%syslogfacility%,%timegenerated%,%HOSTNAME%, .sp 0 -%syslogtag%,%msg%\n" +%syslogtag%,%msg%\\n" .RE A template for RFC 3164 format: @@ -507,7 +507,7 @@ $template RFC3164fmt,"<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag%%msg%" A template for the format traditionally used for user messages: .sp .RS -$template usermsg," XXXX%syslogtag%%msg%\n\r" +$template usermsg," XXXX%syslogtag%%msg%\\n\\r" .RE And a template with the traditional wall-message format: diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index 9ded4b9b..620006f2 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -128,8 +128,8 @@ may not support it. .B "\-D" Runs the Bison config parser in debug mode. This may help when hard to find syntax errors are reported. Please note that the output generated is deeply -.TP technical and orignally targeted towards developers. +.TP .B "\-d" Turns on debug mode. Using this the daemon will not proceed a .BR fork (2) |