summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-09 10:54:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-09 10:54:58 +0200
commit550afa1fefcf1c9a0d44c72c3f51fc15cd33df10 (patch)
tree3cf5cab1e89a0a1db925c18f1ac0fa54a11b96cb /doc
parentb6884a3e1bd22eda94afae687a9a07378eac5318 (diff)
parent89f7dddf36d57c9261464560e3b2c0fb8ea88fd2 (diff)
downloadrsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.tar.gz
rsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.tar.xz
rsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.zip
Merge branch 'v4-devel'
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'doc')
-rw-r--r--doc/omuxsock.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/omuxsock.html b/doc/omuxsock.html
index 4ffc53eb..5fa569eb 100644
--- a/doc/omuxsock.html
+++ b/doc/omuxsock.html
@@ -3,7 +3,7 @@
<a href="features.html">back</a>
</head>
<body>
-<h1>Mail Output Module (omuxsock)</h1>
+<h1>Unix sockets Output Module (omuxsock)</h1>
<p><b>Module Name:&nbsp;&nbsp;&nbsp; omuxsock</b></p>
<p><b>Available since:&nbsp;&nbsp;&nbsp;</b> 4.7.3, 5.5.7</p>
<p><b>Author: </b>Rainer Gerhards &lt;rgerhards@adiscon.com&gt;</p>