summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
authorLucien Gentis <lgentis@apache.org>2013-01-26 17:21:46 +0100
committerLucien Gentis <lgentis@apache.org>2013-01-26 17:21:46 +0100
commit17b861a3121b27fd4fcafca528ad717e1a8c0599 (patch)
treee8d6daf6e34187ce3f298e6408927ac439b86eeb /docs/manual
parenttry to emphasize that ErrorDocument nnn /foo doesn't send a HTTP redirect. (diff)
downloadapache2-17b861a3121b27fd4fcafca528ad717e1a8c0599.tar.xz
apache2-17b861a3121b27fd4fcafca528ad717e1a8c0599.zip
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1438910 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/howto/ssi.xml.fr4
-rw-r--r--docs/manual/mod/core.xml.fr7
-rw-r--r--docs/manual/mod/mod_actions.xml.fr4
-rw-r--r--docs/manual/mod/mod_auth_basic.xml.fr4
-rw-r--r--docs/manual/mod/mod_proxy.xml.fr4
-rw-r--r--docs/manual/vhosts/mass.xml.fr10
6 files changed, 21 insertions, 12 deletions
diff --git a/docs/manual/howto/ssi.xml.fr b/docs/manual/howto/ssi.xml.fr
index 6cfccd02f4..d4394f948d 100644
--- a/docs/manual/howto/ssi.xml.fr
+++ b/docs/manual/howto/ssi.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: 1433780:1435327 (outdated) -->
+<!-- English Revision : 1435327 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -75,7 +75,7 @@ HTML pr&eacute;existants.</p>
page HTML existante :</p>
<example>
- <!--#echo var="DATE_LOCAL" -->
+ &lt;!--#echo var="DATE_LOCAL" --&gt;
</example>
<p>Ainsi, lorsque la page sera servie, la directive sera &eacute;valu&eacute;e et
diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index 50e76db80a..1c0a033483 100644
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.xml.fr
@@ -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: 1421821:1435366 (outdated) -->
+<!-- English Revision : 1438838 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -1295,7 +1295,7 @@ host</context>
<li>afficher un message personnalis&eacute;</li>
- <li>rediriger vers un <var>chemin d'URL</var> local pour traiter
+ <li>rediriger en interne vers un <var>chemin d'URL</var> local pour traiter
le probl&egrave;me ou l'erreur</li>
<li>rediriger vers une <var>URL</var> externe pour traiter
@@ -1650,7 +1650,7 @@ ErrorLogFormat "[%t] [%l] [pid %P] %F: %E: [client %a] %M"
journal pour les requ&ecirc;tes.</p>
<highlight language="config">
-# Exemple (format par d&eacute;faut)
+# Exemple (format par d&eacute;faut pour les MPMs thread&eacute;s)
ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M%&nbsp;,\&nbsp;referer\&nbsp;%{Referer}i"
</highlight>
@@ -3170,6 +3170,7 @@ LogLevel info
<seealso><directive module="core">ErrorLog</directive></seealso>
<seealso><directive module="core">ErrorLogFormat</directive></seealso>
<seealso><directive module="core">LogLevelOverride</directive></seealso>
+<seealso><a href="../logs.html">Journaux du serveur HTTP Apache</a></seealso>
</directivesynopsis>
<directivesynopsis>
diff --git a/docs/manual/mod/mod_actions.xml.fr b/docs/manual/mod/mod_actions.xml.fr
index c7199bc1ba..2d2a57d06f 100644
--- a/docs/manual/mod/mod_actions.xml.fr
+++ b/docs/manual/mod/mod_actions.xml.fr
@@ -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: 1421821:1437836 (outdated) -->
+<!-- English Revision : 1437836 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -26,7 +26,7 @@
<name>mod_actions</name>
-<description>Ce module permet l'ex&eacute;cution des scripts CGI en fonction du
+<description>Ex&eacute;cution des scripts CGI en fonction du
type de m&eacute;dia ou de la m&eacute;thode de requ&ecirc;te.</description>
<status>Base</status>
diff --git a/docs/manual/mod/mod_auth_basic.xml.fr b/docs/manual/mod/mod_auth_basic.xml.fr
index ad4fec032d..7b68d960b3 100644
--- a/docs/manual/mod/mod_auth_basic.xml.fr
+++ b/docs/manual/mod/mod_auth_basic.xml.fr
@@ -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: 1421821:1437836 (outdated) -->
+<!-- English Revision : 1437836 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -25,7 +25,7 @@
<modulesynopsis metafile="mod_auth_basic.xml.meta">
<name>mod_auth_basic</name>
-<description>Authentification de base</description>
+<description>Authentification HTTP de base</description>
<status>Base</status>
<sourcefile>mod_auth_basic.c</sourcefile>
<identifier>auth_basic_module</identifier>
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index ae3917d2cb..82e98545a2 100644
--- a/docs/manual/mod/mod_proxy.xml.fr
+++ b/docs/manual/mod/mod_proxy.xml.fr
@@ -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: 1430575:1436920 (outdated) -->
+<!-- English Revision: 1436920 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -753,7 +753,7 @@ serveur HTTP Apache</compatibility>
<syntax>BalancerInherit On|Off</syntax>
<default>BalancerInherit On</default>
<contextlist><context>server config</context><context>virtual host</context></contextlist>
- <compatibility>Disponible &agrave; partir de la version 2.5.0 du serveur
+ <compatibility>Disponible &agrave; partir de la version 2.4.4 du serveur
HTTP Apache.</compatibility>
<usage>
<p>Cette directive permet d'attribuer au serveur virtuel courant
diff --git a/docs/manual/vhosts/mass.xml.fr b/docs/manual/vhosts/mass.xml.fr
index feae49b3d4..d879c8ab2c 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: 1330878:1436578 (outdated) -->
+<!-- English Revision : 1436578 -->
<!-- French translation : Lucien GENTIS -->
<!--
@@ -317,4 +317,12 @@ href="../rewrite/vhosts.html">documentation sur la r&eacute;&eacute;criture</a>.
</section>
+<section id="macro"><title>H&eacute;bergement virtuel en masse avec mod_macro</title>
+
+<p>Une autre option pour g&eacute;n&eacute;rer dynamiquement des serveurs virtuels :
+mod_macro ; ce module permet de cr&eacute;er un mod&egrave;le de serveur virtuel que
+vous pourrez invoquer pour des noms d'h&ocirc;tes multiples.
+</p>
+</section>
+
</manualpage>