Rebuild html, meta files

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

diff --git a/docs/manual/howto/access.html.en.utf8 b/docs/manual/howto/access.html.en.utf8
index 0b894b102bd838914f0cd903631d1487bd45ac44..a7566078b6be0a123a889113b53ca2740a2fb5a8 100644 (file)
--- a/docs/manual/howto/access.html.en.utf8
+++ b/docs/manual/howto/access.html.en.utf8
@@ -51,7 +51,7 @@
 <h2 id="host">Access control by host <a title="Permanent link" href="#host" class="permalink">&para;</a></h2>
     <p>
     If you wish to restrict access to portions of your site based on the
 <h2 id="host">Access control by host <a title="Permanent link" href="#host" class="permalink">&para;</a></h2>
     <p>
     If you wish to restrict access to portions of your site based on the

-    host address of your visitors, this is most easily done using
+    host address of your visitors, use

     <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.
     </p>
 
     <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.
     </p>
 


@@ -72,10 +72,10 @@
 
     <p>The usage of these directives is:</p>
 
 
     <p>The usage of these directives is:</p>
 

-    <pre class="prettyprint lang-config">Require host <var>address</var>
+<div class="example"><pre class="prettyprint lang-config">Require host <var>address</var>

 Require ip <var>ip.address</var>
 Require ip <var>ip.address</var>

-    </pre>
-
+</pre>
+</div>

 
     <p>In the first form, <var>address</var> is a fully qualified
     domain name (or a partial domain name); you may provide multiple
 
     <p>In the first form, <var>address</var> is a fully qualified
     domain name (or a partial domain name); you may provide multiple


@@ -85,12 +85,26 @@ Require ip <var>ip.address</var>
     partial IP address, a network/netmask pair, or a network/nnn CIDR
     specification. Either IPv4 or IPv6 addresses may be used.</p>
 
     partial IP address, a network/netmask pair, or a network/nnn CIDR
     specification. Either IPv4 or IPv6 addresses may be used.</p>
 

+<div class="example"><h3>Examples of IP address formats</h3><pre class="prettyprint lang-config"># Full IP address
+Require ip 10.2.3.4
+# Partial IP address (matches any host in the 172.20.0.0/16 range)
+Require ip 172.20
+# Network/netmask pair
+Require ip 192.168.1.0/255.255.255.0
+# Network/CIDR specification
+Require ip 192.168.1.0/24
+# IPv6 address
+Require ip 2001:db8::a00:20ff:fea7:ccea
+# IPv6 with CIDR
+Require ip 2001:db8:1::/48</pre>
+</div>
+

     <p>See <a href="../mod/mod_authz_host.html#requiredirectives">the
     mod_authz_host documentation</a> for further examples of this
     syntax.</p>
 
     <p>You can insert <code>not</code> to negate a particular requirement.
     <p>See <a href="../mod/mod_authz_host.html#requiredirectives">the
     mod_authz_host documentation</a> for further examples of this
     syntax.</p>
 
     <p>You can insert <code>not</code> to negate a particular requirement.

-    Note, that since a <code>not</code> is a negation of a value, it cannot
+    Since a <code>not</code> is a negation of a value, it cannot

     be used by itself to allow or deny a request, as <em>not true</em>
     does not constitute <em>false</em>. Thus, to deny a visit using a negation,
     the block must have one element that evaluates as true or false.
     be used by itself to allow or deny a request, as <em>not true</em>
     does not constitute <em>false</em>. Thus, to deny a visit using a negation,
     the block must have one element that evaluates as true or false.


@@ -98,28 +112,28 @@ Require ip <var>ip.address</var>
     board, and you want to keep them out, you could do the
     following:</p>
 
     board, and you want to keep them out, you could do the
     following:</p>
 

-    <pre class="prettyprint lang-config">&lt;RequireAll&gt;
-    Require all granted
-    Require not ip 10.252.46.165
+<div class="example"><pre class="prettyprint lang-config">&lt;RequireAll&gt;
+Require all granted
+Require not ip 10.252.46.165

 &lt;/RequireAll&gt;</pre>
 &lt;/RequireAll&gt;</pre>

-
+</div>

 
     <p>Visitors coming from that address (<code>10.252.46.165</code>)
     will not be able to see the content covered by this directive. If,
     instead, you have a machine name, rather than an IP address, you
     can use that.</p>
 
 
     <p>Visitors coming from that address (<code>10.252.46.165</code>)
     will not be able to see the content covered by this directive. If,
     instead, you have a machine name, rather than an IP address, you
     can use that.</p>
 

-    <pre class="prettyprint lang-config">Require not host <var>host.example.com</var>
-    </pre>
-
+<div class="example"><pre class="prettyprint lang-config">Require not host <var>host.example.com</var>
+</pre>
+</div>

 
     <p>And, if you'd like to block access from an entire domain,
 
     <p>And, if you'd like to block access from an entire domain,

-    you can specify just part of an address or domain name:</p>
+    you can specify part of an address or domain name:</p>

 
 

-    <pre class="prettyprint lang-config">Require not ip 192.168.205
-Require not host phishers.example.com moreidiots.example
+<div class="example"><pre class="prettyprint lang-config">Require not ip 192.168.205
+Require not host phishers.example.com badguys.example

 Require not host gov</pre>
 Require not host gov</pre>

-
+</div>

 
     <p>Use of the <code class="directive"><a href="../mod/mod_authz_core.html#requireall">RequireAll</a></code>, <code class="directive"><a href="../mod/mod_authz_core.html#requireany">RequireAny</a></code>, and <code class="directive"><a href="../mod/mod_authz_core.html#requirenone">RequireNone</a></code> directives may be
     used to enforce more complex sets of requirements.</p>
 
     <p>Use of the <code class="directive"><a href="../mod/mod_authz_core.html#requireall">RequireAll</a></code>, <code class="directive"><a href="../mod/mod_authz_core.html#requireany">RequireAny</a></code>, and <code class="directive"><a href="../mod/mod_authz_core.html#requirenone">RequireNone</a></code> directives may be
     used to enforce more complex sets of requirements.</p>


@@ -134,17 +148,17 @@ Require not host gov</pre>
     based on user-agent (the browser type) you might do the
     following:</p>
 
     based on user-agent (the browser type) you might do the
     following:</p>
 

-    <pre class="prettyprint lang-config">&lt;If "%{HTTP_USER_AGENT} == 'BadBot'"&gt;
-    Require all denied
+<div class="example"><pre class="prettyprint lang-config">&lt;If "%{HTTP_USER_AGENT} == 'BadBot'"&gt;
+Require all denied

 &lt;/If&gt;</pre>
 &lt;/If&gt;</pre>

-
+</div>

 
     <p>Using the <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
     <code>expr</code> syntax, this could also be written as:</p>
 
 
 
     <p>Using the <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
     <code>expr</code> syntax, this could also be written as:</p>
 
 

-    <pre class="prettyprint lang-config">Require expr %{HTTP_USER_AGENT} != 'BadBot'</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Require expr %{HTTP_USER_AGENT} != 'BadBot'</pre>
+</div>

 
     <div class="note"><h3>Warning:</h3>
     <p>Access control by <code>User-Agent</code> is an unreliable technique,
 
     <div class="note"><h3>Warning:</h3>
     <p>Access control by <code>User-Agent</code> is an unreliable technique,


@@ -167,11 +181,11 @@ Require not host gov</pre>
     <p>For example, if you wish to block access to a resource between 8pm
     and 7am, you can do this using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
     <p>For example, if you wish to block access to a resource between 8pm
     and 7am, you can do this using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 

-    <pre class="prettyprint lang-config">RewriteEngine On
+<div class="example"><pre class="prettyprint lang-config">RewriteEngine On

 RewriteCond "%{TIME_HOUR}" "&gt;=20" [OR]
 RewriteCond "%{TIME_HOUR}" "&lt;07"
 RewriteRule "^/fridge"     "-"       [F]</pre>
 RewriteCond "%{TIME_HOUR}" "&gt;=20" [OR]
 RewriteCond "%{TIME_HOUR}" "&lt;07"
 RewriteRule "^/fridge"     "-"       [F]</pre>

-
+</div>

 
     <p>This will return a 403 Forbidden response for any request after 8pm
     or before 7am. This technique can be used for any criteria that you wish
 
     <p>This will return a 403 Forbidden response for any request after 8pm
     or before 7am. This technique can be used for any criteria that you wish

diff --git a/docs/manual/howto/access.html.fr.utf8 b/docs/manual/howto/access.html.fr.utf8
index eb729ded621359c1b55f6700019116dafef85b4f..ff02ef8b3807627fc552ead8bdf020ddca628dd6 100644 (file)
--- a/docs/manual/howto/access.html.fr.utf8
+++ b/docs/manual/howto/access.html.fr.utf8
@@ -27,6 +27,8 @@
 <a href="../es/howto/access.html" hreflang="es" rel="alternate" title="Espa&ntilde;ol">&nbsp;es&nbsp;</a> |
 <a href="../fr/howto/access.html" title="Fran&ccedil;ais">&nbsp;fr&nbsp;</a></p>
 </div>
 <a href="../es/howto/access.html" hreflang="es" rel="alternate" title="Espa&ntilde;ol">&nbsp;es&nbsp;</a> |
 <a href="../fr/howto/access.html" title="Fran&ccedil;ais">&nbsp;fr&nbsp;</a></p>
 </div>

+<div class="outofdate">Cette traduction peut &ecirc;tre p&eacute;rim&eacute;e. V&eacute;rifiez la version
+            anglaise pour les changements r&eacute;cents.</div>

 
     <p>Le contr&ocirc;le d'acc&egrave;s fait r&eacute;f&eacute;rence &agrave; tout concept de contr&ocirc;le
     d'acc&egrave;s &agrave; une ressource quelconque. Il est distinct du processus d'<a href="auth.html">authentification et d'autorisation</a>.</p>
 
     <p>Le contr&ocirc;le d'acc&egrave;s fait r&eacute;f&eacute;rence &agrave; tout concept de contr&ocirc;le
     d'acc&egrave;s &agrave; une ressource quelconque. Il est distinct du processus d'<a href="auth.html">authentification et d'autorisation</a>.</p>

diff --git a/docs/manual/howto/access.xml.es b/docs/manual/howto/access.xml.es
index 91ffca752d319d03d91c39957b4fecc83ac049e4..43d41841179b7ca81df4b00de14fd55f5ee8160a 100644 (file)
--- a/docs/manual/howto/access.xml.es
+++ b/docs/manual/howto/access.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>

-<!-- English Revision: 1745189:1933720 (outdated) -->
+<!-- English Revision: 1745189:1935507 (outdated) -->

 <!-- Updated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 <!-- Reviewed by Sergio Ramos -->
 <!--
 <!-- Updated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 <!-- Reviewed by Sergio Ramos -->
 <!--

diff --git a/docs/manual/howto/access.xml.fr b/docs/manual/howto/access.xml.fr
index c5168e00839cd6e48ae56f9a5b79716208c1999d..9986bf0a772e0d2b3efe4023ff49e5fac5c6d84e 100644 (file)
--- a/docs/manual/howto/access.xml.fr
+++ b/docs/manual/howto/access.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>

-<!-- English Revision: 1933720 -->
+<!-- English Revision: 1933720:1935507 (outdated) -->

 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/howto/access.xml.meta b/docs/manual/howto/access.xml.meta
index 39cc277557413ead2d478dc9a10e9630ec66a4f7..ee45dee0b6551bdd83b8f18bc4aa69a8a4bd8640 100644 (file)
--- a/docs/manual/howto/access.xml.meta
+++ b/docs/manual/howto/access.xml.meta
@@ -9,6 +9,6 @@
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>

-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>

   </variants>
 </metafile>
   </variants>
 </metafile>

diff --git a/docs/manual/howto/auth.html.en.utf8 b/docs/manual/howto/auth.html.en.utf8
index 1c814055963a23ccd974d872558e496e829407cb..d6521d99dcea27b0a1c662d5104409c332f47022 100644 (file)
--- a/docs/manual/howto/auth.html.en.utf8
+++ b/docs/manual/howto/auth.html.en.utf8
@@ -145,8 +145,8 @@ module from each group.</p>
     an <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> directive like the
     following:</p>
 
     an <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> directive like the
     following:</p>
 

-    <pre class="prettyprint lang-config">AllowOverride AuthConfig</pre>
-
+<div class="example"><pre class="prettyprint lang-config">AllowOverride AuthConfig</pre>
+</div>

 
     <p>Or, if you are just going to put the directives directly in
     your main server configuration file, you will of course need to
 
     <p>Or, if you are just going to put the directives directly in
     your main server configuration file, you will of course need to


@@ -218,13 +218,13 @@ module from each group.</p>
     placed in <code>httpd.conf</code> inside a &lt;Directory
     "/usr/local/apache/htdocs/secret"&gt; section.</p>
 
     placed in <code>httpd.conf</code> inside a &lt;Directory
     "/usr/local/apache/htdocs/secret"&gt; section.</p>
 

-    <pre class="prettyprint lang-config">AuthType Basic
+<div class="example"><pre class="prettyprint lang-config">AuthType Basic

 AuthName "Restricted Files"
 # (Following line optional)
 AuthBasicProvider file
 AuthUserFile "/usr/local/apache/passwd/passwords"
 Require user rbowen</pre>
 AuthName "Restricted Files"
 # (Following line optional)
 AuthBasicProvider file
 AuthUserFile "/usr/local/apache/passwd/passwords"
 Require user rbowen</pre>

-
+</div>

 
     <p>Let's examine each of those directives individually. The <code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code> directive selects
     the method that is used to authenticate the user. The most
 
     <p>Let's examine each of those directives individually. The <code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code> directive selects
     the method that is used to authenticate the user. The most


@@ -313,14 +313,14 @@ person in <a title="Permanent link" href="#lettingmorethanonepersonin" class="pe
     <p>Now, you need to modify your <code>.htaccess</code> file to
     look like the following:</p>
 
     <p>Now, you need to modify your <code>.htaccess</code> file to
     look like the following:</p>
 

-    <pre class="prettyprint lang-config">AuthType Basic
+<div class="example"><pre class="prettyprint lang-config">AuthType Basic

 AuthName "By Invitation Only"
 # Optional line:
 AuthBasicProvider file
 AuthUserFile "/usr/local/apache/passwd/passwords"
 AuthGroupFile "/usr/local/apache/passwd/groups"
 Require group GroupName</pre>
 AuthName "By Invitation Only"
 # Optional line:
 AuthBasicProvider file
 AuthUserFile "/usr/local/apache/passwd/passwords"
 AuthGroupFile "/usr/local/apache/passwd/groups"
 Require group GroupName</pre>

-
+</div>

 
     <p>Now, anyone that is listed in the group <code>GroupName</code>,
     and has an entry in the <code>password</code> file, will be let in, if
 
     <p>Now, anyone that is listed in the group <code>GroupName</code>,
     and has an entry in the <code>password</code> file, will be let in, if


@@ -330,8 +330,8 @@ Require group GroupName</pre>
     specific. Rather than creating a group file, you can just use
     the following directive:</p>
 
     specific. Rather than creating a group file, you can just use
     the following directive:</p>
 

-    <pre class="prettyprint lang-config">Require valid-user</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Require valid-user</pre>
+</div>

 
     <p>Using that rather than the <code>Require user rbowen</code>
     line will allow anyone in that is listed in the password file,
 
     <p>Using that rather than the <code>Require user rbowen</code>
     line will allow anyone in that is listed in the password file,


@@ -377,14 +377,14 @@ Require group GroupName</pre>
 
     <p>To select a dbm file rather than a text file, for example:</p>
 
 
     <p>To select a dbm file rather than a text file, for example:</p>
 

-    <pre class="prettyprint lang-config">&lt;Directory "/www/docs/private"&gt;
-    AuthName "Private"
-    AuthType Basic
-    AuthBasicProvider dbm
-    AuthDBMUserFile "/www/passwords/passwd.dbm"
-    Require valid-user
+<div class="example"><pre class="prettyprint lang-config">&lt;Directory "/www/docs/private"&gt;
+AuthName "Private"
+AuthType Basic
+AuthBasicProvider dbm
+AuthDBMUserFile "/www/passwords/passwd.dbm"
+Require valid-user

 &lt;/Directory&gt;</pre>
 &lt;/Directory&gt;</pre>

-
+</div>

 
     <p>Other options are available. Consult the
     <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code> documentation for more details.</p>
 
     <p>Other options are available. Consult the
     <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code> documentation for more details.</p>


@@ -399,15 +399,15 @@ Require group GroupName</pre>
     scheme that meets your needs. In the following example, both the
     file and LDAP based authentication providers are being used.</p>
 
     scheme that meets your needs. In the following example, both the
     file and LDAP based authentication providers are being used.</p>
 

-    <pre class="prettyprint lang-config">&lt;Directory "/www/docs/private"&gt;
-    AuthName "Private"
-    AuthType Basic
-    AuthBasicProvider file ldap
-    AuthUserFile "/usr/local/apache/passwd/passwords"
-    AuthLDAPURL ldap://ldaphost/o=yourorg
-    Require valid-user
+<div class="example"><pre class="prettyprint lang-config">&lt;Directory "/www/docs/private"&gt;
+AuthName "Private"
+AuthType Basic
+AuthBasicProvider file ldap
+AuthUserFile "/usr/local/apache/passwd/passwords"
+AuthLDAPURL ldap://ldaphost/o=yourorg
+Require valid-user

 &lt;/Directory&gt;</pre>
 &lt;/Directory&gt;</pre>

-
+</div>

 
     <p>In this example the file provider will attempt to authenticate
     the user first. If it is unable to authenticate the user, the LDAP
 
     <p>In this example the file provider will attempt to authenticate
     the user first. If it is unable to authenticate the user, the LDAP


@@ -422,17 +422,17 @@ Require group GroupName</pre>
     authorization methods can also be used. In this example both file group
     authorization as well as LDAP group authorization is being used.</p>
 
     authorization methods can also be used. In this example both file group
     authorization as well as LDAP group authorization is being used.</p>
 

-    <pre class="prettyprint lang-config">&lt;Directory "/www/docs/private"&gt;
-    AuthName "Private"
-    AuthType Basic
-    AuthBasicProvider file
-    AuthUserFile "/usr/local/apache/passwd/passwords"
-    AuthLDAPURL ldap://ldaphost/o=yourorg
-    AuthGroupFile "/usr/local/apache/passwd/groups"
-    Require group GroupName
-    Require ldap-group cn=mygroup,o=yourorg
+<div class="example"><pre class="prettyprint lang-config">&lt;Directory "/www/docs/private"&gt;
+AuthName "Private"
+AuthType Basic
+AuthBasicProvider file
+AuthUserFile "/usr/local/apache/passwd/passwords"
+AuthLDAPURL ldap://ldaphost/o=yourorg
+AuthGroupFile "/usr/local/apache/passwd/groups"
+Require group GroupName
+Require ldap-group cn=mygroup,o=yourorg

 &lt;/Directory&gt;</pre>
 &lt;/Directory&gt;</pre>

-
+</div>

 
     <p>To take authorization a little further, authorization container
     directives such as
 
     <p>To take authorization a little further, authorization container
     directives such as


@@ -495,73 +495,15 @@ Require group GroupName</pre>
 
     <h3 id="reqaccessctrl">Using authorization providers for access control</h3>
         <p>Authentication by username and password is only part of the
 
     <h3 id="reqaccessctrl">Using authorization providers for access control</h3>
         <p>Authentication by username and password is only part of the

-        story. Frequently you want to let people in based on something
-        other than who they are. Something such as where they are
-        coming from.</p>
-
-        <p>The authorization providers <code>all</code>,
-        <code>env</code>, <code>host</code> and <code>ip</code> let you
-        allow or deny access based on other host based criteria such as
-        host name or ip address of the machine requesting a
-        document.</p>
-
-        <p>The usage of these providers is specified through the
-        <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive.
-        This directive registers the authorization providers
-        that will be called during the authorization stage of the request
-        processing. For example:</p>
-
-        <pre class="prettyprint lang-config">Require ip <var>address</var>
-        </pre>
-
-
-        <p>where <var>address</var> is an IP address (or a partial IP
-        address) or:</p>
-
-        <pre class="prettyprint lang-config">Require host <var>domain_name</var>
-        </pre>
-
-
-        <p>where <var>domain_name</var> is a fully qualified domain name
-        (or a partial domain name); you may provide multiple addresses or
-        domain names, if desired.</p>
-
-        <p>For example, if you have someone spamming your message
-        board, and you want to keep them out, you could do the
-        following:</p>
-
-        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
-    Require all granted
-    Require not ip 10.252.46.165
-&lt;/RequireAll&gt;</pre>
-
-
-        <p>Visitors coming from that address will not be able to see
-        the content covered by this directive. If, instead, you have a
-        machine name, rather than an IP address, you can use that.</p>
-
-        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
-    Require all granted
-    Require not host host.example.com
-&lt;/RequireAll&gt;</pre>
-
-
-        <p>And, if you'd like to block access from an entire domain,
-        you can specify just part of an address or domain name:</p>
-
-        <pre class="prettyprint lang-config">&lt;RequireAll&gt;
-    Require all granted
-    Require not ip 192.168.205
-    Require not host phishers.example.com moreidiots.example
-    Require not host ke
-&lt;/RequireAll&gt;</pre>
-
-
-        <p>Using <code class="directive"><a href="../mod/mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></code>
-        with multiple <code class="directive"><a href="../mod/mod_authz_core.html#require">&lt;Require&gt;</a></code> directives, each negated with <code>not</code>,
-        will only allow access, if all of negated conditions are true. In other words,
-        access will be blocked, if any of the negated conditions fails.</p>
+        story. You can also allow or deny access based on other
+        criteria, such as the client's IP address or hostname, using
+        the authorization providers <code>all</code>, <code>env</code>,
+        <code>host</code>, and <code>ip</code> with the
+        <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
+        directive.</p>

 
 

+        <p>For full details and examples, see the
+        <a href="access.html">Access Control</a> howto.</p>

     
 
     <h3 id="filesystem">Access Control backwards compatibility</h3>
     
 
     <h3 id="filesystem">Access Control backwards compatibility</h3>


@@ -592,9 +534,8 @@ Require group GroupName</pre>
 <h2 id="socache">Authentication Caching <a title="Permanent link" href="#socache" class="permalink">&para;</a></h2>
     <p>There may be times when authentication puts an unacceptable load
     on a provider or on your network.  This is most likely to affect users
 <h2 id="socache">Authentication Caching <a title="Permanent link" href="#socache" class="permalink">&para;</a></h2>
     <p>There may be times when authentication puts an unacceptable load
     on a provider or on your network.  This is most likely to affect users

-    of <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code> (or third-party/custom providers).
-    To deal with this, HTTPD 2.3/2.4 introduces a new caching provider
-    <code class="module"><a href="../mod/mod_authn_socache.html">mod_authn_socache</a></code> to cache credentials and reduce
+    of <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code> (or third-party/custom providers).  The
+    <code class="module"><a href="../mod/mod_authn_socache.html">mod_authn_socache</a></code> module caches credentials and reduces

     the load on the origin provider(s).</p>
     <p>This may offer a substantial performance boost to some users.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
     the load on the origin provider(s).</p>
     <p>This may offer a substantial performance boost to some users.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>

diff --git a/docs/manual/howto/auth.html.fr.utf8 b/docs/manual/howto/auth.html.fr.utf8
index ff5a08b7e443906f029c1d20a7c9baa3ba754798..cf137f9414b55f3dfc8815a1c4723fa3104d725a 100644 (file)
--- a/docs/manual/howto/auth.html.fr.utf8
+++ b/docs/manual/howto/auth.html.fr.utf8
@@ -30,6 +30,8 @@
 <a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="T&uuml;rk&ccedil;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="T&uuml;rk&ccedil;e">&nbsp;tr&nbsp;</a></p>
 </div>

+<div class="outofdate">Cette traduction peut &ecirc;tre p&eacute;rim&eacute;e. V&eacute;rifiez la version
+            anglaise pour les changements r&eacute;cents.</div>

 
     <p>L'authentification est un processus qui vous permet de v&eacute;rifier
     qu'une personne est bien celle qu'elle pr&eacute;tend &ecirc;tre. L'autorisation
 
     <p>L'authentification est un processus qui vous permet de v&eacute;rifier
     qu'une personne est bien celle qu'elle pr&eacute;tend &ecirc;tre. L'autorisation

diff --git a/docs/manual/howto/auth.xml.es b/docs/manual/howto/auth.xml.es
index 458612d6b784bc15f9caaae56f25fe3c77a3c3cc..126e3fb07b4d9681f337d799ea84a22b5c96cd7d 100644 (file)
--- a/docs/manual/howto/auth.xml.es
+++ b/docs/manual/howto/auth.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>

-<!-- English Revision: 1766314:1933687 (outdated) -->
+<!-- English Revision: 1766314:1935509 (outdated) -->

 <!-- Translated by: Luis Gil de Bernabé Pfeiffer lgilbernabe [AT] apache.org-->
 <!-- Reviewed by: Sergio Ramos -->
 <!--
 <!-- Translated by: Luis Gil de Bernabé Pfeiffer lgilbernabe [AT] apache.org-->
 <!-- Reviewed by: Sergio Ramos -->
 <!--

diff --git a/docs/manual/howto/auth.xml.fr b/docs/manual/howto/auth.xml.fr
index 1b1ad38bff012db5bb8600117323022d7bcd8972..d9d611e1847ff03ad948a9c113a4c2f745cefbd8 100644 (file)
--- a/docs/manual/howto/auth.xml.fr
+++ b/docs/manual/howto/auth.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

-<!-- English Revision: 1933687 -->
+<!-- English Revision: 1933687:1935509 (outdated) -->

 <!-- French translation : Lucien GENTIS -->
 <!-- Reviwed by : Vincent Deffontaines -->
 
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviwed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index be59176f6bf36039b10d90ece7a55f737ec519f2..cf9b03da24eab8e73cedc85ea34268c80ccc562c 100644 (file)
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>

-<!-- English Revision: 479777:1933687 (outdated) -->
+<!-- English Revision: 479777:1935509 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index 7231689fe2e7cbafa81802f3ba7251fe1eb08ef1..bf757c285b3bc072c209034302353af19964528a 100644 (file)
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>

-<!-- English Revision: 105989:1933687 (outdated) -->
+<!-- English Revision: 105989:1935509 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/auth.xml.meta b/docs/manual/howto/auth.xml.meta
index a8148d403c6ab4e94a128aab917c165f32211e4d..5dc018d29c925284b14ad72398681e2b27ce05cc 100644 (file)
--- a/docs/manual/howto/auth.xml.meta
+++ b/docs/manual/howto/auth.xml.meta
@@ -9,7 +9,7 @@
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>

-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>

     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>

diff --git a/docs/manual/howto/auth.xml.tr b/docs/manual/howto/auth.xml.tr
index 2e02f3699d9f06bb7d203581af685b9f560a5f1b..b3af5ec0ad9cb5e5f9c272f0b593c3f2dba5e6e7 100644 (file)
--- a/docs/manual/howto/auth.xml.tr
+++ b/docs/manual/howto/auth.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>

-<!-- English Revision: 1070891:1933687 (outdated) -->
+<!-- English Revision: 1070891:1935509 (outdated) -->

 <!-- =====================================================
  Translated by: Umut Samuk <umut belgeler.org>
    Reviewed by: Nilgün Belma Bugüner <nilgun belgeler.org>
 <!-- =====================================================
  Translated by: Umut Samuk <umut belgeler.org>
    Reviewed by: Nilgün Belma Bugüner <nilgun belgeler.org>

diff --git a/docs/manual/howto/cgi.html.en.utf8 b/docs/manual/howto/cgi.html.en.utf8
index fa21c5bc757d6413bb298bb21211388e081ee950..7ab4be85248554a11b2d49e78544958a31584030 100644 (file)
--- a/docs/manual/howto/cgi.html.en.utf8
+++ b/docs/manual/howto/cgi.html.en.utf8
@@ -58,25 +58,35 @@
 <h2 id="configuring">Configuring httpd to permit CGI <a title="Permanent link" href="#configuring" class="permalink">&para;</a></h2>
     
 
 <h2 id="configuring">Configuring httpd to permit CGI <a title="Permanent link" href="#configuring" class="permalink">&para;</a></h2>
     
 

-    <p>In order to get your CGI programs to work properly, you'll
-    need to have httpd configured to permit CGI execution. There
-    are several ways to do this.</p>
-
-    <div class="warning">Note: If httpd has been built with shared module
-    support you need to ensure that the module is loaded; in your
+    <p>Your httpd configuration must permit CGI execution before
+    CGI programs will work. Several ways to do this are described
+    below.</p>
+
+    <p>CGI support is provided by two modules:
+    <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> and <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>.
+    <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> uses a dedicated external daemon to manage
+    CGI processes and is required when httpd runs a threaded MPM (such as
+    <code class="module"><a href="../mod/event.html">event</a></code> or <code class="module"><a href="../mod/worker.html">worker</a></code>).
+    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> runs CGI programs directly from within the
+    server process and is used with non-threaded MPMs like
+    <code class="module"><a href="../mod/prefork.html">prefork</a></code>, or on Windows. From a configuration
+    standpoint they are interchangeable &mdash; the directives are the same.
+    See the <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> and <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code>
+    reference pages for implementation details.</p>
+
+    <div class="warning">If httpd has been built with shared module
+    support, you need to ensure that the appropriate module is loaded. In your

     <code>httpd.conf</code> you need to make sure the
     <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
     <code>httpd.conf</code> you need to make sure the
     <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>

-    directive has not been commented out.  A correctly configured directive
-    may look like this:
-
-    <pre class="prettyprint lang-config">LoadModule cgid_module modules/mod_cgid.so</pre>
-
+    directive has not been commented out. For a threaded MPM:

 
 

+<div class="example"><pre class="prettyprint lang-config">LoadModule cgid_module modules/mod_cgid.so</pre>
+</div>

 
 

-     On Windows, or using a non-threaded MPM like prefork,  A correctly 
-     configured directive may look like this:
+     For Windows, or a non-threaded MPM like prefork:

 
 

-    <pre class="prettyprint lang-config">LoadModule cgi_module modules/mod_cgi.so</pre>
+<div class="example"><pre class="prettyprint lang-config">LoadModule cgi_module modules/mod_cgi.so</pre>
+</div>

 </div>
 
 
 </div>
 
 


@@ -95,8 +105,8 @@
       <p>The <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
       directive looks like:</p>
 
       <p>The <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
       directive looks like:</p>
 

-      <pre class="prettyprint lang-config">ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"</pre>
-
+<div class="example"><pre class="prettyprint lang-config">ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"</pre>
+</div>

 
       <p>The example shown is from your default <code>httpd.conf</code>
       configuration file, if you installed httpd in the default
 
       <p>The example shown is from your default <code>httpd.conf</code>
       configuration file, if you installed httpd in the default


@@ -114,12 +124,12 @@
       treated as a CGI program.</p>
 
       <p>For example, if the URL
       treated as a CGI program.</p>
 
       <p>For example, if the URL

-      <code>http://www.example.com/cgi-bin/test.pl</code>
+      <code>http://www.example.com/cgi-bin/test.py</code>

       is requested, httpd will attempt to execute the file
       is requested, httpd will attempt to execute the file

-      <code>/usr/local/apache2/cgi-bin/test.pl</code>
-      and return the output. Of course, the file will have to
-      exist, and be executable, and return output in a particular
-      way, or httpd will return an error message.</p>
+      <code>/usr/local/apache2/cgi-bin/test.py</code>
+      and return the output. The file must exist, be executable,
+      and produce output in the expected format; otherwise httpd
+      returns an error.</p>

     
 
     <h3 id="nonscriptalias">CGI outside of ScriptAlias directories</h3>
     
 
     <h3 id="nonscriptalias">CGI outside of ScriptAlias directories</h3>


@@ -136,8 +146,8 @@
       the main <code>cgi-bin</code> directory, they will need to be able to
       run CGI programs elsewhere.</p>
 
       the main <code>cgi-bin</code> directory, they will need to be able to
       run CGI programs elsewhere.</p>
 

-      <p>There are two steps to allowing CGI execution in an arbitrary
-      directory.  First, the <code>cgi-script</code> handler must be
+      <p>Allowing CGI execution in an arbitrary directory requires
+      two steps.  First, the <code>cgi-script</code> handler must be

       activated using the <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> or <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> directive.  Second,
       <code>ExecCGI</code> must be specified in the <code class="directive"><a href="../mod/core.html#options">Options</a></code> directive.</p>
     
       activated using the <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> or <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> directive.  Second,
       <code>ExecCGI</code> must be specified in the <code class="directive"><a href="../mod/core.html#options">Options</a></code> directive.</p>
     


@@ -149,19 +159,19 @@
       file, to specify that CGI execution was permitted in a particular
       directory:</p>
 
       file, to specify that CGI execution was permitted in a particular
       directory:</p>
 

-      <pre class="prettyprint lang-config">&lt;Directory "/usr/local/apache2/htdocs/somedir"&gt;
-    Options +ExecCGI
+<div class="example"><pre class="prettyprint lang-config">&lt;Directory "/usr/local/apache2/htdocs/somedir"&gt;
+Options +ExecCGI

 &lt;/Directory&gt;</pre>
 &lt;/Directory&gt;</pre>

-
+</div>

 
       <p>The above directive tells httpd to permit the execution
       of CGI files. You will also need to tell the server what
       files are CGI files. The following <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> directive tells the server to treat all
 
       <p>The above directive tells httpd to permit the execution
       of CGI files. You will also need to tell the server what
       files are CGI files. The following <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> directive tells the server to treat all

-      files with the <code>cgi</code> or <code>pl</code> extension as CGI
+      files with the <code>cgi</code> or <code>py</code> extension as CGI

       programs:</p>
 
       programs:</p>
 

-      <pre class="prettyprint lang-config">AddHandler cgi-script .cgi .pl</pre>
-
+<div class="example"><pre class="prettyprint lang-config">AddHandler cgi-script .cgi .py</pre>
+</div>

     
 
     <h3 id="htaccess">.htaccess files</h3>
     
 
     <h3 id="htaccess">.htaccess files</h3>


@@ -179,21 +189,21 @@
       <code>.cgi</code> in users' directories, you can use the
       following configuration.</p>
 
       <code>.cgi</code> in users' directories, you can use the
       following configuration.</p>
 

-      <pre class="prettyprint lang-config">&lt;Directory "/home/*/public_html"&gt;
-    Options +ExecCGI
-    AddHandler cgi-script .cgi
+<div class="example"><pre class="prettyprint lang-config">&lt;Directory "/home/*/public_html"&gt;
+Options +ExecCGI
+AddHandler cgi-script .cgi

 &lt;/Directory&gt;</pre>
 &lt;/Directory&gt;</pre>

+</div>

 
 

-
-      <p>If you wish designate a <code>cgi-bin</code> subdirectory of
+      <p>To designate a <code>cgi-bin</code> subdirectory of

       a user's directory where everything will be treated as a CGI
       program, you can use the following.</p>
 
       a user's directory where everything will be treated as a CGI
       program, you can use the following.</p>
 

-      <pre class="prettyprint lang-config">&lt;Directory "/home/*/public_html/cgi-bin"&gt;
-    Options ExecCGI
-    SetHandler cgi-script
+<div class="example"><pre class="prettyprint lang-config">&lt;Directory "/home/*/public_html/cgi-bin"&gt;
+Options ExecCGI
+SetHandler cgi-script

 &lt;/Directory&gt;</pre>
 &lt;/Directory&gt;</pre>

-
+</div>

 
     
 
 
     
 


@@ -202,8 +212,8 @@
 <h2 id="writing">Writing a CGI program <a title="Permanent link" href="#writing" class="permalink">&para;</a></h2>
     
 
 <h2 id="writing">Writing a CGI program <a title="Permanent link" href="#writing" class="permalink">&para;</a></h2>
     
 

-    <p>There are two main differences between ``regular''
-    programming, and CGI programming.</p>
+    <p>CGI programming differs from regular programming in two
+    ways.</p>

 
     <p>First, all output from your CGI program must be preceded by
     a <a class="glossarylink" href="../glossary.html#mime-type" title="see glossary">MIME-type</a> header. This is HTTP header that tells the client
 
     <p>First, all output from your CGI program must be preceded by
     a <a class="glossarylink" href="../glossary.html#mime-type" title="see glossary">MIME-type</a> header. This is HTTP header that tells the client


@@ -217,7 +227,7 @@
     <p>Secondly, your output needs to be in HTML, or some other
     format that a browser will be able to display. Most of the
     time, this will be HTML, but occasionally you might write a CGI
     <p>Secondly, your output needs to be in HTML, or some other
     format that a browser will be able to display. Most of the
     time, this will be HTML, but occasionally you might write a CGI

-    program that outputs a gif image, or other non-HTML
+    program that outputs a GIF image, or other non-HTML

     content.</p>
 
     <p>Apart from those two things, writing a CGI program will look
     content.</p>
 
     <p>Apart from those two things, writing a CGI program will look


@@ -228,45 +238,41 @@
 
       <p>The following is an example CGI program that prints one
       line to your browser. Type in the following, save it to a
 
       <p>The following is an example CGI program that prints one
       line to your browser. Type in the following, save it to a

-      file called <code>first.pl</code>, and put it in your
+      file called <code>first.py</code>, and put it in your

       <code>cgi-bin</code> directory.</p>
 
       <code>cgi-bin</code> directory.</p>
 

-      <pre class="prettyprint lang-perl">#!/usr/bin/perl
-print "Content-type: text/html\n\n";
-print "Hello, World.";</pre>
-
+<div class="example"><pre class="prettyprint lang-python">#!/usr/bin/env python3
+print("Content-type: text/html\n")
+print("Hello, World.")</pre>
+</div>

 
 

-      <p>Even if you are not familiar with Perl, you should be able
-      to see what is happening here. The first line tells httpd
-      (or whatever shell you happen to be running under) that this
-      program can be executed by feeding the file to the
-      interpreter found at the location <code>/usr/bin/perl</code>.
-      The second line prints the content-type declaration we
-      talked about, followed by two carriage-return newline pairs.
-      This puts a blank line after the header, to indicate the end
-      of the HTTP headers, and the beginning of the body. The third
-      line prints the string "Hello, World.". And that's the end
-      of it.</p>
+      <p>The first line tells the operating system which interpreter
+      to use. The first <code>print</code> call outputs the
+      content-type header followed by a blank line (the
+      <code>\n</code> in the string plus the newline that
+      <code>print()</code> adds), which marks the end of HTTP
+      headers. The second <code>print</code> call outputs the body.
+      That is all a CGI program needs to produce a response.</p>

 
       <p>If you open your favorite browser and tell it to get the
       address</p>
 
       <div class="example"><p><code>
 
       <p>If you open your favorite browser and tell it to get the
       address</p>
 
       <div class="example"><p><code>

-        http://www.example.com/cgi-bin/first.pl
+        http://www.example.com/cgi-bin/first.py

       </code></p></div>
 
       <p>or wherever you put your file, you will see the one line
       <code>Hello, World.</code> appear in your browser window.
       It's not very exciting, but once you get that working, you'll
       </code></p></div>
 
       <p>or wherever you put your file, you will see the one line
       <code>Hello, World.</code> appear in your browser window.
       It's not very exciting, but once you get that working, you'll

-      have a good chance of getting just about anything working.</p>
+      have a good chance of getting about anything working.</p>

     
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="troubleshoot">But it's still not working! <a title="Permanent link" href="#troubleshoot" class="permalink">&para;</a></h2>
     
 
     
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="troubleshoot">But it's still not working! <a title="Permanent link" href="#troubleshoot" class="permalink">&para;</a></h2>
     
 

-    <p>There are four basic things that you may see in your browser
-    when you try to access your CGI program from the web:</p>
+    <p>Four basic things may appear in your browser when you try to
+    access your CGI program from the web:</p>

 
     <dl>
       <dt>The output of your CGI program</dt>
 
     <dl>
       <dt>The output of your CGI program</dt>


@@ -308,9 +314,8 @@ print "Hello, World.";</pre>
       a file sufficient permissions to be executed by <code>nobody</code>
       is to give everyone execute permission on the file:</p>
 
       a file sufficient permissions to be executed by <code>nobody</code>
       is to give everyone execute permission on the file:</p>
 

-      <div class="example"><p><code>
-        chmod a+x first.pl
-      </code></p></div>
+<div class="example"><pre class="prettyprint lang-bash">chmod a+x first.py</pre>
+</div>

 
       <p>Also, if your program reads from, or writes to, any other
       files, those files will need to have the correct permissions
 
       <p>Also, if your program reads from, or writes to, any other
       files, those files will need to have the correct permissions


@@ -335,11 +340,11 @@ print "Hello, World.";</pre>
       program.</p>
 
       <p>A common manifestation of this is the path to the script
       program.</p>
 
       <p>A common manifestation of this is the path to the script

-      interpreter (often <code>perl</code>) indicated in the first
+      interpreter (often <code>python3</code>) indicated in the first

       line of your CGI program, which will look something like:</p>
 
       line of your CGI program, which will look something like:</p>
 

-      <pre class="prettyprint lang-perl">#!/usr/bin/perl</pre>
-
+<div class="example"><pre class="prettyprint lang-python">#!/usr/bin/env python3</pre>
+</div>

 
       <p>Make sure that this is in fact the path to the
       interpreter.</p>
 
       <p>Make sure that this is in fact the path to the
       interpreter.</p>


@@ -380,10 +385,10 @@ print "Hello, World.";</pre>
 
       <div class="example"><p><code>
       cd /usr/local/apache2/cgi-bin<br>
 
       <div class="example"><p><code>
       cd /usr/local/apache2/cgi-bin<br>

-      ./first.pl
+      ./first.py

       </code></p></div>
 
       </code></p></div>
 

-      <p>(Do not call the <code>perl</code> interpreter.  The shell
+      <p>(Do not call the <code>python3</code> interpreter directly.  The shell

       and httpd should find the interpreter using the <a href="#pathinformation">path information</a> on the first line of
       the script.)</p>
 
       and httpd should find the interpreter using the <a href="#pathinformation">path information</a> on the first line of
       the script.)</p>
 


@@ -423,7 +428,7 @@ print "Hello, World.";</pre>
       suexec will be activated.</p>
 
       <p>Unless you fully understand suexec, you should not be using it.
       suexec will be activated.</p>
 
       <p>Unless you fully understand suexec, you should not be using it.

-      To disable suexec, simply remove (or rename) the <code class="program"><a href="../programs/suexec.html">suexec</a></code>
+      To disable suexec, remove (or rename) the <code class="program"><a href="../programs/suexec.html">suexec</a></code>

       binary pointed to by <code>SUEXEC_BIN</code> and then restart the
       server.  If, after reading about <a href="../suexec.html">suexec</a>,
       you still wish to use it, then run <code>suexec -V</code> to find
       binary pointed to by <code>SUEXEC_BIN</code> and then restart the
       server.  If, after reading about <a href="../suexec.html">suexec</a>,
       you still wish to use it, then run <code>suexec -V</code> to find


@@ -456,7 +461,7 @@ print "Hello, World.";</pre>
       <p>During the CGI transaction, the server and the browser
       also set environment variables, so that they can communicate
       with one another. These are things like the browser type
       <p>During the CGI transaction, the server and the browser
       also set environment variables, so that they can communicate
       with one another. These are things like the browser type

-      (Chrome, Firefox, Lynx), the server type (Apache httpd, Nginx, IIS),
+      (Chrome, Firefox, Lynx), the server type (httpd, Nginx, IIS),

       the name of the CGI program that is being run, and so on.</p>
 
       <p>These variables are available to the CGI programmer, and
       the name of the CGI program that is being run, and so on.</p>
 
       <p>These variables are available to the CGI programmer, and


@@ -464,7 +469,7 @@ print "Hello, World.";</pre>
       complete list of required variables is at
       Common Gateway Interface RFC (<a href="https://www.rfc-editor.org/rfc/rfc3875">RFC 3875</a>).</p>
 
       complete list of required variables is at
       Common Gateway Interface RFC (<a href="https://www.rfc-editor.org/rfc/rfc3875">RFC 3875</a>).</p>
 

-      <p>This simple Perl CGI program will display all of the
+      <p>This simple Python CGI program will display all of the

       environment variables that are being passed around. Two
       similar programs are included in the
       <code>cgi-bin</code>
       environment variables that are being passed around. Two
       similar programs are included in the
       <code>cgi-bin</code>


@@ -476,15 +481,13 @@ print "Hello, World.";</pre>
       <a href="../env.html">add your own environment variables</a>
       to the basic ones provided by default.</p>
 
       <a href="../env.html">add your own environment variables</a>
       to the basic ones provided by default.</p>
 

-      <pre class="prettyprint lang-perl">#!/usr/bin/perl
-use strict;
-use warnings;
-
-print "Content-type: text/html\n\n";
-foreach my $key (keys %ENV) {
-    print "$key --&gt; $ENV{$key}&lt;br&gt;";
-}</pre>
+<div class="example"><pre class="prettyprint lang-python">#!/usr/bin/env python3
+import os

 
 

+print("Content-type: text/html\n")
+for key, value in os.environ.items():
+print(f"{key} --&gt; {value}&lt;br&gt;")</pre>
+</div>

     
 
     <h3 id="stdin">STDIN and STDOUT</h3>
     
 
     <h3 id="stdin">STDIN and STDOUT</h3>


@@ -524,9 +527,9 @@ foreach my $key (keys %ENV) {
       <code>METHOD</code> attribute in the <code>FORM</code> tag.</p>
 
       <p>Your program is then responsible for splitting that string
       <code>METHOD</code> attribute in the <code>FORM</code> tag.</p>
 
       <p>Your program is then responsible for splitting that string

-      up into useful information. Fortunately, there are libraries
-      and modules available to help you process this data, as well
-      as handle other of the aspects of your CGI program.</p>
+      up into useful information. Fortunately, libraries
+      and modules are available to help you process this data, as well
+      as handle other aspects of your CGI program.</p>

     
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
     
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">


@@ -537,15 +540,14 @@ foreach my $key (keys %ENV) {
     code library, or module, to do most of the grunt work for you.
     This leads to fewer errors, and faster development.</p>
 
     code library, or module, to do most of the grunt work for you.
     This leads to fewer errors, and faster development.</p>
 

-    <p>If you're writing CGI programs in Perl, modules are
-    available on <a href="http://www.cpan.org/">CPAN</a>. The most
-    popular module for this purpose is <code>CGI.pm</code>. You might
-    also consider <code>CGI::Lite</code>, which implements a minimal
-    set of functionality, which is all you need in most programs.</p>
+    <p>If you're writing CGI programs in Python, the standard
+    library's <code>cgi</code> module (deprecated in Python 3.11,
+    removed in 3.13) handled form parsing. For current Python
+    versions, use the <code>urllib.parse</code> module to parse
+    query strings and form data. For more complex applications,
+    consider a lightweight WSGI framework, though that moves
+    beyond the scope of traditional CGI.</p>

 
 

-    <p>If you're writing CGI programs in C, there are a variety of
-    options. One of these is the <code>CGIC</code> library, from
-    <a href="https://web.mit.edu/wwwdev/www/cgic.html">https://web.mit.edu/wwwdev/www/cgic.html</a>.</p>

   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="moreinfo">For more information <a title="Permanent link" href="#moreinfo" class="permalink">&para;</a></h2>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="moreinfo">For more information <a title="Permanent link" href="#moreinfo" class="permalink">&para;</a></h2>


@@ -562,9 +564,9 @@ foreach my $key (keys %ENV) {
     program was in, and, if possible, the offending code. This will
     make finding your problem much simpler.</p>
 
     program was in, and, if possible, the offending code. This will
     make finding your problem much simpler.</p>
 

-    <p>Note that questions about CGI problems should <strong>never</strong>
+    <div class="note">Questions about CGI problems should <strong>never</strong>

     be posted to the httpd bug database unless you are sure you
     be posted to the httpd bug database unless you are sure you

-    have found a problem in the httpd source code.</p>
+    have found a problem in the httpd source code.</div>

   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/cgi.html" title="English">&nbsp;en&nbsp;</a> |
   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/cgi.html" title="English">&nbsp;en&nbsp;</a> |

diff --git a/docs/manual/howto/cgi.html.fr.utf8 b/docs/manual/howto/cgi.html.fr.utf8
index 1920b84be928a6f59ff866598188d067890d2f39..9a501953d61250b0dbbb55b0b0524757cfa1e736 100644 (file)
--- a/docs/manual/howto/cgi.html.fr.utf8
+++ b/docs/manual/howto/cgi.html.fr.utf8
@@ -29,6 +29,8 @@
 <a href="../ja/howto/cgi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <a href="../ja/howto/cgi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>

+<div class="outofdate">Cette traduction peut &ecirc;tre p&eacute;rim&eacute;e. V&eacute;rifiez la version
+            anglaise pour les changements r&eacute;cents.</div>

 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif"> <a href="#intro">Introduction</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#configuring">Configurer httpd pour autoriser CGI</a></li>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif"> <a href="#intro">Introduction</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#configuring">Configurer httpd pour autoriser CGI</a></li>

diff --git a/docs/manual/howto/cgi.xml.es b/docs/manual/howto/cgi.xml.es
index 3724aa8bfc10e4da74e2fb8f4a1fb27a99407330..d8a8c071fc18ef5001f14f6357e27ab10b7f46d4 100644 (file)
--- a/docs/manual/howto/cgi.xml.es
+++ b/docs/manual/howto/cgi.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>

-<!-- English Revision: 1773244:1933506 (outdated) -->
+<!-- English Revision: 1773244:1935512 (outdated) -->

 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 
 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 

diff --git a/docs/manual/howto/cgi.xml.fr b/docs/manual/howto/cgi.xml.fr
index da80a744a87b7ad2271bb79021902e59e89ddc2c..15a81e4b7af0bf13d3518d3d1c82e579358b234d 100644 (file)
--- a/docs/manual/howto/cgi.xml.fr
+++ b/docs/manual/howto/cgi.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

-<!-- English Revision: 1933506 -->
+<!-- English Revision: 1933506:1935512 (outdated) -->

 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/howto/cgi.xml.ja b/docs/manual/howto/cgi.xml.ja
index bfa687f378c63c6fd54b79d27a6fd77098766cd6..aac22f2f3b9b9622d98ad7b255e6822f1e63e49e 100644 (file)
--- a/docs/manual/howto/cgi.xml.ja
+++ b/docs/manual/howto/cgi.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>

-<!-- English Revision: 545841:1933506 (outdated) -->
+<!-- English Revision: 545841:1935512 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/cgi.xml.ko b/docs/manual/howto/cgi.xml.ko
index dc9d45a038b072712d8ab0c67c3d1b799fb3f5ed..c0aa221d5f373acaf538c2e0783461e4229719fc 100644 (file)
--- a/docs/manual/howto/cgi.xml.ko
+++ b/docs/manual/howto/cgi.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>

-<!-- English Revision: 105989:1933506 (outdated) -->
+<!-- English Revision: 105989:1935512 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/cgi.xml.meta b/docs/manual/howto/cgi.xml.meta
index c7cff594303832b3c02d0cfeb12f68c2d9b8a21d..b7cd1c98001e08addb68c627925026d0e113f87f 100644 (file)
--- a/docs/manual/howto/cgi.xml.meta
+++ b/docs/manual/howto/cgi.xml.meta
@@ -9,7 +9,7 @@
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>

-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>

     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>

diff --git a/docs/manual/howto/htaccess.html.en.utf8 b/docs/manual/howto/htaccess.html.en.utf8
index 550a42248fff77b3ce88ef5d511712f315f3bf45..b119e4c5ead61c7e9c92a7440f3d31ddbe07b70a 100644 (file)
--- a/docs/manual/howto/htaccess.html.en.utf8
+++ b/docs/manual/howto/htaccess.html.en.utf8
@@ -67,8 +67,8 @@ configuration files directly.</p>
       if you would rather call the file <code>.config</code> then you
       can put the following in your server configuration file:</p>
 
       if you would rather call the file <code>.config</code> then you
       can put the following in your server configuration file:</p>
 

-      <pre class="prettyprint lang-config">AccessFileName ".config"</pre>
-
+<div class="example"><pre class="prettyprint lang-config">AccessFileName ".config"</pre>
+</div>

     </div>
 
     <p>Directives in <code>.htaccess</code> files use the same syntax as
     </div>
 
     <p>Directives in <code>.htaccess</code> files use the same syntax as


@@ -81,7 +81,7 @@ configuration files directly.</p>
     <code>.htaccess</code> file, while <code class="directive"><a href="../mod/core.html#allowoverridelist">AllowOverrideList</a></code> names individual
     directives to permit (see <a href="#when">below</a>). If a directive
     is permitted, the documentation for that directive will contain an Override section,
     <code>.htaccess</code> file, while <code class="directive"><a href="../mod/core.html#allowoverridelist">AllowOverrideList</a></code> names individual
     directives to permit (see <a href="#when">below</a>). If a directive
     is permitted, the documentation for that directive will contain an Override section,

-    specifying what value must be in <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> in order for that
+    specifying what value must be in <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> for that

     directive to be permitted.</p>
 
     <div class="note">The default value of <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> is <code>None</code>.
     directive to be permitted.</p>
 
     <div class="note">The default value of <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> is <code>None</code>.


@@ -92,7 +92,7 @@ configuration files directly.</p>
     directive, you will find that it is permitted in <code>.htaccess</code>
     files. (See the Context line in the directive summary.) The <a href="../mod/directive-dict.html#Context">Override</a> line reads
     <code>FileInfo</code>. Thus, you must have at least
     directive, you will find that it is permitted in <code>.htaccess</code>
     files. (See the Context line in the directive summary.) The <a href="../mod/directive-dict.html#Context">Override</a> line reads
     <code>FileInfo</code>. Thus, you must have at least

-    <code>AllowOverride FileInfo</code> in order for this directive to be
+    <code>AllowOverride FileInfo</code> for this directive to be

     honored in <code>.htaccess</code> files.</p>
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
     honored in <code>.htaccess</code> files.</p>
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">


@@ -129,34 +129,34 @@ configuration files directly.</p>
     <code>.htaccess</code> file is loaded every time a document is
     requested.</p>
 
     <code>.htaccess</code> file is loaded every time a document is
     requested.</p>
 

-    <p>Further note that httpd must look for <code>.htaccess</code> files
-    in all higher-level directories, in order to have a full complement of
-    directives that it must apply. (See section on <a href="#how">how
+    <p>Additionally, httpd must look for <code>.htaccess</code> files
+    in all higher-level directories to assemble the full set of applicable
+    directives. (See section on <a href="#how">how

     directives are applied</a>.) Thus, if a file is requested out of a
     directory <code>/www/htdocs/example</code>, httpd must look for the
     following files:</p>
 
     directives are applied</a>.) Thus, if a file is requested out of a
     directory <code>/www/htdocs/example</code>, httpd must look for the
     following files:</p>
 

-    <pre class="prettyprint lang-config">/.htaccess
+<div class="example"><pre class="prettyprint lang-config">/.htaccess

 /www/.htaccess
 /www/htdocs/.htaccess
 /www/htdocs/example/.htaccess</pre>
 /www/.htaccess
 /www/htdocs/.htaccess
 /www/htdocs/example/.htaccess</pre>

-
+</div>

 
     <p>And so, for each file access out of that directory, there are 4
     additional file-system accesses, even if none of those files are
 
     <p>And so, for each file access out of that directory, there are 4
     additional file-system accesses, even if none of those files are

-    present. (Note that this would only be the case if
+    present. (This would only be the case if

     <code>.htaccess</code> files were enabled for <code>/</code>, which
     is not usually the case.)</p>
 
     <p><strong>Security:</strong> You are permitting
     users to modify server configuration, which may result in changes over
     which you have no control. Carefully consider whether you want to give
     <code>.htaccess</code> files were enabled for <code>/</code>, which
     is not usually the case.)</p>
 
     <p><strong>Security:</strong> You are permitting
     users to modify server configuration, which may result in changes over
     which you have no control. Carefully consider whether you want to give

-    your users this privilege. Note also that giving users less
+    your users this privilege. Giving users less

     privileges than they need will lead to additional technical support
     requests. Make sure you clearly tell your users what level of
     privileges you have given them. Specifying exactly what you have set
     <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> to, and pointing them
     privileges than they need will lead to additional technical support
     requests. Make sure you clearly tell your users what level of
     privileges you have given them. Specifying exactly what you have set
     <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> to, and pointing them

-    to the relevant documentation, will save yourself a lot of confusion
+    to the relevant documentation, prevents confusion

     later.</p>
 
     <p>If you need to grant <code>.htaccess</code> access but want to
     later.</p>
 
     <p>If you need to grant <code>.htaccess</code> access but want to


@@ -165,48 +165,46 @@ configuration files directly.</p>
     lets you name individual directives that are permitted, providing
     finer-grained control than <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> alone:</p>
 
     lets you name individual directives that are permitted, providing
     finer-grained control than <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> alone:</p>
 

-    <pre class="prettyprint lang-config"># Allow only specific directives, not entire categories
+<div class="example"><pre class="prettyprint lang-config"># Allow only specific directives, not entire categories

 AllowOverride None
 AllowOverrideList Redirect RedirectMatch RewriteEngine RewriteRule RewriteCond</pre>
 AllowOverride None
 AllowOverrideList Redirect RedirectMatch RewriteEngine RewriteRule RewriteCond</pre>

-
+</div>

 
     <p>With this configuration, any directive not explicitly listed will
     cause a server error if encountered in a <code>.htaccess</code> file.
     This is a useful middle ground between full override access and no
     override access.</p>
 
 
     <p>With this configuration, any directive not explicitly listed will
     cause a server error if encountered in a <code>.htaccess</code> file.
     This is a useful middle ground between full override access and no
     override access.</p>
 

-    <p>Note that it is completely equivalent to put a <code>.htaccess</code>
-    file in a directory <code>/www/htdocs/example</code> containing a
-    directive, and to put that same directive in a Directory section
-    <code>&lt;Directory "/www/htdocs/example"&gt;</code> in your main server
+    <p>Placing a directive in a <code>.htaccess</code>
+    file in a directory <code>/www/htdocs/example</code> is completely equivalent to placing that same directive in a
+    <code>&lt;Directory "/www/htdocs/example"&gt;</code> section in your main server

     configuration:</p>
 
     <p><code>.htaccess</code> file in <code>/www/htdocs/example</code>:</p>
 
     <div class="example"><h3>Contents of .htaccess file in
     configuration:</p>
 
     <p><code>.htaccess</code> file in <code>/www/htdocs/example</code>:</p>
 
     <div class="example"><h3>Contents of .htaccess file in

-    <code>/www/htdocs/example</code></h3><pre class="prettyprint lang-config">AddType text/example ".exm"</pre>
-</div>
+    <code>/www/htdocs/example</code></h3><div class="example"><pre class="prettyprint lang-config">AddType text/example ".exm"</pre>
+</div></div>

 
     <div class="example"><h3>Section from your <code>httpd.conf</code>
 
     <div class="example"><h3>Section from your <code>httpd.conf</code>

-    file</h3><pre class="prettyprint lang-config">&lt;Directory "/www/htdocs/example"&gt;
-    AddType text/example ".exm"
+    file</h3><div class="example"><pre class="prettyprint lang-config">&lt;Directory "/www/htdocs/example"&gt;
+AddType text/example ".exm"

 &lt;/Directory&gt;</pre>
 &lt;/Directory&gt;</pre>

-</div>
+</div></div>

 
     <p>The use of <code>.htaccess</code> files can be disabled completely
     by setting the <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
     directive to <code>none</code>:</p>
 
 
     <p>The use of <code>.htaccess</code> files can be disabled completely
     by setting the <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
     directive to <code>none</code>:</p>
 

-    <pre class="prettyprint lang-config">AllowOverride None</pre>
-
+<div class="example"><pre class="prettyprint lang-config">AllowOverride None</pre>
+</div>

 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="how">How directives are applied <a title="Permanent link" href="#how" class="permalink">&para;</a></h2>
 
     <p>The configuration directives found in a <code>.htaccess</code> file
     are applied to the directory in which the <code>.htaccess</code> file
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="how">How directives are applied <a title="Permanent link" href="#how" class="permalink">&para;</a></h2>
 
     <p>The configuration directives found in a <code>.htaccess</code> file
     are applied to the directory in which the <code>.htaccess</code> file

-    is found, and to all subdirectories thereof. However, it is important
-    to also remember that there may have been <code>.htaccess</code> files
+    is found, and to all subdirectories thereof. Remember that there may have been <code>.htaccess</code> files

     in directories higher up. Directives are applied in the order that they
     are found. Therefore, a <code>.htaccess</code> file in a particular
     directory may override directives found in <code>.htaccess</code> files
     in directories higher up. Directives are applied in the order that they
     are found. Therefore, a <code>.htaccess</code> file in a particular
     directory may override directives found in <code>.htaccess</code> files


@@ -219,18 +217,18 @@ AllowOverrideList Redirect RedirectMatch RewriteEngine RewriteRule RewriteCond</
     <p>In the directory <code>/www/htdocs/example1</code> we have a
     <code>.htaccess</code> file containing the following:</p>
 
     <p>In the directory <code>/www/htdocs/example1</code> we have a
     <code>.htaccess</code> file containing the following:</p>
 

-    <pre class="prettyprint lang-config">Options +ExecCGI</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Options +ExecCGI</pre>
+</div>

 
 

-    <p>(Note: you must have "<code>AllowOverride Options</code>" in effect
+    <div class="note">You must have "<code>AllowOverride Options</code>" in effect

     to permit the use of the "<code class="directive"><a href="../mod/core.html#options">Options</a></code>" directive in
     to permit the use of the "<code class="directive"><a href="../mod/core.html#options">Options</a></code>" directive in

-    <code>.htaccess</code> files.)</p>
+    <code>.htaccess</code> files.</div>

 
     <p>In the directory <code>/www/htdocs/example1/example2</code> we have
     a <code>.htaccess</code> file containing:</p>
 
 
     <p>In the directory <code>/www/htdocs/example1/example2</code> we have
     a <code>.htaccess</code> file containing:</p>
 

-    <pre class="prettyprint lang-config">Options Includes</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Options Includes</pre>
+</div>

 
     <p>Because of this second <code>.htaccess</code> file, in the directory
     <code>/www/htdocs/example1/example2</code>, CGI execution is not
 
     <p>Because of this second <code>.htaccess</code> file, in the directory
     <code>/www/htdocs/example1/example2</code>, CGI execution is not


@@ -250,14 +248,14 @@ AllowOverrideList Redirect RedirectMatch RewriteEngine RewriteRule RewriteCond</
     prevent script execution while allowing anything else to be set in
     <code>.htaccess</code> you can use:</p>
 
     prevent script execution while allowing anything else to be set in
     <code>.htaccess</code> you can use:</p>
 

-    <pre class="prettyprint lang-config">&lt;Directory "/www/htdocs"&gt;
-    AllowOverride All
+<div class="example"><pre class="prettyprint lang-config">&lt;Directory "/www/htdocs"&gt;
+AllowOverride All

 &lt;/Directory&gt;
 
 &lt;Location "/"&gt;
 &lt;/Directory&gt;
 
 &lt;Location "/"&gt;

-    Options +IncludesNoExec -ExecCGI
+Options +IncludesNoExec -ExecCGI

 &lt;/Location&gt;</pre>
 &lt;/Location&gt;</pre>

-
+</div>

 
     <div class="note">This example assumes that your <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> is <code>/www/htdocs</code>.</div>
 
 
     <div class="note">This example assumes that your <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> is <code>/www/htdocs</code>.</div>
 


@@ -274,15 +272,15 @@ AllowOverrideList Redirect RedirectMatch RewriteEngine RewriteRule RewriteCond</
 
     <p><code>.htaccess</code> file contents:</p>
 
 
     <p><code>.htaccess</code> file contents:</p>
 

-    <pre class="prettyprint lang-config">AuthType Basic
+<div class="example"><pre class="prettyprint lang-config">AuthType Basic

 AuthName "Password Required"
 AuthUserFile "/www/passwords/password.file"
 AuthGroupFile "/www/passwords/group.file"
 Require group admins</pre>
 AuthName "Password Required"
 AuthUserFile "/www/passwords/password.file"
 AuthGroupFile "/www/passwords/group.file"
 Require group admins</pre>

+</div>

 
 

-
-    <p>Note that <code>AllowOverride AuthConfig</code> must be in effect
-    for these directives to have any effect.</p>
+    <div class="note"><code>AllowOverride AuthConfig</code> must be in effect
+    for these directives to have any effect.</div>

 
     <p>Please see the <a href="auth.html">authentication tutorial</a> for a
     more complete discussion of authentication and authorization.</p>
 
     <p>Please see the <a href="auth.html">authentication tutorial</a> for a
     more complete discussion of authentication and authorization.</p>


@@ -295,14 +293,14 @@ Require group admins</pre>
     configuration directives, placed in a <code>.htaccess</code> file in
     the desired directory:</p>
 
     configuration directives, placed in a <code>.htaccess</code> file in
     the desired directory:</p>
 

-    <pre class="prettyprint lang-config">Options +Includes
+<div class="example"><pre class="prettyprint lang-config">Options +Includes

 AddType text/html "shtml"
 AddHandler server-parsed shtml</pre>
 AddType text/html "shtml"
 AddHandler server-parsed shtml</pre>

+</div>

 
 

-
-    <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
+    <div class="note"><code>AllowOverride Options</code> and <code>AllowOverride

     FileInfo</code> must both be in effect for these directives to have any
     FileInfo</code> must both be in effect for these directives to have any

-    effect.</p>
+    effect.</div>

 
     <p>Please see the <a href="ssi.html">SSI tutorial</a> for a more
     complete discussion of server-side includes.</p>
 
     <p>Please see the <a href="ssi.html">SSI tutorial</a> for a more
     complete discussion of server-side includes.</p>


@@ -315,7 +313,7 @@ changes things a bit. In particular, rules are taken to be relative to
 the current directory, rather than being the original requested URI.
 Consider the following examples:</p>
 
 the current directory, rather than being the original requested URI.
 Consider the following examples:</p>
 

-<pre class="prettyprint lang-config"># In httpd.conf
+<div class="example"><pre class="prettyprint lang-config"># In httpd.conf

 RewriteRule "^/images/(.+)\.jpg" "/images/$1.png"
 
 # In .htaccess in root dir
 RewriteRule "^/images/(.+)\.jpg" "/images/$1.png"
 
 # In .htaccess in root dir


@@ -323,7 +321,7 @@ RewriteRule "^images/(.+)\.jpg" "images/$1.png"
 
 # In .htaccess in images/
 RewriteRule "^(.+)\.jpg" "$1.png"</pre>
 
 # In .htaccess in images/
 RewriteRule "^(.+)\.jpg" "$1.png"</pre>

-
+</div>

 
 <p>In a <code>.htaccess</code> in your document directory, the leading
 slash is removed from the value supplied to <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>, and in the
 
 <p>In a <code>.htaccess</code> in your document directory, the leading
 slash is removed from the value supplied to <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>, and in the


@@ -331,7 +329,7 @@ slash is removed from the value supplied to <code class="directive"><a href="../
 it. Thus, your regular expression needs to omit that portion as
 well.</p>
 
 it. Thus, your regular expression needs to omit that portion as
 well.</p>
 

-<p>Also note that in <code>.htaccess</code> context, regular expressions are
+<p>In <code>.htaccess</code> context, regular expressions are

 recompiled on every request, whereas in the main server configuration they
 are compiled once and cached.</p>
 
 recompiled on every request, whereas in the main server configuration they
 are compiled once and cached.</p>
 


@@ -352,21 +350,21 @@ further details on using <code class="module"><a href="../mod/mod_rewrite.html">
     execution of CGI programs in a particular directory. This may be
     implemented with the following configuration:</p>
 
     execution of CGI programs in a particular directory. This may be
     implemented with the following configuration:</p>
 

-    <pre class="prettyprint lang-config">Options +ExecCGI
+<div class="example"><pre class="prettyprint lang-config">Options +ExecCGI

 AddHandler cgi-script "cgi" "py"</pre>
 AddHandler cgi-script "cgi" "py"</pre>

-
+</div>

 
     <p>Alternately, if you wish to have all files in the given directory be
     considered to be CGI programs, this may be done with the following
     configuration:</p>
 
 
     <p>Alternately, if you wish to have all files in the given directory be
     considered to be CGI programs, this may be done with the following
     configuration:</p>
 

-    <pre class="prettyprint lang-config">Options +ExecCGI
+<div class="example"><pre class="prettyprint lang-config">Options +ExecCGI

 SetHandler cgi-script</pre>
 SetHandler cgi-script</pre>

+</div>

 
 

-
-    <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
+    <div class="note"><code>AllowOverride Options</code> and <code>AllowOverride

     FileInfo</code> must both be in effect for these directives to have any
     FileInfo</code> must both be in effect for these directives to have any

-    effect.</p>
+    effect.</div>

 
     <p>Please see the <a href="cgi.html">CGI tutorial</a> for a more
     complete discussion of CGI programming and configuration.</p>
 
     <p>Please see the <a href="cgi.html">CGI tutorial</a> for a more
     complete discussion of CGI programming and configuration.</p>


@@ -386,8 +384,8 @@ SetHandler cgi-script</pre>
     nonsense word in your <code>.htaccess</code> file and reload the
     page:</p>
 
     nonsense word in your <code>.htaccess</code> file and reload the
     page:</p>
 

-    <pre class="prettyprint lang-config">TestMe</pre>
-
+<div class="example"><pre class="prettyprint lang-config">TestMe</pre>
+</div>

 
     <p>If a server error (HTTP 500) is
     not generated, then you almost certainly have <code>AllowOverride
 
     <p>If a server error (HTTP 500) is
     not generated, then you almost certainly have <code>AllowOverride


@@ -398,12 +396,11 @@ SetHandler cgi-script</pre>
     that the directive used in your <code>.htaccess</code> file is not
     permitted.</p>
 
     that the directive used in your <code>.htaccess</code> file is not
     permitted.</p>
 

-    <pre class="prettyprint lang-config">[Tue May 06 09:12:31.528374 2025] [core:alert] [pid 12345] [client 192.168.1.50:54321] /var/www/html/.htaccess: DirectoryIndex not allowed here</pre>
-
+<div class="example"><pre class="prettyprint lang-sh">[Thu Jun 18 09:12:31.528374 2026] [core:alert] [pid 12345] [client 192.168.1.50:54321] /var/www/html/.htaccess: DirectoryIndex not allowed here</pre>
+</div>

 
     <p>This will indicate either that you've used a directive that is
 
     <p>This will indicate either that you've used a directive that is

-    never permitted in <code>.htaccess</code> files, or that you simply
-    don't have <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> set to
+    never permitted in <code>.htaccess</code> files, or that you don't have <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> set to

     a level sufficient for the directive you've used. Consult the
     documentation for that particular directive to determine which is
     the case.</p>
     a level sufficient for the directive you've used. Consult the
     documentation for that particular directive to determine which is
     the case.</p>


@@ -411,8 +408,8 @@ SetHandler cgi-script</pre>
     <p>Alternately, it may tell you that you had a syntax error in your
     usage of the directive itself.</p>
 
     <p>Alternately, it may tell you that you had a syntax error in your
     usage of the directive itself.</p>
 

-    <pre class="prettyprint lang-config">[Tue May 06 09:14:02.946218 2025] [core:alert] [pid 12345] [client 192.168.1.50:54321] /var/www/html/.htaccess: RewriteCond: bad flag delimiters</pre>
-
+<div class="example"><pre class="prettyprint lang-sh">[Thu Jun 18 09:14:02.946218 2026] [core:alert] [pid 12345] [client 192.168.1.50:54321] /var/www/html/.htaccess: RewriteCond: bad flag delimiters</pre>
+</div>

 
     <p>In this case, the error message should be specific to the
     particular syntax error that you have committed.</p>
 
     <p>In this case, the error message should be specific to the
     particular syntax error that you have committed.</p>

diff --git a/docs/manual/howto/htaccess.html.fr.utf8 b/docs/manual/howto/htaccess.html.fr.utf8
index 934983b929bbdf6acf523cb06a98aca4386b2237..e70c1fc02ed5c24fdd5304e5ce8376c452923ede 100644 (file)
--- a/docs/manual/howto/htaccess.html.fr.utf8
+++ b/docs/manual/howto/htaccess.html.fr.utf8
@@ -30,6 +30,8 @@
 <a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../pt-br/howto/htaccess.html" hreflang="pt-br" rel="alternate" title="Portugu&ecirc;s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div>
 <a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../pt-br/howto/htaccess.html" hreflang="pt-br" rel="alternate" title="Portugu&ecirc;s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div>

+<div class="outofdate">Cette traduction peut &ecirc;tre p&eacute;rim&eacute;e. V&eacute;rifiez la version
+            anglaise pour les changements r&eacute;cents.</div>

 
 <p>Les fichiers <code>.htaccess</code> fournissent une m&eacute;thode pour
 modifier la configuration du serveur au niveau de chaque r&eacute;pertoire, sans
 
 <p>Les fichiers <code>.htaccess</code> fournissent une m&eacute;thode pour
 modifier la configuration du serveur au niveau de chaque r&eacute;pertoire, sans

diff --git a/docs/manual/howto/htaccess.html.pt-br.utf8 b/docs/manual/howto/htaccess.html.pt-br.utf8
index 218d142e27b621c320ef95c009a10e1ea66d4b59..174e23b65b4b2b9251dcc68eadbe5902f37ea9d1 100644 (file)
--- a/docs/manual/howto/htaccess.html.pt-br.utf8
+++ b/docs/manual/howto/htaccess.html.pt-br.utf8
@@ -30,6 +30,8 @@
 <a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../pt-br/howto/htaccess.html" title="Portugu&ecirc;s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div>
 <a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../pt-br/howto/htaccess.html" title="Portugu&ecirc;s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div>

+<div class="outofdate">Esta tradu&ccedil;&atilde;o pode estar desatualizada.
+        Verifique a vers&atilde;o em ingl&ecirc;s para altera&ccedil;&otilde;es recentes.</div>

 
 <p>Arquivos <code>.htaccess</code> oferecem um meio de fazer altera&ccedil;&otilde;es
 nas configura&ccedil;&otilde;es por diret&oacute;rio, sem modificar diretamente os arquivos
 
 <p>Arquivos <code>.htaccess</code> oferecem um meio de fazer altera&ccedil;&otilde;es
 nas configura&ccedil;&otilde;es por diret&oacute;rio, sem modificar diretamente os arquivos

diff --git a/docs/manual/howto/htaccess.xml.es b/docs/manual/howto/htaccess.xml.es
index 547d9867f16a87e662663d6eba3e30a888159326..be97a700bb70d02caca6fa24d7d84c408a4d6cc8 100644 (file)
--- a/docs/manual/howto/htaccess.xml.es
+++ b/docs/manual/howto/htaccess.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>

-<!-- English Revision: 1741842:1934247 (outdated) -->
+<!-- English Revision: 1741842:1935518 (outdated) -->

 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed by Luis Joaquin Gil de Bernabé Pfeiffer -->
 <!--
 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed by Luis Joaquin Gil de Bernabé Pfeiffer -->
 <!--

diff --git a/docs/manual/howto/htaccess.xml.fr b/docs/manual/howto/htaccess.xml.fr
index cfff6b2adac2e72d6aa0bbaeaa600efe29358477..7a70c739f5011ce921a0e94d80725ba2d1e37663 100644 (file)
--- a/docs/manual/howto/htaccess.xml.fr
+++ b/docs/manual/howto/htaccess.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

-<!-- English Revision: 1934247 -->
+<!-- English Revision: 1934247:1935518 (outdated) -->

 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja
index 8672a8c445f2b0004fece61e634f0d675a7b1dd8..016f3922a0031649c0c82d41a95f3387e89620dc 100644 (file)
--- a/docs/manual/howto/htaccess.xml.ja
+++ b/docs/manual/howto/htaccess.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>

-<!-- English Revision: 574882:1934247 (outdated) -->
+<!-- English Revision: 574882:1935518 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/htaccess.xml.ko b/docs/manual/howto/htaccess.xml.ko
index b89d356ca86a91c466c8a0d3f8f46f4ba1f6fe96..4097a319fc0bfd84914d10be056c43cff719411d 100644 (file)
--- a/docs/manual/howto/htaccess.xml.ko
+++ b/docs/manual/howto/htaccess.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>

-<!-- English Revision: 151408:1934247 (outdated) -->
+<!-- English Revision: 151408:1935518 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/htaccess.xml.meta b/docs/manual/howto/htaccess.xml.meta
index e26ebffa69a8d3d2c99459ae68b7fdec7fe35a07..708f779b763f060a8e27ed7cbf97b6ca799b80a8 100644 (file)
--- a/docs/manual/howto/htaccess.xml.meta
+++ b/docs/manual/howto/htaccess.xml.meta
@@ -9,9 +9,9 @@
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>

-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>

     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>

-    <variant>pt-br</variant>
+    <variant outdated="yes">pt-br</variant>

   </variants>
 </metafile>
   </variants>
 </metafile>

diff --git a/docs/manual/howto/htaccess.xml.pt-br b/docs/manual/howto/htaccess.xml.pt-br
index 65f3ddbea137974d45d72338bad2a77e0dc814f5..27629372eb89237e34c58eb6a6cb440a9e7a71a5 100644 (file)
--- a/docs/manual/howto/htaccess.xml.pt-br
+++ b/docs/manual/howto/htaccess.xml.pt-br
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.pt-br.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.pt-br.xsl"?>

-<!-- English Revision: 1934247 -->
+<!-- English Revision: 1934247:1935518 (outdated) -->

 <!-- Portuguese(BR) translation: leonardolara --><!-- Reviewed by: leonardolara -->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 <!-- Portuguese(BR) translation: leonardolara --><!-- Reviewed by: leonardolara -->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/http2.html.en.utf8 b/docs/manual/howto/http2.html.en.utf8
index ef691da6b0e0930c2107f0a52ff8c4b11a0b79fe..335ead9a250cb8247abd757848bae2fe4fd10501 100644 (file)
--- a/docs/manual/howto/http2.html.en.utf8
+++ b/docs/manual/howto/http2.html.en.utf8
@@ -30,7 +30,7 @@
 
     <p>This is the howto guide for the HTTP/2 implementation in Apache httpd. This
     feature is <em>production-ready</em> and you may expect interfaces and directives to
 
     <p>This is the howto guide for the HTTP/2 implementation in Apache httpd. This
     feature is <em>production-ready</em> and you may expect interfaces and directives to

-    remain consistent releases.
+    remain consistent across releases.

     </p>
   </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif"> <a href="#protocol">The HTTP/2 protocol</a></li>
     </p>
   </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif"> <a href="#protocol">The HTTP/2 protocol</a></li>


@@ -49,25 +49,39 @@
     
     <p>HTTP/2 is the evolution of the world's most successful application layer protocol, HTTP.
     It focuses on making more efficient use of network resources. It does not change the fundamentals
     
     <p>HTTP/2 is the evolution of the world's most successful application layer protocol, HTTP.
     It focuses on making more efficient use of network resources. It does not change the fundamentals

-    of HTTP, the semantics. There are still request and responses and headers and all that. So, if
+    of HTTP, the semantics. There are still requests and responses and headers and all that. So, if

     you already know HTTP/1, you know 95% about HTTP/2 as well.</p>
     you already know HTTP/1, you know 95% about HTTP/2 as well.</p>

-    <p>There has been a lot written about HTTP/2 and how it works. The most normative is, of course,
-    its <a href="https://www.rfc-editor.org/rfc/rfc7540">RFC 7540</a> 
-    (also available in more readable formatting, YMMV (<a href="https://www.rfc-editor.org/rfc/rfc7540">RFC 7540</a>)).
-    So, there you'll find the nuts and bolts.</p>
-    <p>But, as RFC do, it's not really a good thing to read first. It's better to first understand
-    <em>what</em> a thing wants to do and then read the RFC about <em>how</em> it is done. A much
-    better document to start with is <a href="https://daniel.haxx.se/http2/">http2  explained</a>
-    by Daniel Stenberg, the author of <a href="https://curl.haxx.se">curl</a>. It is available in
-    an ever growing list of languages, too!</p>
-    <p>Too Long, Didn't read: there are some new terms and gotchas that need to be kept in mind while reading this document:</p>
+
+    <p>The protocol is defined in <a href="https://www.rfc-editor.org/rfc/rfc9113">RFC 9113</a> (which obsoletes the original
+    <a href="https://www.rfc-editor.org/rfc/rfc7540">RFC 7540</a>). For a more approachable introduction, see
+    <a href="https://daniel.haxx.se/http2/">http2 explained</a> by Daniel Stenberg,
+    the author of <a href="https://curl.haxx.se">curl</a>. It covers the motivation
+    and design of HTTP/2 without requiring you to parse RFC notation first.</p>
+
+    <p>In short: there are some new terms and gotchas that need to be kept in
+    mind while reading this document:</p>
+

     <ul>
     <ul>

-        <li>HTTP/2 is a <strong>binary protocol</strong>, as opposed to HTTP 1.1 that is plain text. The latter is meant to be human readable (for example sniffing network traffic) meanwhile the former is not. More info in the official FAQ <a href="https://http2.github.io/faq/#why-is-http2-binary">question</a>.</li>
+        <li>HTTP/2 is a <strong>binary protocol</strong>, as opposed to HTTP 1.1
+        that is plain text. The latter is meant to be human readable (for example
+        sniffing network traffic) while the former is not. More info in the official
+        FAQ <a href="https://http2.github.io/faq/#why-is-http2-binary">question</a>.</li>

         <li><strong>h2</strong> is HTTP/2 over TLS (protocol negotiation via ALPN).</li>
         <li><strong>h2</strong> is HTTP/2 over TLS (protocol negotiation via ALPN).</li>

-        <li><strong>h2c</strong> is HTTP/2 over TCP.</li>
-        <li>A <strong>frame</strong> is the smallest unit of communication within an HTTP/2 connection, consisting of a header and a variable-length sequence of octets structured according to the frame type. More info in the official documentation <a href="https://www.rfc-editor.org/rfc/rfc7540">RFC 7540</a>.</li>
-        <li>A <strong>stream</strong> is a bidirectional flow of frames within the HTTP/2 connection. The correspondent concept in HTTP 1.1 is a request/response message exchange. More info in the official documentation <a href="https://www.rfc-editor.org/rfc/rfc7540">RFC 7540</a>.</li>
-        <li>HTTP/2 is able to run <strong>multiple streams</strong> of data over the same TCP connection, avoiding the classic HTTP 1.1 head of blocking slow request and avoiding to re-instantiate TCP connections for each request/response (KeepAlive patched the problem in HTTP 1.1 but did not fully solve it).</li>
+        <li><strong>h2c</strong> is HTTP/2 over cleartext TCP (without TLS). Note that
+        h2c has been removed from the current specification but httpd still supports it.</li>
+        <li>A <strong>frame</strong> is the smallest unit of communication within
+        an HTTP/2 connection, consisting of a header and a variable-length sequence
+        of octets structured according to the frame type. More info in the official
+        documentation <a href="https://www.rfc-editor.org/rfc/rfc9113">RFC 9113</a>.</li>
+        <li>A <strong>stream</strong> is a bidirectional flow of frames within the
+        HTTP/2 connection. The corresponding concept in HTTP 1.1 is a request/response
+        message exchange. More info in the official documentation
+        <a href="https://www.rfc-editor.org/rfc/rfc9113">RFC 9113</a>.</li>
+        <li>HTTP/2 is able to run <strong>multiple streams</strong> of data over
+        the same TCP connection, avoiding the classic HTTP 1.1 head-of-line blocking
+        of slow requests and avoiding the need to re-instantiate TCP connections
+        for each request/response (KeepAlive patched the problem in HTTP 1.1 but
+        did not fully solve it).</li>

     </ul>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
     </ul>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">


@@ -75,30 +89,30 @@
     
     <p>The HTTP/2 protocol is implemented by its own httpd module, aptly named
     <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code>. It implements the complete set
     
     <p>The HTTP/2 protocol is implemented by its own httpd module, aptly named
     <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code>. It implements the complete set

-    of features described by RFC 7540 and supports HTTP/2 over cleartext (http:), as
+    of features described by RFC 9113 and supports HTTP/2 over cleartext (http:), as

     well as secure (https:) connections. The cleartext variant is named '<code>h2c</code>', 
     the secure one '<code>h2</code>'. For <code>h2c</code> it allows the <em>direct</em>
     mode and the <code>Upgrade:</code> via an initial HTTP/1 request.</p>
     well as secure (https:) connections. The cleartext variant is named '<code>h2c</code>', 
     the secure one '<code>h2</code>'. For <code>h2c</code> it allows the <em>direct</em>
     mode and the <code>Upgrade:</code> via an initial HTTP/1 request.</p>

-    <p>One feature of HTTP/2 that offers new capabilities for web developers is
-    <a href="#push">Server Push</a>. See that section on how your web application
-    can make use of it.</p>
+    <p>One feature of HTTP/2 that formerly offered new capabilities for web developers is
+    <a href="#push">Server Push</a>, though it is now deprecated. See the
+    <a href="#earlyhints">Early Hints</a> section for the recommended alternative.</p>

   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="building">Build httpd with HTTP/2 support <a title="Permanent link" href="#building" class="permalink">&para;</a></h2>
     
     <p><code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> uses the library of <a href="https://nghttp2.org">nghttp2</a>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="building">Build httpd with HTTP/2 support <a title="Permanent link" href="#building" class="permalink">&para;</a></h2>
     
     <p><code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> uses the library of <a href="https://nghttp2.org">nghttp2</a>

-    as its implementation base. In order to build <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> you need at least version 1.2.1 of
+    as its implementation base. Building <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> requires at least version 1.2.1 of

     <code>libnghttp2</code> installed on your system.</p>
     <p>When you <code>./configure</code> your Apache httpd source tree, you need to give it 
     '<code>--enable-http2</code>' as additional argument to trigger the build of the module.
     Should your <code>libnghttp2</code> reside in an unusual place (whatever that is on your
     operating system), you may announce its location with '<code>--with-nghttp2=&lt;path&gt;</code>'
     to <code>configure</code>.</p>
     <code>libnghttp2</code> installed on your system.</p>
     <p>When you <code>./configure</code> your Apache httpd source tree, you need to give it 
     '<code>--enable-http2</code>' as additional argument to trigger the build of the module.
     Should your <code>libnghttp2</code> reside in an unusual place (whatever that is on your
     operating system), you may announce its location with '<code>--with-nghttp2=&lt;path&gt;</code>'
     to <code>configure</code>.</p>

-    <p>While that should do the trick for most, they are people who might prefer a statically
+    <p>While that should do the trick for most, there are people who might prefer a statically

     linked <code>nghttp2</code> in this module. For those, the option <code>--enable-nghttp2-staticlib-deps</code>
     linked <code>nghttp2</code> in this module. For those, the option <code>--enable-nghttp2-staticlib-deps</code>

-    exists. It works quite similar to how one statically links openssl to <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>.</p>
+    exists. It works quite similarly to how one statically links openssl to <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>.</p>

     <p>Speaking of SSL, you need to be aware that most browsers will speak HTTP/2 only on <code>https:</code>
     <p>Speaking of SSL, you need to be aware that most browsers will speak HTTP/2 only on <code>https:</code>

-    URLs, so you need a server with SSL support. But not only that, you will need a SSL library
+    URLs, so you need a server with SSL support. But not only that, you will need an SSL library

     that supports the <code>ALPN</code> extension. If OpenSSL is the library you use, you need
     at least version 1.0.2.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
     that supports the <code>ALPN</code> extension. If OpenSSL is the library you use, you need
     at least version 1.0.2.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>


@@ -107,54 +121,54 @@
     
 
     <p>When you have a <code>httpd</code> built with <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> you need some
     
 
     <p>When you have a <code>httpd</code> built with <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> you need some

-    basic configuration for it becoming active. The first thing, as with every Apache module,
+    basic configuration for it becoming active. The first thing, as with every httpd module,

     is that you need to load it:</p>
     is that you need to load it:</p>

-    <pre class="prettyprint lang-config">LoadModule http2_module modules/mod_http2.so</pre>
-
+<div class="example"><pre class="prettyprint lang-config">LoadModule http2_module modules/mod_http2.so</pre>
+</div>

     
     <p>The second directive you need to add to your server configuration is</p>
     
     <p>The second directive you need to add to your server configuration is</p>

-    <pre class="prettyprint lang-config">Protocols h2 http/1.1</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Protocols h2 http/1.1</pre>
+</div>

     <p>This allows h2, the secure variant, to be the preferred protocol on your server
     <p>This allows h2, the secure variant, to be the preferred protocol on your server

-    connections. When you want to enable all HTTP/2 variants, you simply write:</p>
-    <pre class="prettyprint lang-config">Protocols h2 h2c http/1.1</pre>
-
-    <p>Depending on where you put this directive, it affects all connections or just
-    the ones to a certain virtual host. You can nest it, as in:</p>
-    <pre class="prettyprint lang-config">Protocols http/1.1
+    connections. When you want to enable all HTTP/2 variants, write:</p>
+<div class="example"><pre class="prettyprint lang-config">Protocols h2 h2c http/1.1</pre>
+</div>
+    <p>Depending on where you put this directive, it affects all connections or only
+    those to a specific virtual host. You can nest it, as in:</p>
+<div class="example"><pre class="prettyprint lang-config">Protocols http/1.1

 &lt;VirtualHost ...&gt;
 &lt;VirtualHost ...&gt;

-    ServerName test.example.org
-    Protocols h2 http/1.1
+ServerName test.example.org
+Protocols h2 http/1.1

 &lt;/VirtualHost&gt;</pre>
 &lt;/VirtualHost&gt;</pre>

-
+</div>

 
     <p>This allows only HTTP/1 on connections, except SSL connections to <code>test.example.org</code>
     which offer HTTP/2.</p>
     <div class="note"><h3>Choose a strong SSLCipherSuite</h3>
     <p>The <code class="directive"><a href="../mod/mod_ssl.html#sslciphersuite">SSLCipherSuite</a></code> needs to be configured with
     a strong TLS cipher suite. The current version of <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> does not enforce any cipher but most
 
     <p>This allows only HTTP/1 on connections, except SSL connections to <code>test.example.org</code>
     which offer HTTP/2.</p>
     <div class="note"><h3>Choose a strong SSLCipherSuite</h3>
     <p>The <code class="directive"><a href="../mod/mod_ssl.html#sslciphersuite">SSLCipherSuite</a></code> needs to be configured with
     a strong TLS cipher suite. The current version of <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> does not enforce any cipher but most

-    clients do so. Pointing a browser to a <code>h2</code> enabled server with a inappropriate
-    cipher suite will force it to simply refuse and fall back to HTTP 1.1. This is a common mistake
-    that is done while configuring httpd for HTTP/2 the first time, so please keep it in mind to avoid
+    clients do so. Pointing a browser to a <code>h2</code> enabled server with an inappropriate
+    cipher suite causes it to refuse and fall back to HTTP 1.1. This is a common mistake
+    made while configuring httpd for HTTP/2 the first time, so please keep it in mind to avoid

     long debugging sessions! If you want to be sure about the cipher suite to choose please avoid
     long debugging sessions! If you want to be sure about the cipher suite to choose please avoid

-    the ones listed in the HTTP/2 TLS reject list (<a href="https://www.rfc-editor.org/rfc/rfc7540">RFC 7540</a>).</p>
+    the ones listed in the HTTP/2 TLS reject list (<a href="https://www.rfc-editor.org/rfc/rfc9113#section-9.2.2">RFC 9113</a>).</p>

     </div>
     <p>The order of protocols mentioned is also relevant. By default, the first one is the 
     most preferred protocol. When a client offers multiple choices, the one most to the 
     left is selected. In</p>
     </div>
     <p>The order of protocols mentioned is also relevant. By default, the first one is the 
     most preferred protocol. When a client offers multiple choices, the one most to the 
     left is selected. In</p>

-    <pre class="prettyprint lang-config">Protocols http/1.1 h2</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Protocols http/1.1 h2</pre>
+</div>

     <p>the most preferred protocol is HTTP/1 and it will always be selected unless a 
     client <em>only</em> supports h2. Since we want to talk HTTP/2 to clients that
     support it, the better order is</p>
     <p>the most preferred protocol is HTTP/1 and it will always be selected unless a 
     client <em>only</em> supports h2. Since we want to talk HTTP/2 to clients that
     support it, the better order is</p>

-    <pre class="prettyprint lang-config">Protocols h2 h2c http/1.1</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Protocols h2 h2c http/1.1</pre>
+</div>

 
     <p>There is one more thing to ordering: the client has its own preferences, too. If
     you want, you can configure your server to select the protocol most preferred by
     the client:</p>
 
     <p>There is one more thing to ordering: the client has its own preferences, too. If
     you want, you can configure your server to select the protocol most preferred by
     the client:</p>

-    <pre class="prettyprint lang-config">ProtocolsHonorOrder Off</pre>
-
+<div class="example"><pre class="prettyprint lang-config">ProtocolsHonorOrder Off</pre>
+</div>

     <p>makes the order <em>you</em> wrote the Protocols irrelevant and only the client's
     ordering will decide.</p>
     <p>A last thing: the protocols you configure are not checked for correctness
     <p>makes the order <em>you</em> wrote the Protocols irrelevant and only the client's
     ordering will decide.</p>
     <p>A last thing: the protocols you configure are not checked for correctness


@@ -171,7 +185,7 @@
     
     <p>HTTP/2 is supported in all multi-processing modules that come with httpd. However, if
     you use the <code class="module"><a href="../mod/prefork.html">prefork</a></code> mpm, there will be severe restrictions.</p>
     
     <p>HTTP/2 is supported in all multi-processing modules that come with httpd. However, if
     you use the <code class="module"><a href="../mod/prefork.html">prefork</a></code> mpm, there will be severe restrictions.</p>

-    <p>In <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> will only process one request at at time
+    <p>In <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> will only process one request at a time

     per connection. But clients, such as browsers, will send many requests at the same time.
     If one of these takes long to process (or is a long polling one), the other requests will
     stall.</p>
     per connection. But clients, such as browsers, will send many requests at the same time.
     If one of these takes long to process (or is a long polling one), the other requests will
     stall.</p>


@@ -187,9 +201,9 @@
 <div class="section">
 <h2 id="clients">Clients <a title="Permanent link" href="#clients" class="permalink">&para;</a></h2>
     
 <div class="section">
 <h2 id="clients">Clients <a title="Permanent link" href="#clients" class="permalink">&para;</a></h2>
     

-    <p>Almost all modern browsers support HTTP/2, but only over SSL connections: Firefox (v43),
-    Chrome (v45), Safari (since v9), iOS Safari (v9), Opera (v35), Chrome for Android (v49)
-    and Internet Explorer (v11 on Windows10) (<a href="http://caniuse.com/#search=http2">source</a>).</p>
+    <p>All modern browsers support HTTP/2 over TLS connections
+    (<a href="https://caniuse.com/http2">source</a>). Support has been universal across
+    major browsers since approximately 2015.</p>

     <p>Other clients, as well as servers, are listed 
     <a href="https://github.com/http2/http2-spec/wiki/Implementations">on the Implementations wiki</a>,
     among them implementations for c, c++, common lisp, dart, erlang, haskell, java, nodejs,  php, 
     <p>Other clients, as well as servers, are listed 
     <a href="https://github.com/http2/http2-spec/wiki/Implementations">on the Implementations wiki</a>,
     among them implementations for c, c++, common lisp, dart, erlang, haskell, java, nodejs,  php, 


@@ -202,14 +216,16 @@
     
     <p>The first tool to mention is of course <a href="https://curl.haxx.se">curl</a>. Please make sure that
     your version supports HTTP/2 checking its <code>Features</code>:</p>
     
     <p>The first tool to mention is of course <a href="https://curl.haxx.se">curl</a>. Please make sure that
     your version supports HTTP/2 checking its <code>Features</code>:</p>

-    <pre class="prettyprint lang-config">    $ curl -V
-    curl 7.45.0 (x86_64-apple-darwin15.0.0) libcurl/7.45.0 OpenSSL/1.0.2d zlib/1.2.8 nghttp2/1.3.4
-    Protocols: dict file ftp ftps gopher http https imap imaps ldap ldaps pop3 [...] 
-    Features: IPv6 Largefile NTLM NTLM_WB SSL libz TLS-SRP <strong>HTTP2</strong>
-    </pre>
-
-    <div class="note"><h3>Mac OS homebrew notes</h3>
-    brew install curl --with-openssl --with-nghttp2 
+<div class="example"><pre class="prettyprint lang-sh">$ curl -V
+curl 8.20.0 (x86_64-pc-linux-gnu) libcurl/8.20.0 OpenSSL/3.5.7 zlib/1.3.1 nghttp2/1.69.0
+Protocols: dict file ftp ftps gopher http https imap imaps ldap ldaps pop3 [...]
+Features: IPv6 Largefile NTLM NTLM_WB SSL libz TLS-SRP <strong>HTTP2</strong>
+</pre>
+</div>
+    <div class="note"><h3>macOS Homebrew notes</h3>
+    <p>Homebrew's <code>curl</code> includes HTTP/2 support by default. Install with
+    <code>brew install curl</code> and follow the displayed caveats to put it ahead
+    of the system curl in your PATH.</p>

     </div>
     <p>And for really deep inspection <a href="https://wiki.wireshark.org/HTTP2">wireshark</a>.</p>
     <p>The <a href="https://nghttp2.org">nghttp2</a> package also includes clients, such as:</p>
     </div>
     <p>And for really deep inspection <a href="https://wiki.wireshark.org/HTTP2">wireshark</a>.</p>
     <p>The <a href="https://nghttp2.org">nghttp2</a> package also includes clients, such as:</p>


@@ -219,13 +235,19 @@
     </ul>
     <p>Chrome offers detailed HTTP/2 logs on its connections via the 
     <a href="chrome://net-internals/#http2">special net-internals page</a>. There is also an
     </ul>
     <p>Chrome offers detailed HTTP/2 logs on its connections via the 
     <a href="chrome://net-internals/#http2">special net-internals page</a>. There is also an

-    interesting extension for <a href="https://chrome.google.com/webstore/detail/http2-and-spdy-indicator/mpbpobfflnpcgagjijhmgnchggcjblin?hl=en">Chrome</a>
-    and <a href="https://addons.mozilla.org/en-us/firefox/addon/spdy-indicator/">Firefox</a>
-    to visualize when your browser is using HTTP/2.</p>
+    interesting extension for <a href="https://chromewebstore.google.com/detail/http-indicator/hgcomhbcacfkpffiphlmnlhpppcjgmbl">Chrome</a>
+    and <a href="https://addons.mozilla.org/en-US/firefox/addon/http2-indicator/">Firefox</a>
+    to indicate when your browser is using HTTP/2.</p>

   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="push">Server Push <a title="Permanent link" href="#push" class="permalink">&para;</a></h2>
     
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="push">Server Push <a title="Permanent link" href="#push" class="permalink">&para;</a></h2>
     

+    <div class="warning"><h3>Deprecation Notice</h3>
+    <p>Server Push is deprecated in <a href="https://www.rfc-editor.org/rfc/rfc9113#section-8.4">RFC 9113</a>. Major browsers
+    (Chrome 106+, Edge 106+) have removed support for it. While <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code>
+    still implements push, new deployments should use <a href="#earlyhints">103 Early Hints</a>
+    instead as a more reliable way to inform clients about needed resources.</p>
+    </div>

     <p>The HTTP/2 protocol allows the server to PUSH responses to a client it never
     asked for. The tone of the conversation is: "here is a request that you
     never sent and the response to it will arrive soon..."</p>
     <p>The HTTP/2 protocol allows the server to PUSH responses to a client it never
     asked for. The tone of the conversation is: "here is a request that you
     never sent and the response to it will arrive soon..."</p>


@@ -242,53 +264,53 @@
     <p>To summarize: there is no one good strategy on how to make best use of this 
     feature of HTTP/2 and everyone is still experimenting. So, how do you experiment
     with it in Apache httpd?</p>
     <p>To summarize: there is no one good strategy on how to make best use of this 
     feature of HTTP/2 and everyone is still experimenting. So, how do you experiment
     with it in Apache httpd?</p>

-    <p><code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> inspect response header for <code>Link</code> headers
+    <p><code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code> inspects response headers for <code>Link</code> headers

     in a certain format:</p>
     in a certain format:</p>

-    <pre class="prettyprint lang-config">Link &lt;/xxx.css&gt;;rel=preload, &lt;/xxx.js&gt;; rel=preload</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Link &lt;/xxx.css&gt;;rel=preload, &lt;/xxx.js&gt;; rel=preload</pre>
+</div>

     <p>If the connection supports PUSH, these two resources will be sent to the
     client. As a web developer, you may set these headers either directly in
     your application response or you configure the server via</p>
     <p>If the connection supports PUSH, these two resources will be sent to the
     client. As a web developer, you may set these headers either directly in
     your application response or you configure the server via</p>

-    <pre class="prettyprint lang-config">&lt;Location /xxx.html&gt;
-    Header add Link "&lt;/xxx.css&gt;;rel=preload"
-    Header add Link "&lt;/xxx.js&gt;;rel=preload"
+<div class="example"><pre class="prettyprint lang-config">&lt;Location /xxx.html&gt;
+Header add Link "&lt;/xxx.css&gt;;rel=preload"
+Header add Link "&lt;/xxx.js&gt;;rel=preload"

 &lt;/Location&gt;</pre>
 &lt;/Location&gt;</pre>

-
+</div>

     <p>If you want to use <code>preload</code> links without triggering a PUSH, you
     can use the <code>nopush</code> parameter, as in</p>
     <p>If you want to use <code>preload</code> links without triggering a PUSH, you
     can use the <code>nopush</code> parameter, as in</p>

-    <pre class="prettyprint lang-config">Link &lt;/xxx.css&gt;;rel=preload;nopush</pre>
-
+<div class="example"><pre class="prettyprint lang-config">Link &lt;/xxx.css&gt;;rel=preload;nopush</pre>
+</div>

     <p>or you may disable PUSHes for your server entirely with the directive</p>
     <p>or you may disable PUSHes for your server entirely with the directive</p>

-    <pre class="prettyprint lang-config">H2Push Off</pre>
-
+<div class="example"><pre class="prettyprint lang-config">H2Push Off</pre>
+</div>

     <p>And there is more:</p>
     <p>The module will keep a diary of what has been PUSHed for each connection
     (hashes of URLs, basically) and will not PUSH the same resource twice. When
     the connection closes, this information is discarded.</p>
     <p>There are people thinking about how a client can tell a server what it
     <p>And there is more:</p>
     <p>The module will keep a diary of what has been PUSHed for each connection
     (hashes of URLs, basically) and will not PUSH the same resource twice. When
     the connection closes, this information is discarded.</p>
     <p>There are people thinking about how a client can tell a server what it

-    already has, so PUSHes for those things can be avoided, but this is all
-    highly experimental right now.</p>
-    <p>Another experimental draft that has been implemented in <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code>
+    already has, so PUSHes for those things can be avoided, but no standard
+    emerged before push was deprecated.</p>
+    <p>An experimental draft that was implemented in <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code>

     is the <a href="https://datatracker.ietf.org/doc/html/draft-ruellan-http-accept-push-policy-00">
     Accept-Push-Policy Header Field</a> where a client can, for each request, define
     is the <a href="https://datatracker.ietf.org/doc/html/draft-ruellan-http-accept-push-policy-00">
     Accept-Push-Policy Header Field</a> where a client can, for each request, define

-    what kind of PUSHes it accepts.</p>
+    what kind of PUSHes it accepts. This draft expired and was never adopted.</p>

     <p>
     PUSH might not always trigger the request/response/performance that one expects or 
     hopes for. There are various studies on this topic to be found on the web that explain
     benefits and weaknesses and how different features of client and network influence
     <p>
     PUSH might not always trigger the request/response/performance that one expects or 
     hopes for. There are various studies on this topic to be found on the web that explain
     benefits and weaknesses and how different features of client and network influence

-    the outcome. For example: just because the server PUSHes a resource does not mean
+    the outcome. For example: the fact that the server PUSHes a resource does not mean

     a browser will actually use the data.</p>
     <p>The major thing that influences the response being PUSHed is the request that was
     simulated. The request URL for a PUSH is given by the application, but where do the
     request headers come from? For example, will the PUSH request a <code>accept-language</code>
     header and if yes with what value?</p>
     a browser will actually use the data.</p>
     <p>The major thing that influences the response being PUSHed is the request that was
     simulated. The request URL for a PUSH is given by the application, but where do the
     request headers come from? For example, will the PUSH request a <code>accept-language</code>
     header and if yes with what value?</p>

-    <p>Apache will look at the original request (the one that triggered the PUSH) and copy the 
+    <p>httpd will look at the original request (the one that triggered the PUSH) and copy the 

     following headers over to PUSH requests: <code>user-agent</code>, <code>accept</code>, 
     <code>accept-encoding</code>, <code>accept-language</code>, <code>cache-control</code>.</p>
     <p>All other headers are ignored. Cookies will also not be copied over. PUSHing resources
     that require a cookie to be present will not work. This can be a matter of debate. But 
     following headers over to PUSH requests: <code>user-agent</code>, <code>accept</code>, 
     <code>accept-encoding</code>, <code>accept-language</code>, <code>cache-control</code>.</p>
     <p>All other headers are ignored. Cookies will also not be copied over. PUSHing resources
     that require a cookie to be present will not work. This can be a matter of debate. But 

-    unless this is more clearly discussed with browser, let's err on the side of caution and
-    not expose cookie where they might ordinarily not be visible.</p>
+    unless this is more clearly discussed with browsers, let's err on the side of caution and
+    not expose cookies where they might ordinarily not be visible.</p>

   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="earlyhints">Early Hints <a title="Permanent link" href="#earlyhints" class="permalink">&para;</a></h2>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="earlyhints">Early Hints <a title="Permanent link" href="#earlyhints" class="permalink">&para;</a></h2>


@@ -296,23 +318,23 @@
     <p>An alternative to PUSHing resources is to send <code>Link</code> headers to the
     client before the response is even ready. This uses the HTTP feature called "Early Hints" and
     is described in <a href="https://www.rfc-editor.org/rfc/rfc8297">RFC 8297</a>.</p>
     <p>An alternative to PUSHing resources is to send <code>Link</code> headers to the
     client before the response is even ready. This uses the HTTP feature called "Early Hints" and
     is described in <a href="https://www.rfc-editor.org/rfc/rfc8297">RFC 8297</a>.</p>

-    <p>In order to use this, you need to explicitly enable it on the server via</p>
-    <pre class="prettyprint lang-config">H2EarlyHints on</pre>
-
+    <p>To use this, you need to explicitly enable it on the server via</p>
+<div class="example"><pre class="prettyprint lang-config">H2EarlyHints on</pre>
+</div>

     <p>(It is not enabled by default since some older browser tripped on such responses.)</p>
     <p>If this feature is on, you can use the directive <code class="directive"><a href="../mod/mod_http2.html#h2pushresource">H2PushResource</a></code> to 
     trigger early hints and resource PUSHes:</p>
     <p>(It is not enabled by default since some older browser tripped on such responses.)</p>
     <p>If this feature is on, you can use the directive <code class="directive"><a href="../mod/mod_http2.html#h2pushresource">H2PushResource</a></code> to 
     trigger early hints and resource PUSHes:</p>

-    <pre class="prettyprint lang-config">&lt;Location /xxx.html&gt;
-    H2PushResource /xxx.css
-    H2PushResource /xxx.js
+<div class="example"><pre class="prettyprint lang-config">&lt;Location /xxx.html&gt;
+H2PushResource /xxx.css
+H2PushResource /xxx.js

 &lt;/Location&gt;</pre>
 &lt;/Location&gt;</pre>

-
+</div>

     <p>This will send out a <code>"103 Early Hints"</code> response to a client as soon
     <p>This will send out a <code>"103 Early Hints"</code> response to a client as soon

-    as the server <em>starts</em> processing the request. This may be much early than
+    as the server <em>starts</em> processing the request. This may be much earlier than

     the time the first response headers have been determined, depending on your web
     application.</p>
     <p>If <code class="directive"><a href="../mod/mod_http2.html#h2push">H2Push</a></code> is enabled, this will also start the PUSH right after the
     the time the first response headers have been determined, depending on your web
     application.</p>
     <p>If <code class="directive"><a href="../mod/mod_http2.html#h2push">H2Push</a></code> is enabled, this will also start the PUSH right after the

-    103 response. If <code class="directive"><a href="../mod/mod_http2.html#h2push">H2Push</a></code> is disabled however, the 103 response will be send
+    103 response. If <code class="directive"><a href="../mod/mod_http2.html#h2push">H2Push</a></code> is disabled however, the 103 response will be sent

     nevertheless to the client.</p>
   </div></div>
 <div class="bottomlang">
     nevertheless to the client.</p>
   </div></div>
 <div class="bottomlang">

diff --git a/docs/manual/howto/http2.html.fr.utf8 b/docs/manual/howto/http2.html.fr.utf8
index c053ec53225afb5bf45c7a81f5740ca77b0ab4fe..0fb02bb86f883b09602cf44b0571b8154bbaf534 100644 (file)
--- a/docs/manual/howto/http2.html.fr.utf8
+++ b/docs/manual/howto/http2.html.fr.utf8
@@ -27,6 +27,8 @@
 <a href="../es/howto/http2.html" hreflang="es" rel="alternate" title="Espa&ntilde;ol">&nbsp;es&nbsp;</a> |
 <a href="../fr/howto/http2.html" title="Fran&ccedil;ais">&nbsp;fr&nbsp;</a></p>
 </div>
 <a href="../es/howto/http2.html" hreflang="es" rel="alternate" title="Espa&ntilde;ol">&nbsp;es&nbsp;</a> |
 <a href="../fr/howto/http2.html" title="Fran&ccedil;ais">&nbsp;fr&nbsp;</a></p>
 </div>

+<div class="outofdate">Cette traduction peut &ecirc;tre p&eacute;rim&eacute;e. V&eacute;rifiez la version
+            anglaise pour les changements r&eacute;cents.</div>

 
     <p>Ce document est le guide de l'utilisateur de l'impl&eacute;mentation de HTTP/2
     dans Apache httpd. Cette fonctionnalit&eacute; en est au stade
 
     <p>Ce document est le guide de l'utilisateur de l'impl&eacute;mentation de HTTP/2
     dans Apache httpd. Cette fonctionnalit&eacute; en est au stade

diff --git a/docs/manual/howto/http2.xml.es b/docs/manual/howto/http2.xml.es
index b3972c3adfd2d27ec9e1e187ae6ea78f2abb386e..2842f69a7abcecd3de19ae3aa34f569bc406e546 100644 (file)
--- a/docs/manual/howto/http2.xml.es
+++ b/docs/manual/howto/http2.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>

-<!-- English Revision: 1834263:1933860 (outdated) --> 
+<!-- English Revision: 1834263:1935505 (outdated) --> 

 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed & updated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 <!--
 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed & updated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 <!--

diff --git a/docs/manual/howto/http2.xml.fr b/docs/manual/howto/http2.xml.fr
index bd2e239e98def3bda8d6b0b639c7739d3f91dcef..bbf13fc6f761ac7d6055075ff29718b69784323c 100644 (file)
--- a/docs/manual/howto/http2.xml.fr
+++ b/docs/manual/howto/http2.xml.fr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

-<!-- English Revision: 1933860 -->
+<!-- English Revision: 1933860:1935505 (outdated) -->

 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/howto/http2.xml.meta b/docs/manual/howto/http2.xml.meta
index cd0a8de06449bcb6c600a0c0793cc5d67bb7b64f..9b93a6fba040cab29c5e5e4115e69024276a5b0b 100644 (file)
--- a/docs/manual/howto/http2.xml.meta
+++ b/docs/manual/howto/http2.xml.meta
@@ -9,6 +9,6 @@
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>

-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>

   </variants>
 </metafile>
   </variants>
 </metafile>

diff --git a/docs/manual/howto/public_html.html.en.utf8 b/docs/manual/howto/public_html.html.en.utf8
index a46efd91e9d6d9a0349df38ec10ac533ee12d622..1ea435e5bfc57753497c70519dad0530e3364557 100644 (file)
--- a/docs/manual/howto/public_html.html.en.utf8
+++ b/docs/manual/howto/public_html.html.en.utf8
@@ -36,14 +36,20 @@
     to a URL <code>http://example.com/~username/</code> will get content
     out of the home directory of the user "<code>username</code>", out of
     the subdirectory specified by the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive.</p>
     to a URL <code>http://example.com/~username/</code> will get content
     out of the home directory of the user "<code>username</code>", out of
     the subdirectory specified by the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive.</p>

-<p>Note that, by default, access to these directories is <strong>not</strong>
+<p>By default, access to these directories is <strong>not</strong>

     enabled. You can enable access when using <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> by uncommenting the line:</p>
     enabled. You can enable access when using <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> by uncommenting the line:</p>

-    <pre class="prettyprint lang-config">#Include conf/extra/httpd-userdir.conf</pre>
-
+<div class="example"><pre class="prettyprint lang-config">#Include conf/extra/httpd-userdir.conf</pre>
+</div>

     <p>in the default config file <code>conf/httpd.conf</code>, and adapting the <code>httpd-userdir.conf</code>
     file as necessary, or by including the appropriate directives in a
     <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> block
     within the main config file.</p>
     <p>in the default config file <code>conf/httpd.conf</code>, and adapting the <code>httpd-userdir.conf</code>
     file as necessary, or by including the appropriate directives in a
     <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> block
     within the main config file.</p>

+
+    <div class="note">Third-party distributions of httpd (from your OS vendor or
+    package manager) often place the <code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code>
+    configuration in a separate file, and may enable it by default.
+    Check your distribution's documentation for specifics. The examples
+    in this document assume a default source build of httpd.</div>

 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif"> <a href="#related">Per-user web directories</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#userdir">Setting the file path with UserDir</a></li>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif"> <a href="#related">Per-user web directories</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#userdir">Setting the file path with UserDir</a></li>


@@ -71,8 +77,8 @@
     assumed to be a directory path relative to the home directory of the
     specified user. Given this configuration:</p>
 
     assumed to be a directory path relative to the home directory of the
     specified user. Given this configuration:</p>
 

-    <pre class="prettyprint lang-config">UserDir public_html</pre>
-
+<div class="example"><pre class="prettyprint lang-config">UserDir public_html</pre>
+</div>

 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path


@@ -82,8 +88,8 @@
     constructed using that path, plus the username specified. Given this
     configuration:</p>
 
     constructed using that path, plus the username specified. Given this
     configuration:</p>
 

-    <pre class="prettyprint lang-config">UserDir /var/html</pre>
-
+<div class="example"><pre class="prettyprint lang-config">UserDir /var/html</pre>
+</div>

 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path <code>/var/html/rbowen/file.html</code></p>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path <code>/var/html/rbowen/file.html</code></p>


@@ -92,8 +98,8 @@
     in which the asterisk is replaced with the username. Given this
     configuration:</p>
 
     in which the asterisk is replaced with the username. Given this
     configuration:</p>
 

-    <pre class="prettyprint lang-config">UserDir /var/www/*/docs</pre>
-
+<div class="example"><pre class="prettyprint lang-config">UserDir /var/www/*/docs</pre>
+</div>

 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path


@@ -101,14 +107,14 @@
 
     <p>Multiple directories or directory paths can also be set.</p>
 
 
     <p>Multiple directories or directory paths can also be set.</p>
 

-    <pre class="prettyprint lang-config">UserDir public_html /var/html</pre>
-
+<div class="example"><pre class="prettyprint lang-config">UserDir public_html /var/html</pre>
+</div>

 
 

-    <p>For the URL <code>http://example.com/~rbowen/file.html</code>,
-    Apache will search for <code>~rbowen</code>. If it isn't found,
-    Apache will search for <code>rbowen</code> in <code>/var/html</code>. If
-    found, the above URL will then be translated to the file path
-    <code>/var/html/rbowen/file.html</code></p>
+    <p>The arguments are considered in the order they appear.
+    For the URL <code>http://example.com/~rbowen/file.html</code>,
+    httpd will search for <code>~rbowen</code>. If it isn't found,
+    httpd will then search for <code>rbowen</code> in <code>/var/html</code>. 
+    The file will be served from whichever location is found first.</p>

 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">


@@ -117,8 +123,8 @@
     <p>The <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive can be
       used to redirect user directory requests to external URLs.</p>
 
     <p>The <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive can be
       used to redirect user directory requests to external URLs.</p>
 

-    <pre class="prettyprint lang-config">UserDir http://example.org/users/*/</pre>
-
+<div class="example"><pre class="prettyprint lang-config">UserDir http://example.org/users/*/</pre>
+</div>

 
     <p>The above example will redirect a request for
     <code>http://example.com/~bob/abc.html</code> to
 
     <p>The above example will redirect a request for
     <code>http://example.com/~bob/abc.html</code> to


@@ -132,17 +138,17 @@
     <p>Using the syntax shown in the UserDir documentation, you can restrict
     what users are permitted to use this functionality:</p>
 
     <p>Using the syntax shown in the UserDir documentation, you can restrict
     what users are permitted to use this functionality:</p>
 

-    <pre class="prettyprint lang-config">UserDir disabled root jro fish</pre>
-
+<div class="example"><pre class="prettyprint lang-config">UserDir disabled root jro fish</pre>
+</div>

 
     <p>The configuration above will enable the feature for all users
     except for those listed in the <code>disabled</code> statement.
     You can, likewise, disable the feature for all but a few users by
     using a configuration like the following:</p>
 
 
     <p>The configuration above will enable the feature for all users
     except for those listed in the <code>disabled</code> statement.
     You can, likewise, disable the feature for all but a few users by
     using a configuration like the following:</p>
 

-    <pre class="prettyprint lang-config">UserDir disabled
+<div class="example"><pre class="prettyprint lang-config">UserDir disabled

 UserDir enabled rbowen krietz</pre>
 UserDir enabled rbowen krietz</pre>

-
+</div>

 
     <p>See <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
     documentation for additional examples.</p>
 
     <p>See <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
     documentation for additional examples.</p>


@@ -152,16 +158,16 @@ UserDir enabled rbowen krietz</pre>
 <h2 id="cgi">Enabling a cgi directory for each user <a title="Permanent link" href="#cgi" class="permalink">&para;</a></h2>
   
 
 <h2 id="cgi">Enabling a cgi directory for each user <a title="Permanent link" href="#cgi" class="permalink">&para;</a></h2>
   
 

-   <p>In order to give each user their own cgi-bin directory, you can use
+   <p>To give each user their own cgi-bin directory, you can use

     a <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
     directive to make a particular subdirectory of a user's home directory
     cgi-enabled.</p>
 
     a <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
     directive to make a particular subdirectory of a user's home directory
     cgi-enabled.</p>
 

-    <pre class="prettyprint lang-config">&lt;Directory "/home/*/public_html/cgi-bin/"&gt;
-    Options ExecCGI
-    SetHandler cgi-script
+<div class="example"><pre class="prettyprint lang-config">&lt;Directory "/home/*/public_html/cgi-bin/"&gt;
+Options ExecCGI
+SetHandler cgi-script

 &lt;/Directory&gt;</pre>
 &lt;/Directory&gt;</pre>

-
+</div>

 
     <p>Then, presuming that <code>UserDir</code> is set to
     <code>public_html</code>, a cgi program <code>example.cgi</code>
 
     <p>Then, presuming that <code>UserDir</code> is set to
     <code>public_html</code>, a cgi program <code>example.cgi</code>


@@ -176,7 +182,7 @@ UserDir enabled rbowen krietz</pre>
 <h2 id="htaccess">Allowing users to alter configuration <a title="Permanent link" href="#htaccess" class="permalink">&para;</a></h2>
     
 
 <h2 id="htaccess">Allowing users to alter configuration <a title="Permanent link" href="#htaccess" class="permalink">&para;</a></h2>
     
 

-    <p>If you want to allows users to modify the server configuration in
+    <p>If you want to allow users to modify the server configuration in

     their web space, they will need to use <code>.htaccess</code> files to
     make these changes. Ensure that you have set <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> to a
     value sufficient for the directives that you want to permit the users
     their web space, they will need to use <code>.htaccess</code> files to
     make these changes. Ensure that you have set <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> to a
     value sufficient for the directives that you want to permit the users

diff --git a/docs/manual/howto/public_html.html.es.utf8 b/docs/manual/howto/public_html.html.es.utf8
index da0883672b5b7de16c0a13b5a50a2dcd64c80fc8..d47e6f0a024313ce4aed6df4b52c672b092fbe16 100644 (file)
--- a/docs/manual/howto/public_html.html.es.utf8
+++ b/docs/manual/howto/public_html.html.es.utf8
@@ -30,6 +30,10 @@
 <a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/howto/public_html.html" hreflang="tr" rel="alternate" title="T&uuml;rk&ccedil;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/howto/public_html.html" hreflang="tr" rel="alternate" title="T&uuml;rk&ccedil;e">&nbsp;tr&nbsp;</a></p>
 </div>

+<div class="outofdate">Esta traducci&oacute;n podr&iacute;a estar
+            obsoleta. Consulte la versi&oacute;n en ingl&eacute;s de la
+            documentaci&oacute;n para comprobar si se han producido cambios
+            recientemente.</div>

 
        <p>En sistemas con m&uacute;ltiples usuarios, cada usuario puede tener un website 
     en su directorio home usando la directiva <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>. Los visitantes de una URL 
 
        <p>En sistemas con m&uacute;ltiples usuarios, cada usuario puede tener un website 
     en su directorio home usando la directiva <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>. Los visitantes de una URL 

diff --git a/docs/manual/howto/public_html.html.fr.utf8 b/docs/manual/howto/public_html.html.fr.utf8
index c1171a977a49030cb09a0fd429917a5de5961163..e61a7206c54e03832d32f728e85c1e99a39e776f 100644 (file)
--- a/docs/manual/howto/public_html.html.fr.utf8
+++ b/docs/manual/howto/public_html.html.fr.utf8
@@ -30,6 +30,8 @@
 <a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/howto/public_html.html" hreflang="tr" rel="alternate" title="T&uuml;rk&ccedil;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/howto/public_html.html" hreflang="tr" rel="alternate" title="T&uuml;rk&ccedil;e">&nbsp;tr&nbsp;</a></p>
 </div>

+<div class="outofdate">Cette traduction peut &ecirc;tre p&eacute;rim&eacute;e. V&eacute;rifiez la version
+            anglaise pour les changements r&eacute;cents.</div>

 
 <p>Sur les syst&egrave;mes multi-utilisateurs, on peut permettre &agrave; chaque
 utilisateur d'avoir un site web dans son r&eacute;pertoire home &agrave; l'aide de la
 
 <p>Sur les syst&egrave;mes multi-utilisateurs, on peut permettre &agrave; chaque
 utilisateur d'avoir un site web dans son r&eacute;pertoire home &agrave; l'aide de la

diff --git a/docs/manual/howto/public_html.xml.es b/docs/manual/howto/public_html.xml.es
index e0a374cab24c782f70cea75390eebe8589a77024..1088f3f58f0b4adac1c454d8cbe69b4a0a505fe3 100644 (file)
--- a/docs/manual/howto/public_html.xml.es
+++ b/docs/manual/howto/public_html.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>

-<!-- English Revision: 1745711  -->
+<!-- English Revision: 1745711:1935516 (outdated) -->

 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed by: Luis Gil de Bernabé Pfeiffer -->
 
 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed by: Luis Gil de Bernabé Pfeiffer -->
 

diff --git a/docs/manual/howto/public_html.xml.fr b/docs/manual/howto/public_html.xml.fr
index c871f6453390f692b0fee4597d0e08661eb88001..40bdcccc41a7c965c162b2412818613c0b5bbf12 100644 (file)
--- a/docs/manual/howto/public_html.xml.fr
+++ b/docs/manual/howto/public_html.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

-<!-- English Revision: 1745711 -->
+<!-- English Revision: 1745711:1935516 (outdated) -->

 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/howto/public_html.xml.ja b/docs/manual/howto/public_html.xml.ja
index 2dc2f64a41519a5dfb5f1a413ecbdde6a22e6b86..2e4cacb357d8c644dd1786550bf0e36a8208cc08 100644 (file)
--- a/docs/manual/howto/public_html.xml.ja
+++ b/docs/manual/howto/public_html.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>

-<!-- English Revision: 1591191:1745711 (outdated) -->
+<!-- English Revision: 1591191:1935516 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/public_html.xml.ko b/docs/manual/howto/public_html.xml.ko
index 52703a3c27bac2aa46521d79214cad2d60df1a5f..8ca6144b3635f1137e754139aed081bae406e2db 100644 (file)
--- a/docs/manual/howto/public_html.xml.ko
+++ b/docs/manual/howto/public_html.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>

-<!-- English Revision: 151408:1745711 (outdated) -->
+<!-- English Revision: 151408:1935516 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/public_html.xml.meta b/docs/manual/howto/public_html.xml.meta
index 21c279a14dcccb334aba5cc23bb2724a28c8818a..837b62daaf38a2cf903a02db2443d8372e110c57 100644 (file)
--- a/docs/manual/howto/public_html.xml.meta
+++ b/docs/manual/howto/public_html.xml.meta
@@ -8,8 +8,8 @@
 
   <variants>
     <variant>en</variant>
 
   <variants>
     <variant>en</variant>

-    <variant>es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">es</variant>
+    <variant outdated="yes">fr</variant>

     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>

diff --git a/docs/manual/howto/public_html.xml.tr b/docs/manual/howto/public_html.xml.tr
index bff0e5eb65da5d43f8effcbd80f7883c39db79bd..8f2b434d4b33c8f2008316b0d8962ec00a54fdd6 100644 (file)
--- a/docs/manual/howto/public_html.xml.tr
+++ b/docs/manual/howto/public_html.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>

-<!-- English Revision: 1174747:1745711 (outdated) -->
+<!-- English Revision: 1174747:1935516 (outdated) -->

 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

diff --git a/docs/manual/howto/reverse_proxy.html.en.utf8 b/docs/manual/howto/reverse_proxy.html.en.utf8
index 0cd9f7f1978885749577a4e6aa20787f0606daba..01c5d739e491eec416d15c092849eb2913f1d52b 100644 (file)
--- a/docs/manual/howto/reverse_proxy.html.en.utf8
+++ b/docs/manual/howto/reverse_proxy.html.en.utf8
@@ -28,26 +28,19 @@
 <a href="../fr/howto/reverse_proxy.html" hreflang="fr" rel="alternate" title="Fran&ccedil;ais">&nbsp;fr&nbsp;</a></p>
 </div>
 
 <a href="../fr/howto/reverse_proxy.html" hreflang="fr" rel="alternate" title="Fran&ccedil;ais">&nbsp;fr&nbsp;</a></p>
 </div>
 

-    <p>In addition to being a "basic" web server, and providing static and
-    dynamic content to end-users, Apache httpd (as well as most other web
-    servers) can also act as a reverse proxy server, also-known-as a
-    "gateway" server.</p>
-
-    <p>In such scenarios, httpd itself does not generate or host the data,
-    but rather the content is obtained by one or several backend servers,
-    which normally have no direct connection to the external network. As
-    httpd receives a request from a client, the request itself is <em>proxied</em>
-    to one of these backend servers, which then handles the request, generates
-    the content and then sends this content back to httpd, which then
-    generates the actual HTTP response back to the client.</p>
-
-    <p>There are numerous reasons for such an implementation, but generally
-    the typical rationales are due to security, high-availability, load-balancing
-    and centralized authentication/authorization. It is critical in these
-    implementations that the layout, design and architecture of the backend
-    infrastructure (those servers which actually handle the requests) are
-    insulated and protected from the outside; as far as the client is concerned,
-    the reverse proxy server <em>is</em> the sole source of all content.</p>
+    <p>Besides serving static and dynamic content directly, Apache httpd
+    can act as a reverse proxy server (sometimes called a gateway).</p>
+
+    <p>In this mode, httpd does not generate the content itself. Instead,
+    it forwards each client request to one or more backend servers that
+    have no direct connection to the external network. The backend
+    processes the request and returns the content to httpd, which then
+    delivers the HTTP response to the client.</p>
+
+    <p>Common reasons include security, high availability, load balancing,
+    and centralized authentication. The backend infrastructure should be isolated from the external
+    network; as far as the client is concerned, the reverse proxy
+    <em>is</em> the sole source of all content.</p>

 
     <p>A typical implementation is below:</p>
     <p class="centered"><img src="../images/reverse-proxy-arch.png" alt="reverse-proxy-arch"></p>
 
     <p>A typical implementation is below:</p>
     <p class="centered"><img src="../images/reverse-proxy-arch.png" alt="reverse-proxy-arch"></p>


@@ -80,28 +73,28 @@
       to a single backend:
     </p>
 
       to a single backend:
     </p>
 

-    <pre class="prettyprint lang-config">ProxyPass "/"  "http://www.example.com/"</pre>
-
+<div class="example"><pre class="prettyprint lang-config">ProxyPass "/"  "http://www.example.com/"</pre>
+</div>

 
     <p>
 
     <p>

-      To ensure that and <code>Location:</code> headers generated from
+      To ensure that <code>Location:</code> headers generated from

       the backend are modified to point to the reverse proxy, instead of
       back to itself, the <code class="directive"><a href="../mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code>
       directive is most often required:
     </p>
 
       the backend are modified to point to the reverse proxy, instead of
       back to itself, the <code class="directive"><a href="../mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code>
       directive is most often required:
     </p>
 

-    <pre class="prettyprint lang-config">ProxyPass "/"  "http://www.example.com/"
+<div class="example"><pre class="prettyprint lang-config">ProxyPass "/"  "http://www.example.com/"

 ProxyPassReverse "/"  "http://www.example.com/"</pre>
 ProxyPassReverse "/"  "http://www.example.com/"</pre>

-
+</div>

 
     <p>Only specific URIs can be proxied, as shown in this example:</p>
 
 
     <p>Only specific URIs can be proxied, as shown in this example:</p>
 

-    <pre class="prettyprint lang-config">ProxyPass "/images"  "http://www.example.com/"
+<div class="example"><pre class="prettyprint lang-config">ProxyPass "/images"  "http://www.example.com/"

 ProxyPassReverse "/images"  "http://www.example.com/"</pre>
 ProxyPassReverse "/images"  "http://www.example.com/"</pre>

-
+</div>

 
     <p>In the above, any requests which start with the <code>/images</code>
 
     <p>In the above, any requests which start with the <code>/images</code>

-      path with be proxied to the specified backend, otherwise it will be handled
+      path will be proxied to the specified backend, otherwise it will be handled

       locally.
     </p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
       locally.
     </p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>


@@ -110,27 +103,24 @@ ProxyPassReverse "/images"  "http://www.example.com/"</pre>
     
 
     <p>
     
 
     <p>

-      As useful as the above is, it still has the deficiencies that should
-      the (single) backend node go down, or become heavily loaded, that proxying
-      those requests provides no real advantage. What is needed is the ability
-      to define a set or group of backend servers which can handle such
-      requests and for the reverse proxy to load balance and failover among
-      them. This group is sometimes called a <em>cluster</em> but Apache httpd's
-      term is a <em>balancer</em>. One defines a balancer by leveraging the
+      The single-backend setup above has an obvious weakness: if that
+      node goes down or becomes overloaded, the proxied content is unavailable.
+      What you need is a group of backend servers that the reverse proxy can
+      load-balance and failover among. This group is sometimes called a <em>cluster</em>; Apache httpd's
+      term is a <em>balancer</em>. You define a balancer using the

       <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code> and
       <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code> and

-      <code class="directive"><a href="../mod/mod_proxy.html#balancermember">BalancerMember</a></code> directives as
-      shown:
+      <code class="directive"><a href="../mod/mod_proxy.html#balancermember">BalancerMember</a></code> directives:

     </p>
 
     </p>
 

-    <pre class="prettyprint lang-config">&lt;Proxy balancer://myset&gt;
-    BalancerMember http://www2.example.com:8080
-    BalancerMember http://www3.example.com:8080
-    ProxySet lbmethod=bytraffic
+<div class="example"><pre class="prettyprint lang-config">&lt;Proxy balancer://myset&gt;
+BalancerMember http://www2.example.com:8080
+BalancerMember http://www3.example.com:8080
+ProxySet lbmethod=bytraffic

 &lt;/Proxy&gt;
 
 ProxyPass "/images/"  "balancer://myset/"
 ProxyPassReverse "/images/"  "balancer://myset/"</pre>
 &lt;/Proxy&gt;
 
 ProxyPass "/images/"  "balancer://myset/"
 ProxyPassReverse "/images/"  "balancer://myset/"</pre>

-
+</div>

 
     <p>
       The <code>balancer://</code> scheme is what tells httpd that we are creating
 
     <p>
       The <code>balancer://</code> scheme is what tells httpd that we are creating


@@ -154,23 +144,21 @@ ProxyPassReverse "/images/"  "balancer://myset/"</pre>
     
 
     <p>
     
 
     <p>

-      You can adjust numerous configuration details of the <em>balancers</em>
-      and the <em>workers</em> via the various parameters defined in
-      <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>. For example,
-      assuming we would want <code>http://www3.example.com:8080</code> to
-      handle 3x the traffic with a timeout of 1 second, we would adjust the
-      configuration as follows:
+      You can tune <em>balancers</em> and <em>workers</em> through
+      parameters on <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>.
+      For example, to have <code>http://www3.example.com:8080</code>
+      handle 3&times; the traffic with a 1-second timeout:

     </p>
 
     </p>
 

-    <pre class="prettyprint lang-config">&lt;Proxy balancer://myset&gt;
-    BalancerMember http://www2.example.com:8080
-    BalancerMember http://www3.example.com:8080 loadfactor=3 timeout=1
-    ProxySet lbmethod=bytraffic
+<div class="example"><pre class="prettyprint lang-config">&lt;Proxy balancer://myset&gt;
+BalancerMember http://www2.example.com:8080
+BalancerMember http://www3.example.com:8080 loadfactor=3 timeout=1
+ProxySet lbmethod=bytraffic

 &lt;/Proxy&gt;
 
 ProxyPass "/images"  "balancer://myset/"
 ProxyPassReverse "/images"  "balancer://myset/"</pre>
 &lt;/Proxy&gt;
 
 ProxyPass "/images"  "balancer://myset/"
 ProxyPassReverse "/images"  "balancer://myset/"</pre>

-
+</div>

 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">


@@ -178,9 +166,9 @@ ProxyPassReverse "/images"  "balancer://myset/"</pre>
     
 
     <p>
     
 
     <p>

-      You can also fine-tune various failover scenarios, detailing which workers
-      and even which balancers should be accessed in such cases. For example, the
-      below setup implements three failover cases:
+      You can fine-tune failover scenarios, specifying which workers and
+      balancers handle traffic when others fail. The setup below
+      implements three failover cases:

     </p>
     <ol>
       <li>
     </p>
     <ol>
       <li>


@@ -203,32 +191,30 @@ ProxyPassReverse "/images"  "balancer://myset/"</pre>
       </li>
     </ol>
     <p>
       </li>
     </ol>
     <p>

-      Thus, it is possible to have one or more hot spares and hot standbys for
-      each load balancer set.
+      You can have one or more hot spares and hot standbys for each
+      load balancer set.

     </p>
 
     </p>
 

-    <pre class="prettyprint lang-config">&lt;Proxy balancer://myset&gt;
-    BalancerMember http://www2.example.com:8080
-    BalancerMember http://www3.example.com:8080 loadfactor=3 timeout=1
-    BalancerMember http://spare1.example.com:8080 status=+R
-    BalancerMember http://spare2.example.com:8080 status=+R
-    BalancerMember http://hstandby.example.com:8080 status=+H
-    BalancerMember http://bkup1.example.com:8080 lbset=1
-    BalancerMember http://bkup2.example.com:8080 lbset=1
-    ProxySet lbmethod=byrequests
+<div class="example"><pre class="prettyprint lang-config">&lt;Proxy balancer://myset&gt;
+BalancerMember http://www2.example.com:8080
+BalancerMember http://www3.example.com:8080 loadfactor=3 timeout=1
+BalancerMember http://spare1.example.com:8080 status=+R
+BalancerMember http://spare2.example.com:8080 status=+R
+BalancerMember http://hstandby.example.com:8080 status=+H
+BalancerMember http://bkup1.example.com:8080 lbset=1
+BalancerMember http://bkup2.example.com:8080 lbset=1
+ProxySet lbmethod=byrequests

 &lt;/Proxy&gt;
 
 ProxyPass "/images/"  "balancer://myset/"
 ProxyPassReverse "/images/"  "balancer://myset/"</pre>
 &lt;/Proxy&gt;
 
 ProxyPass "/images/"  "balancer://myset/"
 ProxyPassReverse "/images/"  "balancer://myset/"</pre>

-
+</div>

 
     <p>
 
     <p>

-      For failover, hot spares are used as replacements for unusable workers in
-      the same load balancer set. A worker is considered unusable if it is
-      draining, stopped, or otherwise in an error/failed state. Hot standbys are
-      used if all workers and spares in the load balancer set are
-      unavailable. Load balancer sets (with their respective hot spares and
-      standbys) are always tried in order from lowest to highest.
+      Hot spares replace unusable workers (draining, stopped, or in an
+      error state) within the same load balancer set. Hot standbys
+      activate only when all workers and spares in a set are unavailable.
+      Sets are tried in order from lowest to highest.

     </p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
     </p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>


@@ -237,22 +223,19 @@ ProxyPassReverse "/images/"  "balancer://myset/"</pre>
     
 
     <p>
     
 
     <p>

-      One of the most unique and useful features of Apache httpd's reverse proxy is
-         the embedded <em>balancer-manager</em> application. Similar to
-         <code class="module"><a href="../mod/mod_status.html">mod_status</a></code>, <em>balancer-manager</em> displays
-         the current working configuration and status of the enabled
-         balancers and workers currently in use. However, not only does it
-         display these parameters, it also allows for dynamic, runtime, on-the-fly
-         reconfiguration of almost all of them, including adding new <em>BalancerMembers</em>
-         (workers) to an existing balancer. To enable these capability, the following
-         needs to be added to your configuration:
+      Apache httpd includes an embedded <em>balancer-manager</em>
+         application. Like <code class="module"><a href="../mod/mod_status.html">mod_status</a></code>, it displays the
+         current configuration and status of your balancers and workers.
+         It also lets you reconfigure them at runtime&mdash;including adding
+         new <em>BalancerMembers</em> to an existing balancer. To enable
+         it, add the following to your configuration:

     </p>
 
     </p>
 

-    <pre class="prettyprint lang-config">&lt;Location "/balancer-manager"&gt;
-    SetHandler balancer-manager
-    Require host localhost
+<div class="example"><pre class="prettyprint lang-config">&lt;Location "/balancer-manager"&gt;
+SetHandler balancer-manager
+Require host localhost

 &lt;/Location&gt;</pre>
 &lt;/Location&gt;</pre>

-
+</div>

 
     <div class="warning"><h3>Warning</h3>
       <p>Do not enable the <em>balancer-manager</em> until you have <a href="../mod/mod_proxy.html#access">secured your server</a>. In
 
     <div class="warning"><h3>Warning</h3>
       <p>Do not enable the <em>balancer-manager</em> until you have <a href="../mod/mod_proxy.html#access">secured your server</a>. In


@@ -261,16 +244,16 @@ ProxyPassReverse "/images/"  "balancer://myset/"</pre>
     </div>
 
     <p>
     </div>
 
     <p>

-      When the reverse proxy server is accessed at that url
-      (eg: <code>http://rproxy.example.com/balancer-manager/</code>, you will see a
-      page similar to the below:
+      When you access that URL
+      (e.g. <code>http://rproxy.example.com/balancer-manager/</code>), you
+      will see a page like this:

     </p>
     <p class="centered"><img src="../images/bal-man.png" alt="balancer-manager page"></p>
 
     <p>
     </p>
     <p class="centered"><img src="../images/bal-man.png" alt="balancer-manager page"></p>
 
     <p>

-      This form allows the devops admin to adjust various parameters, take
-      workers offline, change load balancing methods and add new works. For
-      example, clicking on the balancer itself, you will get the following page:
+      From here you can adjust parameters, take workers offline, change
+      load balancing methods, and add new workers. Clicking on the
+      balancer itself shows:

     </p>
     <p class="centered"><img src="../images/bal-man-b.png" alt="balancer-manager page"></p>
 
     </p>
     <p class="centered"><img src="../images/bal-man-b.png" alt="balancer-manager page"></p>
 


@@ -280,8 +263,8 @@ ProxyPassReverse "/images/"  "balancer://myset/"</pre>
     <p class="centered"><img src="../images/bal-man-w.png" alt="balancer-manager page"></p>
 
     <p>
     <p class="centered"><img src="../images/bal-man-w.png" alt="balancer-manager page"></p>
 
     <p>

-      To have these changes persist restarts of the reverse proxy, ensure that
-      <code class="directive"><a href="../mod/mod_proxy.html#balancerpersist">BalancerPersist</a></code> is enabled.
+      To persist these changes across restarts, enable
+      <code class="directive"><a href="../mod/mod_proxy.html#balancerpersist">BalancerPersist</a></code>.

     </p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
     </p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>


@@ -290,12 +273,11 @@ ProxyPassReverse "/images/"  "balancer://myset/"</pre>
     
 
     <p>
     
 
     <p>

-      Before httpd proxies a request to a worker, it can <em>"test"</em> if that worker
-      is available via setting the <code>ping</code> parameter for that worker using
-      <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>. Oftentimes it is
-      more useful to check the health of the workers <em>out of band</em>, in a
-      dynamic fashion. This is achieved in Apache httpd by the
-      <code class="module"><a href="../mod/mod_proxy_hcheck.html">mod_proxy_hcheck</a></code> module.
+      Before proxying a request, httpd can test whether a worker is
+      available using the <code>ping</code> parameter in
+      <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>. Often it is
+      more useful to check worker health <em>out of band</em>.
+      <code class="module"><a href="../mod/mod_proxy_hcheck.html">mod_proxy_hcheck</a></code> provides this capability.

     </p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
     </p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>

diff --git a/docs/manual/howto/reverse_proxy.html.fr.utf8 b/docs/manual/howto/reverse_proxy.html.fr.utf8
index 28823cee668e994a8426ab25fb89b63d61711901..0586c43f2405c947c2b8af718e9007c3eef26561 100644 (file)
--- a/docs/manual/howto/reverse_proxy.html.fr.utf8
+++ b/docs/manual/howto/reverse_proxy.html.fr.utf8
@@ -27,6 +27,8 @@
 <a href="../es/howto/reverse_proxy.html" hreflang="es" rel="alternate" title="Espa&ntilde;ol">&nbsp;es&nbsp;</a> |
 <a href="../fr/howto/reverse_proxy.html" title="Fran&ccedil;ais">&nbsp;fr&nbsp;</a></p>
 </div>
 <a href="../es/howto/reverse_proxy.html" hreflang="es" rel="alternate" title="Espa&ntilde;ol">&nbsp;es&nbsp;</a> |
 <a href="../fr/howto/reverse_proxy.html" title="Fran&ccedil;ais">&nbsp;fr&nbsp;</a></p>
 </div>

+<div class="outofdate">Cette traduction peut &ecirc;tre p&eacute;rim&eacute;e. V&eacute;rifiez la version
+            anglaise pour les changements r&eacute;cents.</div>

 
     <p>En plus de ses fonctions de serveur web "basique", &agrave; savoir fournir du
     contenu statique et dynamique &agrave; l'utilisateur, Apache httpd (comme la
 
     <p>En plus de ses fonctions de serveur web "basique", &agrave; savoir fournir du
     contenu statique et dynamique &agrave; l'utilisateur, Apache httpd (comme la

diff --git a/docs/manual/howto/reverse_proxy.xml.es b/docs/manual/howto/reverse_proxy.xml.es
index 9075783472eda11707a052e51730f8d0a41ff38c..7b1361a49a29bc6bf180289dfaeb794df62f910c 100644 (file)
--- a/docs/manual/howto/reverse_proxy.xml.es
+++ b/docs/manual/howto/reverse_proxy.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>

-<!-- English Revision: 1784674:1874148 (outdated) -->
+<!-- English Revision: 1784674:1935520 (outdated) -->

 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed by Luis Gil de Bernabé Pfeiffer -->
 
 <!-- Spanish translation : Daniel Ferradal -->
 <!-- Reviewed by Luis Gil de Bernabé Pfeiffer -->
 

diff --git a/docs/manual/howto/reverse_proxy.xml.fr b/docs/manual/howto/reverse_proxy.xml.fr
index 4a68e858cda1f57f9102e793aa4104c3b49d9d71..0447142cb3e73ada0e1fd1f3823ac215b8a64f79 100644 (file)
--- a/docs/manual/howto/reverse_proxy.xml.fr
+++ b/docs/manual/howto/reverse_proxy.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

-<!-- English Revision: 1874148 -->
+<!-- English Revision: 1874148:1935520 (outdated) -->

 <!-- French translation : Lucien GENTIS -->
 
 <!--
 <!-- French translation : Lucien GENTIS -->
 
 <!--

diff --git a/docs/manual/howto/reverse_proxy.xml.meta b/docs/manual/howto/reverse_proxy.xml.meta
index 81e38878e9a8f3d3fe93a849e1824119312ee397..e1b2d0688e412912dd68d8facd11955d34ee0fd7 100644 (file)
--- a/docs/manual/howto/reverse_proxy.xml.meta
+++ b/docs/manual/howto/reverse_proxy.xml.meta
@@ -9,6 +9,6 @@
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
   <variants>
     <variant>en</variant>
     <variant outdated="yes">es</variant>

-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>

   </variants>
 </metafile>
   </variants>
 </metafile>

diff --git a/docs/manual/howto/ssi.html.en.utf8 b/docs/manual/howto/ssi.html.en.utf8
index c909a91dcdf6f895cd7bac5745f7320f3b6cd6fe..4ad67a2d682a4d62df1776340f32d214e19446fb 100644 (file)
--- a/docs/manual/howto/ssi.html.en.utf8
+++ b/docs/manual/howto/ssi.html.en.utf8
@@ -30,15 +30,17 @@
 <a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 
 <a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 

-<p>Server-side includes provide a means to add dynamic content to
-existing HTML documents.</p>
+<p>Server Side Includes (SSI) provide a way to add dynamic content to
+existing HTML documents without requiring a full application framework.
+They are particularly useful for inserting common elements &mdash; headers,
+footers, navigation, timestamps &mdash; into otherwise static pages.</p>

 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif"> <a href="#related">Introduction</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#what">What are SSI?</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#configuring">Configuring your server to permit SSI</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#basic">Basic SSI directives</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#additionalexamples">Additional examples</a></li>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif"> <a href="#related">Introduction</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#what">What are SSI?</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#configuring">Configuring your server to permit SSI</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#basic">Basic SSI directives</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#additionalexamples">Additional examples</a></li>

-<li><img alt="" src="../images/down.gif"> <a href="#config">What else can I config?</a></li>
+<li><img alt="" src="../images/down.gif"> <a href="#config">Other config options</a></li>

 <li><img alt="" src="../images/down.gif"> <a href="#exec">Executing commands</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#advanced">Advanced SSI techniques</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#conclusion">Conclusion</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#exec">Executing commands</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#advanced">Advanced SSI techniques</a></li>
 <li><img alt="" src="../images/down.gif"> <a href="#conclusion">Conclusion</a></li>


@@ -48,184 +50,151 @@ existing HTML documents.</p>
 <h2 id="related">Introduction <a title="Permanent link" href="#related" class="permalink">&para;</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_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li><li><code class="directive"><a href="../mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li></ul></td></tr></table>
 
 <h2 id="related">Introduction <a title="Permanent link" href="#related" class="permalink">&para;</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_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li><li><code class="directive"><a href="../mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li></ul></td></tr></table>
 

-    <p>This article deals with Server Side Includes, usually called
-    simply SSI. In this article, I'll talk about configuring your
-    server to permit SSI, and introduce some basic SSI techniques
-    for adding dynamic content to your existing HTML pages.</p>
+    <p>SSI lets you drop simple directives into your HTML files that
+    the server evaluates before sending the page to the client. This
+    is a lightweight way to keep shared content (like a site-wide
+    footer or a "last modified" timestamp) in one place, without
+    needing a template engine or application server.</p>

 
 

-    <p>In the latter part of the article, we'll talk about some of
-    the somewhat more advanced things that can be done with SSI,
-    such as conditional statements in your SSI directives.</p>
+    <p>This document covers configuring httpd to permit SSI, basic
+    SSI directives for common tasks, and some more advanced
+    techniques including variables and conditional expressions.</p>

 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="what">What are SSI? <a title="Permanent link" href="#what" class="permalink">&para;</a></h2>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="what">What are SSI? <a title="Permanent link" href="#what" class="permalink">&para;</a></h2>
 

-    <p>SSI (Server Side Includes) are directives that are placed in
-    HTML pages, and evaluated on the server while the pages are
-    being served. They let you add dynamically generated content to
-    an existing HTML page, without having to serve the entire page
-    via a CGI program, or other dynamic technology.</p>
+    <p>SSI directives are HTML comments with a specific syntax that
+    <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> recognizes and evaluates before the
+    page is sent to the client. They look like this:</p>

 
 

-    <p>For example, you might place a directive into an existing HTML
-    page, such as:</p>
-
-    <div class="example"><p><code>
-    &lt;!--#echo var="DATE_LOCAL" --&gt;
-    </code></p></div>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#echo var="DATE_LOCAL" --&gt;</pre>
+</div>

 
 

-    <p>And, when the page is served, this fragment will be evaluated and replaced with its value:</p>
+    <p>When the page is served, this fragment is replaced with its
+    value:</p>

 
     <div class="example"><p><code>
 
     <div class="example"><p><code>

-    Tuesday, 15-Jan-2013 19:28:54 EST
+    Thursday, 18-Jun-2026 14:22:07 EDT

     </code></p></div>
 
     </code></p></div>
 

-    <p>The decision of when to use SSI, and when to have your page
-    entirely generated by some program, is usually a matter of how
-    much of the page is static, and how much needs to be
-    recalculated every time the page is served. SSI is a great way
-    to add small pieces of information, such as the current time - shown
-    above.  But if a majority of your page is being generated at the time
-    that it is served, you need to look for some other solution.</p>
+    <p>Because the directives are embedded in HTML comments, if SSI
+    is not enabled, browsers ignore them (though they remain
+    visible in the page source).</p>

 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="configuring">Configuring your server to permit SSI <a title="Permanent link" href="#configuring" class="permalink">&para;</a></h2>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="configuring">Configuring your server to permit SSI <a title="Permanent link" href="#configuring" class="permalink">&para;</a></h2>
 
 

-    <p>To permit SSI on your server, you must have the following
-    directive either in your <code>httpd.conf</code> file, or in a
-    <code>.htaccess</code> file:</p>
-<pre class="prettyprint lang-config">Options +Includes</pre>
+    <p>To enable SSI processing, add the following directive to your
+    <code>httpd.conf</code> file or to a <code>.htaccess</code>
+    file:</p>
+
+<div class="example"><pre class="prettyprint lang-config">Options +Includes</pre>
+</div>
+
+    <p>This tells httpd to parse files for SSI directives. Since most
+    configurations contain multiple <code class="directive"><a href="../mod/core.html#options">Options</a></code> directives that can override each other, apply
+    this to the specific directory where you want SSI enabled.</p>

 
 

+    <p>You also need to tell httpd which files to parse. There are
+    two common approaches.</p>

 
 

-    <p>This tells Apache that you want to permit files to be parsed
-    for SSI directives.  Note that most configurations contain
-    multiple <code class="directive"><a href="../mod/core.html#options">Options</a></code> directives
-    that can override each other.  You will probably need to apply the
-    <code>Options</code> to the specific directory where you want SSI
-    enabled in order to assure that it gets evaluated last.</p>
+    <p>The first is to designate a file extension (typically
+    <code>.shtml</code>) for SSI-enabled pages:</p>

 
 

-    <p>Not just any file is parsed for SSI directives. You have to
-    tell Apache which files should be parsed. There are two ways to
-    do this. You can tell Apache to parse any file with a
-    particular file extension, such as <code>.shtml</code>, with
-    the following directives:</p>
-<pre class="prettyprint lang-config">AddType text/html .shtml
+<div class="example"><pre class="prettyprint lang-config">AddType text/html .shtml

 AddOutputFilter INCLUDES .shtml</pre>
 AddOutputFilter INCLUDES .shtml</pre>

+</div>

 
 

+    <p>The disadvantage here is that adding SSI to an existing page
+    requires renaming the file (and updating all links to it) to use
+    the <code>.shtml</code> extension.</p>

 
 

-    <p>One disadvantage to this approach is that if you wanted to
-    add SSI directives to an existing page, you would have to
-    change the name of that page, and all links to that page, in
-    order to give it a <code>.shtml</code> extension, so that those
-    directives would be executed.</p>
+    <p>The second approach uses the <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> directive:</p>

 
 

-    <p>The other method is to use the <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> directive:</p>
-<pre class="prettyprint lang-config">XBitHack on</pre>
+<div class="example"><pre class="prettyprint lang-config">XBitHack on</pre>
+</div>

 
 

+    <p><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> tells
+    httpd to parse any file that has its execute bit set. To enable
+    SSI on an existing page, make the file executable:</p>

 
 

-    <p><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>
-    tells Apache to parse files for SSI
-    directives if they have the execute bit set. So, to add SSI
-    directives to an existing page, rather than having to change
-    the file name, you would just need to make the file executable
-    using <code>chmod</code>.</p>
-<div class="example"><p><code>
-        chmod +x pagename.html
-</code></p></div>
+<div class="example"><pre class="prettyprint lang-bash">chmod +x pagename.html</pre>
+</div>
+
+    <div class="warning"><p>
+    Avoid configuring httpd to parse <em>all</em> <code>.html</code>
+    files for SSI directives. This forces the server to read through
+    every HTML file it serves, even those without any SSI content,
+    which adds unnecessary overhead.
+    </p></div>

 
 

-    <p>A brief comment about what not to do. You'll occasionally
-    see people recommending that you just tell Apache to parse all
-    <code>.html</code> files for SSI, so that you don't have to
-    mess with <code>.shtml</code> file names. These folks have
-    perhaps not heard about <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>. The thing to
-    keep in mind is that, by doing this, you're requiring that
-    Apache read through every single file that it sends out to
-    clients, even if they don't contain any SSI directives. This
-    can slow things down quite a bit, and is not a good idea.</p>
-
-    <p>Of course, on Windows, there is no such thing as an execute
-    bit to set, so that limits your options a little.</p>
-
-    <p>In its default configuration, Apache does not send the last
-    modified date or content length HTTP headers on SSI pages,
-    because these values are difficult to calculate for dynamic
-    content. This can prevent your document from being cached, and
-    result in slower perceived client performance. There are two
-    ways to solve this:</p>
+    <p>On Windows, there is no execute bit, so the
+    <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> approach is
+    not available. Use the file-extension method instead.</p>
+
+    <p>By default, httpd does not send the last-modified date or
+    content-length headers on SSI pages, since these values are
+    difficult to calculate for dynamic content. This can prevent
+    caching and result in slower perceived performance. Two
+    approaches can help:</p>

 
     <ol>
 
     <ol>

-      <li>Use the <code>XBitHack Full</code> configuration. This
-      tells Apache to determine the last modified date by looking
-      only at the date of the originally requested file, ignoring
-      the modification date of any included files.</li>
-
-      <li>Use the directives provided by
-      <code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code> to set an explicit expiration
-      time on your files, thereby letting browsers and proxies
-      know that it is acceptable to cache them.</li>
+      <li>Use <code>XBitHack Full</code>, which tells httpd to
+      determine the last-modified date from the originally requested
+      file, ignoring the modification dates of included files.</li>
+
+      <li>Use <code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code> to set an explicit
+      expiration time, letting browsers and proxies know the content
+      is safe to cache.</li>

     </ol>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="basic">Basic SSI directives <a title="Permanent link" href="#basic" class="permalink">&para;</a></h2>
 
     </ol>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="basic">Basic SSI directives <a title="Permanent link" href="#basic" class="permalink">&para;</a></h2>
 

-    <p>SSI directives have the following syntax:</p>
-<div class="example"><p><code>
-        &lt;!--#function attribute=value attribute=value ... --&gt;
-</code></p></div>
-
-    <p>It is formatted like an HTML comment, so if you don't have
-    SSI correctly enabled, the browser will ignore it, but it will
-    still be visible in the HTML source. If you have SSI correctly
-    configured, the directive will be replaced with its
-    results.</p>
+    <p>SSI directives use the following syntax:</p>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#function attribute=value attribute=value ... --&gt;</pre>
+</div>

 
 

-    <p>The function can be one of a number of things, and we'll talk
-    some more about most of these in the next installment of this
-    series. For now, here are some examples of what you can do with
-    SSI</p>
+    <p>If SSI is correctly configured, the directive is replaced with
+    its output. If not, it remains as an HTML comment &mdash; invisible to
+    the end user but present in the source.</p>

 
 <h3 id="todaysdate">Today's date</h3>
 
 
 <h3 id="todaysdate">Today's date</h3>
 

-<div class="example"><p><code>
-        &lt;!--#echo var="DATE_LOCAL" --&gt;
-</code></p></div>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#echo var="DATE_LOCAL" --&gt;</pre>
+</div>

 
 

-    <p>The <code>echo</code> function just spits out the value of a
-    variable. There are a number of standard variables, which
-    include the whole set of environment variables that are
-    available to CGI programs. Also, you can define your own
-    variables with the <code>set</code> function.</p>
+    <p>The <code>echo</code> function outputs the value of a variable.
+    Standard variables include the full set of environment variables
+    available to CGI programs, plus variables you define with
+    <code>set</code>.</p>

 
 

-    <p>If you don't like the format in which the date gets printed,
-    you can use the <code>config</code> function, with a
-    <code>timefmt</code> attribute, to modify that formatting.</p>
+    <p>To customize the date format, use the <code>config</code>
+    function with the <code>timefmt</code> attribute:</p>

 
 

-<div class="example"><p><code>
-        &lt;!--#config timefmt="%A %B %d, %Y" --&gt;<br>
-        Today is &lt;!--#echo var="DATE_LOCAL" --&gt;
-</code></p></div>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#config timefmt="%A %B %d, %Y" --&gt;<br>
+Today is &lt;!--#echo var="DATE_LOCAL" --&gt;</pre>
+</div>

 
 
 <h3 id="lastmodified">Modification date of the file</h3>
 
 
 
 <h3 id="lastmodified">Modification date of the file</h3>
 

-<div class="example"><p><code>
-        This document last modified &lt;!--#flastmod file="index.html" --&gt;
-</code></p></div>
+<div class="example"><pre class="prettyprint lang-html">This document last modified &lt;!--#flastmod file="index.html" --&gt;</pre>
+</div>

 
 

-    <p>This function is also subject to <code>timefmt</code> format
-    configurations.</p>
+    <p>This function is also subject to <code>timefmt</code>
+    configuration.</p>

 
 
 <h3 id="cgi">Including the results of a CGI program</h3>
 
 
 
 <h3 id="cgi">Including the results of a CGI program</h3>
 

-    <p>This is one of the more common uses of SSI - to output the
-    results of a CGI program, such as everybody's favorite, a ``hit
-    counter.''</p>
+    <p>SSI can include the output of a CGI program directly in the
+    page:</p>

 
 

-<div class="example"><p><code>
-        &lt;!--#include virtual="/cgi-bin/counter.pl" --&gt;
-</code></p></div>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#include virtual="/cgi-bin/counter.pl" --&gt;</pre>
+</div>

 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>


@@ -233,242 +202,182 @@ AddOutputFilter INCLUDES .shtml</pre>
 <h2 id="additionalexamples">Additional examples <a title="Permanent link" href="#additionalexamples" class="permalink">&para;</a></h2>
 
 
 <h2 id="additionalexamples">Additional examples <a title="Permanent link" href="#additionalexamples" class="permalink">&para;</a></h2>
 
 

-    <p>Following are some specific examples of things you can do in
-    your HTML documents with SSI.</p>
+    <p>The following are practical examples of common SSI use
+    cases.</p>

 
 

-<h3 id="docmodified">When was this document
-modified?</h3>
+<h3 id="docmodified">When was this document modified?</h3>

 
 

-    <p>Earlier, we mentioned that you could use SSI to inform the
-    user when the document was most recently modified. However, the
-    actual method for doing that was left somewhat in question. The
-    following code, placed in your HTML document, will put such a
-    time stamp on your page. Of course, you will have to have SSI
-    correctly enabled, as discussed above.</p>
-<div class="example"><p><code>
-        &lt;!--#config timefmt="%A %B %d, %Y" --&gt;<br>
-        This file last modified &lt;!--#flastmod file="ssi.shtml" --&gt;
-</code></p></div>
+    <p>A common use of SSI is to display a "last modified" timestamp
+    on each page. The following code uses the
+    <code>LAST_MODIFIED</code> variable so you can paste the same
+    snippet into any file without changing the filename:</p>

 
 

-    <p>Of course, you will need to replace the
-    <code>ssi.shtml</code> with the actual name of the file that
-    you're referring to. This can be inconvenient if you're just
-    looking for a generic piece of code that you can paste into any
-    file, so you probably want to use the
-    <code>LAST_MODIFIED</code> variable instead:</p>
-<div class="example"><p><code>
-        &lt;!--#config timefmt="%D" --&gt;<br>
-        This file last modified &lt;!--#echo var="LAST_MODIFIED" --&gt;
-</code></p></div>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#config timefmt="%D" --&gt;<br>
+This file last modified &lt;!--#echo var="LAST_MODIFIED" --&gt;</pre>
+</div>

 
 

-    <p>For more details on the <code>timefmt</code> format, go to
-    your favorite search site and look for <code>strftime</code>. The
-    syntax is the same.</p>
+    <p>For details on <code>timefmt</code> format strings, see the
+    documentation for <code>strftime</code> in your system's C
+    library reference.</p>

 
 
 <h3 id="standard-footer">Including a standard footer</h3>
 
 
 
 
 <h3 id="standard-footer">Including a standard footer</h3>
 
 

-    <p>If you are managing any site that is more than a few pages,
-    you may find that making changes to all those pages can be a
-    real pain, particularly if you are trying to maintain some kind
-    of standard look across all those pages.</p>
-
-    <p>Using an include file for a header and/or a footer can
-    reduce the burden of these updates. You just have to make one
-    footer file, and then include it into each page with the
-    <code>include</code> SSI command. The <code>include</code>
-    function can determine what file to include with either the
-    <code>file</code> attribute, or the <code>virtual</code>
-    attribute. The <code>file</code> attribute is a file path,
-    <em>relative to the current directory</em>. That means that it
-    cannot be an absolute file path (starting with /), nor can it
-    contain ../ as part of that path. The <code>virtual</code>
-    attribute is probably more useful, and should specify a URL
-    relative to the document being served. It can start with a /,
-    but must be on the same server as the file being served.</p>
-<div class="example"><p><code>
-        &lt;!--#include virtual="/footer.html" --&gt;
-</code></p></div>
+    <p>On a site with more than a few pages, maintaining a
+    consistent header or footer across all pages can be tedious.
+    SSI solves this by letting you keep shared content in a single
+    file and include it everywhere:</p>
+
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#include virtual="/footer.html" --&gt;</pre>
+</div>

 
 

-    <p>I'll frequently combine the last two things, putting a
-    <code>LAST_MODIFIED</code> directive inside a footer file to be
-    included. SSI directives can be contained in the included file,
-    and includes can be nested - that is, the included file can
-    include another file, and so on.</p>
+    <p>The <code>include</code> function accepts two attributes:
+    <code>file</code> specifies a path relative to the current
+    directory (it cannot be an absolute path or contain
+    <code>../</code>), while <code>virtual</code> specifies a URL
+    relative to the document being served (it can start with
+    <code>/</code> but must be on the same server).</p>
+
+    <p>SSI directives inside included files are evaluated normally,
+    and includes can be nested. This means you can put a
+    <code>LAST_MODIFIED</code> timestamp in your footer file, and
+    it will be evaluated in the context of each page that includes
+    it.</p>

 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">

-<h2 id="config">What else can I config? <a title="Permanent link" href="#config" class="permalink">&para;</a></h2>
+<h2 id="config">Other config options <a title="Permanent link" href="#config" class="permalink">&para;</a></h2>

 
 
 
 

-    <p>In addition to being able to <code>config</code> the time
-    format, you can also <code>config</code> two other things.</p>
+    <p>In addition to <code>timefmt</code>, the <code>config</code>
+    function supports two other attributes.</p>

 
 

-    <p>Usually, when something goes wrong with your SSI directive,
-    you get the message</p>
+    <p>The <code>errmsg</code> attribute changes the error message
+    displayed when an SSI directive fails. The default is:</p>

 <div class="example"><p><code>
 <div class="example"><p><code>

-        [an error occurred while processing this directive]
+[an error occurred while processing this directive]

 </code></p></div>
 
 </code></p></div>
 

-    <p>If you want to change that message to something else, you
-    can do so with the <code>errmsg</code> attribute to the
-    <code>config</code> function:</p>
-<div class="example"><p><code>
-        &lt;!--#config errmsg="[It appears that you don't know how to use SSI]" --&gt;
-</code></p></div>
-
-    <p>Hopefully, end users will never see this message, because
-    you will have resolved all the problems with your SSI
-    directives before your site goes live. (Right?)</p>
+    <p>You can replace it with something more appropriate for your
+    site:</p>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#config errmsg="[Content unavailable]" --&gt;</pre>
+</div>

 
 

-    <p>And you can <code>config</code> the format in which file
-    sizes are returned with the <code>sizefmt</code> attribute. You
-    can specify <code>bytes</code> for a full count in bytes, or
-    <code>abbrev</code> for an abbreviated number in Kb or Mb, as
-    appropriate.</p>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
+    <p>The <code>sizefmt</code> attribute controls how file sizes
+    are formatted: <code>bytes</code> for a full byte count, or
+    <code>abbrev</code> for an abbreviated form in KB or MB.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>

 <div class="section">
 <h2 id="exec">Executing commands <a title="Permanent link" href="#exec" class="permalink">&para;</a></h2>
     
 
 <div class="section">
 <h2 id="exec">Executing commands <a title="Permanent link" href="#exec" class="permalink">&para;</a></h2>
     
 

-    <p>Here's something else that you can do with the <code>exec</code>
-    function. You can actually have SSI execute a command using the
-    shell (<code>/bin/sh</code>, to be precise - or the DOS shell,
-    if you're on Win32). The following, for example, will give you
-    a directory listing.</p>
-<div class="example"><p><code>
-        &lt;pre&gt;<br>
-        &lt;!--#exec cmd="ls" --&gt;<br>
-        &lt;/pre&gt;
-</code></p></div>
+    <p>The <code>exec</code> function can run a shell command and
+    include its output in the page. On Unix-like systems, the
+    command is executed via <code>/bin/sh</code>; on Windows, via
+    the command shell.</p>

 
 

-    <p>or, on Windows</p>
-<div class="example"><p><code>
-        &lt;pre&gt;<br>
-        &lt;!--#exec cmd="dir" --&gt;<br>
-        &lt;/pre&gt;
-</code></p></div>
+<div class="example"><pre class="prettyprint lang-html">&lt;pre&gt;
+&lt;!--#exec cmd="ls" --&gt;
+&lt;/pre&gt;</pre>
+</div>

 
 

-    <p>You might notice some strange formatting with this directive
-    on Windows, because the output from <code>dir</code> contains
-    the string ``&lt;<code>dir</code>&gt;'' in it, which confuses
-    browsers.</p>
-
-    <p>Note that this feature is exceedingly dangerous, as it will
-    execute whatever code happens to be embedded in the
-    <code>exec</code> tag. If you have any situation where users
-    can edit content on your web pages, such as with a
-    ``guestbook'', for example, make sure that you have this
-    feature disabled. You can allow SSI, but not the
-    <code>exec</code> feature, with the <code>IncludesNOEXEC</code>
-    argument to the <code>Options</code> directive.</p>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
+    <div class="warning"><p>
+    The <code>exec</code> feature is a significant security risk. It
+    executes arbitrary commands with the permissions of the web
+    server process. If users can edit content on your site, ensure
+    this feature is disabled by using <code>IncludesNOEXEC</code>
+    instead of <code>Includes</code> in the <code class="directive"><a href="../mod/core.html#options">Options</a></code> directive.
+    </p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>

 <div class="section">
 <h2 id="advanced">Advanced SSI techniques <a title="Permanent link" href="#advanced" class="permalink">&para;</a></h2>
 
 
 <div class="section">
 <h2 id="advanced">Advanced SSI techniques <a title="Permanent link" href="#advanced" class="permalink">&para;</a></h2>
 
 

-    <p>In addition to spitting out content, Apache SSI gives you
-    the option of setting variables, and using those variables in
-    comparisons and conditionals.</p>
+    <p>Beyond simple content inclusion, SSI supports variables and
+    conditional expressions, making it possible to generate
+    different content based on the request context.</p>

 
 <h3 id="variables">Setting variables</h3>
 
 
 <h3 id="variables">Setting variables</h3>
 

-    <p>Using the <code>set</code> directive, you can set variables
-    for later use. We'll need this later in the discussion, so
-    we'll talk about it here. The syntax of this is as follows:</p>
-<div class="example"><p><code>
-        &lt;!--#set var="name" value="Rich" --&gt;
-</code></p></div>
+    <p>The <code>set</code> directive defines variables for use later
+    in the page:</p>
+
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#set var="name" value="Rich" --&gt;</pre>
+</div>

 
 

-    <p>In addition to merely setting values literally like that, you
-    can use any other variable, including <a href="../env.html">environment variables</a> or the variables
-    discussed above (like <code>LAST_MODIFIED</code>, for example) to
-    give values to your variables. You will specify that something is
-    a variable, rather than a literal string, by using the dollar sign
-    ($) before the name of the variable.</p>
+    <p>Variables can reference other variables (including
+    <a href="../env.html">environment variables</a>) using the dollar
+    sign (<code>$</code>) prefix:</p>

 
 

-    <div class="example"><p><code> &lt;!--#set var="modified" value="$LAST_MODIFIED" --&gt;
-    </code></p></div>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#set var="modified" value="$LAST_MODIFIED" --&gt;</pre>
+</div>

 
 

-    <p>To put a literal dollar sign into the value of your
-    variable, you need to escape the dollar sign with a
-    backslash.</p>
-<div class="example"><p><code>
-        &lt;!--#set var="cost" value="\$100" --&gt;
-</code></p></div>
+    <p>To include a literal dollar sign, escape it with a
+    backslash:</p>

 
 

-    <p>Finally, if you want to put a variable in the midst of a
-    longer string, and there's a chance that the name of the
-    variable will run up against some other characters, and thus be
-    confused with those characters, you can place the name of the
-    variable in braces, to remove this confusion. (It's hard to
-    come up with a really good example of this, but hopefully
-    you'll get the point.)</p>
-<div class="example"><p><code>
-        &lt;!--#set var="date" value="${DATE_LOCAL}_${DATE_GMT}" --&gt;
-</code></p></div>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#set var="cost" value="\$100" --&gt;</pre>
+</div>
+
+    <p>When a variable name might be ambiguous within a longer
+    string, use braces to delimit it:</p>
+
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#set var="date" value="${DATE_LOCAL}_${DATE_GMT}" --&gt;</pre>
+</div>

 
 
 <h3 id="conditional">Conditional expressions</h3>
 
 
 
 
 <h3 id="conditional">Conditional expressions</h3>
 
 

-    <p>Now that we have variables, and are able to set and compare
-    their values, we can use them to express conditionals. This
-    lets SSI be a tiny programming language of sorts.
-    <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> provides an <code>if</code>,
-    <code>elif</code>, <code>else</code>, <code>endif</code>
-    structure for building conditional statements. This allows you
-    to effectively generate multiple logical pages out of one
-    actual page.</p>
+    <p><code class="module"><a href="../mod/mod_include.html">mod_include</a></code> provides <code>if</code>,
+    <code>elif</code>, <code>else</code>, and <code>endif</code>
+    constructs for building conditional logic. This lets you
+    generate different output from a single physical page.</p>

 
 

-    <p>The structure of this conditional construct is:</p>
-<div class="example"><p><code>
-    &lt;!--#if expr="test_condition" --&gt;<br>
-    &lt;!--#elif expr="test_condition" --&gt;<br>
-    &lt;!--#else --&gt;<br>
-    &lt;!--#endif --&gt;
-</code></p></div>
+    <p>The structure is:</p>

 
 

-    <p>A <em>test_condition</em> can be any sort of logical
-    comparison - either comparing values to one another, or testing
-    the ``truth'' of a particular value. (A given string is true if
-    it is nonempty.) For a full list of the comparison operators
-    available to you, see the <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
-    documentation.</p>
+<div class="example"><pre class="prettyprint lang-html">&lt;!--#if expr="test_condition" --&gt;<br>
+&lt;!--#elif expr="test_condition" --&gt;<br>
+&lt;!--#else --&gt;<br>
+&lt;!--#endif --&gt;</pre>
+</div>

 
 

-    <p>For example, if you wish to customize the text on your web page
-    based on the time of day, you could use the following recipe, placed
-    in the HTML page:</p>
+    <p>A <em>test_condition</em> can compare values or test whether a
+    variable is non-empty. See the <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+    documentation for the full list of comparison operators.</p>

 
 

-    <div class="example"><p><code>
-    Good
-    &lt;!--#if expr="%{TIME_HOUR} &lt;12" --&gt;<br>
-    morning!<br>
-    &lt;!--#else --&gt;<br>
-    afternoon!<br>
-    &lt;!--#endif --&gt;<br>
-    </code></p></div>
+    <p>For example, to display different greetings based on the time
+    of day:</p>
+
+<div class="example"><pre class="prettyprint lang-html">Good
+&lt;!--#if expr="%{TIME_HOUR} &lt;12" --&gt;<br>
+morning!<br>
+&lt;!--#else --&gt;<br>
+afternoon!<br>
+&lt;!--#endif --&gt;<br>
+</pre>
+</div>

 
 

-    <p>Any other variable (either ones that you define, or normal
-    environment variables) can be used in conditional statements.
-    See <a href="../expr.html">Expressions in Apache HTTP Server</a> for
-    more information on the expression evaluation engine.</p>
+    <p>Any variable &mdash; user-defined or from the environment &mdash; can be
+    used in conditional expressions. See
+    <a href="../expr.html">Expressions in Apache HTTP Server</a> for
+    full details on the expression evaluation engine.</p>

 
 

-    <p>With Apache's ability to set environment variables with the
-    <code>SetEnvIf</code> directives, and other related directives,
-    this functionality can let you do a wide variety of dynamic content
-    on the server side without resorting a full web application.</p>
+    <p>Combined with httpd's ability to set environment variables
+    using <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> and
+    related directives, conditional SSI can handle a wide variety of
+    dynamic content scenarios without a full application
+    framework.</p>

 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="conclusion">Conclusion <a title="Permanent link" href="#conclusion" class="permalink">&para;</a></h2>
 
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"></a></div>
 <div class="section">
 <h2 id="conclusion">Conclusion <a title="Permanent link" href="#conclusion" class="permalink">&para;</a></h2>
 

-    <p>SSI is certainly not a replacement for CGI, or other
-    technologies used for generating dynamic web pages. But it is a
-    great way to add small amounts of dynamic content to pages,
-    without doing a lot of extra work.</p>
+    <p>For sites that are mostly static but need a few dynamic
+    touches, SSI avoids the overhead of setting up a full
+    application stack. It requires only <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+    and a few lines of configuration to get started.</p>

 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/ssi.html" title="English">&nbsp;en&nbsp;</a> |
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/ssi.html" title="English">&nbsp;en&nbsp;</a> |

diff --git a/docs/manual/howto/ssi.html.es.utf8 b/docs/manual/howto/ssi.html.es.utf8
index fbdce926e31f251c74adf27b963efc2a72dfaf62..876b3a11b327b9964dd0b03164f0f69231a29bda 100644 (file)
--- a/docs/manual/howto/ssi.html.es.utf8
+++ b/docs/manual/howto/ssi.html.es.utf8
@@ -31,6 +31,10 @@
 <a href="../ja/howto/ssi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <a href="../ja/howto/ssi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>

+<div class="outofdate">Esta traducci&oacute;n podr&iacute;a estar
+            obsoleta. Consulte la versi&oacute;n en ingl&eacute;s de la
+            documentaci&oacute;n para comprobar si se han producido cambios
+            recientemente.</div>

 
 <p>Los Server Side Includes (Inclusiones en la parte Servidor) facilitan un m&eacute;todo para a&ntilde;adir contenido din&aacute;mico a documentos HTML existentes.</p>
 </div>
 
 <p>Los Server Side Includes (Inclusiones en la parte Servidor) facilitan un m&eacute;todo para a&ntilde;adir contenido din&aacute;mico a documentos HTML existentes.</p>
 </div>

diff --git a/docs/manual/howto/ssi.html.fr.utf8 b/docs/manual/howto/ssi.html.fr.utf8
index 4b46d6dab1fd4435c19c0db90b2c11163fca232f..b91c7141997c704b0505e42f9990a78c08729b01 100644 (file)
--- a/docs/manual/howto/ssi.html.fr.utf8
+++ b/docs/manual/howto/ssi.html.fr.utf8
@@ -31,6 +31,8 @@
 <a href="../ja/howto/ssi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <a href="../ja/howto/ssi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>

+<div class="outofdate">Cette traduction peut &ecirc;tre p&eacute;rim&eacute;e. V&eacute;rifiez la version
+            anglaise pour les changements r&eacute;cents.</div>

 
 <p>Les SSI permettent d'ajouter du contenu dynamique &agrave; des documents
 HTML pr&eacute;existants.</p>
 
 <p>Les SSI permettent d'ajouter du contenu dynamique &agrave; des documents
 HTML pr&eacute;existants.</p>

diff --git a/docs/manual/howto/ssi.xml.es b/docs/manual/howto/ssi.xml.es
index 80d10d739e7d792aac469f13b8c8216b3f0458ff..dba26c5ebf52f0d43fc4e29e0ac5dee8142fb376 100644 (file)
--- a/docs/manual/howto/ssi.xml.es
+++ b/docs/manual/howto/ssi.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>

-<!-- English revision: 1786682 -->
+<!-- English Revision: 1786682:1935522 (outdated) -->

 <!-- Spanish Translation: Daniel Ferradal <dferradal@apache.org> -->
 
 <!--
 <!-- Spanish Translation: Daniel Ferradal <dferradal@apache.org> -->
 
 <!--

diff --git a/docs/manual/howto/ssi.xml.fr b/docs/manual/howto/ssi.xml.fr
index 22b92bd5b93f6ec9820a6020008999b971b2af4e..238bfbe428b62384a65f67c33a535d85b331cc84 100644 (file)
--- a/docs/manual/howto/ssi.xml.fr
+++ b/docs/manual/howto/ssi.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

-<!-- English Revision: 1786682 -->
+<!-- English Revision: 1786682:1935522 (outdated) -->

 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/howto/ssi.xml.ja b/docs/manual/howto/ssi.xml.ja
index 5cfe9bd574b6ffee46e6ba4ce5d048dda7d89f95..a7f22c805d5d01164ed2adc2a3589fd84606e382 100644 (file)
--- a/docs/manual/howto/ssi.xml.ja
+++ b/docs/manual/howto/ssi.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>

-<!-- English Revision: 659902:1786682 (outdated) -->
+<!-- English Revision: 659902:1935522 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/ssi.xml.ko b/docs/manual/howto/ssi.xml.ko
index 31f30355f48a603932c3191d9c1fccce992ba925..f4c2cd847730c1f57d0d15daacfec7cf2bc258e4 100644 (file)
--- a/docs/manual/howto/ssi.xml.ko
+++ b/docs/manual/howto/ssi.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>

-<!-- English Revision: 659902:1786682 (outdated) -->
+<!-- English Revision: 659902:1935522 (outdated) -->

 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/ssi.xml.meta b/docs/manual/howto/ssi.xml.meta
index e1a1717b00b810873754e4d46e115163d6d9d09f..9b8292c558495653aba33f17db17bcc45157ff05 100644 (file)
--- a/docs/manual/howto/ssi.xml.meta
+++ b/docs/manual/howto/ssi.xml.meta
@@ -8,8 +8,8 @@
 
   <variants>
     <variant>en</variant>
 
   <variants>
     <variant>en</variant>

-    <variant>es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">es</variant>
+    <variant outdated="yes">fr</variant>

     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>