[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 8827a9b754d95e6f23eac5c07fdfc80c8f99356c

[Arno Töll]

The following commit has been merged in the next branch:
commit 8827a9b754d95e6f23eac5c07fdfc80c8f99356c
Author: Arno Töll <debian at toell.net>
Date:   Sat Feb 25 21:35:46 2012 +0100

    * Update a2ensite to explain sites need a .conf suffix
    * Close #605535

diff --git a/debian/changelog b/debian/changelog
index 8c14881..d2a620a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,7 +92,7 @@ apache2 (2.4.1-1) experimental; urgency=low
       also configuration changes).
     + Expect a .conf suffix for sites-enabled/sites-available configurations.
     + Remove the default vhost special handling. Instead, we expect the default
-      host to be named appropripriately (e.g. 000-default.conf).
+      host to be named appropripriately (e.g. 000-default.conf; Closes: #605535).
   * The following modules and associated configuration files were removed:
     + mod_authz_default and mod_authn_default: Please use a proper
       authentication module instead
@@ -122,7 +122,7 @@ apache2 (2.4.1-1) experimental; urgency=low
 
   * Update bash completion functions to reflect the new site setup.
 
- -- Arno Töll <debian at toell.net>  Sat, 25 Feb 2012 18:47:15 +0100
+ -- Arno Töll <debian at toell.net>  Sat, 25 Feb 2012 21:34:50 +0100
 
 apache2 (2.2.22-1) unstable; urgency=low
 
diff --git a/debian/manpages/a2ensite.8 b/debian/manpages/a2ensite.8
index 916323f..4e589ed 100644
--- a/debian/manpages/a2ensite.8
+++ b/debian/manpages/a2ensite.8
@@ -43,11 +43,10 @@ disables a site by removing those symlinks.  It is not an error to
 enable a site which is already enabled, or to disable one which is
 already disabled.
 .PP
-The
-.B default
-site is handled specially: The resulting symlink will be called
+Apache treats the very first virtual host enabled specially as every request not
+matching any actual directive is being redirected there. Thus it should be called
 .B 000-default
-in order to be loaded first.
+in order to sort before the remaining hosts to be loaded first.
 .SH OPTIONS
 .TP
 .B \-q, \-\-quiet
@@ -61,7 +60,7 @@ exit with status 0 if all
 are processed successfully, 1 if errors occur, 2 if an invalid option was used.
 .SH EXAMPLES
 .RS
-.B "a2dissite default"
+.B "a2dissite 000-default"
 .RE
 .PP
 Disables the

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)