You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2010/03/12 13:21:49 UTC
svn commit: r922232 - in /httpd/httpd/trunk/docs/manual: server-wide.html.en
server-wide.xml upgrading.html.en upgrading.xml urlmapping.xml.fr
urlmapping.xml.ja urlmapping.xml.ko urlmapping.xml.meta urlmapping.xml.tr
Author: rbowen
Date: Fri Mar 12 12:21:49 2010
New Revision: 922232
URL: http://svn.apache.org/viewvc?rev=922232&view=rev
Log:
Correct usage of 'Apache' vs 'httpd' and 'Apache HTTP Server'
Modified:
httpd/httpd/trunk/docs/manual/server-wide.html.en
httpd/httpd/trunk/docs/manual/server-wide.xml
httpd/httpd/trunk/docs/manual/upgrading.html.en
httpd/httpd/trunk/docs/manual/upgrading.xml
httpd/httpd/trunk/docs/manual/urlmapping.xml.fr
httpd/httpd/trunk/docs/manual/urlmapping.xml.ja
httpd/httpd/trunk/docs/manual/urlmapping.xml.ko
httpd/httpd/trunk/docs/manual/urlmapping.xml.meta
httpd/httpd/trunk/docs/manual/urlmapping.xml.tr
Modified: httpd/httpd/trunk/docs/manual/server-wide.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/server-wide.html.en?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/server-wide.html.en (original)
+++ httpd/httpd/trunk/docs/manual/server-wide.html.en Fri Mar 12 12:21:49 2010
@@ -54,7 +54,7 @@ the basic operations of the server.</p>
directives are used by the server to determine how to construct
self-referential URLs. For example, when a client requests a
directory, but does not include the trailing slash in the
- directory name, Apache must redirect the client to the full
+ directory name, httpd must redirect the client to the full
name including the trailing slash so that the client will
correctly resolve relative references in the document.</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -65,7 +65,7 @@ the basic operations of the server.</p>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></code></li><li><code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code class="directive"><a href="./mod/core.html#mutex">Mutex</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code></li><li><code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code></li></ul></td></tr></table>
<p>These directives control the locations of the various files
- that Apache needs for proper operation. When the pathname used
+ that httpd needs for proper operation. When the pathname used
does not begin with a slash (/), the files are located relative
to the <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code>. Be careful
about locating files in paths which are writable by non-root users.
@@ -80,13 +80,13 @@ the basic operations of the server.</p>
<p>The <code class="directive">LimitRequest</code>*
directives are used to place limits on the amount of resources
- Apache will use in reading requests from clients. By limiting
+ httpd will use in reading requests from clients. By limiting
these values, some kinds of denial of service attacks can be
mitigated.</p>
<p>The <code class="directive">RLimit</code>* directives
are used to limit the amount of resources which can be used by
- processes forked off from the Apache children. In particular,
+ processes forked off from the httpd children. In particular,
this will control resources used by CGI scripts and SSI exec
commands.</p>
Modified: httpd/httpd/trunk/docs/manual/server-wide.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/server-wide.xml?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/server-wide.xml (original)
+++ httpd/httpd/trunk/docs/manual/server-wide.xml Fri Mar 12 12:21:49 2010
@@ -57,7 +57,7 @@ the basic operations of the server.</p>
directives are used by the server to determine how to construct
self-referential URLs. For example, when a client requests a
directory, but does not include the trailing slash in the
- directory name, Apache must redirect the client to the full
+ directory name, httpd must redirect the client to the full
name including the trailing slash so that the client will
correctly resolve relative references in the document.</p>
</section>
@@ -78,7 +78,7 @@ the basic operations of the server.</p>
</related>
<p>These directives control the locations of the various files
- that Apache needs for proper operation. When the pathname used
+ that httpd needs for proper operation. When the pathname used
does not begin with a slash (/), the files are located relative
to the <directive module="core">ServerRoot</directive>. Be careful
about locating files in paths which are writable by non-root users.
@@ -104,13 +104,13 @@ the basic operations of the server.</p>
<p>The <directive>LimitRequest</directive>*
directives are used to place limits on the amount of resources
- Apache will use in reading requests from clients. By limiting
+ httpd will use in reading requests from clients. By limiting
these values, some kinds of denial of service attacks can be
mitigated.</p>
<p>The <directive>RLimit</directive>* directives
are used to limit the amount of resources which can be used by
- processes forked off from the Apache children. In particular,
+ processes forked off from the httpd children. In particular,
this will control resources used by CGI scripts and SSI exec
commands.</p>
Modified: httpd/httpd/trunk/docs/manual/upgrading.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/upgrading.html.en?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.html.en (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.html.en Fri Mar 12 12:21:49 2010
@@ -23,7 +23,7 @@
</div>
<p>In order to assist folks upgrading, we maintain a document
- describing information critical to existing Apache users. These
+ describing information critical to existing Apache HTTP Server users. These
are intended to be brief notes, and you should be able to find
more information in either the <a href="new_features_2_4.html">New Features</a> document, or in
the <code>src/CHANGES</code> file.</p>
@@ -38,7 +38,7 @@
<li><img alt="" src="./images/down.gif" /> <a href="#misc">Misc Changes</a></li>
<li><img alt="" src="./images/down.gif" /> <a href="#third-party">Third Party Modules</a></li>
</ul><h3>See also</h3><ul class="seealso"><li><a href="new_features_2_4.html">Overview of new features in
- Apache 2.4</a></li></ul></div>
+ Apache HTTP Server 2.4</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
<h2><a name="compile-time" id="compile-time">Compile-Time Configuration Changes</a></h2>
Modified: httpd/httpd/trunk/docs/manual/upgrading.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/upgrading.xml?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml Fri Mar 12 12:21:49 2010
@@ -26,7 +26,7 @@
<summary>
<p>In order to assist folks upgrading, we maintain a document
- describing information critical to existing Apache users. These
+ describing information critical to existing Apache HTTP Server users. These
are intended to be brief notes, and you should be able to find
more information in either the <a
href="new_features_2_4.html">New Features</a> document, or in
@@ -39,7 +39,7 @@
</summary>
<seealso><a href="new_features_2_4.html">Overview of new features in
- Apache 2.4</a></seealso>
+ Apache HTTP Server 2.4</a></seealso>
<section id="compile-time">
<title>Compile-Time Configuration Changes</title>
Modified: httpd/httpd/trunk/docs/manual/urlmapping.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.xml.fr?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.xml.fr Fri Mar 12 12:21:49 2010
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 732819 -->
+<!-- English Revision: 732819:921872 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/urlmapping.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.xml.ja?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.xml.ja [utf-8] Fri Mar 12 12:21:49 2010
@@ -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: 151408:732819 (outdated) -->
+<!-- English Revision: 151408:921872 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/urlmapping.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.xml.ko?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.xml.ko [euc-kr] Fri Mar 12 12:21:49 2010
@@ -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: 151408:732819 (outdated) -->
+<!-- English Revision: 151408:921872 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/urlmapping.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.xml.meta?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.xml.meta Fri Mar 12 12:21:49 2010
@@ -8,9 +8,9 @@
<variants>
<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>
Modified: httpd/httpd/trunk/docs/manual/urlmapping.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.xml.tr?rev=922232&r1=922231&r2=922232&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.xml.tr [utf-8] Fri Mar 12 12:21:49 2010
@@ -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: 732819 -->
+<!-- English Revision: 732819:921872 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>