[Pkg-apache-commits] r1310 - in /trunk/apache2: README.multiple-instances changelog

[sf at alioth.debian.org]

Author: sf
Date: Thu May 12 18:46:26 2011
New Revision: 1310

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1310
Log:
Make it clear in README.multiple-instances that the MPMs are shipped
in the apache2.2-bin package.

Modified:
    trunk/apache2/README.multiple-instances
    trunk/apache2/changelog

Modified: trunk/apache2/README.multiple-instances
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/README.multiple-instances?rev=1310&op=diff
==============================================================================
--- trunk/apache2/README.multiple-instances (original)
+++ trunk/apache2/README.multiple-instances Thu May 12 18:46:26 2011
@@ -95,5 +95,10 @@
 ====
 
 You can use different MPMs for different instances by setting APACHE_HTTPD to
-one of /usr/lib/apache2/mpm-*/apache2. Note that some modules like mod_php only
-work with the non-threaded MPMs (prefork, itk).
+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).

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1310&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Thu May 12 18:46:26 2011
@@ -1,6 +1,8 @@
 apache2 (2.2.17-4) UNRELEASED; urgency=low
 
   * Make a2enmod's restart hint more cut'n'paste friendly. LP: #770204
+  * Make it clear in README.multiple-instances that the MPMs are shipped
+    in the apache2.2-bin package.
 
  -- Stefan Fritsch <sf at debian.org>  Mon, 25 Apr 2011 21:03:39 +0200