Update transformations to reflect the graceful-stop XML documentation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263901 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index b683edf276119b6eb63944ac6faddd55487afcb6..92aa59b3035a61e107ff35d263912ed2647c40bd 100644 (file)
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -309,7 +309,7 @@
    <h3><a name="suppress-error-charset" id="suppress-error-charset">suppress-error-charset</a></h3>
        
 
-    <p><em>Available in versions 2.2 and later</em></p>
+    <p><em>Available in versions after 2.0.54</em></p>
 
     <p>When Apache issues a redirect in response to a client request,
     the response includes some actual text to be displayed in case

diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index 8ad838984c9ef6c140e58005d68b66efec5f567c..3b2c03b415d9c1356c12dc3a743cff02b9fa7ae3 100644 (file)
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 170354 -->
+<!-- English Revision: 170354:240426 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors, as

diff --git a/docs/manual/env.xml.ko b/docs/manual/env.xml.ko
index 116a7841ab6e0c05156562157d069738c1146ca6..e9cff3f030f332e4aa6fd174f21becf72032fcf8 100644 (file)
--- a/docs/manual/env.xml.ko
+++ b/docs/manual/env.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:170354 (outdated) -->
+<!-- English Revision: 105989:240426 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/env.xml.meta b/docs/manual/env.xml.meta
index fd4d4a5499b0d660529f2e108a3effc0c17ed6b1..aad5235168fc0c4fb539f93994b40b4aeacef8d0 100644 (file)
--- a/docs/manual/env.xml.meta
+++ b/docs/manual/env.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/faq/all_in_one.xml.ja b/docs/manual/faq/all_in_one.xml.ja
index f1458092af9104743c87665c15f4bdd70848ef59..7260ff77d1ba8c90cc1dfe655a195235de108ce1 100644 (file)
--- a/docs/manual/faq/all_in_one.xml.ja
+++ b/docs/manual/faq/all_in_one.xml.ja
@@ -3,7 +3,7 @@
     <!ENTITY categories SYSTEM "categories.xml.ja">
 ]>
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240306 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/faq/all_in_one.xml.ko b/docs/manual/faq/all_in_one.xml.ko
index 40da0360b104b5fbd6741a55b134927893e99068..baf5b5fdccfdccdfc1973fcfb2e9d28c48e7429b 100644 (file)
--- a/docs/manual/faq/all_in_one.xml.ko
+++ b/docs/manual/faq/all_in_one.xml.ko
@@ -3,7 +3,7 @@
     <!ENTITY categories SYSTEM "categories.xml.ko">
 ]>
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240306 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/faq/all_in_one.xml.meta b/docs/manual/faq/all_in_one.xml.meta
index 56ed899da8a4f7f66d39960da7abd306027435c6..d810b0df13a68da25af234676a64e1359415ae54 100644 (file)
--- a/docs/manual/faq/all_in_one.xml.meta
+++ b/docs/manual/faq/all_in_one.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/mod_alias.xml.ja b/docs/manual/mod/mod_alias.xml.ja
index 7d54b2688b9ed5c7e1d69c1af74f739e9753e126..7fed95a1295ef370bc3124f6441a4ec8daf631ca 100644 (file)
--- a/docs/manual/mod/mod_alias.xml.ja
+++ b/docs/manual/mod/mod_alias.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240299 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/mod/mod_alias.xml.ko b/docs/manual/mod/mod_alias.xml.ko
index 115d18ebf20640f3f0ba3eedf80460561bd06fdf..b986ff050fccef53d4b9e3768708712e3761138c 100644 (file)
--- a/docs/manual/mod/mod_alias.xml.ko
+++ b/docs/manual/mod/mod_alias.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240299 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/mod/mod_alias.xml.meta b/docs/manual/mod/mod_alias.xml.meta
index 7f438145fc049e81676bbc3fd111ec201f99b0ff..2cc440769c663aa42f6bdf42c8d987fa1cb7c1f3 100644 (file)
--- a/docs/manual/mod/mod_alias.xml.meta
+++ b/docs/manual/mod/mod_alias.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index c37a52c9c09d59a31bb68a225c59b7a6e554d7a2..c8e0bb005205d9e9a0189a291332af3b47a0e7f8 100644 (file)
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -181,8 +181,8 @@ will exit.</td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>GracefulShutDownTimeout 0</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/prefork.html">prefork</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.4 and later</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</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 version 2.2 and later</td></tr>
 </table>
     <p>The <code class="directive">GracefulShutdownTimeout</code> specifies
     how many seconds after receiving a "graceful-stop" signal, a 

diff --git a/docs/manual/mod/mpm_common.xml.de b/docs/manual/mod/mpm_common.xml.de
index b9a38806bbf6d864713c7ff345e3083f4de405fa..12c508ee8088a3985cd135ec120bb279b41b41fd 100644 (file)
--- a/docs/manual/mod/mpm_common.xml.de
+++ b/docs/manual/mod/mpm_common.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 151408:240271 (outdated) -->
+<!-- English Revision: 151408:263854 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index 0ba09be3f6e0aeab63a13d3b6d2343b9416c1ca4..2512d0232eb5135e9b37204adca365068be08a01 100644 (file)
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:240271 (outdated) -->
+<!-- English Revision: 190982:263854 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors, as

diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en
index fcd9cb105758900e16939f49f0bfe015946093b4..085da7f016cdc9b0b9c7d535178c213dc96532a4 100644 (file)
--- a/docs/manual/stopping.html.en
+++ b/docs/manual/stopping.html.en
@@ -200,6 +200,24 @@ error. See above for a method of avoiding this.</div>
     as the <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> will
     have been removed, you will not be able to use 
     <code>apachectl</code> or <code>httpd</code> to send this signal,</p>
+
+    <div class="note"><p>The <code>graceful-stop</code> signal allows you to run multiple
+    identically configured instances of <code class="program"><a href="./programs/httpd.html">httpd</a></code> at the 
+    same time. This is a powerful feature when performing graceful 
+    upgrades of Apache, however it can also cause deadlocks and race 
+    conditions with some configurations.</p> 
+
+    <p>Care has been taken to ensure that on-disk files
+    such as the <code class="directive"><a href="./mod/core.html#lockfile">Lockfile</a></code> and <code class="directive"><a href="./mod/mod_cgid.html#scriptsock">ScriptSock</a></code> files contain the server
+    PID, and should co-exist without problem. However, if a configuration
+    directive, third-party module or persistent CGI utilises any other on-disk 
+    lock or  state files; care should be taken to ensure that multiple running 
+    instances of <code class="program"><a href="./programs/httpd.html">httpd</a></code> do not clobber each others files.</p> 
+
+    <p>You should also be wary of other potential race conditions, such as
+    using <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> style piped logging. Multiple running
+    instances of <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> attempting to rotate the same
+    logfiles at the same time may destroy each other's logfiles.</p></div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="race" id="race">Appendix: signals and race conditions</a></h2>

diff --git a/docs/manual/stopping.xml.de b/docs/manual/stopping.xml.de
index fb27a92dc19e926c30d11b25d5875619253946b3..4efd0afe74e8e5d8dcc8bd1f2ad4fc0b25e293a3 100644 (file)
--- a/docs/manual/stopping.xml.de
+++ b/docs/manual/stopping.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 239255:240271 (outdated) -->
+<!-- English Revision: 239255:263857 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/stopping.xml.es b/docs/manual/stopping.xml.es
index b83a67385e5eb16e5a5bea48681079c23be41ec2..4af7943838aef35a6548f994d97c1449baf01354 100644 (file)
--- a/docs/manual/stopping.xml.es
+++ b/docs/manual/stopping.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 105989:240271 (outdated) -->
+<!-- English Revision: 105989:263857 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/stopping.xml.ja b/docs/manual/stopping.xml.ja
index 268c829e0867769ff6abdbe7ecf2699f9c8e3f01..e61e9e75bf2eb78dc9453e5a1dee1a6d00e092f7 100644 (file)
--- a/docs/manual/stopping.xml.ja
+++ b/docs/manual/stopping.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:240271 (outdated) -->
+<!-- English Revision: 151408:263857 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/stopping.xml.ko b/docs/manual/stopping.xml.ko
index 001ee6f9dfa0464418aabb940d31b8c5621a484d..bf26b8da17d1f4d656d346b3f706521b3f28b8a6 100644 (file)
--- a/docs/manual/stopping.xml.ko
+++ b/docs/manual/stopping.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:240271 (outdated) -->
+<!-- English Revision: 105989:263857 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,