summaryrefslogtreecommitdiffstats
path: root/doc/property_replacer.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-21 10:47:31 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-21 10:47:31 +0200
commitbb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d (patch)
treeb738285c841d66b7fbfccb94d136e06275c58553 /doc/property_replacer.html
parent43d9709847de6d286825ed8eb4db3ac702d8ab00 (diff)
parent599a493cac7b067d34cba549c60f2d5bea9333b8 (diff)
downloadrsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.tar.gz
rsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.tar.xz
rsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.zip
Merge branch 'v5-stable' into beta
Conflicts: doc/rsyslog_recording_pri.html
Diffstat (limited to 'doc/property_replacer.html')
-rw-r--r--doc/property_replacer.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/property_replacer.html b/doc/property_replacer.html
index 57592fd1..6456296a 100644
--- a/doc/property_replacer.html
+++ b/doc/property_replacer.html
@@ -65,8 +65,7 @@ BSD syslogd. For example, when TAG is "named[12345]", programname is
</tr>
<tr>
<td><b>pri-text</b></td>
-<td>the PRI part of the message in a textual form (e.g.
-"syslog.info")</td>
+<td>the PRI part of the message in textual form (e.g. "syslog.info")</td>
</tr>
<tr>
<td><b>iut</b></td>