summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-16 12:59:55 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-16 12:59:55 +0200
commit98348ae03d217d1971c54ff135b6a5ce1dff7087 (patch)
treecced038bdf003e375a77a47aa7ea7b4183553664 /doc
parent4af40abc0a9cdc9f328830b6074f6182f43c171a (diff)
parent74b2b24f508be90d20961304d5e3cce648f3eb7c (diff)
downloadrsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.tar.gz
rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.tar.xz
rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.zip
Merge branch 'master' into omfile
Conflicts: ChangeLog runtime/msg.h tcps_sess.c tcpsrv.c tools/syslogd.c
Diffstat (limited to 'doc')
-rw-r--r--doc/property_replacer.html4
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/property_replacer.html b/doc/property_replacer.html
index a6e9b518..7b604ea0 100644
--- a/doc/property_replacer.html
+++ b/doc/property_replacer.html
@@ -30,10 +30,6 @@ Currently supported are:</p>
socket. Should be useful for debugging.</td>
</tr>
<tr>
-<td><b>uxtradmsg</b></td>
-<td>will disappear soon - do NOT use!</td>
-</tr>
-<tr>
<td><b>hostname</b></td>
<td>hostname from the message</td>
</tr>