diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:17:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:17:23 +0200 |
| commit | 6d8df125979065640598bc9126258dc8645f748d (patch) | |
| tree | c625b87b1ad7586222e99410d784703aad7b8c95 /doc/manual.html | |
| parent | 1e9febaf28ffa1a6107cd0f5f2c0ac0ab2b16830 (diff) | |
| parent | d7cfdcf28c1239908619aadac6ef4fa43f1b93fd (diff) | |
| download | rsyslog-6d8df125979065640598bc9126258dc8645f748d.tar.gz rsyslog-6d8df125979065640598bc9126258dc8645f748d.tar.xz rsyslog-6d8df125979065640598bc9126258dc8645f748d.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
doc/rsyslog_conf.html
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html index e61132c1..19332b33 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -44,7 +44,6 @@ the links below for the</b><br></p><ul> <li><a href="generic_design.html">backgrounder on generic syslog application design</a><!-- not good as it currently is ;) <li><a href="contributors.html">contributor "Hall of Fame"</a>--></li> <li><a href="modules.html">description of rsyslog modules</a></li> -<li><a href="man_rsyslogd.html">rsyslogd man page</a> (heavily outdated)</li> </ul> <p><b>We have some in-depth papers on</b></p> <ul> |