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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit cca0eb11a83b04f172d143529f93d829b0b9e46e
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Mar 18 00:33:17 2012 +0100

    More docs fixes

diff --git a/debian/apache2.NEWS b/debian/apache2.NEWS
index 35bfb76..aa30436 100644
--- a/debian/apache2.NEWS
+++ b/debian/apache2.NEWS
@@ -7,10 +7,8 @@ apache2 (2.4.1-1) experimental; urgency=low
   The authorization and authentication system changed. Existing configurations
   using deprecated Order/Allow/Deny directives should be upgraded to the new
   system. Please review upstream's "Authentication, Authorization and Access
-  Control Howto" [1]. Existing configurations can load the "mod_access_compat"
-  module for compatibility with 2.2 configurations by loading
-
-  a2enmod access_compat
+  Control Howto" [1]. However, "mod_access_compat" is loaded by default to
+  provide backward compatibility.
 
   Furthermore, MPMs are simple modules now. Thus, the MPM can be changed anytime
   by (un-)loading a specific module. Note the ITK MPM is not available anymore.
@@ -19,14 +17,16 @@ apache2 (2.4.1-1) experimental; urgency=low
   a2dismod mpm_worker
   a2enmod mpm_prefork
 
-  Morevoer, the configuration mechanism in Debian changed. All configurations
+  Moreover, the configuration mechanism in Debian changed. All configurations
   in sites-enabled and conf-enabled need a ".conf" suffix now. The latter was
   transitioned from the deprecated /etc/apache2/conf.d/ directory which is not
   supported anymore and works just like {sites,mods}-{available,enabled} by
   using the "a2enconf" tool. The upgrade tries to migrate known configuration
   files from /etc/apache2/conf.d/ to /etc/apache2/conf-available/ - please
   review this changes. In addition, the default site was renamed to
-  "000-default.conf" to avoid naming confusions.
+  000-default to avoid naming confusions. The rename of the config files to
+  *.conf makes the special handling inside apache2 to ignore *.dpkg-* backup
+  files obsolete. This special handling has been removed.
 
   [1] http://httpd.apache.org/docs/2.4/howto/auth.html
 
diff --git a/debian/apache2.README.Debian b/debian/apache2.README.Debian
index 03083da..47f2d7b 100644
--- a/debian/apache2.README.Debian
+++ b/debian/apache2.README.Debian
@@ -125,8 +125,8 @@ sites-available/
 	Like mods-available/, except it contains configuration
 	directives for different virtual hosts that might be used with
 	apache2.  Note that the hostname doesn't have to correspond
-	exactly with the filename.  '000-default' is the default host
-	which is provided by Debian.
+	exactly with the filename.  '000-default.conf' is the default
+	host which is provided by Debian.
 
 sites-enabled/
 
@@ -140,7 +140,7 @@ sites-enabled/
 	other sites.
 
 	Example:
-	dedasys -> /etc/apache2/sites-available/dedasys
+	dedasys.conf -> /etc/apache2/sites-available/dedasys.conf
 
 	The a2ensite helper can be used to enable a site.
 
@@ -203,8 +203,8 @@ To enable SSL, type (as user root):
 
 If you want to use self-signed certificates, you should install the ssl-cert
 package (see below). Otherwise, just adjust the SSLCertificateFile and
-SSLCertificateKeyFile directives in /etc/apache2/sites-available/default-ssl to
-point to your SSL certificate. Then restart apache:
+SSLCertificateKeyFile directives in /etc/apache2/sites-available/default-ssl.conf
+to point to your SSL certificate. Then restart apache:
 
 	/etc/init.d/apache2 restart
 
@@ -246,7 +246,7 @@ disabled even for non-SSL connections):
 		downgrade-1.0 force-response-1.0
 	BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 
-The default SSL virtual host in /etc/apache2/sites-available/default-ssl
+The default SSL virtual host in /etc/apache2/sites-available/default-ssl.conf
 already contains this workaround.
 
 
@@ -322,7 +322,8 @@ This can usually be ignored but it means that Apache httpd was unable to obtain
 a fully-qualified hostname by doing a reverse lookup on your server's IP
 address. You may want to add the fully-qualified hostname to /etc/hosts .
 An alternative is to specify "ServerName 127.0.0.1" in the global server
-context of the configuration, e.g. in /etc/apache2/conf-enabled/servername.local .
+context of the configuration, e.g. in
+/etc/apache2/conf-enabled/local-servername.conf .
 
 2) Error message "mod_rewrite: could not create rewrite_log_lock"
 
@@ -404,8 +405,8 @@ Use apache2ctl (it accepts all options of apache2).
 By default, Apache will not give back unused memory but keep it around for
 later use.
 
-  * Tune StartServers, MaxRequestsPerChild, MinSpareThreads/MinSpareServers,
-    MaxSpareThreads/MaxSpareServers in /etc/apache2/apache2.conf
+  * Tune StartServers, MaxConnectionsPerChild, MinSpareThreads/MinSpareServers,
+    MaxSpareThreads/MaxSpareServers in /etc/apache2/mods-enabled/mpm_*.conf
 
   * If you are really starved for memory, try adding 'MaxMemFree 4' to your
     Apache configuration. This will reduce Apache's performance.

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