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/23 13:46:46 UTC
svn commit: r926543 - /httpd/httpd/trunk/docs/manual/mod/
Author: rbowen
Date: Tue Mar 23 12:46:46 2010
New Revision: 926543
URL: http://svn.apache.org/viewvc?rev=926543&view=rev
Log:
More 'Apache' => 'Apache HTTP Server' changes. Other minor nitpicky
changes. Identified a few docs that could use some attention to grammar.
Modified:
httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ko
httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_status.html.en
httpd/httpd/trunk/docs/manual/mod/mod_status.xml
httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en
httpd/httpd/trunk/docs/manual/mod/mod_substitute.xml
httpd/httpd/trunk/docs/manual/mod/mod_userdir.html.en
httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml
httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.html.en
httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.xml
Modified: httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ja?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ja [utf-8] Tue Mar 23 12:46:46 2010
@@ -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: 420990 -->
+<!-- English Revision: 420990:926536 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ko?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.ko [euc-kr] Tue Mar 23 12:46:46 2010
@@ -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: 151408:420990 (outdated) -->
+<!-- English Revision: 151408:926536 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.meta?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_asis.xml.meta Tue Mar 23 12:46:46 2010
@@ -9,7 +9,7 @@
<variants>
<variant>en</variant>
<variant>fr</variant>
- <variant>ja</variant>
+ <variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_status.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_status.html.en?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_status.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_status.html.en Tue Mar 23 12:46:46 2010
@@ -62,7 +62,7 @@ performance</td></tr>
bytes per request (*)</li>
<li>The current percentage CPU used by each worker and in
- total by Apache (*)</li>
+ total by all workers combined (*)</li>
<li>The current hosts and requests being processed (*)</li>
</ul>
@@ -121,9 +121,9 @@ performance</td></tr>
<p>A machine-readable version of the status file is available by
accessing the page
<code>http://your.server.name/server-status?auto</code>. This
- is useful when automatically run, see the Perl program in the
- <code>/support</code> directory of Apache,
- <code>log_server_status</code>.</p>
+ is useful when automatically run, see the Perl program
+ <code>log_server_status</code>, which you will find in the
+ <code>/support</code> directory of your Apache HTTP Server installation.</p>
<div class="note">
<strong>It should be noted that if <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> is
Modified: httpd/httpd/trunk/docs/manual/mod/mod_status.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_status.xml?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_status.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_status.xml Tue Mar 23 12:46:46 2010
@@ -59,7 +59,7 @@ performance</description>
bytes per request (*)</li>
<li>The current percentage CPU used by each worker and in
- total by Apache (*)</li>
+ total by all workers combined (*)</li>
<li>The current hosts and requests being processed (*)</li>
</ul>
@@ -108,9 +108,9 @@ performance</description>
<p>A machine-readable version of the status file is available by
accessing the page
<code>http://your.server.name/server-status?auto</code>. This
- is useful when automatically run, see the Perl program in the
- <code>/support</code> directory of Apache,
- <code>log_server_status</code>.</p>
+ is useful when automatically run, see the Perl program
+ <code>log_server_status</code>, which you will find in the
+ <code>/support</code> directory of your Apache HTTP Server installation.</p>
<note>
<strong>It should be noted that if <module>mod_status</module> is
Modified: httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_substitute.html.en Tue Mar 23 12:46:46 2010
@@ -27,7 +27,7 @@
<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>substitute_module</td></tr>
<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_substitute.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.2.7 and later</td></tr></table>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache HTTP Server 2.2.7 and later</td></tr></table>
<h3>Summary</h3>
<p><code class="module"><a href="../mod/mod_substitute.html">mod_substitute</a></code> provides a mechanism to perform
Modified: httpd/httpd/trunk/docs/manual/mod/mod_substitute.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_substitute.xml?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_substitute.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_substitute.xml Tue Mar 23 12:46:46 2010
@@ -27,7 +27,7 @@
<status>Experimental</status>
<sourcefile>mod_substitute.c</sourcefile>
<identifier>substitute_module</identifier>
-<compatibility>Available in Apache 2.2.7 and later</compatibility>
+<compatibility>Available in Apache HTTP Server 2.2.7 and later</compatibility>
<summary>
<p><module>mod_substitute</module> provides a mechanism to perform
Modified: httpd/httpd/trunk/docs/manual/mod/mod_userdir.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_userdir.html.en?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_userdir.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_userdir.html.en Tue Mar 23 12:46:46 2010
@@ -157,7 +157,7 @@ tutorial</a></li>
redirect to <code>http://www.example.com/bob/one/two.html</code>.</p>
<p>If you add a redirect, it must be the last alternative in the list.
- Apache cannot determine if the redirect succeeded or not, so if you have
+ Apache httpd cannot determine if the redirect succeeded or not, so if you have
the redirect earlier in the list, that will always be the alternative
that is used.</p>
@@ -170,7 +170,7 @@ tutorial</a></li>
<h3>See also</h3>
<ul>
<li>
- <a href="../howto/public_html.html">public_html tutorial</a>
+ <a href="../howto/public_html.html">Per-user web directories tutorial</a>
</li>
</ul>
</div>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_userdir.xml Tue Mar 23 12:46:46 2010
@@ -150,7 +150,7 @@ host</context></contextlist>
redirect to <code>http://www.example.com/bob/one/two.html</code>.</p>
<p>If you add a redirect, it must be the last alternative in the list.
- Apache cannot determine if the redirect succeeded or not, so if you have
+ Apache httpd cannot determine if the redirect succeeded or not, so if you have
the redirect earlier in the list, that will always be the alternative
that is used.</p>
@@ -162,7 +162,7 @@ host</context></contextlist>
</usage>
<seealso>
- <a href="../howto/public_html.html">public_html tutorial</a>
+ <a href="../howto/public_html.html">Per-user web directories tutorial</a>
</seealso>
</directivesynopsis>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.html.en?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.html.en Tue Mar 23 12:46:46 2010
@@ -235,7 +235,7 @@ for a given virtual host</td></tr>
</table>
<p>The <code class="directive">VirtualDocumentRoot</code> directive allows you to
- determine where Apache will find your documents based on the
+ determine where Apache HTTP Server will find your documents based on the
value of the server name. The result of expanding
<em>interpolated-directory</em> is used as the root of the
document tree in a similar manner to the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directive's argument.
@@ -277,7 +277,7 @@ a given virtual host</td></tr>
</table>
<p>The <code class="directive">VirtualScriptAlias</code> directive allows you to
- determine where Apache will find CGI scripts in a similar
+ determine where Apache httpd will find CGI scripts in a similar
manner to <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> does for other documents. It matches
requests for URIs starting <code>/cgi-bin/</code>, much like <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
<code>/cgi-bin/</code> would.</p>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.xml?rev=926543&r1=926542&r2=926543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_vhost_alias.xml Tue Mar 23 12:46:46 2010
@@ -223,7 +223,7 @@ for a given virtual host</description>
<usage>
<p>The <directive>VirtualDocumentRoot</directive> directive allows you to
- determine where Apache will find your documents based on the
+ determine where Apache HTTP Server will find your documents based on the
value of the server name. The result of expanding
<em>interpolated-directory</em> is used as the root of the
document tree in a similar manner to the <directive
@@ -271,7 +271,7 @@ a given virtual host</description>
<usage>
<p>The <directive>VirtualScriptAlias</directive> directive allows you to
- determine where Apache will find CGI scripts in a similar
+ determine where Apache httpd will find CGI scripts in a similar
manner to <directive module="mod_vhost_alias"
>VirtualDocumentRoot</directive> does for other documents. It matches
requests for URIs starting <code>/cgi-bin/</code>, much like <directive