summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-05-09 12:48:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-05-09 12:48:15 +0200
commit1d41b9540ccf8b6714135737855ab71ee75f4364 (patch)
tree2ce7356d2d4fcb4426edfd7e0ddd473bbed4baf5 /doc
parent579c61e579d9452682da51ec5e4b547684573807 (diff)
parent831ce25230f6c8cd7c362fda3616e1233a61cf00 (diff)
downloadrsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.tar.gz
rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.tar.xz
rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.zip
Merge branch 'v4-stable' into v4-devel
Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
Diffstat (limited to 'doc')
-rw-r--r--doc/omrelp.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/omrelp.html b/doc/omrelp.html
index b3132d78..22e6845f 100644
--- a/doc/omrelp.html
+++ b/doc/omrelp.html
@@ -44,6 +44,7 @@ special "RSYSLOG_ForwardFormat" (case sensitive!) template is used.<br>
# port 2514
*.* :omrelp:centralserv:2514;RSYSLOG_ForwardFormat
</textarea>
+Note: to use IPv6 addresses, encode them in [::1] format.
<p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>]
[<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>
<p><font size="2">This documentation is part of the