From: Lucien Gentis Date: Sat, 23 May 2015 16:29:01 +0000 (+0000) Subject: XML updates. X-Git-Tag: 2.5.0-alpha~3135 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e94539dbbf7b4e78c4b1f0d042f954669fcfbef8;p=apache XML updates. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1681363 13f79535-47bb-0310-9956-ffa450edef68 --- 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 @@ - + @@ -187,9 +187,9 @@ d'accès 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]

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 @@ - + @@ -209,14 +209,14 @@ module de chaque groupe.

utiliser les directives suivantes, soit dans le fichier /usr/local/apache/htdocs/secret/.htaccess, soit dans le fichier httpd.conf à l'intérieur d'une section <Directory - /usr/local/apache/htdocs/secret> :

+ "/usr/local/apache/htdocs/secret"> :

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 @@ -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 @@ -398,11 +398,11 @@ passe fichier texte :

-<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> @@ -424,11 +424,11 @@ d'authentification file et LDAP :

-<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 de groupes LDAP.

-<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 @@ - + 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 @@ - + @@ -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 <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> @@ -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> @@ -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> @@ -305,28 +305,28 @@ Listen 172.20.30.50:8080 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> @@ -349,8 +349,8 @@ Listen 80 <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> @@ -369,7 +369,7 @@ Listen 80 <VirtualHost _default_:*> - DocumentRoot /www/default + DocumentRoot "/www/default" </VirtualHost> @@ -401,12 +401,12 @@ Listen 80 <VirtualHost _default_:80> - DocumentRoot /www/default80 + DocumentRoot "/www/default80" # ... </VirtualHost> <VirtualHost _default_:*> - DocumentRoot /www/default + DocumentRoot "/www/default" # ... </VirtualHost> @@ -426,7 +426,7 @@ Listen 80 <VirtualHost _default_:80> -DocumentRoot /www/default +DocumentRoot "/www/default" ... </VirtualHost> @@ -459,16 +459,16 @@ DocumentRoot /www/default 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 <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> 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 @@ - + @@ -109,7 +109,7 @@ de d LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost -CustomLog logs/multiple_vhost_log vhost +CustomLog "logs/multiple_vhost_log" vhost

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 @@ - + @@ -131,18 +131,18 @@ r <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> 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 @@ - + + @@ -183,12 +183,12 @@ virtuel bas # 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>