Finish committing the transformations that I accidentally started in

the last commit.


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

17 files changed, 41 insertions, 25 deletions

diff --git a/docs/man/apachectl.8 b/docs/man/apachectl.8
index 48ec3ef9ad..a4865d2bd3 100644
--- a/docs/man/apachectl.8
+++ b/docs/man/apachectl.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "APACHECTL" 8 "2003-11-25" "Apache HTTP Server" "apachectl"
+.TH "APACHECTL" 8 "2005-05-03" "Apache HTTP Server" "apachectl"
 
 .SH NAME
 apachectl \- Apache HTTP Server Control Interface
@@ -83,10 +83,10 @@ configtest
 Run a configuration file syntax test\&. It parses the configuration files and either reports Syntax Ok or detailed information about the particular syntax error\&. This is equivalent to apachectl -t\&.  
  
 .PP
-The following additional option is available, but deprecated\&.
+The following option was available in earlier versions but has been removed\&.
  
  
 .TP
 startssl
-This is equivalent to apachectl -k start -DSSL\&. We recommend that you use that command explicitly, or you adjust your httpd\&.conf to remove the <IfDefine> section so that SSL will always be available\&.  
+To start httpd with SSL support, you should edit your configuration file to include the relevant directives and then use the normal apachectl start\&.  
  
diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en
index a84ed7b5a7..acfaee16c4 100644
--- a/docs/manual/logs.html.en
+++ b/docs/manual/logs.html.en
@@ -246,7 +246,7 @@
         (<code>%t</code>)</dt>
 
         <dd>
-          The time that the server finished processing the request.
+          The time that the request was received.
           The format is: 
 
           <p class="indent">
diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja
index 00b9e5b58b..e47fc9946a 100644
--- a/docs/manual/logs.xml.ja
+++ b/docs/manual/logs.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 -->
+<!-- English Revision: 151408:165671 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/logs.xml.ko b/docs/manual/logs.xml.ko
index ffc93ff56f..77eef925cd 100644
--- a/docs/manual/logs.xml.ko
+++ b/docs/manual/logs.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:151408 (outdated) -->
+<!-- English Revision: 105989:165671 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/logs.xml.meta b/docs/manual/logs.xml.meta
index fad92b8a75..675e92b994 100644
--- a/docs/manual/logs.xml.meta
+++ b/docs/manual/logs.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/mod/core.html.en b/docs/manual/mod/core.html.en
index 3e3373dc05..613ccfbec0 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -948,9 +948,10 @@ in case of an error</td></tr>
     or a message. Apache will sometimes offer additional information
     regarding the problem/error.</p>
 
-    <p>URLs can begin with a slash (/) for local URLs, or be a full
-    URL which the client can resolve. Alternatively, a message can
-    be provided to be displayed by the browser. Examples:</p>
+    <p>URLs can begin with a slash (/) for local web-paths (relative
+    to the <code class="directive"><a href="#documentroot">DocumentRoot</a></code>), or be a
+    full URL which the client can resolve. Alternatively, a message
+    can be provided to be displayed by the browser. Examples:</p>
 
     <div class="example"><p><code>
       ErrorDocument 500 http://foo.example.com/cgi-bin/tester<br />
@@ -998,6 +999,14 @@ in case of an error</td></tr>
     error rather than masking it.  More information is available in
     Microsoft Knowledge Base article <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>
 
+    <p>Although most error messages can be overriden, there are certain
+    circumstances where the internal messages are used regardless of the
+    setting of <code class="directive"><a href="#errordocument">ErrorDocument</a></code>.  In
+    particular, if a malformed request is detected, normal request processing
+    will be immediately halted and the internal error message returned.
+    This is necessary to guard against security problems caused by
+    bad requests.</p>
+
     <p>Prior to version 2.0, messages were indicated by prefixing
     them with a single unmatched double quote character.</p>
 
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 13c289d280..5c7835da0f 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.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: 161140 -->
+<!-- English Revision: 161140:167959 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 3cdcd94d55..ef8c1b1208 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 161140 -->
+<!-- English Revision: 161140:167959 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index 15f5ff3381..b6a4b3c035 100644
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -6,8 +6,8 @@
   <relpath>..</relpath>
 
   <variants>
-    <variant>de</variant>
+    <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/programs/apachectl.html.en b/docs/manual/programs/apachectl.html.en
index 033b170c31..dac194ed9c 100644
--- a/docs/manual/programs/apachectl.html.en
+++ b/docs/manual/programs/apachectl.html.en
@@ -129,16 +129,15 @@ equivalent to <code>apachectl -t</code>.</dd>
 
 </dl>
 
-<p>The following additional option is available, but deprecated.</p>
+<p>The following option was available in earlier versions but has been removed.</p>
 
 <dl>
 
 <dt><code>startssl</code></dt>
 
-<dd>This is equivalent to <code>apachectl -k start -DSSL</code>.  We
-recommend that you use that command explicitly, or you adjust your
-<code>httpd.conf</code> to remove the <code class="directive"><a href="../mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> section so that SSL will always be
-available.</dd>
+<dd>To start <code class="program"><a href="../programs/httpd.html">httpd</a></code> with SSL support, you should edit
+your configuration file to include the relevant directives and then
+use the normal <code>apachectl start</code>.</dd>
 
 </dl>
 
diff --git a/docs/manual/programs/apachectl.xml.ko b/docs/manual/programs/apachectl.xml.ko
index d954955134..30ee0a789a 100644
--- a/docs/manual/programs/apachectl.xml.ko
+++ b/docs/manual/programs/apachectl.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:151408 (outdated) -->
+<!-- English Revision: 105989:167936 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index d514521969..ec1ab09b1a 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -62,6 +62,14 @@
       the <code>conf/extra/</code> directive of the installed
       server.</li>
 
+      <li>The <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> option
+      <code>startssl</code> is no longer available.  To enable ssl
+      support, you should edit <code>httpd.conf</code> to include the
+      relevant <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code> directives and then use
+      <code>apachectl start</code> to start the server.  An example
+      configuration to activate <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code> has been included
+      in <code>conf/extra/httpd-ssl.conf</code>.</li>
+
       <li>The default setting of <code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code> is now
       <code>Off</code>.  If you did not have this directive in your
       config file, you can add <code>UseCanonicalName On</code> to
diff --git a/docs/manual/upgrading.xml.de b/docs/manual/upgrading.xml.de
index bd7ec26d0b..b69bc5d8d0 100644
--- a/docs/manual/upgrading.xml.de
+++ b/docs/manual/upgrading.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: 151408:160702 (outdated) -->
+<!-- English Revision: 151408:167912 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja
index dd3951bd63..aa2aa82147 100644
--- a/docs/manual/upgrading.xml.ja
+++ b/docs/manual/upgrading.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:160702 (outdated) -->
+<!-- English Revision: 151408:167912 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ko b/docs/manual/upgrading.xml.ko
index 799301563c..2eda8e7c18 100644
--- a/docs/manual/upgrading.xml.ko
+++ b/docs/manual/upgrading.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: 151408:160702 (outdated) -->
+<!-- English Revision: 151408:167912 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.pt-br b/docs/manual/upgrading.xml.pt-br
index d164f5dd3f..3b28557c8b 100644
--- a/docs/manual/upgrading.xml.pt-br
+++ b/docs/manual/upgrading.xml.pt-br
@@ -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.pt-br.xsl"?>
-<!-- English Revision: 151408:160702 (outdated) -->
+<!-- English Revision: 151408:167912 (outdated) -->
 
 <!--
  Copyright 2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ru b/docs/manual/upgrading.xml.ru
index 437ab2c988..4588aec281 100644
--- a/docs/manual/upgrading.xml.ru
+++ b/docs/manual/upgrading.xml.ru
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='KOI8-R' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ru.xsl"?>
-<!-- English Revision: 96997:160702 (outdated) -->
+<!-- English Revision: 96997:167912 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,