Merge remote branch 'symoon/master'

* symoon/master:
  Fix reference rewrite rule
  Canonical place for manuals is /doc/manuals/
  Handle a Redirect for the New Maintainers' Guide
  Handle a RewriteMap for Debian Reference
  Offer a link to DSA without knowing year (Closes: #474730)
  More Redirect previously handled by symlinks
  Handle links to translated 404 pages
  All Redirect are actually RedirectPermanent

Signed-off-by: Peter Palfrader <peter@palfrader.org>

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 8ea828d69b89da9ee743031baa20b7e3560ae067..6e09b0323db75ff9d1a95b2a69d8aaa6114c88f3 100644 (file)
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -24,7 +24,7 @@
 options {
         # disable the chained hostname format in logs
         # (default is enabled)
-        chain_hostnames(0);
+        chain_hostnames(1);
 
         # the time to wait before a died connection is re-established
         # (default is 60)