From 2fac2817d6d1fabdb4e9e9380331d956c5e8ff8f Mon Sep 17 00:00:00 2001
From: Lucien Gentis
Date: Sat, 23 May 2015 16:31:02 +0000
Subject: [PATCH] XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1681365 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/howto/access.xml.fr | 8 +--
docs/manual/howto/auth.xml.fr | 24 ++++-----
docs/manual/vhosts/examples.xml.fr | 78 ++++++++++++++--------------
docs/manual/vhosts/ip-based.xml.fr | 14 ++---
docs/manual/vhosts/mass.xml.fr | 46 ++++++++--------
docs/manual/vhosts/name-based.xml.fr | 6 +--
6 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/docs/manual/howto/access.xml.fr b/docs/manual/howto/access.xml.fr
index 4c42e0765d..0fb30aef5d 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 f6879acbed..41abe339a2 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
@@ -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
@@ -392,12 +392,12 @@ 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>
@@ -420,12 +420,12 @@ 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
@@ -449,14 +449,14 @@ 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
diff --git a/docs/manual/vhosts/examples.xml.fr b/docs/manual/vhosts/examples.xml.fr
index 40f729e430..c3c08d07d0 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
@@ -129,17 +129,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 ...
@@ -172,7 +172,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>
@@ -209,22 +209,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>
@@ -240,12 +240,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>
@@ -273,22 +273,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>
@@ -306,28 +306,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>
@@ -350,8 +350,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>
@@ -370,7 +370,7 @@ Listen 80
<VirtualHost _default_:*>
- DocumentRoot /www/default
+ DocumentRoot "/www/default"
</VirtualHost>
@@ -402,12 +402,12 @@ Listen 80
<VirtualHost _default_:80>
- DocumentRoot /www/default80
+ DocumentRoot "/www/default80"
# ...
</VirtualHost>
<VirtualHost _default_:*>
- DocumentRoot /www/default
+ DocumentRoot "/www/default"
# ...
</VirtualHost>
@@ -427,7 +427,7 @@ Listen 80
<VirtualHost _default_:80>
-DocumentRoot /www/default
+DocumentRoot "/www/default"
...
</VirtualHost>
@@ -460,16 +460,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
# ...
@@ -499,27 +499,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/
+ 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/
+ ServerPath "/sub2/"
RewriteEngine On
- RewriteRule ^(/sub2/.*) /www/subdomain$1
+ RewriteRule "^(/sub2/.*)" "/www/subdomain$1"
# ...
</VirtualHost>
diff --git a/docs/manual/vhosts/ip-based.xml.fr b/docs/manual/vhosts/ip-based.xml.fr
index 60d0723c9f..d941a3709d 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
+ 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 4aabaf5bba..4a5f133816 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>
--
2.40.0