diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-15 16:11:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-15 16:11:05 +0200 |
| commit | 188e4f39fd3c267159c32f750f1da0bc74db910e (patch) | |
| tree | f19a40ae560d8e80acf6965f235dca0fcda05798 /doc/Makefile.am | |
| parent | 19864adc4799ce57204fdabb7049e8ec856ed452 (diff) | |
| parent | 38cdfcfbe1c1ed6aa4a22623afc43d199bc5f7a8 (diff) | |
| download | rsyslog-188e4f39fd3c267159c32f750f1da0bc74db910e.tar.gz rsyslog-188e4f39fd3c267159c32f750f1da0bc74db910e.tar.xz rsyslog-188e4f39fd3c267159c32f750f1da0bc74db910e.zip | |
Merge branch 'master' into beta
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 518b90ed..de3675de 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -21,6 +21,7 @@ html_files = \ rsyslog_high_database_rate.html \ rsyslog_php_syslog_ng.html \ rsyslog_recording_pri.html \ + rsyslog_tls.html \ rsyslog_reliable_forwarding.html \ rsyslog_stunnel.html \ syslog-protocol.html \ @@ -37,9 +38,21 @@ html_files = \ imklog.html \ professional_support.html \ queues.html \ - queueWorkerLogic.dia \ + src/queueWorkerLogic.dia \ queueWorkerLogic.jpg \ queueWorkerLogic_small.jpg \ + tls_cert_100.jpg \ + tls_cert_ca.jpg \ + tls_cert.jpg \ + tls_cert_errmsgs.html \ + rsyslog_secure_tls.html \ + tls_cert_server.html \ + tls_cert_ca.html \ + tls_cert_summary.html \ + tls_cert_machine.html \ + tls_cert_udp_relay.html \ + tls_cert_client.html \ + tls_cert_scenario.html \ rainerscript.html \ rscript_abnf.html \ rsconf1_actionexeconlywhenpreviousissuspended.html \ @@ -72,6 +85,11 @@ html_files = \ rsconf1_resetconfigvariables.html \ rsconf1_umask.html \ v3compatibility.html \ + im3195.html \ + netstream.html \ + ns_gtls.html \ + ns_ptcp.html \ + src/tls_cert.dia \ gssapi.html \ licensing.html \ ommail.html \ |