summaryrefslogtreecommitdiffstats
path: root/doc/omrelp.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-03-11 15:16:57 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-03-11 15:16:57 +0100
commit4df8bb4e6b6c8183c504fdb31d667717bf7584e5 (patch)
treea707a3ea82a3bdefd91ecea44ed7e119b43d496f /doc/omrelp.html
parentdd19c937c1bfbe16063c9d633a79810944ac7eba (diff)
parentae7a01e137f14055f9472408d0cf3ebf9893afba (diff)
downloadrsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.tar.gz
rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.tar.xz
rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.zip
Merge branch 'beta'
Conflicts: doc/omrelp.html
Diffstat (limited to 'doc/omrelp.html')
-rw-r--r--doc/omrelp.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/omrelp.html b/doc/omrelp.html
index 82a62afc..b3132d78 100644
--- a/doc/omrelp.html
+++ b/doc/omrelp.html
@@ -4,9 +4,9 @@
</head>
<body>
-<a href="rsyslog_conf_modules.html">back</a>
+<a href="rsyslog_conf_modules.html">back to rsyslog module documentation</a>
-<h1>RELP Output Module (omlibdbi)</h1>
+<h1>RELP Output Module (omrelp)</h1>
<p><b>Module Name:&nbsp;&nbsp;&nbsp; omrelp</b></p>
<p><b>Author: </b>Rainer Gerhards
&lt;rgerhards@adiscon.com&gt;</p>