--- httpd-2.4.3/docs/conf/extra/httpd-mpm.conf.in	2012-08-14 23:59:24.000000000 +0000
+++ httpd-2.4.3-magellan/docs/conf/extra/httpd-mpm.conf.in	2012-10-31 12:34:47.132526047 +0000
@@ -8,9 +8,7 @@
 #
 # Note that this is the default PidFile for most MPMs.
 #
-<IfModule !mpm_netware_module>
-    PidFile "@rel_runtimedir@/httpd.pid"
-</IfModule>
+PidFile "/run/apache2/apache2.pid"
 
 #
 # Only one of the below sections will be relevant on your
@@ -67,53 +65,8 @@
     MaxConnectionsPerChild   0
 </IfModule>
 
-# NetWare MPM
-# ThreadStackSize: Stack size allocated for each worker thread
-# StartThreads: Number of worker threads launched at server startup
-# MinSpareThreads: Minimum number of idle threads, to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads
-# MaxThreads: Maximum number of worker threads alive at the same time
-# MaxConnectionsPerChild: Maximum  number of connections a thread serves. It
-#                         is recommended that the default value of 0 be set
-#                         for this directive on NetWare.  This will allow the
-#                         thread to continue to service requests indefinitely.
-<IfModule mpm_netware_module>
-    ThreadStackSize      65536
-    StartThreads           250
-    MinSpareThreads         25
-    MaxSpareThreads        250
-    MaxThreads            1000
-    MaxConnectionsPerChild   0
-</IfModule>
-
-# OS/2 MPM
-# StartServers: Number of server processes to maintain
-# MinSpareThreads: Minimum number of idle threads per process, 
-#                  to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads per process
-# MaxConnectionsPerChild: Maximum number of connections per server process
-<IfModule mpm_mpmt_os2_module>
-    StartServers             2
-    MinSpareThreads          5
-    MaxSpareThreads         10
-    MaxConnectionsPerChild   0
-</IfModule>
-
-# WinNT MPM
-# ThreadsPerChild: constant number of worker threads in the server process
-# MaxConnectionsPerChild: maximum number of connections a server process serves
-<IfModule mpm_winnt_module>
-    ThreadsPerChild        150
-    MaxConnectionsPerChild   0
-</IfModule>
-
 # The maximum number of free Kbytes that every allocator is allowed
 # to hold without calling free(). In threaded MPMs, every thread has its own
 # allocator. When not set, or when set to zero, the threshold will be set to
 # unlimited.
-<IfModule !mpm_netware_module>
-    MaxMemFree            2048
-</IfModule>
-<IfModule mpm_netware_module>
-    MaxMemFree             100
-</IfModule>
+MaxMemFree            2048