Commit 8163df86 authored by Lucien Gentis's avatar Lucien Gentis
Browse files

XML updates. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1681365 13f79535-47bb-0310-9956-ffa450edef68
parent 7c95cc66

docs/manual/howto/access.xml.fr

+4 −4
Changes for docs/manual/howto/access.xml.fr: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1" ?>

<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>

<!-- English Revision: 1666026:1673563 (outdated) -->

<!-- English Revision: 1673563 -->

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

<!-- Reviewed by : Vincent Deffontaines -->
@@ -187,9 +187,9 @@ d'acc&egrave;s</title> 


    <highlight language="config">

RewriteEngine On

RewriteCond %{TIME_HOUR} &gt;=20 [OR]

RewriteCond %{TIME_HOUR} &lt;07

RewriteRule ^/fridge - [F]

RewriteCond "%{TIME_HOUR}" "&gt;=20" [OR]

RewriteCond "%{TIME_HOUR}" "&lt;07"

RewriteRule "^/fridge" "-" [F]

    </highlight>



    <p>Toute requ&ecirc;te arrivant apr&egrave;s 20h ou avant 7h du matin provoquera

docs/manual/howto/auth.xml.fr

+12 −12
Changes for docs/manual/howto/auth.xml.fr: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line 
<?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: 1599844:1673563 (outdated) -->

<!-- English Revision: 1673563 -->

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

<!-- Reviwed by : Vincent Deffontaines -->
@@ -209,14 +209,14 @@ module de chaque groupe.</p> 
    utiliser les directives suivantes, soit dans le fichier

    <code>/usr/local/apache/htdocs/secret/.htaccess</code>, soit dans le

    fichier <code>httpd.conf</code> &agrave; l'int&eacute;rieur d'une section &lt;Directory

    /usr/local/apache/htdocs/secret&gt; :</p>

    "/usr/local/apache/htdocs/secret"&gt; :</p>



    <highlight language="config">

AuthType Basic

AuthName "Restricted Files"

# (Following line optional)

AuthBasicProvider file

AuthUserFile /usr/local/apache/passwd/passwords

AuthUserFile "/usr/local/apache/passwd/passwords"

Require user rbowen

    </highlight>
@@ -331,8 +331,8 @@ AuthType Basic 
AuthName "By Invitation Only"

# Optional line:

AuthBasicProvider file

AuthUserFile /usr/local/apache/passwd/passwords

AuthGroupFile /usr/local/apache/passwd/groups

AuthUserFile "/usr/local/apache/passwd/passwords"

AuthGroupFile "/usr/local/apache/passwd/groups"

Require group GroupName

    </highlight>
@@ -392,12 +392,12 @@ passe</title> 
    fichier texte :</p>



    <highlight language="config">

&lt;Directory /www/docs/private&gt;

&lt;Directory "/www/docs/private"&gt;



    AuthName "Private"

    AuthType Basic

    AuthBasicProvider dbm

    AuthDBMUserFile /www/passwords/passwd.dbm

    AuthDBMUserFile "/www/passwords/passwd.dbm"

    Require valid-user



&lt;/Directory&gt;
@@ -420,12 +420,12 @@ d'authentification</title> 
    file et LDAP :</p>



    <highlight language="config">

&lt;Directory /www/docs/private&gt;

&lt;Directory "/www/docs/private"&gt;



    AuthName "Private"

    AuthType Basic

    AuthBasicProvider file ldap

    AuthUserFile /usr/local/apache/passwd/passwords

    AuthUserFile "/usr/local/apache/passwd/passwords"

    AuthLDAPURL ldap://ldaphost/o=yourorg

    Require valid-user
@@ -449,14 +449,14 @@ d'authentification</title> 
    de groupes LDAP.</p>



    <highlight language="config">

&lt;Directory /www/docs/private&gt;

&lt;Directory "/www/docs/private"&gt;



    AuthName "Private"

    AuthType Basic

    AuthBasicProvider file

    AuthUserFile /usr/local/apache/passwd/passwords

    AuthUserFile "/usr/local/apache/passwd/passwords"

    AuthLDAPURL ldap://ldaphost/o=yourorg

    AuthGroupFile /usr/local/apache/passwd/groups

    AuthGroupFile "/usr/local/apache/passwd/groups"

    Require group GroupName

    Require ldap-group cn=mygroup,o=yourorg

docs/manual/vhosts/examples.xml.fr

+39 −39
Changes for docs/manual/vhosts/examples.xml.fr: 39 added lines, 39 removed lines.
Original line number Diff line number Diff line 
<?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: 1562488:1673563 (outdated) -->

<!-- English Revision: 1673563 -->

<!-- French translation by Vincent Deffontaines, Alain B.  -->

<!-- reviewed by Lucien Gentis -->
@@ -59,14 +59,14 @@ 
# Apache doit écouter sur le port 80

Listen 80

&lt;VirtualHost *:80&gt;

    DocumentRoot /www/example1

    DocumentRoot "/www/example1"

    ServerName www.example.com

  

    # Autres directives ici

&lt;/VirtualHost&gt;



&lt;VirtualHost *:80&gt;

    DocumentRoot /www/example2

    DocumentRoot "/www/example2"

    ServerName www.example.org



    # Autres directives ici
@@ -129,17 +129,17 @@ Listen 80 


# Serveur "principal" sur 172.20.30.40

ServerName server.example.com

DocumentRoot /www/mainserver

DocumentRoot "/www/mainserver"



&lt;VirtualHost 172.20.30.50&gt;

    DocumentRoot /www/example1

    DocumentRoot "/www/example1"

    ServerName www.example.com

    

    # D'autres directives ici ...

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.50&gt;

    DocumentRoot /www/example2

    DocumentRoot "/www/example2"

    ServerName www.example.org

    

    # D'autres directives ici ...
@@ -172,7 +172,7 @@ DocumentRoot /www/mainserver 


    <highlight language="config">

&lt;VirtualHost 192.168.1.1 172.20.30.40&gt;

    DocumentRoot /www/server1

    DocumentRoot "/www/server1"

    ServerName server.example.com

    ServerAlias server

&lt;/VirtualHost&gt;
@@ -209,22 +209,22 @@ Listen 8080 


&lt;VirtualHost 172.20.30.40:80&gt;

    ServerName www.example.com

    DocumentRoot /www/domain-80

    DocumentRoot "/www/domain-80"

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40:8080&gt;

    ServerName www.example.com

    DocumentRoot /www/domain-8080

    DocumentRoot "/www/domain-8080"

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40:80&gt;

    ServerName www.example.org

    DocumentRoot /www/otherdomain-80

    DocumentRoot "/www/otherdomain-80"

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40:8080&gt;

    ServerName www.example.org

    DocumentRoot /www/otherdomain-8080

    DocumentRoot "/www/otherdomain-8080"

&lt;/VirtualHost&gt;

    </highlight>
@@ -240,12 +240,12 @@ Listen 8080 
Listen 80



&lt;VirtualHost 172.20.30.40&gt;

    DocumentRoot /www/example1

    DocumentRoot "/www/example1"

    ServerName www.example.com

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.50&gt;

    DocumentRoot /www/example2

    DocumentRoot "/www/example2"

    ServerName www.example.org

&lt;/VirtualHost&gt;

    </highlight>
@@ -273,22 +273,22 @@ Listen 172.20.30.50:80 
Listen 172.20.30.50:8080



&lt;VirtualHost 172.20.30.40:80&gt;

    DocumentRoot /www/example1-80

    DocumentRoot "/www/example1-80"

    ServerName www.example.com

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40:8080&gt;

    DocumentRoot /www/example1-8080

    DocumentRoot "/www/example1-8080"

    ServerName www.example.com

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.50:80&gt;

    DocumentRoot /www/example2-80

    DocumentRoot "/www/example2-80"

    ServerName www.example.org

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.50:8080&gt;

    DocumentRoot /www/example2-8080

    DocumentRoot "/www/example2-8080"

    ServerName www.example.org

&lt;/VirtualHost&gt;

    </highlight>
@@ -306,28 +306,28 @@ Listen 172.20.30.50:8080 
    <highlight language="config">

Listen 80

&lt;VirtualHost 172.20.30.40&gt;

    DocumentRoot /www/example1

    DocumentRoot "/www/example1"

    ServerName www.example.com

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40&gt;

    DocumentRoot /www/example2

    DocumentRoot "/www/example2"

    ServerName www.example.org

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40&gt;

    DocumentRoot /www/example3

    DocumentRoot "/www/example3"

    ServerName www.example.net

&lt;/VirtualHost&gt;



# IP-based

&lt;VirtualHost 172.20.30.50&gt;

    DocumentRoot /www/example4

    DocumentRoot "/www/example4"

    ServerName www.example.edu

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.60&gt;

    DocumentRoot /www/example5

    DocumentRoot "/www/example5"

    ServerName www.example.gov

&lt;/VirtualHost&gt;

    </highlight>
@@ -350,8 +350,8 @@ Listen 80 
    <highlight language="config">

&lt;VirtualHost *:*&gt;

    ProxyPreserveHost On

    ProxyPass / http://192.168.111.2/

    ProxyPassReverse / http://192.168.111.2/

    ProxyPass "/" "http://192.168.111.2/"

    ProxyPassReverse "/" "http://192.168.111.2/"

    ServerName hostname.example.com

&lt;/VirtualHost&gt;

    </highlight>
@@ -370,7 +370,7 @@ Listen 80 


    <highlight language="config">

&lt;VirtualHost _default_:*&gt;

    DocumentRoot /www/default

    DocumentRoot "/www/default"

&lt;/VirtualHost&gt;

    </highlight>
@@ -402,12 +402,12 @@ Listen 80 


    <highlight language="config">

&lt;VirtualHost _default_:80&gt;

    DocumentRoot /www/default80

    DocumentRoot "/www/default80"

    # ...

&lt;/VirtualHost&gt;



&lt;VirtualHost _default_:*&gt;

    DocumentRoot /www/default

    DocumentRoot "/www/default"

    # ...

&lt;/VirtualHost&gt;

    </highlight>
@@ -427,7 +427,7 @@ Listen 80 


    <highlight language="config">

&lt;VirtualHost _default_:80&gt;

DocumentRoot /www/default

DocumentRoot "/www/default"

...

&lt;/VirtualHost&gt;

    </highlight>
@@ -460,16 +460,16 @@ DocumentRoot /www/default 
    <highlight language="config">

Listen 80

ServerName www.example.com

DocumentRoot /www/example1

DocumentRoot "/www/example1"



&lt;VirtualHost 172.20.30.40 172.20.30.50&gt;

    DocumentRoot /www/example2

    DocumentRoot "/www/example2"

    ServerName www.example.org

    # ...

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40&gt;

    DocumentRoot /www/example3

    DocumentRoot "/www/example3"

    ServerName www.example.net

    ServerAlias *.example.net

    # ...
@@ -499,27 +499,27 @@ DocumentRoot /www/example1 
    <highlight language="config">

&lt;VirtualHost 172.20.30.40&gt;

    # serveur virtuel primaire

    DocumentRoot /www/subdomain

    DocumentRoot "/www/subdomain"

    RewriteEngine On

    RewriteRule . /www/subdomain/index.html

    RewriteRule "." "/www/subdomain/index.html"

    # ...

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40&gt;

DocumentRoot /www/subdomain/sub1

DocumentRoot "/www/subdomain/sub1"

    ServerName www.sub1.domain.tld

    ServerPath /sub1/

    ServerPath "/sub1/"

    RewriteEngine On

    RewriteRule ^(/sub1/.*) /www/subdomain$1

    RewriteRule "^(/sub1/.*)" "/www/subdomain$1

    # ...

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.40&gt;

    DocumentRoot /www/subdomain/sub2

    DocumentRoot "/www/subdomain/sub2"

    ServerName www.sub2.domain.tld

    ServerPath /sub2/

    ServerPath "/sub2/"

    RewriteEngine On

    RewriteRule ^(/sub2/.*) /www/subdomain$1

    RewriteRule "^(/sub2/.*)" "/www/subdomain$1"

    # ...

&lt;/VirtualHost&gt;

    </highlight>

docs/manual/vhosts/ip-based.xml.fr

+7 −7
Changes for docs/manual/vhosts/ip-based.xml.fr: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1' ?>

<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>

<!-- English Revision: 1334000:1673563 (outdated) -->

<!-- English Revision: 1673563 -->

<!-- French translation by alain B, review by Vincent Deffontaines -->

<!-- Updated by Lucien Gentis -->
@@ -131,18 +131,18 @@ r 
    <highlight language="config">

&lt;VirtualHost 172.20.30.40:80&gt;

    ServerAdmin webmaster@www1.example.com

    DocumentRoot /www/vhosts/www1

    DocumentRoot "/www/vhosts/www1"

    ServerName www1.example.com

    ErrorLog /www/logs/www1/error_log

    CustomLog /www/logs/www1/access_log combined

    ErrorLog "/www/logs/www1/error_log"

    CustomLog "/www/logs/www1/access_log" combined

&lt;/VirtualHost&gt;



&lt;VirtualHost 172.20.30.50:80&gt;

    ServerAdmin webmaster@www2.example.org

    DocumentRoot /www/vhosts/www2

    DocumentRoot "/www/vhosts/www2"

    ServerName www2.example.org

    ErrorLog /www/logs/www2/error_log

    CustomLog /www/logs/www2/access_log combined

    ErrorLog "/www/logs/www2/error_log"

    CustomLog "/www/logs/www2/access_log" combined

&lt;/VirtualHost&gt;

    </highlight>

docs/manual/vhosts/mass.xml.fr

+23 −23
Changes for docs/manual/vhosts/mass.xml.fr: 23 added lines, 23 removed lines.
Original line number Diff line number Diff line 
<?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: 1334000:1673563 (outdated) -->

<!-- English Revision: 1673563 -->

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



<!--
@@ -46,20 +46,20 @@ 
<highlight language="config">

&lt;VirtualHost 111.22.33.44&gt;

    ServerName                 customer-1.example.com

    DocumentRoot        /www/hosts/customer-1.example.com/docs

    ScriptAlias  /cgi-bin/  /www/hosts/customer-1.example.com/cgi-bin

    DocumentRoot        "/www/hosts/customer-1.example.com/docs"

    ScriptAlias  "/cgi-bin/" "/www/hosts/customer-1.example.com/cgi-bin"

&lt;/VirtualHost&gt;



&lt;VirtualHost 111.22.33.44&gt;

    ServerName                 customer-2.example.com

    DocumentRoot        /www/hosts/customer-2.example.com/docs

    ScriptAlias  /cgi-bin/  /www/hosts/customer-2.example.com/cgi-bin

    DocumentRoot        "/www/hosts/customer-2.example.com/docs"

    ScriptAlias  "/cgi-bin/" "/www/hosts/customer-2.example.com/cgi-bin"

&lt;/VirtualHost&gt;



&lt;VirtualHost 111.22.33.44&gt;

    ServerName                 customer-N.example.com

    DocumentRoot        /www/hosts/customer-N.example.com/docs

    ScriptAlias  /cgi-bin/  /www/hosts/customer-N.example.com/cgi-bin

    DocumentRoot        "/www/hosts/customer-N.example.com/docs"

    ScriptAlias  "/cgi-bin/" "/www/hosts/customer-N.example.com/cgi-bin"

&lt;/VirtualHost&gt;

</highlight>
@@ -161,12 +161,12 @@ UseCanonicalName Off 
# ce format de journal peut &ecirc;tre &eacute;clat&eacute; en journaux par serveur virtuel

# &agrave; l'aide du premier champ via l'utilitaire split-logfile

LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon

CustomLog logs/access_log vcommon

CustomLog "logs/access_log" vcommon



# inclut le nom du serveur dans les noms de fichiers ressources

# n&eacute;cessaires aux traitements des requ&ecirc;tes

VirtualDocumentRoot /www/hosts/%0/docs

VirtualScriptAlias  /www/hosts/%0/cgi-bin

VirtualDocumentRoot "/www/hosts/%0/docs"

VirtualScriptAlias  "/www/hosts/%0/cgi-bin"

</highlight>



    <p>Pour changer cette configuration en solution de serveur virtuel
@@ -201,10 +201,10 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon 
CustomLog logs/access_log vcommon



# insertion d'une partie du nom du serveur dans les noms de fichiers

VirtualDocumentRoot /home/%2/www

VirtualDocumentRoot "/home/%2/www"



# r&eacute;pertoire cgi-bin unique

ScriptAlias  /cgi-bin/  /www/std-cgi/

ScriptAlias  "/cgi-bin/"  "/www/std-cgi/"

</highlight>



    <p>Vous trouverez des exemples plus &eacute;labor&eacute;s d'utilisation de la
@@ -231,12 +231,12 @@ UseCanonicalName Off 


LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon



&lt;Directory /www/commercial&gt;

&lt;Directory "/www/commercial"&gt;

    Options FollowSymLinks

    AllowOverride All

&lt;/Directory&gt;



&lt;Directory /www/homepages&gt;

&lt;Directory "/www/homepages"&gt;

    Options FollowSymLinks

    AllowOverride None

&lt;/Directory&gt;
@@ -244,19 +244,19 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon 
&lt;VirtualHost 111.22.33.44&gt;

    ServerName www.commercial.example.com

    

    CustomLog logs/access_log.commercial vcommon

    CustomLog "logs/access_log.commercial" vcommon

    

    VirtualDocumentRoot /www/commercial/%0/docs

    VirtualScriptAlias  /www/commercial/%0/cgi-bin

    VirtualDocumentRoot "/www/commercial/%0/docs"

    VirtualScriptAlias  "/www/commercial/%0/cgi-bin"

&lt;/VirtualHost&gt;



&lt;VirtualHost 111.22.33.45&gt;

    ServerName www.homepages.example.com

    

    CustomLog logs/access_log.homepages vcommon

    CustomLog "logs/access_log.homepages" vcommon

    

    VirtualDocumentRoot /www/homepages/%0/docs

    ScriptAlias         /cgi-bin/ /www/std-cgi/

    VirtualDocumentRoot "/www/homepages/%0/docs"

    ScriptAlias         "/cgi-bin/" "/www/std-cgi/"

&lt;/VirtualHost&gt;

</highlight>
@@ -293,11 +293,11 @@ UseCanonicalName DNS 
# insertion de l'adresse IP dans les journaux afin de pouvoir les

# &eacute;clater

LogFormat "%A %h %l %u %t \"%r\" %s %b" vcommon

CustomLog logs/access_log vcommon

CustomLog "logs/access_log" vcommon



# insertion de l'adresse IP dans les noms de fichiers

VirtualDocumentRootIP /www/hosts/%0/docs

VirtualScriptAliasIP  /www/hosts/%0/cgi-bin

VirtualDocumentRootIP "/www/hosts/%0/docs"

VirtualScriptAliasIP  "/www/hosts/%0/cgi-bin"

</highlight>



</section>