diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-21 16:54:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-21 16:54:05 +0200 |
| commit | 88caccecf8dd8beaf46915df05241a44f7d635f6 (patch) | |
| tree | 7d6db5808b3bdd2453f041fef5c808b8fab36119 /doc/Makefile.am | |
| parent | 6e410a76f64d74fec03de27a6ca1f3f996844917 (diff) | |
| parent | 8e536c5b25ca1a7106f541149cf0d76bdf9237da (diff) | |
| download | rsyslog-88caccecf8dd8beaf46915df05241a44f7d635f6.tar.gz rsyslog-88caccecf8dd8beaf46915df05241a44f7d635f6.tar.xz rsyslog-88caccecf8dd8beaf46915df05241a44f7d635f6.zip | |
Merge branch 'master' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index d38d4d0b..3015d6b5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -5,6 +5,7 @@ html_files = \ features.html \ generic_design.html \ expression.html \ + droppriv.html \ history.html \ how2help.html \ install.html \ @@ -99,6 +100,14 @@ html_files = \ omrelp.html \ syslog_parsing.html \ troubleshoot.html \ + rsyslog_conf_actions.html \ + rsyslog_conf_examples.html \ + rsyslog_conf_filter.html \ + rsyslog_conf_global.html \ + rsyslog_conf_modules.html \ + rsyslog_conf_output.html \ + rsyslog_conf_templates.html \ + rsyslog_conf_nomatch.html \ src/classes.dia EXTRA_DIST = $(html_files) |