Skip to content

Commit

Permalink
XML updates.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677443 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Lucien Gentis committed May 3, 2015
1 parent 73e66a9 commit 5698990
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 54 deletions.
34 changes: 17 additions & 17 deletions docs/manual/mod/mod_auth_form.xml.fr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision: 1659902:1673892 (outdated) -->
<!-- English Revision: 1673892 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

Expand Down Expand Up @@ -86,10 +86,10 @@ l'authentification</a></seealso>
<example><title>Exemple simple</title>
<highlight language="config">
AuthFormProvider file
AuthUserFile conf/passwd
AuthUserFile "conf/passwd"
AuthType form
AuthName realm
AuthFormLoginRequiredLocation http://example.com/login.html
AuthFormLoginRequiredLocation "http://example.com/login.html"
Session On
SessionCookieName session path=/
SessionCryptoPassphrase secret
Expand Down Expand Up @@ -154,12 +154,12 @@ SessionCryptoPassphrase secret
<example><title>Exemple de configuration du gestionnaire de
formulaire de connexion</title>
<highlight language="config">
&lt;Location /dologin.html&gt;
&lt;Location "/dologin.html"&gt;
SetHandler form-login-handler
AuthFormLoginRequiredLocation http://example.com/login.html
AuthFormLoginSuccessLocation http://example.com/success.html
AuthFormLoginRequiredLocation "http://example.com/login.html"
AuthFormLoginSuccessLocation "http://example.com/success.html"
AuthFormProvider file
AuthUserFile conf/passwd
AuthUserFile "conf/passwd"
AuthType form
AuthName realm
Session On
Expand Down Expand Up @@ -236,11 +236,11 @@ SessionCryptoPassphrase secret
<example><title>Exemple simple d'authentification &agrave; la vol&eacute;e</title>
<highlight language="config">
AuthFormProvider file
ErrorDocument 401 /login.shtml
AuthUserFile conf/passwd
ErrorDocument 401 "/login.shtml"
AuthUserFile "conf/passwd"
AuthType form
AuthName realm
AuthFormLoginRequiredLocation http://example.com/login.html
AuthFormLoginRequiredLocation "http://example.com/login.html"
Session On
SessionCookieName session path=/
SessionCryptoPassphrase secret
Expand Down Expand Up @@ -327,7 +327,7 @@ SessionCryptoPassphrase secret
<example><title>Exemple avec script CGI</title>
<highlight language="config">
AuthFormProvider file
ErrorDocument 401 /cgi-bin/login.cgi
ErrorDocument 401 "/cgi-bin/login.cgi"
...
</highlight>
</example>
Expand Down Expand Up @@ -355,7 +355,7 @@ SessionCryptoPassphrase secret
<highlight language="config">
SetHandler form-logout-handler
AuthName realm
AuthFormLogoutLocation http://example.com/loggedout.html
AuthFormLogoutLocation "http://example.com/loggedout.html"
Session On
SessionCookieName session path=/
SessionCryptoPassphrase secret
Expand All @@ -377,7 +377,7 @@ SessionCryptoPassphrase secret
limit&eacute;e</title>
<highlight language="config">
SetHandler form-logout-handler
AuthFormLogoutLocation http://example.com/loggedout.html
AuthFormLogoutLocation "http://example.com/loggedout.html"
Session On
SessionMaxAge 1
SessionCookieName session path=/
Expand Down Expand Up @@ -418,12 +418,12 @@ zone concern&eacute;e</description>

<example><title>Exemple</title>
<highlight language="config">
&lt;Location /secure&gt;
&lt;Location "/secure"&gt;
AuthType form
AuthName "private area"
AuthFormProvider dbm
AuthDBMType SDBM
AuthDBMUserFile /www/etc/dbmpasswd
AuthDBMUserFile "/www/etc/dbmpasswd"
Require valid-user
#...
&lt;/Location&gt;
Expand Down Expand Up @@ -742,9 +742,9 @@ depuis la version 2.4.4.</compatibility>

<example><title>Exemple</title>
<highlight language="config">
&lt;Location /logout&gt;
&lt;Location "/logout"&gt;
SetHandler form-logout-handler
AuthFormLogoutLocation http://example.com/loggedout.html
AuthFormLogoutLocation "http://example.com/loggedout.html"
Session on
#...
&lt;/Location&gt;
Expand Down
14 changes: 7 additions & 7 deletions docs/manual/mod/mod_dir.xml.fr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision: 1586471:1673945 (outdated) -->
<!-- English Revision: 1673945 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

Expand Down Expand Up @@ -117,20 +117,20 @@ client envoie une requ&ecirc;te pour un r&eacute;pertoire</description>
</p>
<highlight language="config">
# Exemple A: d&eacute;finit index.html comme page d'index, ainsi qu'index.php.
&lt;Directory /foo&gt;
&lt;Directory "/foo"&gt;
DirectoryIndex index.html
DirectoryIndex index.php
&lt;/Directory&gt;

# Exemple B: identique &agrave; l'exemple A, mais avec une seule directive.
&lt;Directory /foo&gt;
&lt;Directory "/foo"&gt;
DirectoryIndex index.html index.php
&lt;/Directory&gt;

# Exemple C: pour remplacer la liste des pages d'index par une autre,
# vous devez tout d'abord supprimer la premi&egrave;re liste : dans l'exemple
# suivant, il ne restera qu'index.php comme page d'index.
&lt;Directory /foo&gt;
&lt;Directory "/foo"&gt;
DirectoryIndex index.html
DirectoryIndex disabled
DirectoryIndex index.php
Expand Down Expand Up @@ -230,7 +230,7 @@ host</context>

<highlight language="config">
# voir l'avertissement de s&eacute;curit&eacute; ci-dessous !
&lt;Location /some/path&gt;
&lt;Location "/some/path"&gt;
DirectorySlash Off
SetHandler some-handler
&lt;/Location&gt;
Expand Down Expand Up @@ -299,10 +299,10 @@ version 2.4.4 du serveur HTTP Apache</compatibility>
<em>http://example.com/blog/</em>, cet URI interm&eacute;diaire doit &ecirc;tre
sp&eacute;cifi&eacute; en tant que <var>url-locale</var> :</p>
<highlight language="config">
&lt;Directory /web/example.com/htdocs/blog&gt;
&lt;Directory "/web/example.com/htdocs/blog"&gt;
FallbackResource /blog/index.php
&lt;/Directory&gt;
&lt;Directory /web/example.com/htdocs/blog/images&gt;
&lt;Directory "/web/example.com/htdocs/blog/images"&gt;
FallbackResource disabled
&lt;/Directory&gt;
</highlight>
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/mod/mod_headers.xml.fr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision: 1643442:1673947 (outdated) -->
<!-- English Revision: 1673947 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

Expand Down
18 changes: 9 additions & 9 deletions docs/manual/mod/mod_macro.xml.fr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision: 1533274:1674195 (outdated) -->
<!-- English Revision: 1674195 -->
<!-- French translation: Fabien Coelho -->
<!-- Updated by Lucien Gentis -->

Expand Down Expand Up @@ -58,9 +58,9 @@ d&eacute;finir de nombreux serveurs virtuels similaires :</p>
ServerName $domain
ServerAlias www.$domain

DocumentRoot /var/www/vhosts/$name
ErrorLog /var/log/httpd/$name.error_log
CustomLog /var/log/httpd/$name.access_log combined
DocumentRoot "/var/www/vhosts/$name"
ErrorLog "/var/log/httpd/$name.error_log"
CustomLog "/var/log/httpd/$name.access_log" combined
&lt;/VirtualHost&gt;
&lt;/Macro&gt;
</highlight>
Expand Down Expand Up @@ -121,7 +121,7 @@ de l'entourer d'accolades afin d'&eacute;viter toute confusion :</p>

<highlight language="config">
&lt;Macro DocRoot ${docroot}&gt;
DocumentRoot /var/www/${docroot}/htdocs
DocumentRoot "/var/www/${docroot}/htdocs"
&lt;/Macro&gt;
</highlight>

Expand All @@ -144,15 +144,15 @@ cr&eacute;ation dynamique de serveurs virtuels.</p>
&lt;VirtualHost *:$port&gt;

ServerName $host
DocumentRoot $dir
DocumentRoot "$dir"

# Racine des documents publique
&lt;Directory $dir&gt;
&lt;Directory "$dir"&gt;
Require all granted
&lt;/Directory&gt;

# restriction d'acc&egrave;s au sous-r&eacute;pertoire intranet.
&lt;Directory $dir/intranet&gt;
&lt;Directory "$dir/intranet"&gt;
Require ip 10.0.0.0/8
&lt;/Directory&gt;
&lt;/VirtualHost&gt;
Expand All @@ -176,7 +176,7 @@ variables peuvent survenir.</p>

<highlight language="config">
&lt;Macro DirGroup $dir $group&gt;
&lt;Directory $dir&gt;
&lt;Directory "$dir"&gt;
Require group $group
&lt;/Directory&gt;
&lt;/Macro&gt;
Expand Down
40 changes: 20 additions & 20 deletions docs/manual/mod/mod_rewrite.xml.fr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision: 1668875:1673945 (outdated) -->
<!-- English Revision: 1673945 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

Expand Down Expand Up @@ -359,14 +359,14 @@ recherche de mots-cl&eacute;s</description>
<directive>RewriteMap</directive> comme suit </p>

<highlight language="config">
RewriteMap map-exemple txt:/chemin/vers/fichier/map.txt
RewriteMap map-exemple "txt:/chemin/vers/fichier/map.txt"
</highlight>

<p>Vous pourrez ensuite utiliser cette table dans une
directive <directive>RewriteRule</directive> comme suit :</p>

<highlight language="config">
RewriteRule ^/ex/(.*) ${map-exemple:$1}
RewriteRule "^/ex/(.*)" "${map-exemple:$1}"
</highlight>

<p>La signification de l'argument <em>MapTypeOptions</em> d&eacute;pend du <em>MapType</em>
Expand Down Expand Up @@ -463,12 +463,12 @@ de configuration aurait conduit le serveur &agrave; rechercher un r&eacute;perto
"opt" &agrave; la racine des documents.</p>

<highlight language="config">
DocumentRoot /var/www/example.com
AliasMatch ^/myapp /opt/myapp-1.2.3
&lt;Directory /opt/myapp-1.2.3&gt;
DocumentRoot "/var/www/example.com"
AliasMatch "^/myapp" "/opt/myapp-1.2.3"
&lt;Directory "/opt/myapp-1.2.3"&gt;
RewriteEngine On
RewriteBase /myapp/
RewriteRule ^index\.html$ welcome.html
RewriteBase "/myapp/"
RewriteRule "^index\.html$" "welcome.html"
&lt;/Directory&gt;
</highlight>

Expand Down Expand Up @@ -1012,7 +1012,7 @@ la r&eacute;&eacute;criture soit effectu&eacute;e

<highlight language="config">
RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br />
RewriteRule ^/images - [F]
RewriteRule "^/images" "-" [F]
</highlight>
</li>

Expand Down Expand Up @@ -1042,9 +1042,9 @@ la r&eacute;&eacute;criture soit effectu&eacute;e
lieu du AND implicite. Exemple typique :

<highlight language="config">
RewriteCond %{REMOTE_HOST} ^host1 [OR]
RewriteCond %{REMOTE_HOST} ^host2 [OR]
RewriteCond %{REMOTE_HOST} ^host3
RewriteCond "%{REMOTE_HOST}" "^host1" [OR]
RewriteCond "%{REMOTE_HOST}" "^host2" [OR]
RewriteCond "%{REMOTE_HOST}" "^host3"
RewriteRule ...r&egrave;gles concernant tous ces h&ocirc;tes...
</highlight>

Expand Down Expand Up @@ -1073,10 +1073,10 @@ RewriteRule ...r&egrave;gles concernant tous ces h&ocirc;tes...
pouvez utiliser ce qui suit : </p>

<highlight language="config">
RewriteCond %{HTTP_USER_AGENT} (iPhone|Blackberry|Android)
RewriteRule ^/$ /homepage.mobile.html [L]
RewriteCond "%{HTTP_USER_AGENT}" "(iPhone|Blackberry|Android)"
RewriteRule "^/$" "/homepage.mobile.html" [L]

RewriteRule ^/$ /homepage.std.html [L]
RewriteRule "^/$" "/homepage.std.html" [L]
</highlight>

<p>Explications : si vous utilisez un navigateur
Expand Down Expand Up @@ -1113,10 +1113,10 @@ RewriteRule ^/$ /homepage.std.html [L]
<a id="regexp" name="regexp">expression rationnelle</a>
compatible perl. Dans la premi&egrave;re r&egrave;gle de r&eacute;&eacute;criture,
l'expression est compar&eacute;e au (%-decoded)
<a href="directive-dict.html#Syntax">chemin de l'URL</a> (ou au
<a href="directive-dict.html#Syntax">chemin fichier</a>, en
fonction du contexte) de la
requ&ecirc;te. Les expressions suivantes sont compar&eacute;es &agrave; la sortie de
<a href="directive-dict.html#Syntax">chemin de l'URL</a> de la
requ&ecirc;te, ou, dans un contexte de répertoire (voir
ci-dessous), au chemin de l'URL relativement à ce contexte de
répertoire. Les expressions suivantes sont compar&eacute;es &agrave; la sortie de
la derni&egrave;re r&egrave;gle de r&eacute;&eacute;criture qui
correspondait.</p>

Expand Down Expand Up @@ -1592,7 +1592,7 @@ redondant)</td>
<p><strong>Dans une configuration de niveau r&eacute;pertoire pour
<code>/chemin</code><br />
(<code>/chemin/physique/vers/chemin/.htacccess</code>, avec
<code>RewriteBase /chemin</code>)<br />
<code>RewriteBase "/chemin"</code>)<br />
pour la requ&ecirc;te ``<code>GET
/chemin/chemin-local/infochemin</code>'':</strong><br />
</p>
Expand Down

0 comments on commit 5698990

Please sign in to comment.