You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2012/05/04 16:34:11 UTC

svn commit: r1333989 - in /httpd/httpd/branches/2.4.x/docs/manual/howto: access.xml auth.xml auth.xml.fr cgi.xml cgi.xml.fr htaccess.xml htaccess.xml.fr public_html.xml public_html.xml.fr ssi.xml ssi.xml.fr

Author: humbedooh
Date: Fri May  4 14:34:10 2012
New Revision: 1333989

URL: http://svn.apache.org/viewvc?rev=1333989&view=rev
Log:
Backporting syntax highlighting for howto/

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/howto/access.xml
    httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml
    httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml.fr
    httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml
    httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml.fr
    httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml
    httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml.fr
    httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml
    httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml.fr
    httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml
    httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml.fr

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/access.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/access.xml?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/access.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/access.xml Fri May  4 14:34:10 2012
@@ -67,10 +67,10 @@
 
     <p>The usage of these directives is:</p>
 
-    <example>
-      Require host <var>address</var><br />
-      Require ip <var>ip.address</var>
-    </example>
+    <highlight language="config">
+Require host <var>address</var>
+Require ip <var>ip.address</var>
+    </highlight>
 
     <p>In the first form, <var>address</var> is a fully qualified
     domain name (or a partial domain name); you may provide multiple
@@ -89,26 +89,22 @@
     board, and you want to keep them out, you could do the
     following:</p>
 
-    <example>
-      Require not ip 10.252.46.165
-    </example>
+    <highlight language="config">Require not ip 10.252.46.165</highlight>
 
     <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>
 
-    <example>
-      Require not host <var>host.example.com</var>
-    </example>
+    <highlight language="config">Require not host <var>host.example.com</var></highlight>
 
     <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>
 
-    <example>
-      Require not ip <var>192.168.205</var><br />
-      Require not host <var>phishers.example.com</var> <var>moreidiots.example</var><br />
-      Require not gov
-    </example>
+    <highlight language="config">
+Require not ip <var>192.168.205</var>
+Require not host <var>phishers.example.com</var> <var>moreidiots.example</var>
+Require not gov
+    </highlight>
 
     <p>Use of the <directive
     module="mod_authz_core">RequireAll</directive>, <directive
@@ -126,13 +122,11 @@
     based on user-agent (the browser type) you might do the
     following:</p>
 
-    <example>
-    &lt;If "%{HTTP_USER_AGENT} = 'BadBot'"&gt;<br />
-    <indent>
-        Require All Denied<br />
-    </indent>
-    &lt;/If&gt;
-    </example>
+    <highlight language="config">
+&lt;If "%{HTTP_USER_AGENT} = 'BadBot'"&gt;
+    Require All Denied
+&lt;/If&gt;
+    </highlight>
 
     <note><title>Warning:</title>
     <p>Access control by <code>User-Agent</code> is an unreliable technique,
@@ -156,12 +150,12 @@
     <p>For example, if you wish to block access to a resource between 8pm
     and 6am, you can do this using <module>mod_rewrite</module>.</p>
 
-    <example>
-    RewriteEngine On<br />
-    RewriteCond %{TIME_HOUR} &gt;20 [OR]<br />
-    RewriteCond %{TIME_HOUR} &lt;07<br />
-    RewriteRule ^/fridge - [F]
-    </example>
+    <highlight language="config">
+RewriteEngine On
+RewriteCond %{TIME_HOUR} &gt;20 [OR]
+RewriteCond %{TIME_HOUR} &lt;07
+RewriteRule ^/fridge - [F]
+    </highlight>
 
     <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

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml Fri May  4 14:34:10 2012
@@ -23,7 +23,7 @@
 <manualpage metafile="auth.xml.meta">
 <parentdocument href="./">How-To / Tutorials</parentdocument>
 
-<title>Authentication, Authorization and Access Control</title>
+<title>Authentication and Authorization</title>
 
 <summary>
     <p>Authentication is any process by which you verify that
@@ -127,9 +127,7 @@ module from each group.</p>
     an <directive module="core">AllowOverride</directive> directive like the
     following:</p>
 
-    <example>
-      AllowOverride AuthConfig
-    </example>
+    <highlight language="config">AllowOverride AuthConfig</highlight>
 
     <p>Or, if you are just going to put the directives directly in
     your main server configuration file, you will of course need to
@@ -201,14 +199,14 @@ module from each group.</p>
     placed in <code>httpd.conf</code> inside a &lt;Directory
     /usr/local/apache/htdocs/secret&gt; section.</p>
 
-    <example>
-      AuthType Basic<br />
-      AuthName "Restricted Files"<br />
-      # (Following line optional)<br />
-      AuthBasicProvider file<br />
-      AuthUserFile /usr/local/apache/passwd/passwords<br />
-      Require user rbowen
-    </example>
+    <highlight language="config">
+AuthType Basic
+AuthName "Restricted Files"
+# (Following line optional)
+AuthBasicProvider file
+AuthUserFile /usr/local/apache/passwd/passwords
+Require user rbowen
+    </highlight>
 
     <p>Let's examine each of those directives individually. The <directive
     module="mod_authn_core">AuthType</directive> directive selects
@@ -305,15 +303,15 @@ person in</title>
     <p>Now, you need to modify your <code>.htaccess</code> file to
     look like the following:</p>
 
-    <example>
-      AuthType Basic<br />
-      AuthName "By Invitation Only"<br />
-      # Optional line:<br />
-      AuthBasicProvider file<br />
-      AuthUserFile /usr/local/apache/passwd/passwords<br />
-      AuthGroupFile /usr/local/apache/passwd/groups<br />
-      Require group GroupName
-    </example>
+    <highlight language="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
+    </highlight>
 
     <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
@@ -323,9 +321,7 @@ person in</title>
     specific. Rather than creating a group file, you can just use
     the following directive:</p>
 
-    <example>
-      Require valid-user
-    </example>
+    <highlight language="config">Require valid-user</highlight>
 
     <p>Using that rather than the <code>Require user rbowen</code>
     line will allow anyone in that is listed in the password file,
@@ -372,17 +368,15 @@ person in</title>
 
     <p>To select a dbd file rather than a text file, for example:</p>
 
-    <example>
-    &lt;Directory /www/docs/private&gt;<br />
-    <indent>
-    AuthName "Private"<br />
-    AuthType Basic<br />
-    AuthBasicProvider dbm<br />
-    AuthDBMUserFile /www/passwords/passwd.dbm<br />
-    Require valid-user<br />
-    </indent>
-    &lt;/Directory&gt;
-    </example>
+    <highlight language="config">
+&lt;Directory /www/docs/private&gt;
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider dbm
+    AuthDBMUserFile /www/passwords/passwd.dbm
+    Require valid-user
+&lt;/Directory&gt;
+    </highlight>
 
     <p>Other options are available. Consult the
     <module>mod_authn_dbm</module> documentation for more details.</p>
@@ -397,18 +391,16 @@ person in</title>
     scheme that meets your needs. In the following example, both the
     file and LDAP based authentication providers are being used.</p>
 
-    <example>
-    &lt;Directory /www/docs/private&gt;<br />
-    <indent>
-    AuthName "Private"<br />
-    AuthType Basic<br />
-    AuthBasicProvider file ldap<br />
-    AuthUserFile /usr/local/apache/passwd/passwords<br />
-    AuthLDAPURL ldap://ldaphost/o=yourorg<br />
-    Require valid-user<br />
-    </indent>
-    &lt;/Directory&gt;
-    </example>
+    <highlight language="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;
+    </highlight>
 
     <p>In this example the file provider will attempt to authenticate
     the user first. If it is unable to authenticate the user, the LDAP
@@ -423,20 +415,18 @@ person in</title>
     authorization methods can also be used. In this example both file group
     authorization as well as LDAP group authorization is being used.</p>
 
-    <example>
-    &lt;Directory /www/docs/private&gt;<br />
-    <indent>
-    AuthName "Private"<br />
-    AuthType Basic<br />
-    AuthBasicProvider file<br />
-    AuthUserFile /usr/local/apache/passwd/passwords<br />
-    AuthLDAPURL ldap://ldaphost/o=yourorg<br />
-    AuthGroupFile /usr/local/apache/passwd/groups<br />
-    Require group GroupName<br />
-    Require ldap-group cn=mygroup,o=yourorg<br />
-    </indent>
-    &lt;/Directory&gt;
-    </example>
+    <highlight language="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;
+    </highlight>
 
     <p>To take authorization a little further, authorization container
     directives such as
@@ -514,16 +504,12 @@ person in</title>
         that will be called during the authorization stage of the request
         processing. For example:</p>
 
-        <example>
-          Require ip <var>address</var>
-        </example>
+        <highlight language="config">Require ip <var>address</var></highlight>
 
         <p>where <var>address</var> is an IP address (or a partial IP
         address) or:</p>
 
-        <example>
-          Require host <var>domain_name</var>
-        </example>
+        <highlight language="config">Require host <var>domain_name</var></highlight>
 
         <p>where <var>domain_name</var> is a fully qualified domain name
         (or a partial domain name); you may provide multiple addresses or
@@ -533,45 +519,37 @@ person in</title>
         board, and you want to keep them out, you could do the
         following:</p>
 
-        <example>
-          &lt;RequireAll&gt;
-          <indent>
-            Require all granted<br/>
-            Require not ip 10.252.46.165
-          </indent>
-          &lt;/RequireAll&gt;
-        </example>
+        <highlight language="config">
+&lt;RequireAll&gt;
+    Require all granted
+    Require not ip 10.252.46.165
+&lt;/RequireAll&gt;
+        </highlight>
 
         <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>
 
-        <example>
-          &lt;RequireAll&gt;
-          <indent>
-            Require all granted<br/>
-            Require not host <var>host.example.com</var>
-          </indent>
-          &lt;/RequireAll&gt;
-        </example>
+        <highlight language="config">
+&lt;RequireAll&gt;
+    Require all granted
+    Require not host host.example.com
+&lt;/RequireAll&gt;
+        </highlight>
 
         <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>
 
-        <example>
-          &lt;RequireAll&gt;
-          <indent>
-            Require all granted<br/>
-            &lt;RequireNone&gt;
-            <indent>
-              Require ip 192.168.205<br />
-              Require host phishers.example.com moreidiots.example<br />
-              Require host ke
-            </indent>
-            &lt;/RequireNone&gt;
-          </indent>
-          &lt;/RequireAll&gt;
-        </example>
+        <highlight language="config">
+&lt;RequireAll&gt;
+    Require all granted
+    &lt;RequireNone&gt;
+        Require ip 192.168.205
+        Require host phishers.example.com moreidiots.example
+        Require host ke
+    &lt;/RequireNone&gt; 
+&lt;/RequireAll&gt;
+        </highlight>
 
         <p>The above example uses the <directive module="mod_authz_core"
         type="section">RequireNone</directive> directive

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml.fr?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/auth.xml.fr Fri May  4 14:34:10 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1070891:1332094 (outdated) -->
+<!-- English Revision : 1331425 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviwed by : Vincent Deffontaines -->
 
@@ -25,7 +25,7 @@
 <manualpage metafile="auth.xml.meta">
 <parentdocument href="./">Recettes / Tutoriels</parentdocument>
 
-<title>Authentification, autorisation et contr&ocirc;le d'acc&egrave;s</title>
+<title>Authentification et autorisation</title>
 
 <summary>
     <p>L'authentification est un processus qui vous permet de v&eacute;rifier
@@ -135,9 +135,7 @@ module de chaque groupe.</p>
     d'une directive <directive module="core">AllowOverride</directive>
     du style :</p>
 
-    <example>
-      AllowOverride AuthConfig
-    </example>
+    <highlight language="config">AllowOverride AuthConfig</highlight>
 
     <p>Si vous avez l'intention d'ajouter les directives directement
     dans le fichier de configuration principal, vous devrez bien entendu
@@ -213,14 +211,14 @@ module de chaque groupe.</p>
     fichier <code>httpd.conf</code> &agrave; l'int&eacute;rieur d'une section &lt;Directory
     /usr/local/apache/htdocs/secret&gt; :</p>
 
-    <example>
-      AuthType Basic<br />
-      AuthName "Fichiers r&eacute;serv&eacute;s"<br />
-      # (La ligne suivante est facultative)<br />
-      AuthBasicProvider file<br />
-      AuthUserFile /usr/local/apache/passwd/passwords<br />
-      Require user rbowen
-    </example>
+    <highlight language="config">
+AuthType Basic
+AuthName "Restricted Files"
+# (Following line optional)
+AuthBasicProvider file
+AuthUserFile /usr/local/apache/passwd/passwords
+Require user rbowen
+    </highlight>
 
     <p>Examinons ces directives une &agrave; une. La directive <directive
     module="mod_authn_core">AuthType</directive> d&eacute;finit la m&eacute;thode
@@ -325,15 +323,15 @@ plusieurs personnes</title>
     <p>Maintenant, vous devez modifier votre fichier
     <code>.htaccess</code> comme suit :</p>
 
-    <example>
-      AuthType Basic<br />
-      AuthName "By Invitation Only"<br />
-      # Ligne facultative :<br />
-      AuthBasicProvider file<br />
-      AuthUserFile /usr/local/apache/passwd/passwords<br />
-      AuthGroupFile /usr/local/apache/passwd/groups<br />
-      Require group Nom-de-groupe
-    </example>
+    <highlight language="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
+    </highlight>
 
     <p>Maintenant, quiconque appartient au groupe
     <code>Nom-de-groupe</code>, et poss&egrave;de une entr&eacute;e dans le fichier
@@ -344,9 +342,7 @@ plusieurs personnes</title>
     l'acc&egrave;s &agrave; plusieurs personnes. Plut&ocirc;t que de cr&eacute;er un fichier de
     groupes, il vous suffit d'ajouter la directive suivante :</p>
 
-    <example>
-      Require valid-user
-    </example>
+    <highlight language="config">Require valid-user</highlight>
 
     <p>Le remplacement de la ligne <code>Require user rbowen</code> par
     la ligne <code>Require valid-user</code> autorisera l'acc&egrave;s &agrave;
@@ -399,17 +395,15 @@ passe</title>
     <p>Par exemple, pour s&eacute;lectionner un fichier dbm &agrave; la place d'un
     fichier texte :</p>
 
-    <example>
-    &lt;Directory /www/docs/private&gt;<br />
-    <indent>
-    AuthName "Private"<br />
-    AuthType Basic<br />
-    AuthBasicProvider dbm<br />
-    AuthDBMUserFile /www/passwords/passwd.dbm<br />
-    Require valid-user<br />
-    </indent>
-    &lt;/Directory&gt;
-    </example>
+    <highlight language="config">
+&lt;Directory /www/docs/private&gt;
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider dbm
+    AuthDBMUserFile /www/passwords/passwd.dbm
+    Require valid-user
+&lt;/Directory&gt;
+    </highlight>
 
     <p>D'autres options sont disponibles. Consultez la documentation de
     <module>mod_authn_dbm</module> pour plus de d&eacute;tails.</p>
@@ -427,18 +421,16 @@ d'authentification</title>
     conjointement les fournisseurs d'authentification
     file et LDAP :</p>
 
-    <example>
-    &lt;Directory /www/docs/private&gt;<br />
-    <indent>
-    AuthName "Private"<br />
-    AuthType Basic<br />
-    AuthBasicProvider file ldap<br />
-    AuthUserFile /usr/local/apache/passwd/passwords<br />
-    AuthLDAPURL ldap://ldaphost/o=yourorg<br />
-    Require valid-user<br />
-    </indent>
-    &lt;/Directory&gt;
-    </example>
+    <highlight language="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;
+    </highlight>
 
     <p>Dans cet exemple, le fournisseur file va tenter d'authentifier
     l'utilisateur en premier. S'il n'y parvient pas, le fournisseur LDAP
@@ -456,20 +448,18 @@ d'authentification</title>
     autorisation &agrave; base de fichier de groupes et une autorisation &agrave; base
     de groupes LDAP.</p>
 
-    <example>
-    &lt;Directory /www/docs/private&gt;<br />
-    <indent>
-    AuthName "Private"<br />
-    AuthType Basic<br />
-    AuthBasicProvider file<br />
-    AuthUserFile /usr/local/apache/passwd/passwords<br />
+    <highlight language="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<br />
-    Require group GroupName<br />
-    Require ldap-group cn=mygroup,o=yourorg<br />
-    </indent>
-    &lt;/Directory&gt;
-    </example>
+    AuthGroupFile /usr/local/apache/passwd/groups
+    Require group GroupName
+    Require ldap-group cn=mygroup,o=yourorg
+&lt;/Directory&gt;
+    </highlight>
 
     <p>Pour un sc&eacute;nario d'autorisation un peu plus avanc&eacute;, des
     directives de conteneur d'autorisation comme <directive
@@ -562,16 +552,12 @@ autorisation</title>
 	seront appel&eacute;s dans le processus d'autorisation au cours du
 	traitement de la requ&ecirc;te. Par exemple :</p>
 
-        <example>
-          Require ip <var>adresse</var>
-        </example>
+        <highlight language="config">Require ip <var>address</var></highlight>
 
         <p>o&ugrave; <var>adresse</var> est une adresse IP (ou une adresse IP
 	partielle) ou :</p>
 
-        <example>
-          Require host <var>nom_domaine</var>
-        </example>
+        <highlight language="config">Require host <var>domain_name</var></highlight>
 
         <p>o&ugrave; <var>nom_domaine</var> est un nom de domaine enti&egrave;rement
 	qualif&eacute; (ou un nom de domaine partiel) ; vous pouvez indiquer
@@ -580,47 +566,39 @@ autorisation</title>
         <p>Par exemple, si vous voulez rejeter les spams dont une
 	machine vous inonde, vous pouvez utiliser ceci :</p>
 
-        <example>
-          &lt;RequireAll&gt;
-          <indent>
-            Require all granted<br/>
-            Require not ip 10.252.46.165
-          </indent>
-          &lt;/RequireAll&gt;
-        </example>
+        <highlight language="config">
+&lt;RequireAll&gt;
+    Require all granted
+    Require not ip 10.252.46.165
+&lt;/RequireAll&gt;
+        </highlight>
 
         <p>Ainsi, les visiteurs en provenance de cette adresse ne
 	pourront pas voir le contenu concern&eacute; par cette directive. Si,
 	par contre, vous connaissez le nom de la machine, vous pouvez
 	utiliser ceci :</p>
 
-        <example>
-           &lt;RequireAll&gt;
-          <indent>
-            Require all granted<br/>
-            Require not host <var>serveur.example.com</var>
-          </indent>
-          &lt;/RequireAll&gt;
-        </example>
+        <highlight language="config">
+&lt;RequireAll&gt;
+    Require all granted
+    Require not host host.example.com
+&lt;/RequireAll&gt;
+        </highlight>
 
         <p>Et si vous voulez interdire l'acc&egrave;s &agrave; toutes les machines
 	d'un domaine, vous pouvez sp&eacute;cifier une partie seulement de
 	l'adresse ou du nom de domaine :</p>
 
-        <example>
-         &lt;RequireAll&gt;
-          <indent>
-             Require all granted<br/>
-            &lt;RequireNone&gt;
-            <indent>
-              Require ip 192.168.205<br />
-              Require host phishers.example.com autres-idiots.exemple<br />
-              Require host ke
-            </indent>
-            &lt;/RequireNone&gt;
-          </indent>
-          &lt;/RequireAll&gt;
-        </example>
+        <highlight language="config">
+&lt;RequireAll&gt;
+    Require all granted
+    &lt;RequireNone&gt;
+        Require ip 192.168.205
+        Require host phishers.example.com moreidiots.example
+        Require host ke
+    &lt;/RequireNone&gt; 
+&lt;/RequireAll&gt;
+        </highlight>
 
         <p>Dans l'exemple ci-dessus, on utilise la directive du
 	conteneur <directive module="mod_authz_core"

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml Fri May  4 14:34:10 2012
@@ -64,9 +64,9 @@
     directive has not been commented out.  A correctly configured directive
     may look like this:
 
-    <example>
+    <highlight language="config">
       LoadModule cgi_module modules/mod_cgi.so
-    </example></note>
+    </highlight></note>
 
     <section id="scriptalias">
       <title>ScriptAlias</title>
@@ -83,9 +83,9 @@
       <p>The <directive module="mod_alias">ScriptAlias</directive>
       directive looks like:</p>
 
-      <example>
+      <highlight language="config">
         ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-      </example>
+      </highlight>
 
       <p>The example shown is from your default <code>httpd.conf</code>
       configuration file, if you installed Apache in the default
@@ -145,13 +145,11 @@
       file, to specify that CGI execution was permitted in a particular
       directory:</p>
 
-      <example>
-        &lt;Directory /usr/local/apache2/htdocs/somedir&gt;<br />
-        <indent>
-          Options +ExecCGI<br />
-        </indent>
-        &lt;/Directory&gt;
-      </example>
+      <highlight language="config">
+&lt;Directory /usr/local/apache2/htdocs/somedir&gt;
+    Options +ExecCGI
+&lt;/Directory&gt;
+      </highlight>
 
       <p>The above directive tells Apache to permit the execution
       of CGI files. You will also need to tell the server what
@@ -160,9 +158,9 @@
       files with the <code>cgi</code> or <code>pl</code> extension as CGI
       programs:</p>
 
-      <example>
+      <highlight language="config">
         AddHandler cgi-script .cgi .pl
-      </example>
+      </highlight>
     </section>
 
     <section id="htaccess">
@@ -180,27 +178,23 @@
       <code>.cgi</code> in users' directories, you can use the
       following configuration.</p>
 
-      <example>
-      &lt;Directory /home/*/public_html&gt;<br/>
-      <indent>
-        Options +ExecCGI<br/>
-        AddHandler cgi-script .cgi<br/>
-      </indent>
-      &lt;/Directory&gt;
-      </example>
+      <highlight language="config">
+&lt;Directory /home/*/public_html&gt;
+    Options +ExecCGI
+    AddHandler cgi-script .cgi
+&lt;/Directory&gt;
+      </highlight>
 
       <p>If you wish 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>
 
-      <example>
-      &lt;Directory /home/*/public_html/cgi-bin&gt;<br/>
-      <indent>
-        Options ExecCGI<br/>
-        SetHandler cgi-script<br/>
-      </indent>
-      &lt;/Directory&gt;
-      </example>
+      <highlight language="config">
+&lt;Directory /home/*/public_html/cgi-bin&gt;
+    Options ExecCGI
+    SetHandler cgi-script
+&lt;/Directory&gt;
+      </highlight>
 
     </section>
 
@@ -238,11 +232,11 @@
       file called <code>first.pl</code>, and put it in your
       <code>cgi-bin</code> directory.</p>
 
-      <example>
-        #!/usr/bin/perl<br />
-        print "Content-type: text/html\n\n";<br />
-        print "Hello, World.";
-      </example>
+      <highlight language="perl">
+#!/usr/bin/perl
+print "Content-type: text/html\n\n";
+print "Hello, World.";
+      </highlight>
 
       <p>Even if you are not familiar with Perl, you should be able
       to see what is happening here. The first line tells Apache
@@ -346,9 +340,9 @@
       interpreter (often <code>perl</code>) indicated in the first
       line of your CGI program, which will look something like:</p>
 
-      <example>
+      <highlight language="perl">
         #!/usr/bin/perl
-      </example>
+      </highlight>
 
       <p>Make sure that this is in fact the path to the
       interpreter.</p>
@@ -489,15 +483,13 @@
       <a href="../env.html">add your own environment variables</a>
       to the basic ones provided by default.</p>
 
-      <example>
-        #!/usr/bin/perl<br />
-        print "Content-type: text/html\n\n";<br />
-        foreach $key (keys %ENV) {<br />
-        <indent>
-          print "$key --&gt; $ENV{$key}&lt;br&gt;";<br />
-        </indent>
-        }
-      </example>
+      <highlight language="perl">
+#!/usr/bin/perl
+print "Content-type: text/html\n\n";
+foreach $key (keys %ENV) {
+    print "$key --&gt; $ENV{$key}&lt;br&gt;";
+}
+      </highlight>
     </section>
 
     <section id="stdin">

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml.fr?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/cgi.xml.fr Fri May  4 14:34:10 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1174747 -->
+<!-- English Revision : 1331576 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -67,9 +67,9 @@
     comment&eacute;e dans votre <code>httpd.conf</code>. Une directive correcte
     doit ressembler &agrave; ceci :
 
-    <example>
+    <highlight language="config">
       LoadModule cgi_module modules/mod_cgi.so
-    </example></note>
+    </highlight></note>
 
     <section id="scriptalias">
       <title>ScriptAlias</title>
@@ -85,9 +85,9 @@
       module="mod_alias">ScriptAlias</directive> se pr&eacute;sente comme suit
       :</p>
 
-      <example>
+      <highlight language="config">
         ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-      </example>
+      </highlight>
 
       <p>Cet exemple est tir&eacute; de votre fichier de configuration
       <code>httpd.conf</code> par d&eacute;faut, si vous avez install&eacute; Apache
@@ -158,13 +158,11 @@
       l'ex&eacute;cution des programmes CGI est permise depuis un r&eacute;pertoire
       particulier :</p>
 
-      <example>
-        &lt;Directory /usr/local/apache2/htdocs/un-repertoire&gt;<br />
-        <indent>
-          Options +ExecCGI<br />
-        </indent>
-        &lt;/Directory&gt;
-      </example>
+      <highlight language="config">
+&lt;Directory /usr/local/apache2/htdocs/somedir&gt;
+    Options +ExecCGI
+&lt;/Directory&gt;
+      </highlight>
 
       <p>La directive ci-dessus indique &agrave; Apache qu'il doit permettre
       l'ex&eacute;cution des fichiers CGI. Vous devez aussi indiquer au serveur
@@ -174,9 +172,9 @@
       extension <code>cgi</code> ou <code>pl</code> en tant que
       programmes CGI :</p>
 
-      <example>
+      <highlight language="config">
         AddHandler cgi-script .cgi .pl
-      </example>
+      </highlight>
     </section>
 
     <section id="htaccess">
@@ -196,27 +194,23 @@
       r&eacute;pertoire utilisateur, vous pouvez utiliser la configuration
       suivante :</p>
 
-      <example>
-      &lt;Directory /home/*/public_html&gt;<br/>
-      <indent>
-        Options +ExecCGI<br/>
-        AddHandler cgi-script .cgi<br/>
-      </indent>
-      &lt;/Directory&gt;
-      </example>
+      <highlight language="config">
+&lt;Directory /home/*/public_html&gt;
+    Options +ExecCGI
+    AddHandler cgi-script .cgi
+&lt;/Directory&gt;
+      </highlight>
 
       <p>Pour indiquer un sous-r&eacute;pertoire <code>cgi-bin</code> d'un
       r&eacute;pertoire utilisateur o&ugrave; tout fichier sera trait&eacute; en tant que
       programme CGI, vous pouvez utiliser ceci :</p>
 
-      <example>
-      &lt;Directory /home/*/public_html/cgi-bin&gt;<br/>
-      <indent>
-        Options ExecCGI<br/>
-        SetHandler cgi-script<br/>
-      </indent>
-      &lt;/Directory&gt;
-      </example>
+      <highlight language="config">
+&lt;Directory /home/*/public_html/cgi-bin&gt;
+    Options ExecCGI
+    SetHandler cgi-script
+&lt;/Directory&gt;
+      </highlight>
 
     </section>
 
@@ -255,11 +249,11 @@
       <code>premier.pl</code>, et placez le dans votre r&eacute;pertoire
       <code>cgi-bin</code>.</p>
 
-      <example>
-        #!/usr/bin/perl<br />
-        print "Content-type: text/html\n\n";<br />
-        print "Bonjour tout le monde . . .";
-      </example>
+      <highlight language="perl">
+#!/usr/bin/perl
+print "Content-type: text/html\n\n";
+print "Hello, World.";
+      </highlight>
 
       <p>M&ecirc;me si Perl ne vous est pas familier, vous devriez &ecirc;tre
       capable de comprendre le fonctionnement de ce programme. La
@@ -374,9 +368,9 @@
       trouve &agrave; la premi&egrave;re ligne de votre programme CGI et qui va
       ressembler &agrave; ceci :</p>
 
-      <example>
+      <highlight language="perl">
         #!/usr/bin/perl
-      </example>
+      </highlight>
 
       <p>Assurez-vous qu'il s'agit bien du chemin correct vers
       l'interpr&eacute;teur.</p>
@@ -531,15 +525,13 @@
       variables d'environnement</a> aux variables de base fournies par
       d&eacute;faut.</p>
 
-      <example>
-        #!/usr/bin/perl<br />
-        print "Content-type: text/html\n\n";<br />
-        foreach $key (keys %ENV) {<br />
-        <indent>
-          print "$key --&gt; $ENV{$key}&lt;br&gt;";<br />
-        </indent>
-        }
-      </example>
+      <highlight language="perl">
+#!/usr/bin/perl
+print "Content-type: text/html\n\n";
+foreach $key (keys %ENV) {
+    print "$key --&gt; $ENV{$key}&lt;br&gt;";
+}
+      </highlight>
     </section>
 
     <section id="stdin">

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml Fri May  4 14:34:10 2012
@@ -23,7 +23,7 @@
 <manualpage metafile="htaccess.xml.meta">
 <parentdocument href="./">How-To / Tutorials</parentdocument>
 
-<title>Apache Tutorial: .htaccess files</title>
+<title>Apache HTTP Server Tutorial: .htaccess files</title>
 
 <summary>
 <p><code>.htaccess</code> files provide a way to make configuration
@@ -57,7 +57,7 @@ changes on a per-directory basis.</p>
     </related>
 
     <note>You should avoid using <code>.htaccess</code> files completely if you have access to
-    httpd main server config file. Using <code>.htaccess</code> files slows down your Apache server.
+    httpd main server config file. Using <code>.htaccess</code> files slows down your Apache http server.
     Any directive that you can include in a <code>.htaccess</code> file is better set in a <directive module="core">Directory</directive> block, as it will have the same effect with better performance.</note>
 </section>
 
@@ -77,9 +77,7 @@ changes on a per-directory basis.</p>
       if you would rather call the file <code>.config</code> then you
       can put the following in your server configuration file:</p>
 
-      <example>
-        AccessFileName .config
-      </example>
+      <highlight language="config">AccessFileName .config</highlight>
     </note>
 
     <p>In general, <code>.htaccess</code> files use the same syntax as
@@ -159,18 +157,18 @@ changes on a per-directory basis.</p>
 
     <p>The first of these is performance. When <directive
     module="core">AllowOverride</directive>
-    is set to allow the use of <code>.htaccess</code> files, Apache will
+    is set to allow the use of <code>.htaccess</code> files, httpd will
     look in every directory for <code>.htaccess</code> files. Thus,
     permitting <code>.htaccess</code> files causes a performance hit,
     whether or not you actually even use them! Also, the
     <code>.htaccess</code> file is loaded every time a document is
     requested.</p>
 
-    <p>Further note that Apache must look for <code>.htaccess</code> files
+    <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
     directives are applied</a>.) Thus, if a file is requested out of a
-    directory <code>/www/htdocs/example</code>, Apache must look for the
+    directory <code>/www/htdocs/example</code>, httpd must look for the
     following files:</p>
 
     <example>
@@ -218,30 +216,28 @@ changes on a per-directory basis.</p>
 
     <example><title>Contents of .htaccess file in
     <code>/www/htdocs/example</code></title>
-        AddType text/example .exm
+    <highlight language="config">AddType text/example .exm</highlight>
     </example>
 
     <example><title>Section from your <code>httpd.conf</code>
     file</title>
-      &lt;Directory /www/htdocs/example&gt;<br />
-      <indent>
-        AddType text/example .exm<br />
-      </indent>
-      &lt;/Directory&gt;
+    <highlight language="config">
+&lt;Directory /www/htdocs/example&gt;<br />
+    AddType text/example .exm<br />
+&lt;/Directory&gt;
+    </highlight>
     </example>
 
     <p>However, putting this configuration in your server configuration
     file will result in less of a performance hit, as the configuration is
-    loaded once when Apache starts, rather than every time a file is
+    loaded once when httpd starts, rather than every time a file is
     requested.</p>
 
     <p>The use of <code>.htaccess</code> files can be disabled completely
     by setting the <directive module="core">AllowOverride</directive>
     directive to <code>none</code>:</p>
 
-    <example>
-      AllowOverride None
-    </example>
+    <highlight language="config">AllowOverride None</highlight>
 </section>
 
 <section id="how"><title>How directives are applied</title>
@@ -262,9 +258,7 @@ changes on a per-directory basis.</p>
     <p>In the directory <code>/www/htdocs/example1</code> we have a
     <code>.htaccess</code> file containing the following:</p>
 
-    <example>
-       Options +ExecCGI
-    </example>
+    <highlight language="config">Options +ExecCGI</highlight>
 
     <p>(Note: you must have "<code>AllowOverride Options</code>" in effect
     to permit the use of the "<directive
@@ -274,9 +268,7 @@ changes on a per-directory basis.</p>
     <p>In the directory <code>/www/htdocs/example1/example2</code> we have
     a <code>.htaccess</code> file containing:</p>
 
-    <example>
-       Options Includes
-    </example>
+    <highlight language="config">Options Includes</highlight>
 
     <p>Because of this second <code>.htaccess</code> file, in the directory
     <code>/www/htdocs/example1/example2</code>, CGI execution is not
@@ -299,19 +291,15 @@ changes on a per-directory basis.</p>
     prevent script execution while allowing anything else to be set in
     <code>.htaccess</code> you can use:</p>
 
-    <example>
-&lt;Directory /www/htdocs&gt;<br />
-<indent>
-Allowoverride All<br />
-</indent>
-&lt;/Directory&gt;<br />
-<br />
-&lt;Location /&gt;<br />
-<indent>
-Options +IncludesNoExec -ExecCGI<br />
-</indent>
+    <highlight language="config">
+&lt;Directory /www/htdocs&gt;
+    Allowoverride All
+&lt;/Directory&gt;
+
+&lt;Location /&gt;
+    Options +IncludesNoExec -ExecCGI<br />
 &lt;/Location&gt;
-    </example>
+    </highlight>
 
     <note>This example assumes that your <directive
     module="core">DocumentRoot</directive> is <code>/www/htdocs</code>.</note>
@@ -339,13 +327,13 @@ Options +IncludesNoExec -ExecCGI<br />
 
     <p><code>.htaccess</code> file contents:</p>
 
-    <example>
-      AuthType Basic<br />
-      AuthName "Password Required"<br />
-      AuthUserFile /www/passwords/password.file<br />
-      AuthGroupFile /www/passwords/group.file<br />
-      Require Group admins
-    </example>
+    <highlight language="config">
+AuthType Basic
+AuthName "Password Required"
+AuthUserFile /www/passwords/password.file
+AuthGroupFile /www/passwords/group.file
+Require Group admins
+    </highlight>
 
     <p>Note that <code>AllowOverride AuthConfig</code> must be in effect
     for these directives to have any effect.</p>
@@ -361,11 +349,11 @@ Options +IncludesNoExec -ExecCGI<br />
     the following configuration directives, placed in a
     <code>.htaccess</code> file in the desired directory:</p>
 
-    <example>
-       Options +Includes<br />
-       AddType text/html shtml<br />
-       AddHandler server-parsed shtml
-    </example>
+    <highlight language="config">
+Options +Includes
+AddType text/html shtml
+AddHandler server-parsed shtml
+    </highlight>
 
     <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
     FileInfo</code> must both be in effect for these directives to have any
@@ -381,19 +369,19 @@ Options +IncludesNoExec -ExecCGI<br />
     the execution of CGI programs in a particular directory. This may be
     implemented with the following configuration:</p>
 
-    <example>
-       Options +ExecCGI<br />
-       AddHandler cgi-script cgi pl
-    </example>
+    <highlight language="config">
+Options +ExecCGI
+AddHandler cgi-script cgi pl
+    </highlight>
 
     <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>
 
-    <example>
-       Options +ExecCGI<br />
-       SetHandler cgi-script
-    </example>
+    <highlight language="config">
+Options +ExecCGI
+SetHandler cgi-script
+    </highlight>
 
     <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
     FileInfo</code> must both be in effect for these directives to have any
@@ -420,7 +408,7 @@ Options +IncludesNoExec -ExecCGI<br />
     None</code> in effect.</p>
 
     <p>If, on the other hand, you are getting server errors when trying to
-    access documents, check your Apache error log. It will likely tell you
+    access documents, check your httpd error log. It will likely tell you
     that the directive used in your <code>.htaccess</code> file is not
     permitted.</p>
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml.fr?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/htaccess.xml.fr Fri May  4 14:34:10 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1031040 -->
+<!-- English Revision : 1330277 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -25,7 +25,7 @@
 <manualpage metafile="htaccess.xml.meta">
 <parentdocument href="./">Recettes / Tutoriels</parentdocument>
 
-<title>Tutoriel Apache : fichiers .htaccess</title>
+<title>Tutoriel du serveur HTTP Apache : fichiers .htaccess</title>
 
 <summary>
 <p>Les fichiers <code>.htaccess</code> fournissent une m&eacute;thode pour
@@ -61,7 +61,7 @@ modifier la configuration du serveur au 
     <note>Les fichiers <code>.htaccess</code> ne doivent &ecirc;tre utilis&eacute;s
     que si vous n'avez pas acc&egrave;s au fichier de configuration du serveur
     principal. L'utilisation des fichiers <code>.htaccess</code>
-    ralentit le fonctionnement de votre serveur Apache. Il est toujours
+    ralentit le fonctionnement de votre serveur HTTP Apache. Il est toujours
     pr&eacute;f&eacute;rable de d&eacute;finir les directives que vous pouvez inclure dans un
     fichier <code>.htaccess</code> dans une section <directive
     module="core">Directory</directive>, car elles produiront le
@@ -86,9 +86,9 @@ modifier la configuration du serveur au 
       <code>.config</code>, vous pouvez mettre ceci dans le fichier de
       configuration de votre serveur :</p>
 
-      <example>
+      <highlight language="config">
         AccessFileName .config
-      </example>
+      </highlight>
     </note>
 
     <p>En g&eacute;n&eacute;ral, les fichiers <code>.htaccess</code> utilisent la m&ecirc;me
@@ -182,20 +182,20 @@ modifier la configuration du serveur au 
     <p>La premi&egrave;re est li&eacute;e aux performances. Lorsque la directive
     <directive module="core">AllowOverride</directive> est d&eacute;finie de
     fa&ccedil;on &agrave; autoriser l'utilisation des fichiers <code>.htaccess</code>,
-    Apache va rechercher leur pr&eacute;sence dans chaque r&eacute;pertoire. Ainsi,
+    httpd va rechercher leur pr&eacute;sence dans chaque r&eacute;pertoire. Ainsi,
     permettre l'utilisation des fichiers <code>.htaccess</code> est d&eacute;j&agrave;
     en soi une cause de d&eacute;gradation des performances, que vous utilisiez
     effectivement ces fichiers ou non ! De plus, le fichier
     <code>.htaccess</code> est charg&eacute; en m&eacute;moire chaque fois qu'un
     document fait l'objet d'une requ&ecirc;te.</p>
 
-    <p>Notez aussi qu'Apache doit rechercher les fichiers
+    <p>Notez aussi que httpd doit rechercher les fichiers
     <code>.htaccess</code> dans tous les r&eacute;pertoires de niveau
     sup&eacute;rieur, afin de rassembler toutes les directives qui s'appliquent
     au r&eacute;pertoire courant (Voir la section <a href="#how">comment sont
     appliqu&eacute;es les directives</a>). Ainsi, si un fichier fait l'objet
     d'une requ&ecirc;te &agrave; partir d'un r&eacute;pertoire
-    <code>/www/htdocs/exemple</code>, Apache doit rechercher les
+    <code>/www/htdocs/exemple</code>, httpd doit rechercher les
     fichiers suivants :</p>
 
     <example>
@@ -238,16 +238,16 @@ modifier la configuration du serveur au 
 
     <example><title>Contenu du fichier .htaccess dans
     <code>/www/htdocs/exemple</code></title>
-    	AddType text/exemple .exm
+    	<highlight language="config">AddType text/example .exm</highlight>
     </example>
 
     <example><title>Section de votre fichier
     <code>httpd.conf</code></title>
-      &lt;Directory /www/htdocs/exemple&gt;<br />
-      <indent>
-        AddType text/exemple .exm<br />
-      </indent>
-      &lt;/Directory&gt;
+      <highlight language="config">
+&lt;Directory /www/htdocs/example&gt;<br />
+    AddType text/example .exm<br />
+&lt;/Directory&gt;
+    </highlight>
     </example>
 
     <p>Cependant, la perte de performances sera moindre si vous
@@ -260,9 +260,7 @@ modifier la configuration du serveur au 
     enti&egrave;rement d&eacute;sactiv&eacute;e en d&eacute;finissant la directive <directive
     module="core">AllowOverride</directive> &agrave; <code>none</code> :</p>
 
-    <example>
-      AllowOverride None
-    </example>
+    <highlight language="config">AllowOverride None</highlight>
 </section>
 
 <section id="how"><title>Comment sont appliqu&eacute;es les directives ?</title>
@@ -287,9 +285,7 @@ modifier la configuration du serveur au 
     <p>Dans le r&eacute;pertoire <code>/www/htdocs/exemple1</code> se trouve un
     fichier <code>.htaccess</code> contenant ce qui suit :</p>
 
-    <example>
-       Options +ExecCGI
-    </example>
+    <highlight language="config">Options +ExecCGI</highlight>
 
     <p>Note : "<code>AllowOverride Options</code>" doit &ecirc;tre pr&eacute;sent
     pour permettre l'utilisation de la directive "<directive
@@ -300,9 +296,7 @@ modifier la configuration du serveur au 
     trouve un fichier <code>.htaccess</code> contenant ce qui suit
     :</p>
 
-    <example>
-       Options Includes
-    </example>
+    <highlight language="config">Options Includes</highlight>
 
     <p>Ainsi, &agrave; cause de ce second fichier <code>.htaccess</code> du
     r&eacute;pertoire <code>/www/htdocs/exemple1/exemple2</code>, l'ex&eacute;cution
@@ -327,19 +321,15 @@ modifier la configuration du serveur au 
     d&eacute;finition de toute autre option dans les fichiers
     <code>.htaccess</code>, vous pouvez utiliser :</p>
 
-    <example>
-&lt;Directory /www/htdocs&gt;<br />
-<indent>
-Allowoverride All<br />
-</indent>
-&lt;/Directory&gt;<br />
-<br />
-&lt;Location /&gt;<br />
-<indent>
-Options +IncludesNoExec -ExecCGI<br />
-</indent>
+    <highlight language="config">
+&lt;Directory /www/htdocs&gt;
+    Allowoverride All
+&lt;/Directory&gt;
+
+&lt;Location /&gt;
+    Options +IncludesNoExec -ExecCGI<br />
 &lt;/Location&gt;
-    </example>
+    </highlight>
 
     <note>Dans cet exemple, on consid&egrave;re que le chemin d&eacute;fini par la
     directive <directive module="core">DocumentRoot</directive> est
@@ -370,13 +360,13 @@ Options +IncludesNoExec -ExecCGI<br />
 
     <p>Contenu du fichier <code>.htaccess</code> :</p>
 
-    <example>
-      AuthType Basic<br />
-      AuthName "Password Required"<br />
-      AuthUserFile /www/passwords/password.file<br />
-      AuthGroupFile /www/passwords/group.file<br />
-      Require Group admins
-    </example>
+    <highlight language="config">
+AuthType Basic
+AuthName "Password Required"
+AuthUserFile /www/passwords/password.file
+AuthGroupFile /www/passwords/group.file
+Require Group admins
+    </highlight>
 
     <p>Notez que <code>AllowOverride AuthConfig</code> doit &ecirc;tre pr&eacute;sent
     pour que ces directives produisent leur effet.</p>
@@ -395,11 +385,11 @@ Includes - SSI)</title>
     plac&eacute;es dans un fichier <code>.htaccess</code> enregistr&eacute; dans le
     r&eacute;pertoire consid&eacute;r&eacute; :</p>
 
-    <example>
-       Options +Includes<br />
-       AddType text/html shtml<br />
-       AddHandler server-parsed shtml
-    </example>
+    <highlight language="config">
+Options +Includes
+AddType text/html shtml
+AddHandler server-parsed shtml
+    </highlight>
 
     <p>Notez que <code>AllowOverride Options</code> et <code>AllowOverride
     FileInfo</code> doivent &ecirc;tre tous les deux pr&eacute;sents pour que ces
@@ -416,19 +406,19 @@ Includes - SSI)</title>
     dans un r&eacute;pertoire particulier. Pour y parvenir, vous pouvez
     utiliser la configuration suivante :</p>
 
-    <example>
-       Options +ExecCGI<br />
-       AddHandler cgi-script cgi pl
-    </example>
+    <highlight language="config">
+Options +ExecCGI
+AddHandler cgi-script cgi pl
+    </highlight>
 
     <p>Alternativement, si vous souhaitez que tous les fichiers d'un
     r&eacute;pertoire donn&eacute; soient consid&eacute;r&eacute;s comme des programmes CGI, vous
     pouvez utiliser la configuration suivante :</p>
 
-    <example>
-       Options +ExecCGI<br />
-       SetHandler cgi-script
-    </example>
+    <highlight language="config">
+Options +ExecCGI
+SetHandler cgi-script
+    </highlight>
 
     <p>Notez que <code>AllowOverride Options</code> et <code>AllowOverride
     FileInfo</code> doivent &ecirc;tre tous les deux pr&eacute;sents pour que ces
@@ -459,7 +449,7 @@ Includes - SSI)</title>
 
     <p>Par contre, si vous obtenez des erreurs de serveur lorsque vous
     tentez d'acc&eacute;der &agrave; des documents, consultez votre journal des
-    erreurs d'Apache. Il vous indiquera probablement que la directive
+    erreurs de httpd. Il vous indiquera probablement que la directive
     utilis&eacute;e dans votre fichier <code>.htaccess</code> n'est pas
     permise.</p>
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml Fri May  4 14:34:10 2012
@@ -72,9 +72,7 @@
     assumed to be a directory path relative to the home directory of the
     specified user. Given this configuration:</p>
 
-    <example>
-      UserDir public_html
-    </example>
+    <highlight language="config">UserDir public_html</highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -84,9 +82,7 @@
     constructed using that path, plus the username specified. Given this
     configuration:</p>
 
-    <example>
-      UserDir /var/html
-    </example>
+    <highlight language="config">UserDir /var/html</highlight>
 
     <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>
@@ -95,9 +91,7 @@
     in which the asterisk is replaced with the username. Given this
     configuration:</p>
 
-    <example>
-      UserDir /var/www/*/docs
-    </example>
+    <highlight language="config">UserDir /var/www/*/docs</highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -105,9 +99,7 @@
 
     <p>Multiple directories or directory paths can also be set.</p>
 
-    <example>
-      UserDir public_html /var/html
-    </example>
+    <highlight language="config">UserDir public_html /var/html</highlight>
 
     <p>For the URL <code>http://example.com/~rbowen/file.html</code>,
     Apache will search for <code>~rbowen</code>. If it isn't found,
@@ -122,9 +114,7 @@
     <p>The <directive module="mod_userdir">UserDir</directive> directive can be
       used to redirect user directory requests to external URLs.</p>
 
-    <example>
-      UserDir http://example.org/users/*/
-    </example>
+    <highlight language="config">UserDir http://example.org/users/*/</highlight>
 
     <p>The above example will redirect a request for
     <code>http://example.com/~bob/abc.html</code> to
@@ -138,19 +128,17 @@
     <p>Using the syntax shown in the UserDir documentation, you can restrict
     what users are permitted to use this functionality:</p>
 
-    <example>
-      UserDir disabled root jro fish
-    </example>
+    <highlight language="config">UserDir disabled root jro fish</highlight>
 
     <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>
 
-    <example>
+    <highlight language="config">
       UserDir disabled<br />
       UserDir enabled rbowen krietz
-    </example>
+    </highlight>
 
     <p>See <directive module="mod_userdir">UserDir</directive>
     documentation for additional examples.</p>
@@ -165,12 +153,12 @@
     directive to make a particular subdirectory of a user's home directory
     cgi-enabled.</p>
 
-    <example>
-      &lt;Directory /home/*/public_html/cgi-bin/&gt;<br />
-       Options ExecCGI<br />
-       SetHandler cgi-script<br />
-       &lt;/Directory&gt;
-    </example>
+    <highlight language="config">
+&lt;Directory /home/*/public_html/cgi-bin/&gt;
+    Options ExecCGI
+    SetHandler cgi-script
+&lt;/Directory&gt;
+    </highlight>
 
     <p>Then, presuming that <code>UserDir</code> is set to
     <code>public_html</code>, a cgi program <code>example.cgi</code>

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml.fr?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/public_html.xml.fr Fri May  4 14:34:10 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1174747 -->
+<!-- English Revision : 1330277 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -77,9 +77,7 @@ avec le syst&egrave;me de fichiers</a></
     interpr&eacute;t&eacute; comme chemin relatif au r&eacute;pertoire home de l'utilisateur
     consid&eacute;r&eacute;. Par exemple, avec cette configuration :</p>
 
-    <example>
-      UserDir public_html
-    </example>
+    <highlight language="config">UserDir public_html</highlight>
 
     <p>l'URL <code>http://example.com/~rbowen/fichier.html</code>
     correspondra au chemin fichier
@@ -89,9 +87,7 @@ avec le syst&egrave;me de fichiers</a></
     sera construit en utilisant ce chemin, suivi du nom de l'utilisateur
     consid&eacute;r&eacute;. Par exemple, avec cette configuration :</p>
 
-    <example>
-      UserDir /var/html
-    </example>
+    <highlight language="config">UserDir /var/html</highlight>
 
     <p>l'URL <code>http://example.com/~rbowen/fichier.html</code>
     correspondra au chemin fichier
@@ -101,9 +97,7 @@ avec le syst&egrave;me de fichiers</a></
     remplac&eacute; par le nom de l'utilisateur dans le chemin du fichier
     correspondant. Par exemple, avec cette configuration :</p>
 
-    <example>
-      UserDir /var/www/*/docs
-    </example>
+    <highlight language="config">UserDir /var/www/*/docs</highlight>
 
     <p>l'URL <code>http://example.com/~rbowen/fichier.html</code>
     correspondra au chemin fichier
@@ -112,9 +106,7 @@ avec le syst&egrave;me de fichiers</a></
     <p>On peut aussi d&eacute;finir plusieurs r&eacute;pertoires ou chemins de
     r&eacute;pertoires.</p>
 
-    <example>
-      UserDir public_html /var/html
-    </example>
+    <highlight language="config">UserDir public_html /var/html</highlight>
 
     <p>Avec l'URL <code>http://example.com/~rbowen/fichier.html</code>,
     Apache va rechercher <code>~rbowen</code>. S'il ne le trouve pas,
@@ -130,9 +122,7 @@ avec le syst&egrave;me de fichiers</a></
     module="mod_userdir">UserDir</directive> pour rediriger les requ&ecirc;tes
     relatives aux r&eacute;pertoires utilisateurs vers des URLs externes.</p>
 
-    <example>
-      UserDir http://exemple.org/users/*/
-    </example>
+    <highlight language="config">UserDir http://example.org/users/*/</highlight>
 
     <p>L'exemple ci-dessus va rediriger une requ&ecirc;te pour
     <code>http://example.com/~bob/abc.html</code> vers
@@ -147,9 +137,7 @@ avec le syst&egrave;me de fichiers</a></
     vous pouvez d&eacute;finir quels utilisateurs sont autoris&eacute;s &agrave; utiliser
     cette fonctionnalit&eacute; :</p>
 
-    <example>
-      UserDir disabled root jro fish
-    </example>
+    <highlight language="config">UserDir disabled root jro fish</highlight>
 
     <p>La configuration ci-dessus va autoriser l'utilisation de la
     fonctionnalit&eacute; pour tous les utilisateurs, &agrave; l'exception de ceux
@@ -158,10 +146,10 @@ avec le syst&egrave;me de fichiers</a></
     utilisateurs sauf certains d'entre eux en utilisant une
     configuration du style :</p>
 
-    <example>
+    <highlight language="config">
       UserDir disabled<br />
       UserDir enabled rbowen krietz
-    </example>
+    </highlight>
 
     <p>Vous trouverez d'autres exemples dans la documentation de
     <directive module="mod_userdir">UserDir</directive>.</p>
@@ -176,12 +164,12 @@ avec le syst&egrave;me de fichiers</a></
    type="section">Directory</directive> pour activer CGI dans un
    sous-r&eacute;pertoire particulier d'un r&eacute;pertoire home utilisateur.</p>
 
-    <example>
-      &lt;Directory /home/*/public_html/cgi-bin/&gt;<br />
-       Options ExecCGI<br />
-       SetHandler cgi-script<br />
-       &lt;/Directory&gt;
-    </example>
+    <highlight language="config">
+&lt;Directory /home/*/public_html/cgi-bin/&gt;
+    Options ExecCGI
+    SetHandler cgi-script
+&lt;/Directory&gt;
+    </highlight>
 
     <p>Avec la configuration ci-dessus, et en supposant que
     <code>UserDir</code> est d&eacute;fini &agrave; <code>public_html</code>, un

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml Fri May  4 14:34:10 2012
@@ -82,9 +82,9 @@ existing HTML documents.</p>
     <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>
-<example>
+<highlight language="config">
         Options +Includes
-</example>
+</highlight>
 
     <p>This tells Apache that you want to permit files to be parsed
     for SSI directives.  Note that most configurations contain
@@ -98,10 +98,10 @@ existing HTML documents.</p>
     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>
-<example>
+<highlight language="config">
         AddType text/html .shtml<br />
         AddOutputFilter INCLUDES .shtml
-</example>
+</highlight>
 
     <p>One disadvantage to this approach is that if you wanted to
     add SSI directives to an existing page, you would have to
@@ -111,9 +111,9 @@ existing HTML documents.</p>
 
     <p>The other method is to use the <directive
     module="mod_include">XBitHack</directive> directive:</p>
-<example>
+<highlight language="config">
         XBitHack on
-</example>
+</highlight>
 
     <p><directive module="mod_include">XBitHack</directive>
     tells Apache to parse files for SSI
@@ -436,10 +436,10 @@ modified?</title>
 
     <p>In your configuration file, you could put the following
     line:</p>
-<example>
+<highlight language="config">
         BrowserMatchNoCase macintosh Mac<br />
         BrowserMatchNoCase MSIE InternetExplorer
-</example>
+</highlight>
 
     <p>This will set environment variables ``Mac'' and
     ``InternetExplorer'' to true, if the client is running Internet

Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml.fr?rev=1333989&r1=1333988&r2=1333989&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/ssi.xml.fr Fri May  4 14:34:10 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1174747 -->
+<!-- English Revision : 1331486 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -87,9 +87,9 @@ HTML pr&eacute;existants.</p>
     devez ajouter la directive suivante dans votre fichier
     <code>httpd.conf</code>, ou dans un fichier <code>.htaccess</code>
     :</p>
-<example>
+<highlight language="config">
         Options +Includes
-</example>
+</highlight>
 
     <p>Cette directive indique &agrave; Apache que vous d&eacute;sirez permettre la
     recherche de directives SSI lors de l'interpr&eacute;tation des fichiers.
@@ -104,10 +104,10 @@ HTML pr&eacute;existants.</p>
     directives SSI. Vous devez indiquer &agrave; Apache quels fichiers seront
     concern&eacute;s. Vous pouvez y parvenir en indiquant une extension, comme
     <code>.shtml</code>, &agrave; l'aide des directives suivantes :</p>
-<example>
+<highlight language="config">
         AddType text/html .shtml<br />
         AddOutputFilter INCLUDES .shtml
-</example>
+</highlight>
 
     <p>Un des d&eacute;savantages de cette approche r&eacute;side dans le fait que si
     vous voulez ajouter des directives SSI &agrave; une page pr&eacute;existante, vous
@@ -118,9 +118,9 @@ HTML pr&eacute;existants.</p>
 
     <p>Une autre m&eacute;thode consiste &agrave; utiliser la directive <directive
     module="mod_include">XBitHack</directive> :</p>
-<example>
+<highlight language="config">
         XBitHack on
-</example>
+</highlight>
 
     <p>La directive <directive module="mod_include">XBitHack</directive>
     indique &agrave; Apache qu'il doit rechercher des directivves SSI dans les
@@ -446,10 +446,10 @@ HTML pr&eacute;existants.</p>
 
     <p>Vous pouvez ajouter les lignes suivantes dans votre fichier de
     configuration :</p>
-<example>
+<highlight language="config">
         BrowserMatchNoCase macintosh Mac<br />
         BrowserMatchNoCase MSIE InternetExplorer
-</example>
+</highlight>
 
     <p>Ces lignes d&eacute;finissent les variables d'environnement "Mac" et
     "InternetExplorer" &agrave; true, si le client utilise InternetExplorer sur