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

[Arno Töll]

The following commit has been merged in the next branch:
commit 5080dc13d2e2ae50023a8e2976bb911cc90b9343
Author: Arno Töll <debian at toell.net>
Date:   Tue Mar 13 23:39:35 2012 +0100

    More docs updates

diff --git a/debian/README.backtrace b/debian/README.backtrace
index b1513eb..17ccb18 100644
--- a/debian/README.backtrace
+++ b/debian/README.backtrace
@@ -17,14 +17,14 @@ In case of a crash, do the following:
 4) Do whatever it takes to reproduce the crash. There should now be the file
 /var/cache/apache2/core .
 
-5) If you use apache2-mpm-prefork, execute:
-	
+5) If you use a forking MPM (e.g. mod_prefork), execute:
+
 	gdb /usr/sbin/apache2 /var/cache/apache2/core
 	(gdb) bt full
 	...
 	(gdb) quit
 
-If you use a threaded mpm, execute:
+If you use a threaded mpm (mod_worker, mod_event), execute:
 
 	gdb /usr/sbin/apache2 /var/cache/apache2/core
         (gdb) thread apply all bt full
diff --git a/debian/README.multiple-instances b/debian/README.multiple-instances
index 0a04c7d..62de5d6 100644
--- a/debian/README.multiple-instances
+++ b/debian/README.multiple-instances
@@ -8,7 +8,7 @@ The basic idea is to copy /etc/apache2 to /etc/apache2-xxx. An example script
 that demonstrates what else needs to be done can be found in
 /usr/share/doc/apache2.2-common/examples/setup-instance. Use with:
 
-	sh /usr/share/doc/apache2.2-common/examples/setup-instance xxx
+	sh /usr/share/doc/apache2/examples/setup-instance xxx
 
 Adjust the configuration in /etc/apache2-xxx, especially the listen ports in
 ports.conf and in the virtual host directives in
@@ -90,15 +90,3 @@ APACHE_SITES_ENABLED	$APACHE_CONFDIR/sites-enabled
 APACHE_LYNX		www-browser -dump
 APACHE_STATUSURL	http://localhost:80/server-status
 
-
-MPMs
-====
-
-You can use different MPMs for different instances by setting APACHE_HTTPD to
-one of /usr/lib/apache2/mpm-*/apache2. The MPM binaries are shipped in the
-apache2.2-bin package, it is not necessary to have the apache2-mpm-* pacakges
-installed for this to work. Those packages only provide the /usr/sbin/apache2
-symlink for the default MPM.
-
-Note that some modules like mod_php only work with the non-threaded MPMs
-(prefork, itk).
diff --git a/debian/setup-instance b/debian/setup-instance
index e91ddb1..adf7d3b 100644
--- a/debian/setup-instance
+++ b/debian/setup-instance
@@ -19,7 +19,7 @@ echo Setting up /etc/apache2-$SUFFIX ...
 cp -a /etc/apache2 /etc/apache2-$SUFFIX
 
 echo Setting up /etc/init.d/apache2-$SUFFIX ...
-cp /usr/share/doc/apache2.2-common/examples/secondary-init-script /etc/init.d/apache2-$SUFFIX
+cp /usr/share/doc/apache2/examples/secondary-init-script /etc/init.d/apache2-$SUFFIX
 # adjust service name (this prevents us from using a simple symlink)
 perl -p -i -e s,XXX,$SUFFIX, /etc/init.d/apache2-$SUFFIX
 chmod 755 /etc/init.d/apache2-$SUFFIX

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