diff options
author | Lucien Gentis <lgentis@apache.org> | 2015-05-23 18:29:01 +0200 |
---|---|---|
committer | Lucien Gentis <lgentis@apache.org> | 2015-05-23 18:29:01 +0200 |
commit | e94539dbbf7b4e78c4b1f0d042f954669fcfbef8 (patch) | |
tree | c000cad00c4e0a6866ec305f69f320c462cca84a | |
parent | stapling improvement now in 2.4.x branch (diff) | |
download | apache2-e94539dbbf7b4e78c4b1f0d042f954669fcfbef8.tar.xz apache2-e94539dbbf7b4e78c4b1f0d042f954669fcfbef8.zip |
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1681363 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | docs/manual/howto/access.xml.fr | 8 | ||||
-rw-r--r-- | docs/manual/howto/auth.xml.fr | 24 | ||||
-rw-r--r-- | docs/manual/vhosts/details.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/vhosts/examples.xml.fr | 74 | ||||
-rw-r--r-- | docs/manual/vhosts/fd-limits.xml.fr | 4 | ||||
-rw-r--r-- | docs/manual/vhosts/ip-based.xml.fr | 16 | ||||
-rw-r--r-- | docs/manual/vhosts/mass.xml.fr | 49 | ||||
-rw-r--r-- | docs/manual/vhosts/name-based.xml.fr | 6 |
8 files changed, 92 insertions, 91 deletions
diff --git a/docs/manual/howto/access.xml.fr b/docs/manual/howto/access.xml.fr index 4555dd59f6..10ca285c60 100644 --- a/docs/manual/howto/access.xml.fr +++ b/docs/manual/howto/access.xml.fr @@ -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.en.xsl"?> -<!-- English Revision: 1666025:1673945 (outdated) --> +<!-- English Revision: 1673945 --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> @@ -187,9 +187,9 @@ d'accès</title> <highlight language="config"> RewriteEngine On -RewriteCond %{TIME_HOUR} >=20 [OR] -RewriteCond %{TIME_HOUR} <07 -RewriteRule ^/fridge - [F] +RewriteCond "%{TIME_HOUR}" ">=20" [OR] +RewriteCond "%{TIME_HOUR}" "<07" +RewriteRule "^/fridge" "-" [F] </highlight> <p>Toute requête arrivant après 20h ou avant 7h du matin provoquera diff --git a/docs/manual/howto/auth.xml.fr b/docs/manual/howto/auth.xml.fr index f80cb393f1..d915e083bf 100644 --- a/docs/manual/howto/auth.xml.fr +++ b/docs/manual/howto/auth.xml.fr @@ -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: 1599841:1673932 (outdated) --> +<!-- English Revision: 1673932 --> <!-- 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> à l'intérieur d'une section <Directory - /usr/local/apache/htdocs/secret> :</p> + "/usr/local/apache/htdocs/secret"> :</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> @@ -330,8 +330,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> @@ -398,11 +398,11 @@ passe</title> fichier texte :</p> <highlight language="config"> -<Directory /www/docs/private> +<Directory "/www/docs/private"> AuthName "Private" AuthType Basic AuthBasicProvider dbm - AuthDBMUserFile /www/passwords/passwd.dbm + AuthDBMUserFile "/www/passwords/passwd.dbm" Require valid-user </Directory> </highlight> @@ -424,11 +424,11 @@ d'authentification</title> file et LDAP :</p> <highlight language="config"> -<Directory /www/docs/private> +<Directory "/www/docs/private"> 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 </Directory> @@ -451,13 +451,13 @@ d'authentification</title> de groupes LDAP.</p> <highlight language="config"> -<Directory /www/docs/private> +<Directory "/www/docs/private"> 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 </Directory> diff --git a/docs/manual/vhosts/details.xml.fr b/docs/manual/vhosts/details.xml.fr index 0e9dfa975f..17e2236574 100644 --- a/docs/manual/vhosts/details.xml.fr +++ b/docs/manual/vhosts/details.xml.fr @@ -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: 1344666:1673947 (outdated) --> +<!-- English Revision: 1673947 --> <!-- French translation by Vincent Deffontaines, review by alain B --> <!-- Updated by Lucien Gentis --> diff --git a/docs/manual/vhosts/examples.xml.fr b/docs/manual/vhosts/examples.xml.fr index c20dc8260c..57825fef9f 100644 --- a/docs/manual/vhosts/examples.xml.fr +++ b/docs/manual/vhosts/examples.xml.fr @@ -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: 1628690:1673945 (outdated) --> +<!-- English Revision: 1673945 --> <!-- French translation by Vincent Deffontaines, Alain B. --> <!-- reviewed by Lucien Gentis --> @@ -59,14 +59,14 @@ # Apache doit écouter sur le port 80 Listen 80 <VirtualHost *:80> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com # Autres directives ici </VirtualHost> <VirtualHost *:80> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # Autres directives ici @@ -128,17 +128,17 @@ Listen 80 # Serveur "principal" sur 172.20.30.40 ServerName server.example.com -DocumentRoot /www/mainserver +DocumentRoot "/www/mainserver" <VirtualHost 172.20.30.50> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com # D'autres directives ici ... </VirtualHost> <VirtualHost 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # D'autres directives ici ... @@ -171,7 +171,7 @@ DocumentRoot /www/mainserver <highlight language="config"> <VirtualHost 192.168.1.1 172.20.30.40> - DocumentRoot /www/server1 + DocumentRoot "/www/server1" ServerName server.example.com ServerAlias server </VirtualHost> @@ -208,22 +208,22 @@ Listen 8080 <VirtualHost 172.20.30.40:80> ServerName www.example.com - DocumentRoot /www/domain-80 + DocumentRoot "/www/domain-80" </VirtualHost> <VirtualHost 172.20.30.40:8080> ServerName www.example.com - DocumentRoot /www/domain-8080 + DocumentRoot "/www/domain-8080" </VirtualHost> <VirtualHost 172.20.30.40:80> ServerName www.example.org - DocumentRoot /www/otherdomain-80 + DocumentRoot "/www/otherdomain-80" </VirtualHost> <VirtualHost 172.20.30.40:8080> ServerName www.example.org - DocumentRoot /www/otherdomain-8080 + DocumentRoot "/www/otherdomain-8080" </VirtualHost> </highlight> @@ -239,12 +239,12 @@ Listen 8080 Listen 80 <VirtualHost 172.20.30.40> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org </VirtualHost> </highlight> @@ -272,22 +272,22 @@ Listen 172.20.30.50:80 Listen 172.20.30.50:8080 <VirtualHost 172.20.30.40:80> - DocumentRoot /www/example1-80 + DocumentRoot "/www/example1-80" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.40:8080> - DocumentRoot /www/example1-8080 + DocumentRoot "/www/example1-8080" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.50:80> - DocumentRoot /www/example2-80 + DocumentRoot "/www/example2-80" ServerName www.example.org </VirtualHost> <VirtualHost 172.20.30.50:8080> - DocumentRoot /www/example2-8080 + DocumentRoot "/www/example2-8080" ServerName www.example.org </VirtualHost> </highlight> @@ -305,28 +305,28 @@ Listen 172.20.30.50:8080 <highlight language="config"> Listen 80 <VirtualHost 172.20.30.40> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example3 + DocumentRoot "/www/example3" ServerName www.example.net </VirtualHost> # IP-based <VirtualHost 172.20.30.50> - DocumentRoot /www/example4 + DocumentRoot "/www/example4" ServerName www.example.edu </VirtualHost> <VirtualHost 172.20.30.60> - DocumentRoot /www/example5 + DocumentRoot "/www/example5" ServerName www.example.gov </VirtualHost> </highlight> @@ -349,8 +349,8 @@ Listen 80 <highlight language="config"> <VirtualHost *:*> 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 </VirtualHost> </highlight> @@ -369,7 +369,7 @@ Listen 80 <highlight language="config"> <VirtualHost _default_:*> - DocumentRoot /www/default + DocumentRoot "/www/default" </VirtualHost> </highlight> @@ -401,12 +401,12 @@ Listen 80 <highlight language="config"> <VirtualHost _default_:80> - DocumentRoot /www/default80 + DocumentRoot "/www/default80" # ... </VirtualHost> <VirtualHost _default_:*> - DocumentRoot /www/default + DocumentRoot "/www/default" # ... </VirtualHost> </highlight> @@ -426,7 +426,7 @@ Listen 80 <highlight language="config"> <VirtualHost _default_:80> -DocumentRoot /www/default +DocumentRoot "/www/default" ... </VirtualHost> </highlight> @@ -459,16 +459,16 @@ DocumentRoot /www/default <highlight language="config"> Listen 80 ServerName www.example.com -DocumentRoot /www/example1 +DocumentRoot "/www/example1" <VirtualHost 172.20.30.40 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # ... </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example3 + DocumentRoot "/www/example3" ServerName www.example.net ServerAlias *.example.net # ... @@ -498,27 +498,27 @@ DocumentRoot /www/example1 <highlight language="config"> <VirtualHost 172.20.30.40> # serveur virtuel primaire - DocumentRoot /www/subdomain + DocumentRoot "/www/subdomain" RewriteEngine On - RewriteRule . /www/subdomain/index.html + RewriteRule "." "/www/subdomain/index.html" # ... </VirtualHost> <VirtualHost 172.20.30.40> -DocumentRoot /www/subdomain/sub1 +DocumentRoot "/www/subdomain/sub1" ServerName www.sub1.domain.tld ServerPath /sub1/ RewriteEngine On - RewriteRule ^(/sub1/.*) /www/subdomain$1 + RewriteRule "^(/sub1/.*)" "/www/subdomain$1" # ... </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/subdomain/sub2 + DocumentRoot "/www/subdomain/sub2" ServerName www.sub2.domain.tld ServerPath /sub2/ RewriteEngine On - RewriteRule ^(/sub2/.*) /www/subdomain$1 + RewriteRule "^(/sub2/.*)" "/www/subdomain$1" # ... </VirtualHost> </highlight> diff --git a/docs/manual/vhosts/fd-limits.xml.fr b/docs/manual/vhosts/fd-limits.xml.fr index 2190aa4628..f37ef26f3f 100644 --- a/docs/manual/vhosts/fd-limits.xml.fr +++ b/docs/manual/vhosts/fd-limits.xml.fr @@ -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: 1561569:1674195 (outdated) --> +<!-- English Revision: 1674195 --> <!-- French translation by Vincent Deffontaines, review by alain B --> <!-- Updated by Lucien Gentis --> @@ -109,7 +109,7 @@ de définition du format de journalisations :</p> <highlight language="config"> LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost -CustomLog logs/multiple_vhost_log vhost +CustomLog "logs/multiple_vhost_log" vhost </highlight> <p>Cette configuration va provoquer la création d'un fichier de diff --git a/docs/manual/vhosts/ip-based.xml.fr b/docs/manual/vhosts/ip-based.xml.fr index 23faca2138..067a7bbec4 100644 --- a/docs/manual/vhosts/ip-based.xml.fr +++ b/docs/manual/vhosts/ip-based.xml.fr @@ -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.en.xsl"?> -<!-- English Revision: 1330878:1673658 (outdated) --> +<!-- English Revision: 1673658 --> <!-- French translation by alain B, review by Vincent Deffontaines --> <!-- Updated by Lucien Gentis --> @@ -131,18 +131,18 @@ résident pour des serveurs virtuels</title> <highlight language="config"> <VirtualHost 172.20.30.40:80> 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 </VirtualHost> <VirtualHost 172.20.30.50:80> - ServerAdmin webmaster@www2.example.org - DocumentRoot /www/vhosts/www2 + ServerAdmin "webmaster@www2.example.org" + 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 </VirtualHost> </highlight> diff --git a/docs/manual/vhosts/mass.xml.fr b/docs/manual/vhosts/mass.xml.fr index 33ae778d5f..5356244c58 100644 --- a/docs/manual/vhosts/mass.xml.fr +++ b/docs/manual/vhosts/mass.xml.fr @@ -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: 1436578:1674195 (outdated) --> +<!-- English Revision: 1674195 --> <!-- French translation : Lucien GENTIS --> <!-- @@ -46,20 +46,21 @@ <highlight language="config"> <VirtualHost 111.22.33.44> 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" </VirtualHost> <VirtualHost 111.22.33.44> 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" </VirtualHost> <VirtualHost 111.22.33.44> 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" </VirtualHost> </highlight> @@ -161,12 +162,12 @@ UseCanonicalName Off # ce format de journal peut être éclaté en journaux par serveur virtuel # à 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écessaires aux traitements des requê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 @@ -198,13 +199,13 @@ simplifié</title> UseCanonicalName Off LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon -CustomLog logs/access_log 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épertoire cgi-bin unique -ScriptAlias /cgi-bin/ /www/std-cgi/ +ScriptAlias "/cgi-bin/" "/www/std-cgi/" </highlight> <p>Vous trouverez des exemples plus élaborés d'utilisation de la @@ -231,12 +232,12 @@ UseCanonicalName Off LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon -<Directory /www/commercial> +<Directory "/www/commercial"> Options FollowSymLinks AllowOverride All </Directory> -<Directory /www/homepages> +<Directory "/www/homepages"> Options FollowSymLinks AllowOverride None </Directory> @@ -244,19 +245,19 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon <VirtualHost 111.22.33.44> 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" </VirtualHost> <VirtualHost 111.22.33.45> 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/" </VirtualHost> </highlight> @@ -293,11 +294,11 @@ UseCanonicalName DNS # insertion de l'adresse IP dans les journaux afin de pouvoir les # é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> diff --git a/docs/manual/vhosts/name-based.xml.fr b/docs/manual/vhosts/name-based.xml.fr index 1d9bee4318..9d3aec4c64 100644 --- a/docs/manual/vhosts/name-based.xml.fr +++ b/docs/manual/vhosts/name-based.xml.fr @@ -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: 1647229:1673945 (outdated) --> +<!-- English Revision: 1673945 --> <!-- French translation by alain B, review by Vincent Deffontaines updated by Lucien GENTIS --> @@ -183,12 +183,12 @@ virtuel basé sur le nom approprié</title> # serveur par défaut pour *:80 ServerName www.example.com ServerAlias example.com - DocumentRoot /www/domain + DocumentRoot "/www/domain" </VirtualHost> <VirtualHost *:80> ServerName other.example.com - DocumentRoot /www/otherdomain + DocumentRoot "/www/otherdomain" </VirtualHost> </highlight> |