You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2012/05/04 17:45:38 UTC
svn commit: r1334039 [7/23] - in /httpd/httpd/branches/2.4.x/docs/manual: ./
developer/ howto/ misc/ mod/ platform/ programs/ rewrite/ ssl/ vhosts/
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_core.html.en Fri May 4 15:45:05 2012
@@ -78,38 +78,34 @@
multiple ldap hosts:
</p>
- <div class="example"><h3>Example</h3><p><code>
- <AuthzProviderAlias ldap-group ldap-group-alias1 cn=my-group,o=ctx><br />
- <span class="indent">
- AuthLDAPBindDN cn=youruser,o=ctx<br />
- AuthLDAPBindPassword yourpassword<br />
- AuthLDAPURL ldap://ldap.host/o=ctx<br />
- </span>
- </AuthzProviderAlias><br /><br />
- <AuthzProviderAlias ldap-group ldap-group-alias2
- cn=my-other-group,o=dev><br />
- <span class="indent">
- AuthLDAPBindDN cn=yourotheruser,o=dev<br />
- AuthLDAPBindPassword yourotherpassword<br />
- AuthLDAPURL ldap://other.ldap.host/o=dev?cn<br />
- </span>
- </AuthzProviderAlias><br /><br />
-
- Alias /secure /webpages/secure<br />
- <Directory /webpages/secure><br />
- <span class="indent">
- Require all granted<br /><br />
-
- AuthBasicProvider file<br /><br />
-
- AuthType Basic<br />
- AuthName LDAP_Protected_Place<br /><br />
-
- #implied OR operation<br />
- Require ldap-group-alias1<br />
- Require ldap-group-alias2<br />
- </span> </Directory><br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+<AuthzProviderAlias ldap-group ldap-group-alias1 cn=my-group,o=ctx>
+ AuthLDAPBindDN cn=youruser,o=ctx
+ AuthLDAPBindPassword yourpassword
+ AuthLDAPURL ldap://ldap.host/o=ctx
+</AuthzProviderAlias>
+
+<AuthzProviderAlias ldap-group ldap-group-alias2 cn=my-other-group,o=dev>
+ AuthLDAPBindDN cn=yourotheruser,o=dev
+ AuthLDAPBindPassword yourotherpassword
+ AuthLDAPURL ldap://other.ldap.host/o=dev?cn
+</AuthzProviderAlias>
+
+Alias /secure /webpages/secure
+<Directory /webpages/secure>
+ Require all granted
+
+ AuthBasicProvider file
+
+ AuthType Basic
+ AuthName LDAP_Protected_Place
+
+ #implied OR operation
+ Require ldap-group-alias1
+ Require ldap-group-alias2
+</Directory>
+ </pre>
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -135,39 +131,28 @@
not belong to either the <code>temps</code> group or the
LDAP group <code>Temporary Employees</code>.</p>
- <div class="example"><p><code>
- <Directory /www/mydocs>
- <span class="indent">
+ <pre class="prettyprint lang-config">
+<Directory /www/mydocs>
+ <RequireAll>
+ <RequireAny>
+ Require user superadmin
<RequireAll>
- <span class="indent">
+ Require group admins
+ Require ldap-group cn=Administrators,o=Airius
<RequireAny>
- <span class="indent">
- Require user superadmin<br />
- <RequireAll>
- <span class="indent">
- Require group admins<br />
- Require ldap-group cn=Administrators,o=Airius<br />
- <RequireAny>
- <span class="indent">
- Require group sales<br />
- Require ldap-attribute dept="sales"
- </span>
- </RequireAny>
- </span>
- </RequireAll>
- </span>
- </RequireAny><br />
- <RequireNone>
- <span class="indent">
- Require group temps<br />
- Require ldap-group cn=Temporary Employees,o=Airius
- </span>
- </RequireNone>
- </span>
+ Require group sales
+ Require ldap-attribute dept="sales"
+ </RequireAny>
</RequireAll>
- </span>
- </Directory>
- </code></p></div>
+ </RequireAny>
+ <RequireNone>
+ Require group temps
+ Require ldap-group cn=Temporary Employees,o=Airius
+ </RequireNone>
+ </RequireAll>
+</Directory>
+ </pre>
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
@@ -190,14 +175,13 @@
<code>User-Agent</code> (browser type), <code>Referer</code>, or
other HTTP request header fields.</p>
- <div class="example"><h3>Example:</h3><p><code>
- SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in<br />
- <Directory /docroot><br />
- <span class="indent">
- Require env let_me_in<br />
- </span>
- </Directory>
- </code></p></div>
+ <pre class="prettyprint lang-config">
+SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
+<Directory /docroot>
+ Require env let_me_in
+</Directory>
+ </pre>
+
<p>In this case, browsers with a user-agent string beginning
with <code>KnockKnock/2.0</code> will be allowed access, and all
@@ -213,13 +197,15 @@
'granted' or 'denied'. The following examples will grant or deny
access to all requests.</p>
- <div class="example"><p><code>
- Require all granted<br />
- </code></p></div>
-
- <div class="example"><p><code>
- Require all denied<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+ Require all granted
+ </pre>
+
+
+ <pre class="prettyprint lang-config">
+ Require all denied
+ </pre>
+
@@ -233,20 +219,22 @@
<p>The following example will only allow GET, HEAD, POST, and OPTIONS
requests:</p>
- <div class="example"><p><code>
- Require method GET POST OPTIONS<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+ Require method GET POST OPTIONS
+ </pre>
+
<p>The following example will allow GET, HEAD, POST, and OPTIONS
requests without authentication, and require a valid user for all other
methods:</p>
- <div class="example"><p><code>
- <RequireAny><br />
- Require method GET POST OPTIONS<br />
- Require valid-user<br />
- </RequireAny><br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+<RequireAny>
+ Require method GET POST OPTIONS
+ Require valid-user
+</RequireAny>
+ </pre>
+
@@ -255,9 +243,10 @@
<p>The <code>expr</code> provider allows to base authorization
decisions on arbitrary expressions.</p>
- <div class="example"><p><code>
- Require expr %{TIME_HOUR} >= 9 && %{TIME_HOUR} <= 17 <br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+ Require expr %{TIME_HOUR} >= 9 && %{TIME_HOUR} <= 17
+ </pre>
+
<p>The syntax is described in the <a href="../expr.html">ap_expr</a>
documentation.</p>
@@ -314,30 +303,25 @@ sections.</td></tr>
preceding sections. Thus only users belong to the group
<code>gamma</code> may access <code>/www/docs/ab/gamma</code>.</div>
- <div class="example"><p><code>
- <Directory /www/docs>
- <span class="indent">
- AuthType Basic<br />
- AuthName Documents<br />
- AuthBasicProvider file<br />
- AuthUserFile /usr/local/apache/passwd/passwords<br />
- Require group alpha
- </span>
- </Directory><br />
- <br />
- <Directory /www/docs/ab>
- <span class="indent">
- AuthMerging Or<br />
- Require group beta
- </span>
- </Directory><br />
- <br />
- <Directory /www/docs/ab/gamma>
- <span class="indent">
- Require group gamma
- </span>
- </Directory>
- </code></p></div>
+ <pre class="prettyprint lang-config">
+<Directory /www/docs>
+ AuthType Basic
+ AuthName Documents
+ AuthBasicProvider file
+ AuthUserFile /usr/local/apache/passwd/passwords
+ Require group alpha
+</Directory>
+
+<Directory /www/docs/ab>
+ AuthMerging Or
+ Require group beta
+</Directory>
+
+<Directory /www/docs/ab/gamma>
+ Require group gamma
+</Directory>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -460,14 +444,15 @@ an authorization provider.</td></tr>
and <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> (to
define users and groups) in order to work correctly. Example:</p>
- <div class="example"><p><code>
- AuthType Basic<br />
- AuthName "Restricted Resource"<br />
- AuthBasicProvider file<br />
- AuthUserFile /web/users<br />
- AuthGroupFile /web/groups<br />
- Require group admin
- </code></p></div>
+ <pre class="prettyprint lang-config">
+AuthType Basic
+AuthName "Restricted Resource"
+AuthBasicProvider file
+AuthUserFile /web/users
+AuthGroupFile /web/groups
+Require group admin
+ </pre>
+
<p>Access controls which are applied in this way are effective for
<strong>all</strong> methods. <strong>This is what is normally
@@ -489,18 +474,15 @@ an authorization provider.</td></tr>
and <code>beta</code> groups are authorized, except for those who
are also in the <code>reject</code> group.</p>
- <div class="example"><p><code>
- <Directory /www/docs>
- <span class="indent">
- <RequireAll>
- <span class="indent">
- Require group alpha beta<br />
- Require not group reject
- </span>
- </RequireAll>
- </span>
- </Directory>
- </code></p></div>
+ <pre class="prettyprint lang-config">
+<Directory /www/docs>
+ <RequireAll>
+ Require group alpha beta
+ Require not group reject
+ </RequireAll>
+</Directory>
+ </pre>
+
<p>When multiple <code class="directive">Require</code> directives are
used in a single
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbd.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbd.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbd.html.en Fri May 4 15:45:05 2012
@@ -57,7 +57,7 @@
<ul id="topics">
<li><img alt="" src="../images/down.gif" /> <a href="#login">Database Login</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#client">Client Login</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#example">Configuration Example</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#example">Configuration example</a></li>
</ul><h3>See also</h3>
<ul class="seealso">
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
@@ -96,9 +96,9 @@ the database. Other session management
to implement functions that start and end client-side sessions.</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
-<h2><a name="example" id="example">Configuration Example</a></h2>
+<h2><a name="example" id="example">Configuration example</a></h2>
-<div class="example"><pre>
+<pre class="prettyprint lang-config">
# mod_dbd configuration
DBDriver pgsql
DBDParams "dbname=apacheauth user=apache pass=xxxxxx"
@@ -132,13 +132,11 @@ DBDExptime 300
<Files login.html>
# don't require user to already be logged in!
- AuthDBDUserPWQuery \
- "SELECT password FROM authn WHERE user = %s"
+ AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
# dbd-login action executes a statement to log user in
Require dbd-login
- AuthzDBDQuery \
- "UPDATE authn SET login = 'true' WHERE user = %s"
+ AuthzDBDQuery "UPDATE authn SET login = 'true' WHERE user = %s"
# return user to referring page (if any) after
# successful login
@@ -148,11 +146,11 @@ DBDExptime 300
<Files logout.html>
# dbd-logout action executes a statement to log user out
Require dbd-logout
- AuthzDBDQuery \
- "UPDATE authn SET login = 'false' WHERE user = %s"
+ AuthzDBDQuery "UPDATE authn SET login = 'false' WHERE user = %s"
</Files>
</Directory>
-</pre></div>
+</pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthzDBDLoginToReferer" id="AuthzDBDLoginToReferer">AuthzDBDLoginToReferer</a> <a name="authzdbdlogintoreferer" id="authzdbdlogintoreferer">Directive</a></h2>
@@ -195,22 +193,22 @@ header is present</td></tr>
The first column value of each row returned by the query statement
should be a string containing a group name. Zero, one, or more rows
may be returned.
- <div class="example"><h3>Example</h3><pre>
+ <pre class="prettyprint lang-config">
Require dbd-group
-AuthzDBDQuery \
- "SELECT group FROM groups WHERE user = %s"
-</pre></div>
+AuthzDBDQuery "SELECT group FROM groups WHERE user = %s"
+</pre>
+
</li>
<li>When used with a <code>Require dbd-login</code> or
<code>Require dbd-logout</code> directive, it will never deny access,
but will instead execute a SQL statement designed to log the user
in or out. The user must already be authenticated with
<code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>.
- <div class="example"><h3>Example</h3><pre>
+ <pre class="prettyprint lang-config">
Require dbd-login
-AuthzDBDQuery \
- "UPDATE authn SET login = 'true' WHERE user = %s"
-</pre></div>
+AuthzDBDQuery "UPDATE authn SET login = 'true' WHERE user = %s"
+</pre>
+
</li>
</ul>
<p>In all cases, the user's ID will be passed as a single string
@@ -232,10 +230,10 @@ AuthzDBDQuery \
specific to the user. The user's ID will be passed as a single string
parameter when the SQL query is executed. It may be referenced within
the query statement using a <code>%s</code> format specifier.</p>
- <div class="example"><h3>Example</h3><pre>
-AuthzDBDRedirectQuery \
- "SELECT userpage FROM userpages WHERE user = %s"
-</pre></div>
+ <pre class="prettyprint lang-config">
+AuthzDBDRedirectQuery "SELECT userpage FROM userpages WHERE user = %s"
+</pre>
+
<p>The first column value of the first row returned by the query
statement should be a string containing a URL to which to redirect
the client. Subsequent rows will be ignored. If no rows are returned,
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbm.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbm.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbm.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbm.html.en Fri May 4 15:45:05 2012
@@ -87,10 +87,11 @@ of user groups for authorization</td></t
accomplished by first setting the group and password files to
point to the same DBM:</p>
- <div class="example"><p><code>
- AuthDBMGroupFile /www/userbase<br />
- AuthDBMUserFile /www/userbase
- </code></p></div>
+ <pre class="prettyprint lang-config">
+AuthDBMGroupFile /www/userbase
+AuthDBMUserFile /www/userbase
+ </pre>
+
<p>The key for the single DBM is the username. The value consists
of</p>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbm.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbm.xml.ko?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbm.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_dbm.xml.ko [euc-kr] Fri May 4 15:45:05 2012
@@ -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: 111480:574882 (outdated) -->
+<!-- English Revision: 111480:1334008 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.html.en Fri May 4 15:45:05 2012
@@ -88,35 +88,39 @@ address)</td></tr>
<p>A full IP address:</p>
- <div class="example"><p><code>
- Require ip 10.1.2.3<br />
- Require ip 192.168.1.104 192.168.1.205
- </code></p></div>
+ <pre class="prettyprint lang-config">
+Require ip 10.1.2.3
+Require ip 192.168.1.104 192.168.1.205
+ </pre>
+
<p>An IP address of a host allowed access</p>
<p>A partial IP address:</p>
- <div class="example"><p><code>
- Require ip 10.1<br />
- Require ip 10 172.20 192.168.2
- </code></p></div>
+ <pre class="prettyprint lang-config">
+Require ip 10.1
+Require ip 10 172.20 192.168.2
+ </pre>
+
<p>The first 1 to 3 bytes of an IP address, for subnet
restriction.</p>
<p>A network/netmask pair:</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
Require ip 10.1.0.0/255.255.0.0
- </code></p></div>
+ </pre>
+
<p>A network a.b.c.d, and a netmask w.x.y.z. For more
fine-grained subnet restriction.</p>
<p>A network/nnn CIDR specification:</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
Require ip 10.1.0.0/16
- </code></p></div>
+ </pre>
+
<p>Similar to the previous case, except the netmask consists of
nnn high-order 1 bits.</p>
@@ -126,10 +130,11 @@ address)</td></tr>
<p>IPv6 addresses and IPv6 subnets can be specified as shown
below:</p>
- <div class="example"><p><code>
- Require ip 2001:db8::a00:20ff:fea7:ccea<br />
- Require ip 2001:db8::a00:20ff:fea7:ccea/10
- </code></p></div>
+ <pre class="prettyprint lang-config">
+Require ip 2001:db8::a00:20ff:fea7:ccea
+Require ip 2001:db8::a00:20ff:fea7:ccea/10
+ </pre>
+
@@ -143,10 +148,11 @@ address)</td></tr>
<p>A (partial) domain-name</p>
- <div class="example"><p><code>
- Require host example.org<br />
- Require host .net example.edu
- </code></p></div>
+ <pre class="prettyprint lang-config">
+Require host example.org
+Require host .net example.edu
+ </pre>
+
<p>Hosts whose names match, or end in, this string are allowed
access. Only complete components are matched, so the above
@@ -176,9 +182,10 @@ address)</td></tr>
<p>This allows a convenient way to match connections that originate from
the local host:</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
Require local
- </code></p></div>
+ </pre>
+
</div>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.html.fr Fri May 4 15:45:05 2012
@@ -27,6 +27,8 @@
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authz_host.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../fr/mod/mod_authz_host.html" title="Français"> fr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Autorisations de groupe basées sur l'hôte (nom ou adresse
IP)</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Base</td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.xml.fr Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1174747 -->
+<!-- English Revision: 1174747:1334008 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_host.xml.meta Fri May 4 15:45:05 2012
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.html.en Fri May 4 15:45:05 2012
@@ -97,17 +97,16 @@
files in <code>/home/smith/public_html/private</code> unless they
were owned by <code>jones</code> instead of <code>smith</code>.</p>
- <div class="example"><p><code>
- <Directory /home/*/public_html/private><br />
- <span class="indent">
- AuthType Basic<br />
- AuthName MyPrivateFiles<br />
- AuthBasicProvider dbm<br />
- AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all<br />
- Require file-owner<br />
- </span>
- </Directory>
- </code></p></div>
+ <pre class="prettyprint lang-config">
+<Directory /home/*/public_html/private>
+ AuthType Basic
+ AuthName MyPrivateFiles
+ AuthBasicProvider dbm
+ AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all
+ Require file-owner
+</Directory>
+ </pre>
+
<h3><a name="examples.file-group" id="examples.file-group">Require file-group</a></h3>
@@ -122,22 +121,21 @@
authorized to access the <code>project-foo</code> directories of
each other.</p>
- <div class="example"><p><code>
- <Directory /home/*/public_html/project-foo><br />
- <span class="indent">
- AuthType Basic<br />
- AuthName "Project Foo Files"<br />
- AuthBasicProvider dbm<br />
- <br />
- # combined user/group database<br />
- AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all<br />
- AuthDBMGroupFile /usr/local/apache2/etc/.htdbm-all<br />
- <br />
- Satisfy All<br />
- Require file-group<br />
- </span>
- </Directory>
- </code></p></div>
+ <pre class="prettyprint lang-config">
+<Directory /home/*/public_html/project-foo>
+ AuthType Basic
+ AuthName "Project Foo Files"
+ AuthBasicProvider dbm
+
+ # combined user/group database
+ AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all
+ AuthDBMGroupFile /usr/local/apache2/etc/.htdbm-all
+
+ Satisfy All
+ Require file-group
+</Directory>
+ </pre>
+
</div>
</div>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.html.fr Fri May 4 15:45:05 2012
@@ -29,6 +29,8 @@
<a href="../ja/mod/mod_authz_owner.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Autorisation basée sur l'appartenance des
fichiers</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.fr Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1303783 -->
+<!-- English Revision: 1303783:1334008 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.ja?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.ja [utf-8] Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 574882:1303783 (outdated) -->
+<!-- English Revision: 574882:1334008 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.ko?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.ko [euc-kr] Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1303783 (outdated) -->
+<!-- English Revision: 151408:1334008 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authz_owner.xml.meta Fri May 4 15:45:05 2012
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.en Fri May 4 15:45:05 2012
@@ -71,7 +71,8 @@
same header repeatedly toggles between ascending and descending
order. These column header links are suppressed with the
<code class="directive"><a href="#indexoptions">IndexOptions</a></code> directive's
- <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code> option.</p>
+ <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code>
+ option.</p>
<p>Note that when the display is sorted by "Size", it's the
<em>actual</em> size of the files that's used, not the
@@ -224,10 +225,11 @@ icon selected by filename</td></tr>
is displayed if the client is image-incapable, has image loading
disabled, or fails to retrieve the icon.</p>
- <div class="example"><h3>Examples</h3><p><code>
- AddAlt "PDF file" *.pdf<br />
- AddAlt Compressed *.gz *.zip *.Z
- </code></p></div>
+ <pre class="prettyprint lang-config">
+AddAlt "PDF file" *.pdf
+AddAlt Compressed *.gz *.zip *.Z
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -250,9 +252,10 @@ selected by MIME-encoding</td></tr>
This alternate text is displayed if the client is image-incapable,
has image loading disabled, or fails to retrieve the icon.</p>
- <div class="example"><h3>Example</h3><p><code>
+ <pre class="prettyprint lang-config">
AddAltByEncoding gzip x-gzip
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -275,9 +278,10 @@ icon selected by MIME content-type</td><
This alternate text is displayed if the client is image-incapable,
has image loading disabled, or fails to retrieve the icon.</p>
- <div class="example"><h3>Example</h3><p><code>
+ <pre class="prettyprint lang-config">
AddAltByType 'plain text' text/plain
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -296,10 +300,11 @@ icon selected by MIME content-type</td><
expression or full filename for files to describe.
<var>String</var> is enclosed in double quotes (<code>"</code>).</p>
- <div class="example"><h3>Example</h3><p><code>
- AddDescription "The planet Mars" mars.gif <br />
- AddDescription "My friend Marshall" friends/mars.gif
- </code></p></div>
+ <pre class="prettyprint lang-config">
+AddDescription "The planet Mars" mars.gif
+AddDescription "My friend Marshall" friends/mars.gif
+ </pre>
+
<p>The typical, default description field is 23 bytes wide. 6
more bytes are added by the <code><a href="#indexoptions.suppressicon">IndexOptions SuppressIcon</a></code> option, 7 bytes are
@@ -363,11 +368,13 @@ icon selected by MIME content-type</td><
is unnecessary if you're using <code>IndexOptions
HTMLTable</code>.</p>
- <div class="example"><h3>Examples</h3><p><code>
- AddIcon (IMG,/icons/image.png) .gif .jpg .png<br />
- AddIcon /icons/dir.png ^^DIRECTORY^^<br />
- AddIcon /icons/backup.png *~
- </code></p></div>
+ <pre class="prettyprint lang-config">
+#Examples
+AddIcon (IMG,/icons/image.png) .gif .jpg .png
+AddIcon /icons/dir.png ^^DIRECTORY^^
+AddIcon /icons/backup.png *~
+ </pre>
+
<p><code class="directive"><a href="#addiconbytype">AddIconByType</a></code>
should be used in preference to <code class="directive">AddIcon</code>,
@@ -396,9 +403,10 @@ content-encoding</td></tr>
<p><var>MIME-encoding</var> is a valid content-encoding, such as
<code>x-compress</code>.</p>
- <div class="example"><h3>Example</h3><p><code>
+ <pre class="prettyprint lang-config">
AddIconByEncoding /icons/compress.png x-compress
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -424,9 +432,10 @@ content-type</td></tr>
<p><var>MIME-type</var> is a wildcard expression matching
required the mime types.</p>
- <div class="example"><h3>Example</h3><p><code>
+ <pre class="prettyprint lang-config">
AddIconByType (IMG,/icons/image.png) image/*
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -445,9 +454,10 @@ configured</td></tr>
<var>Url-path</var> is a (%-escaped) relative URL to the icon,
or a fully qualified remote URL.</p>
- <div class="example"><h3>Example</h3><p><code>
+ <pre class="prettyprint lang-config">
DefaultIcon /icon/unknown.png
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -465,9 +475,10 @@ of the index listing</td></tr>
of the file that will be inserted at the top of the index
listing. <var>Filename</var> is the name of the file to include.</p>
- <div class="example"><h3>Example</h3><p><code>
+ <pre class="prettyprint lang-config">
HeaderName HEADER.html
- </code></p></div>
+ </pre>
+
<div class="note">
<p>Both HeaderName and <code class="directive"><a href="#readmename">ReadmeName</a></code> now treat
@@ -475,9 +486,10 @@ of the index listing</td></tr>
access the directory being indexed. If <var>Filename</var> begins
with a slash, it will be taken to be relative to the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>.</p>
- <div class="example"><h3>Example</h3><p><code>
+ <pre class="prettyprint lang-config">
HeaderName /include/HEADER.html
- </code></p></div>
+ </pre>
+
<p><var>Filename</var> must resolve to a document with a major
content type of <code>text/*</code> (<em>e.g.</em>,
@@ -486,9 +498,10 @@ of the index listing</td></tr>
actual file type (as opposed to its output) is marked as
<code>text/html</code> such as with a directive like:</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
AddType text/html .cgi
- </code></p></div>
+ </pre>
+
<p><a href="../content-negotiation.html">Content negotiation</a>
will be performed if <code class="directive"><a href="../mod/core.html#options">Options</a></code>
@@ -524,10 +537,10 @@ of the index listing</td></tr>
<p>The <code class="directive">IndexHeadInsert</code> directive specifies a
string to insert in the <var><head></var> section of the HTML
generated for the index page.</p>
- <div class="example"><h3>Example</h3><p><code>
-
+ <pre class="prettyprint lang-config">
IndexHeadInsert "<link rel=\"sitemap\" href=\"/sitemap.html\">"
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -550,9 +563,10 @@ a directory</td></tr>
files. By default, the list contains <code>.</code> (the current
directory).</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
- </code></p></div>
+ </pre>
+
<div class="note"><h3>Regular Expressions</h3>
<p>This directive does not currently work in configuration sections
@@ -577,15 +591,16 @@ a directory</td></tr>
any files ignored by <code class="directive">IndexIgnore</code> otherwise
inherited from other configuration sections. </p>
- <div class="example"><p><code>
- <Directory /var/www>
- IndexIgnore *.bak .??* *~ *# HEADER* README* RCS CVS *,v *,t
- </Directory>
- <Directory /var/www/backups>
- IndexIgnoreReset ON
- IndexIgnore .??* *# HEADER* README* RCS CVS *,v *,t
- </Directory>
- </code></p></div>
+ <pre class="prettyprint lang-config">
+<Directory /var/www>
+ IndexIgnore *.bak .??* *~ *# HEADER* README* RCS CVS *,v *,t
+</Directory>
+<Directory /var/www/backups>
+ IndexIgnoreReset ON
+ IndexIgnore .??* *# HEADER* README* RCS CVS *,v *,t
+</Directory>
+ </pre>
+
<div class="warning"><p> Review the default configuration for a list of
patterns that you might want to explicitly ignore after using this
@@ -633,9 +648,10 @@ indexing</td></tr>
(It depends on whether the underlying file system
uses Unicode filenames or not.)
- <div class="example"><h3>Example:</h3><p><code>
+ <pre class="prettyprint lang-config">
IndexOptions Charset=UTF-8
- </code></p></div>
+ </pre>
+
</dd>
<dt><a name="indexoptions.descriptionwidth" id="indexoptions.descriptionwidth">DescriptionWidth=[<var>n</var> | *]</a></dt>
@@ -838,9 +854,10 @@ indexing</td></tr>
specify the MIME content-type of the generated page. The default
is <var>text/html</var>.
- <div class="example"><h3>Example:</h3><p><code>
+ <pre class="prettyprint lang-config">
IndexOptions Type=text/plain
- </code></p></div>
+ </pre>
+
</dd>
<dt><a name="indexoptions.versionsort" id="indexoptions.versionsort">VersionSort</a>
@@ -889,20 +906,20 @@ indexing</td></tr>
<li>Multiple <code class="directive">IndexOptions</code> directives for a
single directory are now merged together. The result of:
- <div class="example"><p><code>
- <Directory /foo>
- <span class="indent">
- IndexOptions HTMLTable<br />
- IndexOptions SuppressColumnsorting
- </span>
- </Directory>
- </code></p></div>
+ <pre class="prettyprint lang-config">
+<Directory /foo>
+ IndexOptions HTMLTable
+ IndexOptions SuppressColumnsorting
+</Directory>
+ </pre>
+
<p>will be the equivalent of</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
IndexOptions HTMLTable SuppressColumnsorting
- </code></p></div>
+ </pre>
+
</li>
<li>The addition of the incremental syntax (<em>i.e.</em>, prefixing
@@ -916,10 +933,11 @@ indexing</td></tr>
clears all inherited options and any incremental settings encountered
so far. Consider the following example:</p>
- <div class="example"><p><code>
- IndexOptions +ScanHTMLTitles -IconsAreLinks FancyIndexing<br />
- IndexOptions +SuppressSize
- </code></p></div>
+ <pre class="prettyprint lang-config">
+IndexOptions +ScanHTMLTitles -IconsAreLinks FancyIndexing<br />
+IndexOptions +SuppressSize
+ </pre>
+
<p>The net effect is equivalent to <code>IndexOptions FancyIndexing
+SuppressSize</code>, because the unprefixed <code>FancyIndexing</code>
@@ -980,10 +998,10 @@ Name|Date|Size|Description</code></td></
<p>The <code class="directive">IndexStyleSheet</code> directive sets the name of
the file that will be used as the CSS for the index listing.
</p>
- <div class="example"><h3>Example</h3><p><code>
-
+ <pre class="prettyprint lang-config">
IndexStyleSheet "/css/style.css"
- </code></p></div>
+ </pre>
+
<p>Using this directive in conjunction with <code>IndexOptions
HTMLTable</code> adds a number of CSS classes to the resulting HTML.
@@ -1023,13 +1041,17 @@ of the index listing</td></tr>
relative to the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>.
</p>
- <div class="example"><h3>Example 1</h3><p><code>
- ReadmeName FOOTER.html
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Example 1
+ReadmeName FOOTER.html
+ </pre>
+
+
+ <pre class="prettyprint lang-config">
+# Example 2
+ReadmeName /include/FOOTER.html
+ </pre>
- <div class="example"><h3>Example 2</h3><p><code>
- ReadmeName /include/FOOTER.html
- </code></p></div>
<p>See also <code class="directive"><a href="#headername">HeaderName</a></code>, where this behavior is described in greater
detail.</p>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.fr Fri May 4 15:45:05 2012
@@ -30,6 +30,8 @@
<a href="../ko/mod/mod_autoindex.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/mod/mod_autoindex.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Génère automatiquement des index de répertoires d'une
manière similaire à la commande Unix <code>ls</code>, ou à la commande
shell Win32 <code>dir</code></td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.tr.utf8?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.html.tr.utf8 [utf-8] Fri May 4 15:45:05 2012
@@ -30,6 +30,7 @@
<a href="../ko/mod/mod_autoindex.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/mod/mod_autoindex.html" title="Türkçe"> tr </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>Unix <code>ls</code> veya Win32 <code>dir</code> kabuk komutunun
yaptığı gibi dizin içeriğini listeler.</td></tr>
<tr><th><a href="module-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.fr Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1303776 -->
+<!-- English Revision: 1303776:1334008 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.ja?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.ja [utf-8] Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 689261:1303776 (outdated) -->
+<!-- English Revision: 689261:1334008 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.ko?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.ko [euc-kr] Fri May 4 15:45:05 2012
@@ -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: 103423:1303776 (outdated) -->
+<!-- English Revision: 103423:1334008 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.meta Fri May 4 15:45:05 2012
@@ -8,9 +8,9 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.tr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_autoindex.xml.tr [utf-8] Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1303776 -->
+<!-- English Revision: 1303776:1334008 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.html.en Fri May 4 15:45:05 2012
@@ -58,9 +58,10 @@
<code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code> or
<code class="directive"><a href="../mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code> directives.</p>
- <div class="example"><h3>Using buffer with mod_include</h3><p><code>
- AddOutputFilterByType INCLUDES;BUFFER text/html<br />
- </code></p></div>
+ <div class="example"><h3>Using buffer with mod_include</h3><pre class="prettyprint lang-config">
+ AddOutputFilterByType INCLUDES;BUFFER text/html
+ </pre>
+</div>
<div class="warning">The buffer filters read the request/response into
RAM and then repack the request/response into the fewest memory
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.html.fr Fri May 4 15:45:05 2012
@@ -27,6 +27,8 @@
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_buffer.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../fr/mod/mod_buffer.html" title="Français"> fr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Support de la mise en tampon des requêtes</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>buffer_module</td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.xml.fr Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1174747 -->
+<!-- English Revision: 1174747:1334011 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_buffer.xml.meta Fri May 4 15:45:05 2012
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.html.en Fri May 4 15:45:05 2012
@@ -115,6 +115,12 @@
supported by this module. The <code class="program"><a href="../programs/htcacheclean.html">htcacheclean</a></code> tool is
provided to list cached URLs, remove cached URLs, or to maintain the size
of the disk cache within size and inode limits.</dd>
+ <dt><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></dt>
+ <dd>Implements a shared object cache based storage manager. Headers and
+ bodies are stored together beneath a single key based on the URL of the
+ response being cached. Multiple content negotiated responses can
+ be stored concurrently, however the caching of partial content is not
+ supported by this module.</dd>
</dl>
<p>Further details, discussion, and examples, are provided in the
@@ -159,33 +165,29 @@
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="related" id="related">Related Modules and Directives</a></h2>
- <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li></ul></td></tr></table>
+ <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocache">CacheSocache</a></code></li><li><code class="directiv
e"><a href="../mod/mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime</a></code></li></ul></td></tr></table>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="sampleconf" id="sampleconf">Sample Configuration</a></h2>
- <div class="example"><h3>Sample httpd.conf</h3><p><code>
- #<br />
- # Sample Cache Configuration<br />
- #<br />
- LoadModule cache_module modules/mod_cache.so<br />
- <br />
- <IfModule mod_cache.c><br />
- <span class="indent">
- LoadModule cache_disk_module modules/mod_cache_disk.so<br />
- <IfModule mod_cache_disk.c><br />
- <span class="indent">
- CacheRoot c:/cacheroot<br />
- CacheEnable disk /<br />
- CacheDirLevels 5<br />
- CacheDirLength 3<br />
- </span>
- </IfModule> <br />
- <br />
- # When acting as a proxy, don't cache the list of security updates<br />
- CacheDisable http://security.update.server/update-list/<br />
- </span>
- </IfModule>
- </code></p></div>
+ <div class="example"><h3>Sample httpd.conf</h3><pre class="prettyprint lang-config">
+#
+# Sample Cache Configuration
+#
+LoadModule cache_module modules/mod_cache.so
+<IfModule mod_cache.c>
+ LoadModule cache_disk_module modules/mod_cache_disk.so
+ <IfModule mod_cache_disk.c>
+ CacheRoot c:/cacheroot
+ CacheEnable disk /
+ CacheDirLevels 5
+ CacheDirLength 3
+ </IfModule>
+
+ # When acting as a proxy, don't cache the list of security updates
+ CacheDisable http://security.update.server/update-list/
+</IfModule>
+ </pre>
+</div>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="thunderingherd" id="thunderingherd">Avoiding the Thundering Herd</a></h2>
@@ -237,18 +239,17 @@
<h3>Example configuration</h3>
- <div class="example"><h3>Enabling the cache lock</h3><p><code>
- #<br />
- # Enable the cache lock<br />
- #<br />
- <IfModule mod_cache.c><br />
- <span class="indent">
- CacheLock on<br />
- CacheLockPath /tmp/mod_cache-lock<br />
- CacheLockMaxAge 5<br />
- </span>
- </IfModule>
- </code></p></div>
+ <div class="example"><h3>Enabling the cache lock</h3><pre class="prettyprint lang-config">
+#
+# Enable the cache lock
+#
+<IfModule mod_cache.c>
+ CacheLock on
+ CacheLockPath /tmp/mod_cache-lock
+ CacheLockMaxAge 5
+</IfModule>
+ </pre>
+</div>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -281,33 +282,36 @@
place the <strong>CACHE</strong> filter before the <strong>DEFLATE</strong>
filter as in the example below:</p>
- <div class="example"><p><code>
- # Cache content before optional compression<br />
- CacheQuickHandler off<br />
- AddOutputFilterByType CACHE;DEFLATE text/plain<br /><br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Cache content before optional compression
+CacheQuickHandler off
+AddOutputFilterByType CACHE;DEFLATE text/plain
+ </pre>
+
<p>Another option is to have content cached before personalisation is applied
by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> (or another content processing filter). In this
example templates containing tags understood by
<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> are cached before being parsed:</p>
- <div class="example"><p><code>
- # Cache content before mod_include and mod_deflate<br />
- CacheQuickHandler off<br />
- AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html<br /><br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Cache content before mod_include and mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html
+ </pre>
+
<p>You may place the <strong>CACHE</strong> filter anywhere you wish within the
filter chain. In this example, content is cached after being parsed by
<code class="module"><a href="../mod/mod_include.html">mod_include</a></code>, but before being processed by
<code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>:</p>
- <div class="example"><p><code>
- # Cache content between mod_include and mod_deflate<br />
- CacheQuickHandler off<br />
- AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html<br /><br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Cache content between mod_include and mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html
+ </pre>
+
<div class="warning"><h3>Warning:</h3>If the location of the
<strong>CACHE</strong> filter in the filter chain is changed for any reason,
@@ -325,28 +329,33 @@
<code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> directive as
follows:</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
LogFormat "%{cache-status}e ..."
- </code></p></div>
+ </pre>
+
<p>Based on the caching decision made, the reason is also written to the
- subprocess environment under one the following three keys, as appropriate:</p>
+ subprocess environment under one the following four keys, as appropriate:</p>
<dl>
<dt>cache-hit</dt><dd>The response was served from cache.</dd>
<dt>cache-revalidate</dt><dd>The response was stale and was successfully
revalidated, then served from cache.</dd>
<dt>cache-miss</dt><dd>The response was served from the upstream server.</dd>
+ <dt>cache-invalidate</dt><dd>The cached entity was invalidated by a request
+ method other than GET or HEAD.</dd>
</dl>
<p>This makes it possible to support conditional logging of cached requests
as per the following example:</p>
- <div class="example"><p><code>
- CustomLog cached-requests.log common env=cache-hit<br />
- CustomLog uncached-requests.log common env=cache-miss<br />
- CustomLog revalidated-requests.log common env=cache-revalidate<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+CustomLog cached-requests.log common env=cache-hit
+CustomLog uncached-requests.log common env=cache-miss
+CustomLog revalidated-requests.log common env=cache-revalidate
+CustomLog invalidated-requests.log common env=cache-invalidate
+ </pre>
+
<p>For module authors, a hook called <var>cache_status</var> is available,
allowing modules to respond to the caching outcomes above in customised
@@ -367,9 +376,10 @@
with the document. The value specified with the <code class="directive">CacheMaxExpire</code>
directive does <em>not</em> override this setting.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheDefaultExpire 86400
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -398,10 +408,11 @@
is used, this directive must appear within a server or virtual host context, otherwise
the setting will be ignored.</p>
- <div class="example"><p><code>
- # Enable the X-Cache-Detail header<br />
- CacheDetailHeader on<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Enable the X-Cache-Detail header
+CacheDetailHeader on
+ </pre>
+
<div class="example"><p><code>
X-Cache-Detail: "conditional cache hit: entity refreshed" from localhost<br />
@@ -422,21 +433,21 @@
<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to <em>not</em> cache urls at or below
<var>url-string</var>.</p>
- <div class="example"><h3>Example</h3><p><code>
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
CacheDisable /local_files
- </code></p></div>
+ </pre>
+</div>
<p>If used in a <code class="directive"><Location></code> directive,
the path needs to be specified below the Location, or if the word "on"
is used, caching for the whole location will be disabled.</p>
- <div class="example"><h3>Example</h3><p><code>
- <Location /foo><br />
- <span class="indent">
- CacheDisable on<br />
- </span>
- </Location><br />
- </code></p></div>
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
+<Location /foo>
+ CacheDisable on
+</Location>
+ </pre>
+</div>
<p>The <code>no-cache</code> environment variable can be set to
disable caching on a finer grained set of resources in versions
@@ -468,7 +479,10 @@ manager</td></tr>
the content is cacheable.
<var>cache_type</var> <code>disk</code> instructs
<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to use the disk based storage manager
- implemented by <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>.</p>
+ implemented by <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>. <var>cache_type</var>
+ <code>socache</code> instructs <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to use the
+ shared object cache based storage manager implemented by
+ <code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code>.</p>
<p>In the event that the URL space overlaps between different
<code class="directive">CacheEnable</code> directives (as in the example below),
each possible storage manager will be run until the first one that
@@ -483,37 +497,39 @@ manager</td></tr>
also be used to specify remote sites and proxy protocols which
caching should be enabled for.</p>
- <div class="example"><p><code>
- # Cache content<br />
- <Location /foo><br />
- <span class="indent">
- CacheEnable disk<br />
- </span>
- </Location><br /><br />
- # Cache regex<br />
- <LocationMatch foo$><br />
- <span class="indent">
- CacheEnable disk<br />
- </span>
- </LocationMatch><br /><br />
- # Cache proxied url's<br />
- CacheEnable disk /<br /><br />
- # Cache FTP-proxied url's<br />
- CacheEnable disk ftp://<br /><br />
- # Cache content from www.example.org<br />
- CacheEnable disk http://www.example.org/<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Cache content
+<Location /foo>
+ CacheEnable disk
+</Location>
+
+# Cache regex
+<LocationMatch foo$>
+ CacheEnable disk
+</LocationMatch>
+
+# Cache proxied url's
+CacheEnable disk /
+
+# Cache FTP-proxied url's
+CacheEnable disk ftp://
+
+# Cache content from www.example.org
+CacheEnable disk http://www.example.org/
+ </pre>
+
<p>A hostname starting with a <strong>"*"</strong> matches all hostnames with
that suffix. A hostname starting with <strong>"."</strong> matches all
hostnames containing the domain components that follow.</p>
- <div class="example"><p><code>
- # Match www.example.org, and fooexample.org<br />
- CacheEnable disk http://*example.org/<br />
- # Match www.example.org, but not fooexample.org<br />
- CacheEnable disk http://.example.org/<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Match www.example.org, and fooexample.org
+CacheEnable disk http://*example.org/
+# Match www.example.org, but not fooexample.org
+CacheEnable disk http://.example.org/
+ </pre>
+
<p> The <code>no-cache</code> environment variable can be set to
disable caching on a finer grained set of resources in versions
@@ -553,14 +569,16 @@ manager</td></tr>
server and was not served from cache.</dd>
</dl>
- <div class="example"><p><code>
- # Enable the X-Cache header<br />
- CacheHeader on<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Enable the X-Cache header
+CacheHeader on
+ </pre>
+
+
+ <pre class="prettyprint lang-config">
+ X-Cache: HIT from localhost
+ </pre>
- <div class="example"><p><code>
- X-Cache: HIT from localhost<br />
- </code></p></div>
</div>
@@ -582,9 +600,10 @@ manager</td></tr>
if the request contains no-cache header values. Resources requiring
authorization will <em>never</em> be cached.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheIgnoreCacheControl On
- </code></p></div>
+ </pre>
+
<div class="warning"><h3>Warning:</h3>
This directive will allow serving from the cache even if the client has
@@ -635,13 +654,15 @@ manager</td></tr>
behaviour), <code class="directive">CacheIgnoreHeaders</code> can be set to
<code>None</code>.</p>
- <div class="example"><h3>Example 1</h3><p><code>
+ <div class="example"><h3>Example 1</h3><pre class="prettyprint lang-config">
CacheIgnoreHeaders Set-Cookie
- </code></p></div>
+ </pre>
+</div>
- <div class="example"><h3>Example 2</h3><p><code>
+ <div class="example"><h3>Example 2</h3><pre class="prettyprint lang-config">
CacheIgnoreHeaders None
- </code></p></div>
+ </pre>
+</div>
<div class="warning"><h3>Warning:</h3>
If headers like <code>Expires</code> which are needed for proper cache
@@ -673,9 +694,10 @@ header.</td></tr>
<code class="directive">CacheDefaultExpire</code> directive will be used to
generate an expiration date.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheIgnoreNoLastMod On
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -697,9 +719,10 @@ header.</td></tr>
view the request is treated as if having no query string when this
directive is enabled.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheIgnoreQueryString On
- </code></p></div>
+ </pre>
+
</div>
@@ -730,13 +753,15 @@ header.</td></tr>
<p><code>CacheIgnoreURLSessionIdentifiers None</code> clears the list of ignored
identifiers. Otherwise, each identifier is added to the list.</p>
- <div class="example"><h3>Example 1</h3><p><code>
+ <div class="example"><h3>Example 1</h3><pre class="prettyprint lang-config">
CacheIgnoreURLSessionIdentifiers jsessionid
- </code></p></div>
+ </pre>
+</div>
- <div class="example"><h3>Example 2</h3><p><code>
+ <div class="example"><h3>Example 2</h3><pre class="prettyprint lang-config">
CacheIgnoreURLSessionIdentifiers None
- </code></p></div>
+ </pre>
+</div>
</div>
@@ -759,10 +784,11 @@ header.</td></tr>
should be cached beneath the same cache key, a new base URL can be specified
with this directive.</p>
- <div class="example"><p><code>
- # Override the base URL of the cache key.<br />
- CacheKeyBaseURL http://www.example.com/<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Override the base URL of the cache key.
+CacheKeyBaseURL http://www.example.com/
+ </pre>
+
<div class="warning">Take care when setting this directive. If two separate virtual
hosts are accidentally given the same base URL, entries from one virtual host
@@ -800,9 +826,10 @@ LastModified date.</td></tr>
<code class="directive">CacheMaxExpire</code>, then the latter takes
precedence.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheLastModifiedFactor 0.5
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -822,10 +849,11 @@ LastModified date.</td></tr>
<p>In a minimal configuration the following directive is all that is needed to
enable the thundering herd lock in the default system temp directory.</p>
- <div class="example"><p><code>
- # Enable cache lock<br />
- CacheLock on<br /><br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Enable cache lock
+CacheLock on
+ </pre>
+
</div>
@@ -882,9 +910,10 @@ LastModified date.</td></tr>
server. Thus, documents will be out of date at most this number of seconds. This maximum
value is enforced even if an expiry date was supplied with the document.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheMaxExpire 604800
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -902,9 +931,10 @@ LastModified date.</td></tr>
server. This is only used if no valid expire time was supplied with the document.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheMinExpire 3600
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -932,21 +962,23 @@ LastModified date.</td></tr>
slower than the default, it allows the cache to be used in cases where full
processing is required, such as when content is subject to authorisation.</p>
- <div class="example"><p><code>
- # Run cache as a normal handler<br />
- CacheQuickHandler off<br /><br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Run cache as a normal handler
+CacheQuickHandler off
+ </pre>
+
<p>It is also possible, when the quick handler is disabled, for the
administrator to choose the precise location within the filter chain where
caching is to be performed, by adding the <strong>CACHE</strong> filter to
the chain.</p>
- <div class="example"><p><code>
- # Cache content before mod_include and mod_deflate<br />
- CacheQuickHandler off<br />
- AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html<br /><br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Cache content before mod_include and mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html
+ </pre>
+
<p>If the CACHE filter is specified more than once, the last instance will
apply.</p>
@@ -971,10 +1003,11 @@ LastModified date.</td></tr>
and the raw 5xx responses returned to the client on request, the 5xx response so
returned to the client will not invalidate the content in the cache.</p>
- <div class="example"><p><code>
- # Serve stale data on error.<br />
- CacheStaleOnError on<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+# Serve stale data on error.
+CacheStaleOnError on
+ </pre>
+
</div>
@@ -997,9 +1030,10 @@ LastModified date.</td></tr>
the origin server, and the response may be fulfilled from cache
if the backend resource has not changed.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheStoreExpired On
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1020,9 +1054,10 @@ LastModified date.</td></tr>
no-store header values. Resources requiring authorization will
<em>never</em> be cached.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheStoreNoStore On
- </code></p></div>
+ </pre>
+
<div class="warning"><h3>Warning:</h3>
As described in RFC 2616, the no-store directive is intended to
@@ -1055,9 +1090,10 @@ LastModified date.</td></tr>
private header values. Resources requiring authorization will
<em>never</em> be cached.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheStorePrivate On
- </code></p></div>
+ </pre>
+
<div class="warning"><h3>Warning:</h3>
This directive will allow caching even if the upstream server has
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.html.fr Fri May 4 15:45:05 2012
@@ -29,6 +29,8 @@
<a href="../ja/mod/mod_cache.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/mod/mod_cache.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Filtre de mise en cache HTTP conforme à la RFC 2616</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>cache_module</td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.fr Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1300893 -->
+<!-- English Revision: 1300893:1334011 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.ja?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.ja [utf-8] Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 504183:1300893 (outdated) -->
+<!-- English Revision: 504183:1334011 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.ko?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.ko [euc-kr] Fri May 4 15:45:05 2012
@@ -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: 105569:1300893 (outdated) -->
+<!-- English Revision: 105569:1334011 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache.xml.meta Fri May 4 15:45:05 2012
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.html.en Fri May 4 15:45:05 2012
@@ -82,7 +82,12 @@
<li><img alt="" src="../images/down.gif" /> <a href="#cachereadtime">CacheReadTime</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cacheroot">CacheRoot</a></li>
</ul>
-</div>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
+<li><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></li>
+<li><a href="../caching.html">Caching Guide</a></li>
+</ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CacheDirLength" id="CacheDirLength">CacheDirLength</a> <a name="cachedirlength" id="cachedirlength">Directive</a></h2>
@@ -152,9 +157,10 @@ cache</td></tr>
maximum size, in bytes, for a document to be considered for storage in
the cache.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheMaxFileSize 64000
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -172,9 +178,10 @@ cache</td></tr>
minimum size, in bytes, for a document to be considered for storage
in the cache.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheMinFileSize 64
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -199,9 +206,10 @@ cache</td></tr>
<p>This directive only takes effect when the data is being saved to the
cache, as opposed to data being served from the cache.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheReadSize 102400
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -230,9 +238,10 @@ cache</td></tr>
ensure that the server does not buffer excessively should data arrive faster
than expected.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheReadTime 1000
- </code></p></div>
+ </pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -252,9 +261,10 @@ stored</td></tr>
a configuration file processing error. The <code class="directive"><a href="#cachedirlevels">CacheDirLevels</a></code> and <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> directives define
the structure of the directories under the specified root directory.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
CacheRoot c:/cacheroot
- </code></p></div>
+ </pre>
+
</div>
</div>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.fr Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1029833:1174747 (outdated) -->
+<!-- English Revision: 1029833:1334011 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.ja?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.ja [utf-8] Fri May 4 15:45:05 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 515267:1174747 (outdated) -->
+<!-- English Revision: 515267:1334011 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.ko?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cache_disk.xml.ko [euc-kr] Fri May 4 15:45:05 2012
@@ -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: 105989:1174747 (outdated) -->
+<!-- English Revision: 105989:1334011 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cern_meta.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cern_meta.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cern_meta.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cern_meta.html.en Fri May 4 15:45:05 2012
@@ -74,12 +74,14 @@ files</td></tr>
accessed. Set to "<code>.</code>" to look in the same directory
as the file:</p>
- <div class="example"><p><code>MetaDir .</code></p></div>
+ <pre class="prettyprint lang-config">MetaDir .</pre>
+
<p>Or, to set it to a subdirectory of the directory containing the
files:</p>
- <div class="example"><p><code>MetaDir .meta</code></p></div>
+ <pre class="prettyprint lang-config">MetaDir .meta</pre>
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -99,7 +101,7 @@ files</td></tr>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="MetaSuffix" id="MetaSuffix">MetaSuffix</a> <a name="metasuffix" id="metasuffix">Directive</a></h2>
<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File name suffix for the file containg CERN-style
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File name suffix for the file containing CERN-style
meta information</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MetaSuffix <var>suffix</var></code></td></tr>
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MetaSuffix .meta</code></td></tr>