httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r167960 - in /httpd/httpd/trunk/docs/man: ./ al/ al/mod/ al/programs/
Date Tue, 03 May 2005 19:12:52 GMT
Author: slive
Date: Tue May  3 12:12:51 2005
New Revision: 167960

URL: http://svn.apache.org/viewcvs?rev=167960&view=rev
Log:
Finish committing the transformations that I accidentally started in
the last commit.

Modified:
    httpd/httpd/trunk/docs/man/apachectl.8
    httpd/httpd/trunk/docs/manual/logs.html.en
    httpd/httpd/trunk/docs/manual/logs.xml.ja
    httpd/httpd/trunk/docs/manual/logs.xml.ko
    httpd/httpd/trunk/docs/manual/logs.xml.meta
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.xml.de
    httpd/httpd/trunk/docs/manual/mod/core.xml.ja
    httpd/httpd/trunk/docs/manual/mod/core.xml.meta
    httpd/httpd/trunk/docs/manual/programs/apachectl.html.en
    httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko
    httpd/httpd/trunk/docs/manual/upgrading.html.en
    httpd/httpd/trunk/docs/manual/upgrading.xml.de
    httpd/httpd/trunk/docs/manual/upgrading.xml.ja
    httpd/httpd/trunk/docs/manual/upgrading.xml.ko
    httpd/httpd/trunk/docs/manual/upgrading.xml.pt-br
    httpd/httpd/trunk/docs/manual/upgrading.xml.ru

Modified: httpd/httpd/trunk/docs/man/apachectl.8
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/man/apachectl.8?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/apachectl.8 (original)
+++ httpd/httpd/trunk/docs/man/apachectl.8 Tue May  3 12:12:51 2005
@@ -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 @@
 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\&.  
  

Modified: httpd/httpd/trunk/docs/manual/logs.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/logs.html.en?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/logs.html.en (original)
+++ httpd/httpd/trunk/docs/manual/logs.html.en Tue May  3 12:12:51 2005
@@ -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">

Modified: httpd/httpd/trunk/docs/manual/logs.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/logs.xml.ja?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/logs.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/logs.xml.ja [iso-2022-jp] Tue May  3 12:12:51 2005
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/logs.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/logs.xml.ko?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/logs.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/logs.xml.ko [euc-kr] Tue May  3 12:12:51 2005
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/logs.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/logs.xml.meta?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/logs.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/logs.xml.meta Tue May  3 12:12:51 2005
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Tue May  3 12:12:51 2005
@@ -948,9 +948,10 @@
     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 />
@@ -997,6 +998,14 @@
     greater than 512 bytes, then MSIE will show the server-generated
     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>

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/core.xml.de?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Tue May  3 12:12:51 2005
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [iso-2022-jp] Tue May  3 12:12:51 2005
@@ -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,
@@ -2392,7 +2392,7 @@
     パラメータには数字か、オペレーティングシステムの最大となる
     <code>max</code> のどちらかを指定することができます。
     最大のリソースリミットを上げるためには、サーバを
-    <code>root</code> で実行するか起�0$5$l$J$1$l$P$$$1$^$;$s!#</p>
+    <code>root</code> で実行するか起動されなければいけません。</p>
 
     <p>この設定は Apache の子プロセス自体ではなく、
     リクエストを受け付けた Apache の子プロセスから fork されたプロセスに

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/core.xml.meta?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.meta Tue May  3 12:12:51 2005
@@ -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>

Modified: httpd/httpd/trunk/docs/manual/programs/apachectl.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/apachectl.html.en?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/apachectl.html.en (original)
+++ httpd/httpd/trunk/docs/manual/programs/apachectl.html.en Tue May  3 12:12:51 2005
@@ -129,16 +129,15 @@
 
 </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>
 

Modified: httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko [euc-kr] Tue May  3 12:12:51 2005
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/upgrading.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.html.en?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.html.en (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.html.en Tue May  3 12:12:51 2005
@@ -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

Modified: httpd/httpd/trunk/docs/manual/upgrading.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.xml.de?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml.de Tue May  3 12:12:51 2005
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/upgrading.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.xml.ja?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml.ja [iso-2022-jp] Tue May  3 12:12:51 2005
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/upgrading.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.xml.ko?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml.ko [euc-kr] Tue May  3 12:12:51 2005
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/upgrading.xml.pt-br
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.xml.pt-br?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml.pt-br (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml.pt-br Tue May  3 12:12:51 2005
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/upgrading.xml.ru
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/upgrading.xml.ru?rev=167960&r1=167959&r2=167960&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml.ru [koi8-r] (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml.ru [koi8-r] Tue May  3 12:12:51 2005
@@ -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,



Mime
View raw message