diff options
author | Rich Bowen <rbowen@apache.org> | 2010-03-12 13:21:49 +0100 |
---|---|---|
committer | Rich Bowen <rbowen@apache.org> | 2010-03-12 13:21:49 +0100 |
commit | a12b88d9919e17c34a5818a590c3701533214a51 (patch) | |
tree | 6a6cae13acb96a06eb4e57350b04584f77984a80 | |
parent | A temporary solution to an outdated link. Would be nice to have this (diff) | |
download | apache2-a12b88d9919e17c34a5818a590c3701533214a51.tar.xz apache2-a12b88d9919e17c34a5818a590c3701533214a51.zip |
Correct usage of 'Apache' vs 'httpd' and 'Apache HTTP Server'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@922232 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | docs/manual/server-wide.html.en | 8 | ||||
-rw-r--r-- | docs/manual/server-wide.xml | 8 | ||||
-rw-r--r-- | docs/manual/upgrading.html.en | 4 | ||||
-rw-r--r-- | docs/manual/upgrading.xml | 4 | ||||
-rw-r--r-- | docs/manual/urlmapping.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/urlmapping.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/urlmapping.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/urlmapping.xml.meta | 4 | ||||
-rw-r--r-- | docs/manual/urlmapping.xml.tr | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/docs/manual/server-wide.html.en b/docs/manual/server-wide.html.en index 422623a6f8..d6529cc5b4 100644 --- a/docs/manual/server-wide.html.en +++ b/docs/manual/server-wide.html.en @@ -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> diff --git a/docs/manual/server-wide.xml b/docs/manual/server-wide.xml index 161bb41871..b22f9b3c04 100644 --- a/docs/manual/server-wide.xml +++ b/docs/manual/server-wide.xml @@ -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> diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en index 8dd6e1c527..fdefb8adc7 100644 --- a/docs/manual/upgrading.html.en +++ b/docs/manual/upgrading.html.en @@ -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> diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index 74c5a1561a..a78559a95f 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -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> diff --git a/docs/manual/urlmapping.xml.fr b/docs/manual/urlmapping.xml.fr index 57db63ce90..3b8522a22c 100644 --- a/docs/manual/urlmapping.xml.fr +++ b/docs/manual/urlmapping.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: 732819 --> +<!-- English Revision: 732819:921872 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.ja b/docs/manual/urlmapping.xml.ja index d3655ea14b..7a78942a44 100644 --- a/docs/manual/urlmapping.xml.ja +++ b/docs/manual/urlmapping.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: 151408:732819 (outdated) --> +<!-- English Revision: 151408:921872 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.ko b/docs/manual/urlmapping.xml.ko index b69df62a8a..3c21f18c99 100644 --- a/docs/manual/urlmapping.xml.ko +++ b/docs/manual/urlmapping.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: 151408:732819 (outdated) --> +<!-- English Revision: 151408:921872 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.meta b/docs/manual/urlmapping.xml.meta index 88f0e34da4..75d199cbfd 100644 --- a/docs/manual/urlmapping.xml.meta +++ b/docs/manual/urlmapping.xml.meta @@ -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> diff --git a/docs/manual/urlmapping.xml.tr b/docs/manual/urlmapping.xml.tr index ef57ee569c..18d86e3978 100644 --- a/docs/manual/urlmapping.xml.tr +++ b/docs/manual/urlmapping.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: 732819 --> +<!-- English Revision: 732819:921872 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> |