summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2012-05-29 19:18:08 +0000
committerStefan Fritsch <sf@apache.org>2012-05-29 19:18:08 +0000
commit1fe7ef2924834f01bfc512d7d6777e4d6f73172e (patch)
treef5d52026b61fb0d566348897459ac0fb6d44fb7b
parent7ec854099f9185ea1d14ae97e9b8dca4dc2a0a18 (diff)
downloadhttpd-1fe7ef2924834f01bfc512d7d6777e4d6f73172e.tar.gz
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1343936 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/configuring.html.en3
-rw-r--r--docs/manual/configuring.html.fr2
-rw-r--r--docs/manual/configuring.html.tr.utf81
-rw-r--r--docs/manual/configuring.xml.de2
-rw-r--r--docs/manual/configuring.xml.fr2
-rw-r--r--docs/manual/configuring.xml.ja2
-rw-r--r--docs/manual/configuring.xml.ko2
-rw-r--r--docs/manual/configuring.xml.meta4
-rw-r--r--docs/manual/configuring.xml.tr2
-rw-r--r--docs/manual/mod/mod_info.html.en12
-rw-r--r--docs/manual/mod/mod_info.html.fr2
-rw-r--r--docs/manual/mod/mod_info.xml.fr2
-rw-r--r--docs/manual/mod/mod_info.xml.ja2
-rw-r--r--docs/manual/mod/mod_info.xml.ko2
-rw-r--r--docs/manual/mod/mod_info.xml.meta2
-rw-r--r--docs/manual/mod/mod_log_forensic.html.en2
-rw-r--r--docs/manual/mod/mod_log_forensic.html.tr.utf81
17 files changed, 30 insertions, 15 deletions
diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index 339416388b..40fa22c3fa 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -109,7 +109,8 @@ Server.</p>
variables resolved and all comments and non-matching
<code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> and
<code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> sections
- removed.</p>
+ removed. However, the output does not reflect the merging or overriding
+ that may happen for repeated directives.</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
<h2><a name="modules" id="modules">Modules</a></h2>
diff --git a/docs/manual/configuring.html.fr b/docs/manual/configuring.html.fr
index c4d1d03620..873ff27791 100644
--- a/docs/manual/configuring.html.fr
+++ b/docs/manual/configuring.html.fr
@@ -28,6 +28,8 @@
<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>Ce document décrit les fichiers utilisés pour configurer
le Serveur HTTP Apache.</p>
diff --git a/docs/manual/configuring.html.tr.utf8 b/docs/manual/configuring.html.tr.utf8
index 5f9a7d2be8..a7c69ffd8a 100644
--- a/docs/manual/configuring.html.tr.utf8
+++ b/docs/manual/configuring.html.tr.utf8
@@ -28,6 +28,7 @@
<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="./tr/configuring.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
</div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
<p>Bu belgede Apache HTTP Sunucusunu yapılandırmakta kullanılan dosyalar
açıklanmıştır.</p>
diff --git a/docs/manual/configuring.xml.de b/docs/manual/configuring.xml.de
index fb7dae9144..5b7c609efc 100644
--- a/docs/manual/configuring.xml.de
+++ b/docs/manual/configuring.xml.de
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 420990:1213338 (outdated) -->
+<!-- English Revision: 420990:1343935 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/configuring.xml.fr b/docs/manual/configuring.xml.fr
index bfaeb2accf..31cf3f2660 100644
--- a/docs/manual/configuring.xml.fr
+++ b/docs/manual/configuring.xml.fr
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision : 1213338 -->
+<!-- English Revision: 1213338:1343935 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/configuring.xml.ja b/docs/manual/configuring.xml.ja
index 38da19cb6c..36e1ac4632 100644
--- a/docs/manual/configuring.xml.ja
+++ b/docs/manual/configuring.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1213338 (outdated) -->
+<!-- English Revision: 420990:1343935 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/configuring.xml.ko b/docs/manual/configuring.xml.ko
index 4f73abbeb3..bcc96ea01a 100644
--- a/docs/manual/configuring.xml.ko
+++ b/docs/manual/configuring.xml.ko
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 420990:1213338 (outdated) -->
+<!-- English Revision: 420990:1343935 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/configuring.xml.meta b/docs/manual/configuring.xml.meta
index b06983ee58..28796b60e2 100644
--- a/docs/manual/configuring.xml.meta
+++ b/docs/manual/configuring.xml.meta
@@ -9,9 +9,9 @@
<variants>
<variant outdated="yes">de</variant>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
diff --git a/docs/manual/configuring.xml.tr b/docs/manual/configuring.xml.tr
index 4791e8acb8..b00566b7c9 100644
--- a/docs/manual/configuring.xml.tr
+++ b/docs/manual/configuring.xml.tr
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1213338 -->
+<!-- English Revision: 1213338:1343935 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index 3f6a10b1a0..282ee8de4e 100644
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -133,8 +133,16 @@ configuration</td></tr>
<h2><a name="startup" id="startup">Dumping the configuration on startup</a></h2>
<p>If the config define <code>-DDUMP_CONFIG</code> is set,
<code class="module"><a href="../mod/mod_info.html">mod_info</a></code> will dump the pre-parsed configuration to
- <code>stdout</code> during server startup. This is roughly equivalent
- to the <code>?config</code> query.</p>
+ <code>stdout</code> during server startup. Pre-parsed means that
+ directives like
+ <code class="directive"><a href="../mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> and
+ <code class="directive"><a href="../mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> are
+ evaluated and environment varialbles are replaced. However it does
+ not represent the final state of the configuration. In particular,
+ it does not represent the merging or overriding that may happen
+ for repeated directives.</p>
+
+ <p>This is roughly equivalent to the <code>?config</code> query.</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="limitations" id="limitations">Known Limitations</a></h2>
diff --git a/docs/manual/mod/mod_info.html.fr b/docs/manual/mod/mod_info.html.fr
index fdf7d4c07d..3e1ab106c0 100644
--- a/docs/manual/mod/mod_info.html.fr
+++ b/docs/manual/mod/mod_info.html.fr
@@ -29,6 +29,8 @@
<a href="../ja/mod/mod_info.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="../ko/mod/mod_info.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Affiche une présentation complète de la configuration du
serveur</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
diff --git a/docs/manual/mod/mod_info.xml.fr b/docs/manual/mod/mod_info.xml.fr
index 588870f62d..68e327f44d 100644
--- a/docs/manual/mod/mod_info.xml.fr
+++ b/docs/manual/mod/mod_info.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 : 1331006 -->
+<!-- English Revision: 1331006:1343935 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja
index acde858bad..9ad4b4bbfa 100644
--- a/docs/manual/mod/mod_info.xml.ja
+++ b/docs/manual/mod/mod_info.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 450473:1331006 (outdated) -->
+<!-- English Revision: 450473:1343935 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_info.xml.ko b/docs/manual/mod/mod_info.xml.ko
index 18c06dd539..5f08b871d0 100644
--- a/docs/manual/mod/mod_info.xml.ko
+++ b/docs/manual/mod/mod_info.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 125277:1331006 (outdated) -->
+<!-- English Revision: 125277:1343935 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_info.xml.meta b/docs/manual/mod/mod_info.xml.meta
index 9e62f45727..9f670b9a11 100644
--- a/docs/manual/mod/mod_info.xml.meta
+++ b/docs/manual/mod/mod_info.xml.meta
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
diff --git a/docs/manual/mod/mod_log_forensic.html.en b/docs/manual/mod/mod_log_forensic.html.en
index d9caf4d448..a386328189 100644
--- a/docs/manual/mod/mod_log_forensic.html.en
+++ b/docs/manual/mod/mod_log_forensic.html.en
@@ -168,7 +168,7 @@ version 2.1</td></tr></table>
</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&amp;A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
<script type="text/javascript"><!--//--><![CDATA[//><!--
var comments_shortname = 'httpd';
-var comments_identifier = 'http://httpd.apache.org/docs/trunk/mod/mod_log_forensic.html';
+var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_log_forensic.html.en';
(function(w, d) {
var disabled = false;
if (w.location.hostname.toLowerCase() == "httpd.apache.org" && disabled !== true) {
diff --git a/docs/manual/mod/mod_log_forensic.html.tr.utf8 b/docs/manual/mod/mod_log_forensic.html.tr.utf8
index e7880a30ed..da50cdc17e 100644
--- a/docs/manual/mod/mod_log_forensic.html.tr.utf8
+++ b/docs/manual/mod/mod_log_forensic.html.tr.utf8
@@ -28,6 +28,7 @@
<a href="../ja/mod/mod_log_forensic.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="../tr/mod/mod_log_forensic.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
</div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Açıklama:</a></th><td>Sunucuya yapılan isteklerin adli günlük kayıtlarının tutulması</td></tr>
<tr><th><a href="module-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Modül Betimleyici:</a></th><td>log_forensic_module</td></tr>