[Pkg-apache-commits] r1011 - in /trunk/apache2: changelog config-dir/conf.d/localized-error-pages

[sf at alioth.debian.org]

Author: sf
Date: Wed Jul 29 23:43:57 2009
New Revision: 1011

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1011
Log:
Clarify the required order of the aliases in the comment

Modified:
    trunk/apache2/changelog
    trunk/apache2/config-dir/conf.d/localized-error-pages

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1011&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Wed Jul 29 23:43:57 2009
@@ -12,7 +12,8 @@
     README.Debian (closes #511878).
   * Enable localized error pages by default if the neccessary modules are
     loaded. Move the config for it from apache2.conf to
-    /etc/apache2/conf.d/localized-error-pages (closes: #467004).
+    /etc/apache2/conf.d/localized-error-pages (closes: #467004). Clarify the
+    required order of the aliases in the comment (closes: #196795).
   * Change default for ServerTokens to 'OS', to not announce the exact module
     versions to the world (LP: #205996)
   * Make a2ensite and friends ignore the same filenames as apache does for

Modified: trunk/apache2/config-dir/conf.d/localized-error-pages
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/conf.d/localized-error-pages?rev=1011&op=diff
==============================================================================
--- trunk/apache2/config-dir/conf.d/localized-error-pages (original)
+++ trunk/apache2/config-dir/conf.d/localized-error-pages Wed Jul 29 23:43:57 2009
@@ -23,9 +23,11 @@
 #
 # which allows you to create your own set of files by starting with the
 # /usr/share/apache2/error/include/ files and copying them to /your/include/path/, 
-# even on a per-VirtualHost basis.  The default include files will display
-# your Apache version number and your ServerAdmin email address regardless
-# of the setting of ServerSignature.
+# even on a per-VirtualHost basis.  If you include the Alias in the global server
+# context, is has to come _before_ the 'Alias /error/ ...' line.
+#
+# The default include files will display your Apache version number and your
+# ServerAdmin email address regardless of the setting of ServerSignature.
 #
 # The internationalized error documents require mod_alias, mod_include
 # and mod_negotiation.  To activate them, uncomment the following 30 lines.