summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
authorDaniel Gruno <humbedooh@apache.org>2012-09-19 18:10:12 +0200
committerDaniel Gruno <humbedooh@apache.org>2012-09-19 18:10:12 +0200
commit15b4ec2aa6d28b5e14453cf41b267e232d9d12d2 (patch)
tree81597382b25cf1e7a894453004d747c8d952ca27 /docs/manual
parents/2.3/2.5/ and s/2.5/2.&httpd.minor;/ where applicable (assuming it works) (diff)
downloadapache2-15b4ec2aa6d28b5e14453cf41b267e232d9d12d2.tar.xz
apache2-15b4ec2aa6d28b5e14453cf41b267e232d9d12d2.zip
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387658 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/install.html.en2
-rw-r--r--docs/manual/install.html.fr2
-rw-r--r--docs/manual/install.xml.de2
-rw-r--r--docs/manual/install.xml.es2
-rw-r--r--docs/manual/install.xml.fr2
-rw-r--r--docs/manual/install.xml.ja2
-rw-r--r--docs/manual/install.xml.ko2
-rw-r--r--docs/manual/install.xml.meta2
-rw-r--r--docs/manual/install.xml.tr2
-rw-r--r--docs/manual/invoking.html.en6
-rw-r--r--docs/manual/invoking.html.fr2
-rw-r--r--docs/manual/invoking.html.tr.utf81
-rw-r--r--docs/manual/invoking.xml.de2
-rw-r--r--docs/manual/invoking.xml.es2
-rw-r--r--docs/manual/invoking.xml.fr2
-rw-r--r--docs/manual/invoking.xml.ja2
-rw-r--r--docs/manual/invoking.xml.ko2
-rw-r--r--docs/manual/invoking.xml.meta4
-rw-r--r--docs/manual/invoking.xml.tr2
-rw-r--r--docs/manual/mod/mod_authn_dbd.html.en2
-rw-r--r--docs/manual/platform/windows.html.en30
-rw-r--r--docs/manual/platform/windows.xml.ko2
22 files changed, 40 insertions, 37 deletions
diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index a9f255844c..d52e9ed2f2 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -362,7 +362,7 @@ $ tar xvf httpd-<em>NN</em>.tar
<p>The first step in upgrading is to read the release announcement
and the file <code>CHANGES</code> in the source distribution to
find any changes that may affect your site. When changing between
- major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.3),
+ major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.4),
there will likely be major differences in the compile-time and
run-time configuration that will require manual adjustments. All
modules will also need to be upgraded to accommodate changes in the
diff --git a/docs/manual/install.html.fr b/docs/manual/install.html.fr
index ee76e83f28..72f7697b22 100644
--- a/docs/manual/install.html.fr
+++ b/docs/manual/install.html.fr
@@ -29,6 +29,8 @@
<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="./tr/install.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 couvre l'installation et la compilation du serveur
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de
index 68cde19148..d4ae985dba 100644
--- a/docs/manual/install.xml.de
+++ b/docs/manual/install.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: 239255:1328589 (outdated) -->
+<!-- English Revision: 239255:1387657 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es
index 05bfa5c44e..89373a5cb2 100644
--- a/docs/manual/install.xml.es
+++ b/docs/manual/install.xml.es
@@ -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.es.xsl"?>
-<!-- English Revision: 105989:1328589 (outdated) -->
+<!-- English Revision: 105989:1387657 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr
index c8f947a979..5db7837c0e 100644
--- a/docs/manual/install.xml.fr
+++ b/docs/manual/install.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 : 1328589 -->
+<!-- English Revision: 1328589:1387657 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index 2af6c068d2..3cbbe3d1c7 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.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: 527129:1328589 (outdated) -->
+<!-- English Revision: 527129:1387657 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko
index e31a24dcc2..2e82d2a220 100644
--- a/docs/manual/install.xml.ko
+++ b/docs/manual/install.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: 105989:1328589 (outdated) -->
+<!-- English Revision: 105989:1387657 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.meta b/docs/manual/install.xml.meta
index 6a8403bc30..de3fcaf615 100644
--- a/docs/manual/install.xml.meta
+++ b/docs/manual/install.xml.meta
@@ -10,7 +10,7 @@
<variant outdated="yes">de</variant>
<variant>en</variant>
<variant outdated="yes">es</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">tr</variant>
diff --git a/docs/manual/install.xml.tr b/docs/manual/install.xml.tr
index 770e0ba74d..f419c49458 100644
--- a/docs/manual/install.xml.tr
+++ b/docs/manual/install.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: 1296735:1328589 (outdated) -->
+<!-- English Revision: 1296735:1387657 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en
index 8bda700839..8043e652a6 100644
--- a/docs/manual/invoking.html.en
+++ b/docs/manual/invoking.html.en
@@ -31,10 +31,8 @@
</div>
<p>On Windows, Apache is normally run as a service on Windows
- NT, 2000 and XP, or as a console application on Windows 9x and
- ME. For details, see <a href="platform/windows.html#winsvc">Running Apache as a Service</a>
- and <a href="platform/windows.html#wincons">Running Apache as a
- Console Application</a>.</p>
+ NT, 2000 and XP. For details, see <a href="platform/windows.html#winsvc">Running Apache as a Service</a>.
+ </p>
<p>On Unix, the <code class="program"><a href="./programs/httpd.html">httpd</a></code> program
is run as a daemon that executes continuously in the
diff --git a/docs/manual/invoking.html.fr b/docs/manual/invoking.html.fr
index 530f20bc6f..179f02ee4b 100644
--- a/docs/manual/invoking.html.fr
+++ b/docs/manual/invoking.html.fr
@@ -29,6 +29,8 @@
<a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="./tr/invoking.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>Apache est habituellement lancé en tant que service
sous Windows NT, 2000 et XP, ou comme application en mode console sous
diff --git a/docs/manual/invoking.html.tr.utf8 b/docs/manual/invoking.html.tr.utf8
index d32ab18e6e..74fffab295 100644
--- a/docs/manual/invoking.html.tr.utf8
+++ b/docs/manual/invoking.html.tr.utf8
@@ -29,6 +29,7 @@
<a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="./tr/invoking.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>Apache normal olarak, Windows NT, 2000 ve XP'de bir hizmet olarak,
Windows 9x ve ME’de ise bir konsol uygulaması olarak çalışır. Ayrıntılı
diff --git a/docs/manual/invoking.xml.de b/docs/manual/invoking.xml.de
index 99e1f95fc7..6d978d8991 100644
--- a/docs/manual/invoking.xml.de
+++ b/docs/manual/invoking.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: 395228:1044380 (outdated) -->
+<!-- English Revision: 395228:1387612 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.es b/docs/manual/invoking.xml.es
index a26a5a0283..34797e8471 100644
--- a/docs/manual/invoking.xml.es
+++ b/docs/manual/invoking.xml.es
@@ -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.es.xsl"?>
-<!-- English Revision: 105989:1044380 (outdated) -->
+<!-- English Revision: 105989:1387612 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.fr b/docs/manual/invoking.xml.fr
index 1e9ef7a161..52871f731d 100644
--- a/docs/manual/invoking.xml.fr
+++ b/docs/manual/invoking.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: 1044380 -->
+<!-- English Revision: 1044380:1387612 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.ja b/docs/manual/invoking.xml.ja
index af2e4fa5cb..47ec96e8c1 100644
--- a/docs/manual/invoking.xml.ja
+++ b/docs/manual/invoking.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: 567441:1044380 (outdated) -->
+<!-- English Revision: 567441:1387612 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.ko b/docs/manual/invoking.xml.ko
index 916cf7d15f..34f7344e8c 100644
--- a/docs/manual/invoking.xml.ko
+++ b/docs/manual/invoking.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: 105989:1044380 (outdated) -->
+<!-- English Revision: 105989:1387612 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/invoking.xml.meta b/docs/manual/invoking.xml.meta
index f1681166a1..6919b9d87c 100644
--- a/docs/manual/invoking.xml.meta
+++ b/docs/manual/invoking.xml.meta
@@ -10,9 +10,9 @@
<variant outdated="yes">de</variant>
<variant>en</variant>
<variant outdated="yes">es</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/invoking.xml.tr b/docs/manual/invoking.xml.tr
index cab4715295..665e50d46e 100644
--- a/docs/manual/invoking.xml.tr
+++ b/docs/manual/invoking.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: 1044380 -->
+<!-- English Revision: 1044380:1387612 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_authn_dbd.html.en b/docs/manual/mod/mod_authn_dbd.html.en
index e46268a78d..cfe1354271 100644
--- a/docs/manual/mod/mod_authn_dbd.html.en
+++ b/docs/manual/mod/mod_authn_dbd.html.en
@@ -76,7 +76,7 @@
<div class="section">
<h2><a name="socache" id="socache">Performance and Cacheing</a></h2>
-<p>Some users of DBD authentication in HTTPD 2.2 have reported that it
+<p>Some users of DBD authentication in HTTPD 2.2/2.4 have reported that it
imposes a problematic load on the database. This is most likely where
an HTML page contains hundreds of objects (e.g. images, scripts, etc)
each of which requires authentication. Users affected (or concerned)
diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index 0cd4d2fd2e..c171ba0433 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -26,7 +26,7 @@
</div>
<p>This document explains how to install, configure and run
- Apache 2.3 under Microsoft Windows. If you have questions after
+ Apache 2.5 under Microsoft Windows. If you have questions after
reviewing the documentation (and any event and error logs), you
should consult the peer-supported
<a href="http://httpd.apache.org/userslist.html">users' mailing
@@ -53,7 +53,7 @@
<h2><a name="req" id="req">Operating System Requirements</a></h2>
- <p>The primary Windows platform for running Apache 2.3 is Windows
+ <p>The primary Windows platform for running Apache 2.5 is Windows
2000 or later. The binary installer only works with the x86 family
of processors, such as Intel and AMD processors. Always obtain and
install the current service pack to avoid operating system bugs.</p>
@@ -98,11 +98,11 @@
<a href="http://support.microsoft.com/kb/292539/">KB 292539</a>.
Windows XP and later do not require this update.</p>
- <p>Note that you cannot install two versions of Apache 2.3 on the
+ <p>Note that you cannot install two versions of Apache 2.5 on the
same computer with the binary installer. You can, however, install
a version of the 1.3 series <strong>and</strong> a version of the
- 2.3 series on the same computer without problems. If you need to
- have two different 2.3 versions on the same computer, you have to
+ 2.5 series on the same computer without problems. If you need to
+ have two different 2.5 versions on the same computer, you have to
<a href="win_compiling.html">compile and install Apache from the
source</a>.</p>
@@ -307,14 +307,14 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
validate all path names given. This means that each directory
which Apache evaluates, from the drive root up to the directory
leaf, must have read, list and traverse directory permissions.
- If Apache2.3 is installed at C:\Program Files, then the root
- directory, Program Files and Apache2.3 must all be visible
+ If Apache2.5 is installed at C:\Program Files, then the root
+ directory, Program Files and Apache2.5 must all be visible
to Apache.</p></li>
<li><p>Apache for Windows contains the ability to load modules at
runtime, without recompiling the server. If Apache is compiled
normally, it will install a number of optional modules in the
- <code>\Apache2.3\modules</code> directory. To activate these or
+ <code>\Apache2.5\modules</code> directory. To activate these or
other modules, the new <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
directive must be used. For example, to activate the status
module, use the following (in addition to the status-activating
@@ -398,7 +398,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
</code></p></div>
<p>If you use the first command without any special parameters except
- <code>-k install</code>, the service will be called <code>Apache2.3</code>
+ <code>-k install</code>, the service will be called <code>Apache2.5</code>
and the configuration will be assumed to be <code>conf\httpd.conf</code>.
</p>
@@ -416,8 +416,8 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
<p>Normal starting, restarting and shutting down of an Apache
service is usually done via the Apache Service Monitor, by using
- commands like <code>NET START Apache2.3</code> and <code>NET STOP
- Apache2.3</code> or via normal Windows service management. Before
+ commands like <code>NET START Apache2.5</code> and <code>NET STOP
+ Apache2.5</code> or via normal Windows service management. Before
starting Apache as a service by any means, you should test the
service's configuration file by using:</p>
@@ -495,7 +495,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
</ol>
<div class="note">It is usually a good practice to grant the user the Apache
- service runs as read and execute (RX) access to the whole Apache2.3
+ service runs as read and execute (RX) access to the whole Apache2.5
directory, except the <code>logs</code> subdirectory, where the
user has to have at least change (RWXD) rights.</div>
@@ -518,7 +518,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
Windows Control Panel, you may get the following message:</p>
<div class="example"><p><code>
- Could not start the Apache2.3 service on \\COMPUTER <br />
+ Could not start the Apache2.5 service on \\COMPUTER <br />
Error 1067; The process terminated unexpectedly.
</code></p></div>
@@ -552,7 +552,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
<p>You can also run Apache via the shortcut Start Apache in Console
placed to <code>Start Menu --&gt; Programs --&gt; Apache HTTP Server
- 2.3.xx --&gt; Control Apache Server</code> during the installation.
+ 2.5.xx --&gt; Control Apache Server</code> during the installation.
This will open a console window and start Apache inside it. If you
don't have Apache installed as a service, the window will remain
visible until you stop Apache by pressing Control-C in the console
@@ -603,7 +603,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
<div class="example"><p><code>
c: <br />
- cd "\Program Files\Apache Software Foundation\Apache2.3\bin" <br />
+ cd "\Program Files\Apache Software Foundation\Apache2.5\bin" <br />
httpd.exe
</code></p></div>
diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko
index 5dfe1b693a..e4fd2627a0 100644
--- a/docs/manual/platform/windows.xml.ko
+++ b/docs/manual/platform/windows.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: 105989:1330882 (outdated) -->
+<!-- English Revision: 105989:1387657 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more