21 files changed, 122 insertions, 152 deletions
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index 44f2d513e2..4b8849c61f 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -377,7 +377,7 @@
 <li><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup</a></li>
 <li><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit</a></li>
 <li><a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
-<li><a href="mpm_netware.html#threadstacksize">ThreadStackSize</a></li>
+<li><a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
 <li><a href="core.html#timeout">TimeOut</a></li>
 <li><a href="mod_log_config.html#transferlog">TransferLog</a></li>
 <li><a href="mod_mime.html#typesconfig">TypesConfig</a></li>
@@ -391,7 +391,6 @@
 <li><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias</a></li>
 <li><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP</a></li>
 <li><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></li>
-<li><a href="mpm_common.html#workerstacksize">WorkerStackSize</a></li>
 <li><a href="mod_include.html#xbithack" id="X" name="X">XBitHack</a></li>
 </ul></div>
 <div class="bottomlang">
diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr
index 6e9aad4aba..6e783acef5 100644
--- a/docs/manual/mod/directives.html.ko.euc-kr
+++ b/docs/manual/mod/directives.html.ko.euc-kr
@@ -373,7 +373,7 @@
 <li><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup</a></li>
 <li><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit</a></li>
 <li><a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
-<li><a href="mpm_netware.html#threadstacksize">ThreadStackSize</a></li>
+<li><a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
 <li><a href="core.html#timeout">TimeOut</a></li>
 <li><a href="mod_log_config.html#transferlog">TransferLog</a></li>
 <li><a href="mod_mime.html#typesconfig">TypesConfig</a></li>
@@ -387,7 +387,6 @@
 <li><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias</a></li>
 <li><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP</a></li>
 <li><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></li>
-<li><a href="mpm_common.html#workerstacksize">WorkerStackSize</a></li>
 <li><a href="mod_include.html#xbithack" id="X" name="X">XBitHack</a></li>
 </ul></div>
 <div class="bottomlang">
diff --git a/docs/manual/mod/leader.html.en b/docs/manual/mod/leader.html.en
index 6eb37b3c5d..c3f82f2f96 100644
--- a/docs/manual/mod/leader.html.en
+++ b/docs/manual/mod/leader.html.en
@@ -74,8 +74,8 @@ MPM</td></tr>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#workerstacksize">WorkerStackSize</a></li>
 </ul>
 </div>
 
diff --git a/docs/manual/mod/leader.xml b/docs/manual/mod/leader.xml
index ac7ed17557..38d08a27b3 100644
--- a/docs/manual/mod/leader.xml
+++ b/docs/manual/mod/leader.xml
@@ -89,9 +89,9 @@ MPM</description>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>ThreadsPerChild</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>User</name>
+<directivesynopsis location="mpm_common"><name>ThreadStackSize</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>WorkerStackSize</name>
+<directivesynopsis location="mpm_common"><name>User</name>
 </directivesynopsis>
 
 </modulesynopsis>
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index ef57259257..6b4b06fcd2 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -51,8 +51,8 @@ more than one multi-processing module (MPM)</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#startthreads">StartThreads</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#threadlimit">ThreadLimit</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#user">User</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#workerstacksize">WorkerStackSize</a></li>
 </ul>
 </div>
 
@@ -791,6 +791,50 @@ and later</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadStackSize" id="ThreadStackSize">ThreadStackSize</a> <a name="threadstacksize" id="threadstacksize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The size in bytes of the stack used by threads handling 
+client connections</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ThreadStackSize <var>size</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>65536 on NetWare; varies on other operating systems</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.1 and later</td></tr>
+</table>
+    <p>The <code class="directive">ThreadStackSize</code> directive sets the 
+    size of the stack (for autodata) of threads which handle client
+    connections and call modules to help process those connections.  
+    In most cases the operating system default for stack size is 
+    reasonable, but there are some conditions where it may need to be 
+    adjusted:</p>
+
+    <ul>
+      <li>On platforms with a relatively small default thread stack size
+      (e.g., HP-UX), Apache may crash when using some third-party modules
+      which use a relatively large amount of autodata storage.  Those
+      same modules may have worked fine on other platforms where the
+      default thread stack size is larger.  This type of crash is
+      resolved by setting <code class="directive">ThreadStackSize</code> to a 
+      value higher than the operating system default.  This type of 
+      adjustment is necessary only if the provider of the third-party 
+      module specifies that it is required, or if diagnosis of an Apache 
+      crash indicates that the thread stack size was too small.</li>
+
+      <li>On platforms where the default thread stack size is 
+      significantly larger than necessary for the web server
+      configuration, a higher number of threads per child process
+      will be achievable if <code class="directive">ThreadStackSize</code> is
+      set to a value lower than the operating system default.  This type
+      of adjustment should only be made in a test environment which allows
+      the full set of web server processing can be exercised, as there
+      may be infrequent requests which require more stack to process.
+      A change in the web server configuration can invalidate the
+      current <code class="directive">ThreadStackSize</code> setting.</li>
+    </ul>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="User" id="User">User</a> <a name="user" id="user">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The userid under which the server will answer
@@ -852,50 +896,6 @@ requests</td></tr>
     </div>
 
 </div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="WorkerStackSize" id="WorkerStackSize">WorkerStackSize</a> <a name="workerstacksize" id="workerstacksize">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The size in bytes of the stack used by threads handling 
-client connections</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>WorkerStackSize <var>size</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>varies by operating system</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.1 and later</td></tr>
-</table>
-    <p>The <code class="directive">WorkerStackSize</code> directive sets the 
-    size of the stack (for autodata) of threads which handle client
-    connections and call modules to help process those connections.  
-    In most cases the operating system default for stack size is 
-    reasonable, but there are some conditions where it may need to be 
-    adjusted:</p>
-
-    <ul>
-      <li>On platforms with a relatively small default thread stack size
-      (e.g., HP-UX), Apache may crash when using some third-party modules
-      which use a relatively large amount of autodata storage.  Those
-      same modules may have worked fine on other platforms where the
-      default thread stack size is larger.  This type of crash is
-      resolved by setting <code class="directive">WorkerStackSize</code> to a 
-      value higher than the operating system default.  This type of 
-      adjustment is necessary only if the provider of the third-party 
-      module specifies that it is required, or if diagnosis of an Apache 
-      crash indicates that the thread stack size was too small.</li>
-
-      <li>On platforms where the default thread stack size is 
-      significantly larger than necessary for the web server
-      configuration, a higher number of threads per child process
-      will be achievable if <code class="directive">WorkerStackSize</code> is
-      set to a value lower than the operating system default.  This type
-      of adjustment should only be made in a test environment which allows
-      the full set of web server processing can be exercised, as there
-      may be infrequent requests which require more stack to process.
-      A change in the web server configuration can invalidate the
-      current <code class="directive">WorkerStackSize</code> setting.</li>
-    </ul>
-
-</div>
 </div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index 300007c3fd..aa8a6bec2c 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -826,6 +826,53 @@ and later</compatibility>
 </directivesynopsis>
 
 <directivesynopsis>
+<name>ThreadStackSize</name>
+<description>The size in bytes of the stack used by threads handling 
+client connections</description> 
+<syntax>ThreadStackSize <var>size</var></syntax>
+<default>65536 on NetWare; varies on other operating systems</default>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>leader</module><module>mpm_netware</module>
+<module>mpm_winnt</module><module>perchild</module>
+<module>threadpool</module><module>worker</module>
+</modulelist>
+<compatibility>Available in Apache 2.1 and later</compatibility>
+
+<usage>
+    <p>The <directive>ThreadStackSize</directive> directive sets the 
+    size of the stack (for autodata) of threads which handle client
+    connections and call modules to help process those connections.  
+    In most cases the operating system default for stack size is 
+    reasonable, but there are some conditions where it may need to be 
+    adjusted:</p>
+
+    <ul>
+      <li>On platforms with a relatively small default thread stack size
+      (e.g., HP-UX), Apache may crash when using some third-party modules
+      which use a relatively large amount of autodata storage.  Those
+      same modules may have worked fine on other platforms where the
+      default thread stack size is larger.  This type of crash is
+      resolved by setting <directive>ThreadStackSize</directive> to a 
+      value higher than the operating system default.  This type of 
+      adjustment is necessary only if the provider of the third-party 
+      module specifies that it is required, or if diagnosis of an Apache 
+      crash indicates that the thread stack size was too small.</li>
+
+      <li>On platforms where the default thread stack size is 
+      significantly larger than necessary for the web server
+      configuration, a higher number of threads per child process
+      will be achievable if <directive>ThreadStackSize</directive> is
+      set to a value lower than the operating system default.  This type
+      of adjustment should only be made in a test environment which allows
+      the full set of web server processing can be exercised, as there
+      may be infrequent requests which require more stack to process.
+      A change in the web server configuration can invalidate the
+      current <directive>ThreadStackSize</directive> setting.</li>
+    </ul>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
 <name>User</name>
 <description>The userid under which the server will answer
 requests</description>
@@ -892,51 +939,4 @@ requests</description>
 </usage>
 </directivesynopsis>
 
-<directivesynopsis>
-<name>WorkerStackSize</name>
-<description>The size in bytes of the stack used by threads handling 
-client connections</description> 
-<syntax>WorkerStackSize <var>size</var></syntax>
-<default>varies by operating system</default>
-<contextlist><context>server config</context></contextlist>
-<modulelist><module>leader</module><module>mpm_winnt</module>
-<module>perchild</module><module>threadpool</module>
-<module>worker</module>
-</modulelist>
-<compatibility>Available in Apache 2.1 and later</compatibility>
-
-<usage>
-    <p>The <directive>WorkerStackSize</directive> directive sets the 
-    size of the stack (for autodata) of threads which handle client
-    connections and call modules to help process those connections.  
-    In most cases the operating system default for stack size is 
-    reasonable, but there are some conditions where it may need to be 
-    adjusted:</p>
-
-    <ul>
-      <li>On platforms with a relatively small default thread stack size
-      (e.g., HP-UX), Apache may crash when using some third-party modules
-      which use a relatively large amount of autodata storage.  Those
-      same modules may have worked fine on other platforms where the
-      default thread stack size is larger.  This type of crash is
-      resolved by setting <directive>WorkerStackSize</directive> to a 
-      value higher than the operating system default.  This type of 
-      adjustment is necessary only if the provider of the third-party 
-      module specifies that it is required, or if diagnosis of an Apache 
-      crash indicates that the thread stack size was too small.</li>
-
-      <li>On platforms where the default thread stack size is 
-      significantly larger than necessary for the web server
-      configuration, a higher number of threads per child process
-      will be achievable if <directive>WorkerStackSize</directive> is
-      set to a value lower than the operating system default.  This type
-      of adjustment should only be made in a test environment which allows
-      the full set of web server processing can be exercised, as there
-      may be infrequent requests which require more stack to process.
-      A change in the web server configuration can invalidate the
-      current <directive>WorkerStackSize</directive> setting.</li>
-    </ul>
-</usage>
-</directivesynopsis>
-
 </modulesynopsis>
diff --git a/docs/manual/mod/mpm_netware.html.en b/docs/manual/mod/mpm_netware.html.en
index a5e48bf8a7..0f869c077f 100644
--- a/docs/manual/mod/mpm_netware.html.en
+++ b/docs/manual/mod/mpm_netware.html.en
@@ -71,7 +71,7 @@
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startthreads">StartThreads</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
 </ul>
 <h3>See also</h3>
 <ul class="seealso">
@@ -100,21 +100,6 @@
     </code></p></div>
 
 </div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ThreadStackSize" id="ThreadStackSize">ThreadStackSize</a> <a name="threadstacksize" id="threadstacksize">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determine the stack size for each thread</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ThreadStackSize <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ThreadStackSize 65536</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mpm_netware</td></tr>
-</table>
-    <p>This directive tells the server what stack size to use for
-    each of the running threads. If you ever get a stack overflow
-    you will need to bump this number to a higher setting.</p>
-
-</div>
 </div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mpm_netware.html" title="English">&nbsp;en&nbsp;</a></p>
diff --git a/docs/manual/mod/mpm_netware.xml b/docs/manual/mod/mpm_netware.xml
index da435a5b74..8c1964a6d9 100644
--- a/docs/manual/mod/mpm_netware.xml
+++ b/docs/manual/mod/mpm_netware.xml
@@ -79,6 +79,8 @@
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>StartThreads</name>
 </directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ThreadStackSize</name>
+</directivesynopsis>
 
 <directivesynopsis>
 <name>MaxThreads</name>
@@ -99,18 +101,4 @@
 </usage>
 </directivesynopsis>
 
-<directivesynopsis>
-<name>ThreadStackSize</name>
-<description>Determine the stack size for each thread</description>
-<syntax>ThreadStackSize <var>number</var></syntax>
-<default>ThreadStackSize 65536</default>
-<contextlist><context>server config</context></contextlist>
-
-<usage>
-    <p>This directive tells the server what stack size to use for
-    each of the running threads. If you ever get a stack overflow
-    you will need to bump this number to a higher setting.</p>
-</usage>
-</directivesynopsis>
-
 </modulesynopsis>
diff --git a/docs/manual/mod/mpm_winnt.html.en b/docs/manual/mod/mpm_winnt.html.en
index 37af18f43f..65537728db 100644
--- a/docs/manual/mod/mpm_winnt.html.en
+++ b/docs/manual/mod/mpm_winnt.html.en
@@ -49,8 +49,8 @@ NT.</td></tr>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#win32disableacceptex">Win32DisableAcceptEx</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#workerstacksize">WorkerStackSize</a></li>
 </ul>
 </div>
 
diff --git a/docs/manual/mod/mpm_winnt.xml b/docs/manual/mod/mpm_winnt.xml
index ae2d996f6b..6c63c76a01 100644
--- a/docs/manual/mod/mpm_winnt.xml
+++ b/docs/manual/mod/mpm_winnt.xml
@@ -54,7 +54,7 @@ NT.</description>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>ThreadsPerChild</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>WorkerStackSize</name>
+<directivesynopsis location="mpm_common"><name>ThreadStackSize</name>
 </directivesynopsis>
 
 <directivesynopsis>
diff --git a/docs/manual/mod/perchild.html.en b/docs/manual/mod/perchild.html.en
index 66725fabf3..61e6335fc4 100644
--- a/docs/manual/mod/perchild.html.en
+++ b/docs/manual/mod/perchild.html.en
@@ -63,8 +63,8 @@ requests to be assigned a variety of different userids</td></tr>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startthreads">StartThreads</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#workerstacksize">WorkerStackSize</a></li>
 </ul>
 <h3>Topics</h3>
 <ul id="topics">
diff --git a/docs/manual/mod/perchild.xml b/docs/manual/mod/perchild.xml
index aa30c2b77c..e882bd31b4 100644
--- a/docs/manual/mod/perchild.xml
+++ b/docs/manual/mod/perchild.xml
@@ -172,9 +172,9 @@ uses</a></seealso>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>ThreadLimit</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>User</name>
+<directivesynopsis location="mpm_common"><name>ThreadStackSize</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>WorkerStackSize</name>
+<directivesynopsis location="mpm_common"><name>User</name>
 </directivesynopsis>
 
 <directivesynopsis>
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 5eb9f188cc..b0d9df9d6b 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -672,7 +672,8 @@ Certificate verification</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
 per child process</td></tr>
 <tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
-<tr class="odd"><td><a href="mpm_netware.html#threadstacksize">ThreadStackSize <var>number</var></a></td><td> 65536 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Determine the stack size for each thread</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
+client connections</td></tr>
 <tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
 <tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specify location of a log file</td></tr>
@@ -697,9 +698,7 @@ a given virtual host</td></tr>
 <tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
 a given virtual host</td></tr>
 <tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#workerstacksize">WorkerStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
-client connections</td></tr>
-<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+<tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
 set</td></tr>
 </table></div>
 <div class="bottomlang">
diff --git a/docs/manual/mod/threadpool.html.en b/docs/manual/mod/threadpool.html.en
index c24e6d91b7..26ed0631c3 100644
--- a/docs/manual/mod/threadpool.html.en
+++ b/docs/manual/mod/threadpool.html.en
@@ -67,8 +67,8 @@
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#workerstacksize">WorkerStackSize</a></li>
 </ul>
 </div>
 
diff --git a/docs/manual/mod/threadpool.xml b/docs/manual/mod/threadpool.xml
index 6c22abcc0e..faf2c72c1b 100644
--- a/docs/manual/mod/threadpool.xml
+++ b/docs/manual/mod/threadpool.xml
@@ -84,9 +84,9 @@
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>ThreadsPerChild</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>User</name>
+<directivesynopsis location="mpm_common"><name>ThreadStackSize</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>WorkerStackSize</name>
+<directivesynopsis location="mpm_common"><name>User</name>
 </directivesynopsis>
 
 </modulesynopsis>
diff --git a/docs/manual/mod/worker.html.en b/docs/manual/mod/worker.html.en
index a6a9db1e11..6cc814349b 100644
--- a/docs/manual/mod/worker.html.en
+++ b/docs/manual/mod/worker.html.en
@@ -67,8 +67,8 @@
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#workerstacksize">WorkerStackSize</a></li>
 </ul>
 <h3>Topics</h3>
 <ul id="topics">
diff --git a/docs/manual/mod/worker.xml b/docs/manual/mod/worker.xml
index 28deb4a353..f0be287656 100644
--- a/docs/manual/mod/worker.xml
+++ b/docs/manual/mod/worker.xml
@@ -175,9 +175,9 @@ uses</a></seealso>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>ThreadsPerChild</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>User</name>
+<directivesynopsis location="mpm_common"><name>ThreadStackSize</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>WorkerStackSize</name>
+<directivesynopsis location="mpm_common"><name>User</name>
 </directivesynopsis>
 
 </modulesynopsis>
diff --git a/docs/manual/platform/netware.html.en b/docs/manual/platform/netware.html.en
index fc21c6d2ab..782607e8b1 100644
--- a/docs/manual/platform/netware.html.en
+++ b/docs/manual/platform/netware.html.en
@@ -362,7 +362,7 @@
         This directive limits the total number of work threads to a maximum
         value. The recommended default is <code>ThreadsPerChild 250</code>.</p>
 
-        <p><code class="directive"><a href="../mod/mpm_netware.html#threadstacksize">ThreadStackSize</a></code> -
+        <p><code class="directive"><a href="../mod/mpm_common.html#threadstacksize">ThreadStackSize</a></code> -
         This directive tells the server what size of stack to use
         for the individual worker thread. The recommended default
         is <code>ThreadStackSize 65536</code>.</p>
diff --git a/docs/manual/platform/netware.xml b/docs/manual/platform/netware.xml
index df685bc52b..9e5308575d 100644
--- a/docs/manual/platform/netware.xml
+++ b/docs/manual/platform/netware.xml
@@ -361,7 +361,7 @@
         This directive limits the total number of work threads to a maximum
         value. The recommended default is <code>ThreadsPerChild 250</code>.</p>
 
-        <p><directive module="mpm_netware">ThreadStackSize</directive> -
+        <p><directive module="mpm_common">ThreadStackSize</directive> -
         This directive tells the server what size of stack to use
         for the individual worker thread. The recommended default
         is <code>ThreadStackSize 65536</code>.</p>
diff --git a/docs/manual/server-wide.html.en b/docs/manual/server-wide.html.en
index 05b3d6da8e..c023a72ab1 100644
--- a/docs/manual/server-wide.html.en
+++ b/docs/manual/server-wide.html.en
@@ -72,7 +72,7 @@ the basic operations of the server.</p>
 <h2><a name="resource" id="resource">Limiting Resource Usage</a></h2>
     
 
-    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#limitrequestbody">LimitRequestBody</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfields">LimitRequestFields</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfieldsize">LimitRequestFieldsize</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestline">LimitRequestLine</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitcpu">RLimitCPU</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitmem">RLimitMEM</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitnproc">RLimitNPROC</a></code></li><li><code class="directive"><a href="./mod/mpm_netware.html#threadstacksize">ThreadStackSize</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#limitrequestbody">LimitRequestBody</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfields">LimitRequestFields</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfieldsize">LimitRequestFieldsize</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestline">LimitRequestLine</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitcpu">RLimitCPU</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitmem">RLimitMEM</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitnproc">RLimitNPROC</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#threadstacksize">ThreadStackSize</a></code></li></ul></td></tr></table>
 
     <p>The <code class="directive">LimitRequest</code>*
     directives are used to place limits on the amount of resources
@@ -86,8 +86,8 @@ the basic operations of the server.</p>
     this will control resources used by CGI scripts and SSI exec
     commands.</p>
 
-    <p>The <code class="directive"><a href="./mod/mpm_netware.html#threadstacksize">ThreadStackSize</a></code> directive
-    is used only on Netware to control the stack size.</p>
+    <p>The <code class="directive"><a href="./mod/mpm_common.html#threadstacksize">ThreadStackSize</a></code>
+    directive is used with some platforms to control the stack size.</p>
   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./en/server-wide.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/server-wide.xml b/docs/manual/server-wide.xml
index 50c03272a1..6d5c876691 100644
--- a/docs/manual/server-wide.xml
+++ b/docs/manual/server-wide.xml
@@ -94,7 +94,7 @@ the basic operations of the server.</p>
         <directive module="core">RLimitCPU</directive>
         <directive module="core">RLimitMEM</directive>
         <directive module="core">RLimitNPROC</directive>
-        <directive module="mpm_netware">ThreadStackSize</directive>
+        <directive module="mpm_common">ThreadStackSize</directive>
       </directivelist>
     </related>
 
@@ -110,7 +110,7 @@ the basic operations of the server.</p>
     this will control resources used by CGI scripts and SSI exec
     commands.</p>
 
-    <p>The <directive module="mpm_netware">ThreadStackSize</directive> directive
-    is used only on Netware to control the stack size.</p>
+    <p>The <directive module="mpm_common">ThreadStackSize</directive>
+    directive is used with some platforms to control the stack size.</p>
   </section>
 </manualpage>