You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2006/07/06 22:52:53 UTC
svn commit: r419698 - in /httpd/httpd/branches/2.2.x/docs/manual: ./ misc/
mod/ platform/
Author: nd
Date: Thu Jul 6 13:52:51 2006
New Revision: 419698
URL: http://svn.apache.org/viewvc?rev=419698&view=rev
Log:
update transformation
Modified:
httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en
httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.ja.euc-jp
httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ja
httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ko
httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.meta
httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.html.en
httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.xml.ko
httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.de
httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.ja.euc-jp
httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.html.ko.euc-kr
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.ko
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de
httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es
httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ja.euc-jp
httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ko.euc-kr
httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r
httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en
httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.ko
httpd/httpd/branches/2.2.x/docs/manual/stopping.html.en
httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.de
httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.es
httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ja
httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ko
Modified: httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.en Thu Jul 6 13:52:51 2006
@@ -504,6 +504,7 @@
<div class="example"><h3>Example</h3><p><code>
SetEnvIf Cookie "language=(.+)" prefer-language=$1
+ Header append Vary cookie
</code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
Modified: httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.ja.euc-jp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.ja.euc-jp?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.ja.euc-jp [euc-jp] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.html.ja.euc-jp [euc-jp] Thu Jul 6 13:52:51 2006
@@ -22,6 +22,8 @@
<a href="./ja/content-negotiation.html" title="Japanese"> ja </a> |
<a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div>
+<div class="outofdate">This translation may be out of date. Check the
+ English version for recent changes.</div>
<p>Apache は HTTP/1.1 の規格に記述されているコンテントネゴシエーションを
Modified: httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ja?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ja [iso-2022-jp] Thu Jul 6 13:52:51 2006
@@ -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: 396056 -->
+<!-- English Revision: 396056:418355 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors, as
Modified: httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ko?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.ko [euc-kr] Thu Jul 6 13:52:51 2006
@@ -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:396056 (outdated) -->
+<!-- English Revision: 151408:418355 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.meta?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/content-negotiation.xml.meta Thu Jul 6 13:52:51 2006
@@ -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/branches/2.2.x/docs/manual/misc/perf-tuning.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.html.en?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.html.en Thu Jul 6 13:52:51 2006
@@ -110,7 +110,7 @@
Apache 1.3 this setting defaults to <code>Off</code>. If you need
to have addresses in your log files resolved to hostnames, use the
<code class="program"><a href="../programs/logresolve.html">logresolve</a></code>
- program that comes with Apache, on one of the numerous log
+ program that comes with Apache, or one of the numerous log
reporting packages which are available.</p>
<p>It is recommended that you do this sort of postprocessing of
Modified: httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.xml.ko?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/misc/perf-tuning.xml.ko [euc-kr] Thu Jul 6 13:52:51 2006
@@ -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:396056 (outdated) -->
+<!-- English Revision: 105989:418315 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.de?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.de Thu Jul 6 13:52:51 2006
@@ -149,7 +149,7 @@
für gewöhnliche Dateien weist <code>PATH_INFO</code>-Zugriffe
standardmäßig zurück. Handler, die Skripte bedienen,
wie z.B. <a href="mod_cgi.html">cgi-script</a> und
- <a href="mod_isapi.html">isapi-isa</a>, sind im Allgemeinen darauf
+ <a href="mod_isapi.html">isapi-handler</a>, sind im Allgemeinen darauf
voreingestellt, <code>PATH_INFO</code> zu akzeptieren.</dd>
</dl>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.ja.euc-jp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.ja.euc-jp?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.ja.euc-jp [euc-jp] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.ja.euc-jp [euc-jp] Thu Jul 6 13:52:51 2006
@@ -186,7 +186,7 @@
<dt><code>Default</code></dt><dd>続きのパス名情報の扱いはリクエストの
<a href="../handler.html">ハンドラ</a>で決まります。
普通のファイルのためのコアハンドラのデフォルトは <code>PATH_INFO</code> を拒否します。
- <a href="mod_cgi.html">cgi-script</a> や <a href="mod_isapi.html">isapi-isa</a> のようにスクリプトを扱うハンドラは
+ <a href="mod_cgi.html">cgi-script</a> や <a href="mod_isapi.html">isapi-handler</a> のようにスクリプトを扱うハンドラは
一般的にデフォルトで <code>PATH_INFO</code> を受け付けます。</dd>
</dl>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de Thu Jul 6 13:52:51 2006
@@ -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: 167959:396056 (outdated) -->
+<!-- English Revision: 167959:417234 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.html.en?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.html.en Thu Jul 6 13:52:51 2006
@@ -260,4 +260,4 @@
</div><div id="footer">
<p class="apache">Copyright 1995-2006 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
+</body></html>
\ No newline at end of file
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.html.ko.euc-kr?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.html.ko.euc-kr [euc-kr] Thu Jul 6 13:52:51 2006
@@ -24,6 +24,8 @@
<p><span>가능한 언어: </span><a href="../en/mod/mod_isapi.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../ko/mod/mod_isapi.html" title="Korean"> ko </a></p>
</div>
+<div class="outofdate">이 문서는 최신판 번역이 아닙니다.
+ 최근에 변경된 내용은 영어 문서를 참고하세요.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">설명:</a></th><td>Windows용 아파치에서 ISAPI Extension 사용</td></tr>
<tr><th><a href="module-dict.html#Status">상태:</a></th><td>Base</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">모듈명:</a></th><td>isapi_module</td></tr>
@@ -61,11 +63,11 @@
<h2><a name="usage" id="usage">사용법</a></h2>
<p>서버설정파일에서 <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> 지시어를 사용하여
- ISAPI 파일 확장자와 <code>isapi-isa</code> 핸들러를 연결한다.
+ ISAPI 파일 확장자와 <code>isapi-handler</code> 핸들러를 연결한다.
.dll 파일을 ISAPI extension으로 처리하려면 httpd.conf 파일에
다음과 같이 추가한다.</p>
<div class="example"><p><code>
- AddHandler isapi-isa .dll
+ AddHandler isapi-handler .dll
</code></p></div>
<p>아파치 서버는 요청한 모듈을 메모리에 계속 둘 수 없다.
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.ko?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.ko [euc-kr] Thu Jul 6 13:52:51 2006
@@ -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: 396056 -->
+<!-- English Revision: 396056:417234 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta Thu Jul 6 13:52:51 2006
@@ -7,6 +7,6 @@
<variants>
<variant>en</variant>
- <variant>ko</variant>
+ <variant outdated="yes">ko</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en Thu Jul 6 13:52:51 2006
@@ -102,9 +102,8 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one<br />
- AuthLDAPAuthoritative on<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
@@ -231,9 +230,8 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
- AuthLDAPAuthoritative on<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
@@ -252,9 +250,8 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS<br />
- AuthLDAPAuthoritative on<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
@@ -304,10 +301,9 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
LDAPTrustedClientCert CERT_NICKNAME <nickname> [password]<br />
AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
- AuthLDAPAuthoritative on<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
@@ -371,11 +367,10 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br />
LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br />
AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
- AuthLDAPAuthoritative on<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en Thu Jul 6 13:52:51 2006
@@ -1405,34 +1405,38 @@
</li>
</ul>
-<div class="note"><h3>Note: Enabling rewrites in per-directory context</h3>
- To enable the rewrite engine
- for per-directory configuration files you need to set
- ``<code>RewriteEngine On</code>'' in these files
- <strong>and</strong> ``<code>Options
- FollowSymLinks</code>'' must be enabled. If your
- administrator has disabled override of
- <code>FollowSymLinks</code> for a user's directory, then
- you cannot use the rewrite engine. This restriction is
- required for security reasons.
-</div>
+<div class="note"><h3>Per-directory Rewrites</h3>
+
+<p>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files. To enable the
+rewrite engine for these files you need to set
+"<code>RewriteEngine On</code>" <strong>and</strong>
+"<code>Options FollowSymLinks</code>" must be enabled. If your
+administrator has disabled override of <code>FollowSymLinks</code> for
+a user's directory, then you cannot use the rewrite engine. This
+restriction is required for security reasons.</p>
-<div class="note"><h3>Note: Pattern matching in per-directory context</h3>
- Never forget that <em>Pattern</em> is
-applied to a complete URL in per-server configuration
-files. <strong>However, in per-directory configuration files, the
+<p>When using the rewrite engine in <code>.htaccess</code> files the
per-directory prefix (which always is the same for a specific
directory) is automatically <em>removed</em> for the pattern matching
and automatically <em>added</em> after the substitution has been
-done.</strong> This feature is essential for many sorts of rewriting -
-without this, you would always have to match the parent
-directory, which is not always possible.
+done. This feature is essential for many sorts of rewriting; without
+this, you would always have to match the parent directory, which is
+not always possible. There is one exception: If a substitution string
+starts with <code>http://</code>, then the directory prefix will
+<strong>not</strong> be added, and an external redirect (or proxy
+throughput, if using flag <strong>P</strong>) is forced. See the
+<code class="directive"><a href="#rewritebase">RewriteBase</a></code> directive for
+more information.</p>
+
+<p>The rewrite engine may also be used in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections with the same
+prefix-matching rules as would be applied to <code>.htaccess</code>
+files. It is usually simpler, however, to avoid the prefix substitution
+complication by putting the rewrite rules in the main server or
+virtual host context, rather than in a <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section.</p>
+
+<p>Although rewrite rules are syntactically permitted in <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections, this
+should never be necessary and is unsupported.</p>
- <p>There is one exception: If a substitution string
- starts with ``<code>http://</code>'', then the directory
- prefix will <strong>not</strong> be added ,and an
- external redirect (or proxy throughput, if using flag
- <strong>P</strong>) is forced!</p>
</div>
<div class="note"><h3>Note: Substitution of Absolute URLs</h3>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de Thu Jul 6 13:52:51 2006
@@ -263,7 +263,7 @@
<tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
a DAV resource</td></tr>
<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
<tr><td><a href="mod_dbd.html#dbdparams">DBDParams
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en Thu Jul 6 13:52:51 2006
@@ -260,7 +260,7 @@
<tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
a DAV resource</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es Thu Jul 6 13:52:51 2006
@@ -263,7 +263,7 @@
<tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
a DAV resource</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ja.euc-jp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ja.euc-jp?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ja.euc-jp [euc-jp] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ja.euc-jp [euc-jp] Thu Jul 6 13:52:51 2006
@@ -244,7 +244,7 @@
<tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">サーバが DAV リソースのロックを維持する最小時間です。
</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ko.euc-kr?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ko.euc-kr [euc-kr] Thu Jul 6 13:52:51 2006
@@ -230,7 +230,7 @@
<tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">DAV 잠금 데이터베이스 위치</td></tr>
<tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">서버가 DAV 자원에 대해 유지할 잠금의 최소시간</td></tr>
<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
<tr><td><a href="mod_dbd.html#dbdparams">DBDParams
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r [koi8-r] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r [koi8-r] Thu Jul 6 13:52:51 2006
@@ -262,7 +262,7 @@
<tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
a DAV resource</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en Thu Jul 6 13:52:51 2006
@@ -132,29 +132,38 @@
<code>openssl</code>, obtained from <a href="http://www.openssl.org/source/">http://www.openssl.org/source/</a>, in order to compile <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>
or the abs project (<code>ab.exe</code> with SSL support.) To prepare OpenSSL
for both <code>release</code> and <code>debug</code> builds of Apache, and
- disable the patent protected features in 0.9.7, you might use the following
+ disable the patent protected features in OpenSSL, you might use the following
build commands:</p>
<div class="example"><p><code>
perl Configure VC-WIN32<br />
perl util\mkfiles.pl >MINFO<br />
- perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 >makefile<br />
+ perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 >makefile.rel<br />
perl util\mk1mf.pl dll debug no-asm no-mdc2 no-rc5 no-idea VC-WIN32 >makefile.dbg<br />
perl util\mkdef.pl 32 libeay no-asm no-mdc2 no-rc5 no-idea >ms\libeay32.def<br />
perl util\mkdef.pl 32 ssleay no-asm no-mdc2 no-rc5 no-idea >ms\ssleay32.def<br />
- nmake<br />
+ nmake -f makefile.rel<br />
nmake -f makefile.dbg
</code></p></div>
+ <p>Note; you can use the scripts in the <code>ms\</code> subdirectory, however,
+ it's rather tricky to force <code>ms\do_masm.bat</code>, for example, to perform
+ the patent encumberances as mentioned above. Patches to add the $* argument list
+ to the appropriate .bat lines in these scripts aren't incorporated, thus far.</p>
</li>
<li>
- <p>[Optional] zlib sources (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
+ <p>[Optional] zlib library (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
<p>Zlib must be installed into a <code>srclib</code> subdirectory named
- <code>zlib</code>, however those sources need not be compiled. The build system
- will compile the compression sources directly into the <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>
- module. Zlib can be obtained from <a href="http://www.gzip.org/zlib/">http://www.gzip.org/zlib/</a> -- <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is
- confirmed to build correctly with version 1.1.4.</p>
+ <code>zlib</code>. This must be built in-place. Zlib can be obtained
+ from <a href="http://www.zlib.net/">http://www.zlib.net/</a> -- the
+ <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is confirmed to work correctly with
+ version 1.2.3.</p>
+
+ <div class="example"><p><code>
+ nmake -f win32\Makefile.msc<br />
+ nmake -f win32\Makefile.msc test
+ </code></p></div>
</li>
</ul>
Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.ko?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.ko [euc-kr] Thu Jul 6 13:52:51 2006
@@ -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:396056 (outdated) -->
+<!-- English Revision: 105989:419637 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/branches/2.2.x/docs/manual/stopping.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/stopping.html.en?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/stopping.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/stopping.html.en Thu Jul 6 13:52:51 2006
@@ -37,7 +37,7 @@
<li><img alt="" src="./images/down.gif" /> <a href="#graceful">Graceful Restart</a></li>
<li><img alt="" src="./images/down.gif" /> <a href="#hup">Restart Now</a></li>
<li><img alt="" src="./images/down.gif" /> <a href="#gracefulstop">Graceful Stop</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li><li><a href="invoking.html">Starting</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
<h2><a name="introduction" id="introduction">Introduction</a></h2>
@@ -50,10 +50,11 @@
but you should not send signals to any of them except the parent,
whose pid is in the <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>. That is to say you
shouldn't ever need to send signals to any process except the
- parent. There are three signals that you can send the parent:
+ parent. There are four signals that you can send the parent:
<code><a href="#term">TERM</a></code>,
+ <code><a href="#graceful">USR1</a></code>,
<code><a href="#hup">HUP</a></code>, and
- <code><a href="#graceful">USR1</a></code>, which
+ <code><a href="#gracefulstop">WINCH</a></code>, which
will be described in a moment.</p>
<p>To send a signal to the parent you should issue a command
Modified: httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.de?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.de Thu Jul 6 13:52:51 2006
@@ -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: 396056:413452 (outdated) -->
+<!-- English Revision: 396056:418353 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.es
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.es?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.es (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.es Thu Jul 6 13:52:51 2006
@@ -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:413452 (outdated) -->
+<!-- English Revision: 105989:418353 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ja?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ja [iso-2022-jp] Thu Jul 6 13:52:51 2006
@@ -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:413452 (outdated) -->
+<!-- English Revision: 151408:418353 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ko?rev=419698&r1=419697&r2=419698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.ko [euc-kr] Thu Jul 6 13:52:51 2006
@@ -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:413452 (outdated) -->
+<!-- English Revision: 105989:418353 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,