You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2008/12/22 15:27:37 UTC

svn commit: r728701 [1/7] - in /httpd/httpd/trunk/docs/manual: ./ mod/

Author: jim
Date: Mon Dec 22 06:27:36 2008
New Revision: 728701

URL: http://svn.apache.org/viewvc?rev=728701&view=rev
Log:
xforms

Modified:
    httpd/httpd/trunk/docs/manual/convenience.map
    httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8
    httpd/httpd/trunk/docs/manual/mod/directives.html.de
    httpd/httpd/trunk/docs/manual/mod/directives.html.es
    httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8
    httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8
    httpd/httpd/trunk/docs/manual/mod/index.html.de
    httpd/httpd/trunk/docs/manual/mod/index.html.es
    httpd/httpd/trunk/docs/manual/mod/index.html.ja.utf8
    httpd/httpd/trunk/docs/manual/mod/index.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/mod/index.html.tr.utf8
    httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.ja.utf8
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.de
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.es
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.ja.utf8
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.tr.utf8
    httpd/httpd/trunk/docs/manual/new_features_2_4.html.fr
    httpd/httpd/trunk/docs/manual/sitemap.html.de
    httpd/httpd/trunk/docs/manual/sitemap.html.es
    httpd/httpd/trunk/docs/manual/sitemap.html.ja.utf8
    httpd/httpd/trunk/docs/manual/sitemap.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/sitemap.html.tr.utf8

Modified: httpd/httpd/trunk/docs/manual/convenience.map
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/convenience.map?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/convenience.map (original)
+++ httpd/httpd/trunk/docs/manual/convenience.map Mon Dec 22 06:27:36 2008
@@ -84,6 +84,7 @@
 authldapsubgroupattribute	mod/mod_authnz_ldap.html#authldapsubgroupattribute
 authldapsubgroupclass	mod/mod_authnz_ldap.html#authldapsubgroupclass
 authldapurl	mod/mod_authnz_ldap.html#authldapurl
+authmerging	mod/mod_authz_core.html#authmerging
 authname	mod/mod_authn_core.html#authname
 authnprovideralias	mod/mod_authn_core.html#authnprovideralias
 authtype	mod/mod_authn_core.html#authtype
@@ -193,6 +194,10 @@
 group	mod/mod_unixd.html#group
 header	mod/mod_headers.html#header
 headername	mod/mod_autoindex.html#headername
+heartbeataddress	mod/mod_heartbeat.html#heartbeataddress
+heartbeatlisten	mod/mod_heartmonitor.html#heartbeatlisten
+heartbeatstorage	mod/mod_lbmethod_heartbeat.html#heartbeatstorage
+heartbeatstorage	mod/mod_heartmonitor.html#heartbeatstorage
 hostnamelookups	mod/core.html#hostnamelookups
 identitycheck	mod/mod_ident.html#identitycheck
 identitychecktimeout	mod/mod_ident.html#identitychecktimeout
@@ -250,11 +255,6 @@
 lockfile	mod/mpm_common.html#lockfile
 logformat	mod/mod_log_config.html#logformat
 loglevel	mod/core.html#loglevel
-match	mod/mod_authz_core.html#match
-matchall	mod/mod_authz_core.html#matchall
-matchany	mod/mod_authz_core.html#matchany
-matchnotall	mod/mod_authz_core.html#matchnotall
-matchnotany	mod/mod_authz_core.html#matchnotany
 maxclients	mod/mpm_common.html#maxclients
 maxkeepaliverequests	mod/core.html#maxkeepaliverequests
 maxmemfree	mod/mpm_common.html#maxmemfree
@@ -264,7 +264,6 @@
 maxsparethreads	mod/mpm_common.html#maxsparethreads
 maxthreads	mod/mpm_netware.html#maxthreads
 maxthreadsperchild	mod/perchild.html#maxthreadsperchild
-mergeauthz	mod/mod_authz_core.html#mergeauthz
 metadir	mod/mod_cern_meta.html#metadir
 metafiles	mod/mod_cern_meta.html#metafiles
 metasuffix	mod/mod_cern_meta.html#metasuffix
@@ -324,6 +323,9 @@
 removetype	mod/mod_mime.html#removetype
 requestheader	mod/mod_headers.html#requestheader
 require	mod/mod_authz_core.html#require
+requireall	mod/mod_authz_core.html#requireall
+requireany	mod/mod_authz_core.html#requireany
+requirenone	mod/mod_authz_core.html#requirenone
 rewritebase	mod/mod_rewrite.html#rewritebase
 rewritecond	mod/mod_rewrite.html#rewritecond
 rewriteengine	mod/mod_rewrite.html#rewriteengine

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.tr.utf8 [utf-8] Mon Dec 22 06:27:36 2008
@@ -26,6 +26,7 @@
 <a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../tr/mod/core.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Açıklama:</a></th><td>Apache HTTP Sunucusunda daima mevcut olan çekirdek
  özellikler</td></tr>
 <tr><th><a href="module-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr></table>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.de?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.de Mon Dec 22 06:27:36 2008
@@ -118,6 +118,7 @@
 <li><a href="mod_authnz_ldap.html#authldapsubgroupattribute">AuthLDAPSubGroupAttribute</a></li>
 <li><a href="mod_authnz_ldap.html#authldapsubgroupclass">AuthLDAPSubGroupClass</a></li>
 <li><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl</a></li>
+<li><a href="mod_authz_core.html#authmerging">AuthMerging</a></li>
 <li><a href="core.html#authname">AuthName</a></li>
 <li><a href="mod_authn_core.html#authname">AuthName</a></li>
 <li><a href="mod_authn_core.html#authnprovideralias">&lt;AuthnProviderAlias&gt;</a></li>
@@ -228,6 +229,10 @@
 <li><a href="mpm_common.html#group">Group</a></li>
 <li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
 <li><a href="mod_autoindex.html#headername">HeaderName</a></li>
+<li><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage</a></li>
+<li><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage</a></li>
 <li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
 <li><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck</a></li>
 <li><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout</a></li>
@@ -284,12 +289,7 @@
 <li><a href="mpm_common.html#lockfile">LockFile</a></li>
 <li><a href="mod_log_config.html#logformat">LogFormat</a></li>
 <li><a href="core.html#loglevel">LogLevel</a></li>
-<li><a href="mod_authz_core.html#match" id="M" name="M">Match</a></li>
-<li><a href="mod_authz_core.html#matchall">&lt;MatchAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchany">&lt;MatchAny&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotall">&lt;MatchNotAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotany">&lt;MatchNotAny&gt;</a></li>
-<li><a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
 <li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
@@ -298,7 +298,6 @@
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
 <li><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
-<li><a href="mod_authz_core.html#mergeauthz">MergeAuthz</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
@@ -358,6 +357,9 @@
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
 <li><a href="core.html#require">Require</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
+<li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
+<li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
+<li><a href="mod_authz_core.html#requirenone">&lt;RequireNone&gt;</a></li>
 <li><a href="mod_rewrite.html#rewritebase">RewriteBase</a></li>
 <li><a href="mod_rewrite.html#rewritecond">RewriteCond</a></li>
 <li><a href="mod_rewrite.html#rewriteengine">RewriteEngine</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.es?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.es Mon Dec 22 06:27:36 2008
@@ -122,6 +122,7 @@
 <li><a href="mod_authnz_ldap.html#authldapsubgroupattribute">AuthLDAPSubGroupAttribute</a></li>
 <li><a href="mod_authnz_ldap.html#authldapsubgroupclass">AuthLDAPSubGroupClass</a></li>
 <li><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl</a></li>
+<li><a href="mod_authz_core.html#authmerging">AuthMerging</a></li>
 <li><a href="mod_authn_core.html#authname">AuthName</a></li>
 <li><a href="mod_authn_core.html#authnprovideralias">&lt;AuthnProviderAlias&gt;</a></li>
 <li><a href="mod_authn_core.html#authtype">AuthType</a></li>
@@ -231,6 +232,10 @@
 <li><a href="mod_unixd.html#group">Group</a></li>
 <li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
 <li><a href="mod_autoindex.html#headername">HeaderName</a></li>
+<li><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage</a></li>
+<li><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage</a></li>
 <li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
 <li><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck</a></li>
 <li><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout</a></li>
@@ -288,12 +293,7 @@
 <li><a href="mpm_common.html#lockfile">LockFile</a></li>
 <li><a href="mod_log_config.html#logformat">LogFormat</a></li>
 <li><a href="core.html#loglevel">LogLevel</a></li>
-<li><a href="mod_authz_core.html#match" id="M" name="M">Match</a></li>
-<li><a href="mod_authz_core.html#matchall">&lt;MatchAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchany">&lt;MatchAny&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotall">&lt;MatchNotAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotany">&lt;MatchNotAny&gt;</a></li>
-<li><a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
 <li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
@@ -302,7 +302,6 @@
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
 <li><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
-<li><a href="mod_authz_core.html#mergeauthz">MergeAuthz</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
@@ -362,6 +361,9 @@
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
+<li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
+<li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
+<li><a href="mod_authz_core.html#requirenone">&lt;RequireNone&gt;</a></li>
 <li><a href="mod_rewrite.html#rewritebase">RewriteBase</a></li>
 <li><a href="mod_rewrite.html#rewritecond">RewriteCond</a></li>
 <li><a href="mod_rewrite.html#rewriteengine">RewriteEngine</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8 [utf-8] Mon Dec 22 06:27:36 2008
@@ -118,6 +118,7 @@
 <li><a href="mod_authnz_ldap.html#authldapsubgroupattribute">AuthLDAPSubGroupAttribute</a></li>
 <li><a href="mod_authnz_ldap.html#authldapsubgroupclass">AuthLDAPSubGroupClass</a></li>
 <li><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl</a></li>
+<li><a href="mod_authz_core.html#authmerging">AuthMerging</a></li>
 <li><a href="mod_authn_core.html#authname">AuthName</a></li>
 <li><a href="mod_authn_core.html#authnprovideralias">&lt;AuthnProviderAlias&gt;</a></li>
 <li><a href="mod_authn_core.html#authtype">AuthType</a></li>
@@ -228,6 +229,10 @@
 <li><a href="mpm_common.html#group">Group</a></li>
 <li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
 <li><a href="mod_autoindex.html#headername">HeaderName</a></li>
+<li><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage</a></li>
+<li><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage</a></li>
 <li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
 <li><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck</a></li>
 <li><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout</a></li>
@@ -285,12 +290,7 @@
 <li><a href="mpm_common.html#lockfile">LockFile</a></li>
 <li><a href="mod_log_config.html#logformat">LogFormat</a></li>
 <li><a href="core.html#loglevel">LogLevel</a></li>
-<li><a href="mod_authz_core.html#match" id="M" name="M">Match</a></li>
-<li><a href="mod_authz_core.html#matchall">&lt;MatchAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchany">&lt;MatchAny&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotall">&lt;MatchNotAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotany">&lt;MatchNotAny&gt;</a></li>
-<li><a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
 <li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
@@ -299,7 +299,6 @@
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
 <li><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
-<li><a href="mod_authz_core.html#mergeauthz">MergeAuthz</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
@@ -354,6 +353,9 @@
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
+<li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
+<li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
+<li><a href="mod_authz_core.html#requirenone">&lt;RequireNone&gt;</a></li>
 <li><a href="mod_rewrite.html#rewritebase">RewriteBase</a></li>
 <li><a href="mod_rewrite.html#rewritecond">RewriteCond</a></li>
 <li><a href="mod_rewrite.html#rewriteengine">RewriteEngine</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] Mon Dec 22 06:27:36 2008
@@ -117,6 +117,7 @@
 <li><a href="mod_authnz_ldap.html#authldapsubgroupattribute">AuthLDAPSubGroupAttribute</a></li>
 <li><a href="mod_authnz_ldap.html#authldapsubgroupclass">AuthLDAPSubGroupClass</a></li>
 <li><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl</a></li>
+<li><a href="mod_authz_core.html#authmerging">AuthMerging</a></li>
 <li><a href="mod_authn_core.html#authname">AuthName</a></li>
 <li><a href="mod_authn_core.html#authnprovideralias">&lt;AuthnProviderAlias&gt;</a></li>
 <li><a href="mod_authn_core.html#authtype">AuthType</a></li>
@@ -224,6 +225,10 @@
 <li><a href="mod_unixd.html#group">Group</a></li>
 <li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
 <li><a href="mod_autoindex.html#headername">HeaderName</a></li>
+<li><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage</a></li>
+<li><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage</a></li>
 <li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
 <li><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck</a></li>
 <li><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout</a></li>
@@ -280,12 +285,7 @@
 <li><a href="mpm_common.html#lockfile">LockFile</a></li>
 <li><a href="mod_log_config.html#logformat">LogFormat</a></li>
 <li><a href="core.html#loglevel">LogLevel</a></li>
-<li><a href="mod_authz_core.html#match" id="M" name="M">Match</a></li>
-<li><a href="mod_authz_core.html#matchall">&lt;MatchAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchany">&lt;MatchAny&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotall">&lt;MatchNotAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotany">&lt;MatchNotAny&gt;</a></li>
-<li><a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
 <li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
@@ -294,7 +294,6 @@
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
 <li><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
-<li><a href="mod_authz_core.html#mergeauthz">MergeAuthz</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
@@ -354,6 +353,9 @@
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
+<li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
+<li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
+<li><a href="mod_authz_core.html#requirenone">&lt;RequireNone&gt;</a></li>
 <li><a href="mod_rewrite.html#rewritebase">RewriteBase</a></li>
 <li><a href="mod_rewrite.html#rewritecond">RewriteCond</a></li>
 <li><a href="mod_rewrite.html#rewriteengine">RewriteEngine</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8 [utf-8] Mon Dec 22 06:27:36 2008
@@ -116,6 +116,7 @@
 <li><a href="mod_authnz_ldap.html#authldapsubgroupattribute">AuthLDAPSubGroupAttribute</a></li>
 <li><a href="mod_authnz_ldap.html#authldapsubgroupclass">AuthLDAPSubGroupClass</a></li>
 <li><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl</a></li>
+<li><a href="mod_authz_core.html#authmerging">AuthMerging</a></li>
 <li><a href="mod_authn_core.html#authname">AuthName</a></li>
 <li><a href="mod_authn_core.html#authnprovideralias">&lt;AuthnProviderAlias&gt;</a></li>
 <li><a href="mod_authn_core.html#authtype">AuthType</a></li>
@@ -225,6 +226,10 @@
 <li><a href="mod_unixd.html#group">Group</a></li>
 <li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
 <li><a href="mod_autoindex.html#headername">HeaderName</a></li>
+<li><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></li>
+<li><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage</a></li>
+<li><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage</a></li>
 <li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
 <li><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck</a></li>
 <li><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout</a></li>
@@ -282,12 +287,7 @@
 <li><a href="mpm_common.html#lockfile">LockFile</a></li>
 <li><a href="mod_log_config.html#logformat">LogFormat</a></li>
 <li><a href="core.html#loglevel">LogLevel</a></li>
-<li><a href="mod_authz_core.html#match" id="M" name="M">Match</a></li>
-<li><a href="mod_authz_core.html#matchall">&lt;MatchAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchany">&lt;MatchAny&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotall">&lt;MatchNotAll&gt;</a></li>
-<li><a href="mod_authz_core.html#matchnotany">&lt;MatchNotAny&gt;</a></li>
-<li><a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients</a></li>
 <li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
 <li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
 <li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
@@ -296,7 +296,6 @@
 <li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
 <li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
 <li><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
-<li><a href="mod_authz_core.html#mergeauthz">MergeAuthz</a></li>
 <li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
 <li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
 <li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
@@ -356,6 +355,9 @@
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
+<li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
+<li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
+<li><a href="mod_authz_core.html#requirenone">&lt;RequireNone&gt;</a></li>
 <li><a href="mod_rewrite.html#rewritebase">RewriteBase</a></li>
 <li><a href="mod_rewrite.html#rewritecond">RewriteCond</a></li>
 <li><a href="mod_rewrite.html#rewriteengine">RewriteEngine</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/index.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/index.html.de?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.de Mon Dec 22 06:27:36 2008
@@ -136,6 +136,8 @@
 <dt><a href="mod_filter.html">mod_filter</a></dt><dd>Context-sensitive smart filter configuration module</dd>
 <dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>Customization of HTTP request and response
 headers</dd>
+<dt><a href="mod_heartbeat.html">mod_heartbeat</a></dt><dd />
+<dt><a href="mod_heartmonitor.html">mod_heartmonitor</a></dt><dd />
 <dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident lookups</dd>
 <dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>Server-side imagemap processing</dd>
 <dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
@@ -145,6 +147,7 @@
 <dt><a href="mod_lbmethod_bybusyness.html" id="L" name="L">mod_lbmethod_bybusyness</a></dt><dd>Pending Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></dt><dd>Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_bytraffic.html">mod_lbmethod_bytraffic</a></dt><dd>Weighted Traffic Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
+<dt><a href="mod_lbmethod_heartbeat.html">mod_lbmethod_heartbeat</a></dt><dd> This document is still under development.</dd>
 <dt><a href="mod_ldap.html">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
 by other LDAP modules</dd>
 <dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>Logging of the requests made to the server</dd>

Modified: httpd/httpd/trunk/docs/manual/mod/index.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/index.html.es?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.es Mon Dec 22 06:27:36 2008
@@ -137,6 +137,8 @@
 <dt><a href="mod_filter.html">mod_filter</a></dt><dd>Context-sensitive smart filter configuration module</dd>
 <dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>Customization of HTTP request and response
 headers</dd>
+<dt><a href="mod_heartbeat.html">mod_heartbeat</a></dt><dd />
+<dt><a href="mod_heartmonitor.html">mod_heartmonitor</a></dt><dd />
 <dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident lookups</dd>
 <dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>Server-side imagemap processing</dd>
 <dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
@@ -146,6 +148,7 @@
 <dt><a href="mod_lbmethod_bybusyness.html" id="L" name="L">mod_lbmethod_bybusyness</a></dt><dd>Pending Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></dt><dd>Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_bytraffic.html">mod_lbmethod_bytraffic</a></dt><dd>Weighted Traffic Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
+<dt><a href="mod_lbmethod_heartbeat.html">mod_lbmethod_heartbeat</a></dt><dd> This document is still under development.</dd>
 <dt><a href="mod_ldap.html">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
 by other LDAP modules</dd>
 <dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>Logging of the requests made to the server</dd>

Modified: httpd/httpd/trunk/docs/manual/mod/index.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/index.html.ja.utf8?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.ja.utf8 [utf-8] Mon Dec 22 06:27:36 2008
@@ -126,6 +126,8 @@
 <dt><a href="mod_file_cache.html" id="F" name="F">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
 <dt><a href="mod_filter.html">mod_filter</a></dt><dd>Context-sensitive smart filter configuration module</dd>
 <dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>HTTP リクエストのヘッダと応答のヘッダのカスタマイズ</dd>
+<dt><a href="mod_heartbeat.html">mod_heartbeat</a></dt><dd />
+<dt><a href="mod_heartmonitor.html">mod_heartmonitor</a></dt><dd />
 <dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident lookups</dd>
 <dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>Server-side imagemap processing</dd>
 <dt><a href="mod_include.html">mod_include</a></dt><dd>サーバがパースする html ドキュメント (Server Side Includes)</dd>
@@ -134,6 +136,7 @@
 <dt><a href="mod_lbmethod_bybusyness.html" id="L" name="L">mod_lbmethod_bybusyness</a></dt><dd>Pending Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></dt><dd>Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_bytraffic.html">mod_lbmethod_bytraffic</a></dt><dd>Weighted Traffic Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
+<dt><a href="mod_lbmethod_heartbeat.html">mod_lbmethod_heartbeat</a></dt><dd> This document is still under development.</dd>
 <dt><a href="mod_ldap.html">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
 by other LDAP modules</dd>
 <dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>サーバへのリクエストのロギング</dd>

Modified: httpd/httpd/trunk/docs/manual/mod/index.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/index.html.ko.euc-kr?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.ko.euc-kr [euc-kr] Mon Dec 22 06:27:36 2008
@@ -121,6 +121,8 @@
 <dt><a href="mod_file_cache.html" id="F" name="F">mod_file_cache</a></dt><dd>메모리에 정적 파일들을 캐쉬</dd>
 <dt><a href="mod_filter.html">mod_filter</a></dt><dd>Context-sensitive smart filter configuration module</dd>
 <dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>HTTP 요청 헤더와 응답 헤더 수정</dd>
+<dt><a href="mod_heartbeat.html">mod_heartbeat</a></dt><dd />
+<dt><a href="mod_heartmonitor.html">mod_heartmonitor</a></dt><dd />
 <dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident 검색</dd>
 <dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>서버측 이미지맵(imagemap) 처리</dd>
 <dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
@@ -129,6 +131,7 @@
 <dt><a href="mod_lbmethod_bybusyness.html" id="L" name="L">mod_lbmethod_bybusyness</a></dt><dd>Pending Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></dt><dd>Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_bytraffic.html">mod_lbmethod_bytraffic</a></dt><dd>Weighted Traffic Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
+<dt><a href="mod_lbmethod_heartbeat.html">mod_lbmethod_heartbeat</a></dt><dd> This document is still under development.</dd>
 <dt><a href="mod_ldap.html">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
 by other LDAP modules</dd>
 <dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>서버로의 요청을 로그에 기록한다</dd>

Modified: httpd/httpd/trunk/docs/manual/mod/index.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/index.html.tr.utf8?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.tr.utf8 [utf-8] Mon Dec 22 06:27:36 2008
@@ -128,6 +128,8 @@
 <dt><a href="mod_filter.html">mod_filter</a></dt><dd>Context-sensitive smart filter configuration module</dd>
 <dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>Customization of HTTP request and response
 headers</dd>
+<dt><a href="mod_heartbeat.html">mod_heartbeat</a></dt><dd />
+<dt><a href="mod_heartmonitor.html">mod_heartmonitor</a></dt><dd />
 <dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident lookups</dd>
 <dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>Server-side imagemap processing</dd>
 <dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
@@ -137,6 +139,7 @@
 <dt><a href="mod_lbmethod_bybusyness.html" id="L" name="L">mod_lbmethod_bybusyness</a></dt><dd>Pending Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></dt><dd>Request Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
 <dt><a href="mod_lbmethod_bytraffic.html">mod_lbmethod_bytraffic</a></dt><dd>Weighted Traffic Counting load balancer scheduler algorithm for <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dd>
+<dt><a href="mod_lbmethod_heartbeat.html">mod_lbmethod_heartbeat</a></dt><dd> This document is still under development.</dd>
 <dt><a href="mod_ldap.html">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
 by other LDAP modules</dd>
 <dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>Sunucuya yapılan isteklerin günlük kayıtlarının tutulması

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en Mon Dec 22 06:27:36 2008
@@ -102,8 +102,8 @@
              AuthName LDAP_Protected_Place<br /><br />
 
              #implied OR operation<br /> 
-             Require alias1-ldap-group<br /> 
-             Require alias2-ldap-group<br />
+             Require ldap-group-alias1<br /> 
+             Require ldap-group-alias2<br />
           </span> &lt;/Directory&gt;<br />
         </code></p></div>
     

Modified: httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.ja.utf8?rev=728701&r1=728700&r2=728701&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_negotiation.html.ja.utf8 [utf-8] Mon Dec 22 06:27:36 2008
@@ -25,8 +25,6 @@
 <p><span>言語: </span><a href="../en/mod/mod_negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
-<div class="outofdate">この日本語訳はすでに古くなっている可能性があります。
-          更新された内容を見るには英語版をご覧下さい。</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td><a href="../content-negotiation.html">コンテントネゴシエーション</a>
   機能を提供する</td></tr>
 <tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
@@ -100,8 +98,8 @@
       このヘッダがない場合、ファイルの実際の長さが使用されます。</dd>
 
       <dt><code>Content-Type:</code></dt>
-      <dd>ドキュメントの MIME
-      メディアタイプ、オプショナルなパラメータ付き。パラメータの構文は
+      <dd>ドキュメントの <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME
+      メディアタイプ</a>、オプショナルなパラメータ付き。パラメータの構文は
       <code>name=value</code>
       で、メディアタイプや他のパラメータとはセミコロンで分離されます。
       共通のパラメータは以下のとおり: