httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbo...@apache.org
Subject svn commit: r924467 - in /httpd/httpd/trunk/docs/manual: ./ mod/
Date Wed, 17 Mar 2010 20:26:43 GMT
Author: rbowen
Date: Wed Mar 17 20:26:42 2010
New Revision: 924467

URL: http://svn.apache.org/viewvc?rev=924467&view=rev
Log:
Remove mentions of HTTPD. Mea culpa.

Modified:
    httpd/httpd/trunk/docs/manual/bind.html.en
    httpd/httpd/trunk/docs/manual/bind.xml
    httpd/httpd/trunk/docs/manual/configuring.html.en
    httpd/httpd/trunk/docs/manual/configuring.xml
    httpd/httpd/trunk/docs/manual/dns-caveats.html.en
    httpd/httpd/trunk/docs/manual/dns-caveats.xml
    httpd/httpd/trunk/docs/manual/install.html.en
    httpd/httpd/trunk/docs/manual/install.xml
    httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja
    httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko
    httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_filter.xml
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
    httpd/httpd/trunk/docs/manual/mod/worker.html.en
    httpd/httpd/trunk/docs/manual/mod/worker.xml
    httpd/httpd/trunk/docs/manual/stopping.html.en
    httpd/httpd/trunk/docs/manual/stopping.xml

Modified: httpd/httpd/trunk/docs/manual/bind.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/bind.html.en?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/bind.html.en (original)
+++ httpd/httpd/trunk/docs/manual/bind.html.en Wed Mar 17 20:26:42 2010
@@ -26,7 +26,7 @@
 <a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
-    <p>Configuring Apache HTTPD to listen on specific addresses and ports.</p>
+    <p>Configuring Apache HTTP Server to listen on specific addresses and ports.</p>
   </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif"
/> <a href="#overview">Overview</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#ipv6">Special IPv6
Considerations</a></li>

Modified: httpd/httpd/trunk/docs/manual/bind.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/bind.xml?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/bind.xml (original)
+++ httpd/httpd/trunk/docs/manual/bind.xml Wed Mar 17 20:26:42 2010
@@ -25,7 +25,7 @@
   <title>Binding</title>
 
   <summary>
-    <p>Configuring Apache HTTPD to listen on specific addresses and ports.</p>
+    <p>Configuring Apache HTTP Server to listen on specific addresses and ports.</p>
   </summary>
 
   <seealso><a href="vhosts/">Virtual Hosts</a></seealso>

Modified: httpd/httpd/trunk/docs/manual/configuring.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/configuring.html.en?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/configuring.html.en (original)
+++ httpd/httpd/trunk/docs/manual/configuring.html.en Wed Mar 17 20:26:42 2010
@@ -26,7 +26,8 @@
 <a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
-<p>This document describes the files used to configure Apache HTTPD.</p>
+<p>This document describes the files used to configure Apache HTTP
+Server.</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif"
/> <a href="#main">Main Configuration Files</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#syntax">Syntax of
the Configuration Files</a></li>
@@ -40,7 +41,7 @@
     
     <table class="related"><tr><th>Related Modules</th><th>Related
Directives</th></tr><tr><td><ul><li><code class="module"><a
href="./mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code
class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code></li><li><code
class="directive"><a href="./mod/core.html#include">Include</a></code></li><li><code
class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code></li></ul></td></tr></table>
 
-    <p>Apache HTTPD is configured by placing <a href="mod/directives.html">directives</a>
in plain text
+    <p>Apache HTTP Server is configured by placing <a href="mod/directives.html">directives</a>
in plain text
     configuration files. The main configuration file is usually called
     <code>httpd.conf</code>. The location of this file is set at
     compile-time, but may be overridden with the <code>-f</code>

Modified: httpd/httpd/trunk/docs/manual/configuring.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/configuring.xml?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/configuring.xml (original)
+++ httpd/httpd/trunk/docs/manual/configuring.xml Wed Mar 17 20:26:42 2010
@@ -25,7 +25,8 @@
   <title>Configuration Files</title>
 
 <summary>
-<p>This document describes the files used to configure Apache HTTPD.</p>
+<p>This document describes the files used to configure Apache HTTP
+Server.</p>
 </summary>
 
   <section id="main">
@@ -41,7 +42,7 @@
       </directivelist>
     </related>
 
-    <p>Apache HTTPD is configured by placing <a
+    <p>Apache HTTP Server is configured by placing <a
     href="mod/directives.html">directives</a> in plain text
     configuration files. The main configuration file is usually called
     <code>httpd.conf</code>. The location of this file is set at

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/dns-caveats.html.en?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.html.en (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.html.en Wed Mar 17 20:26:42 2010
@@ -27,7 +27,7 @@
 
     <p>This page could be summarized with the statement: don't
     configure Apache HTTP Server in such a way that it relies on DNS resolution
-    for parsing of the configuration files. If HTTPD requires DNS
+    for parsing of the configuration files. If httpd requires DNS
     resolution to parse the configuration files then your server
     may be subject to reliability problems (ie. it might not boot),
     or denial and theft of service attacks (including users able
@@ -52,16 +52,16 @@
       &lt;/VirtualHost&gt;
     </code></p></div>
 
-    <p>In order for HTTPD to function properly, it absolutely needs
+    <p>In order for the server to function properly, it absolutely needs
     to have two pieces of information about each virtual host: the
     <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
and at least one
     IP address that the server will bind and respond to. The above
-    example does not include the IP address, so HTTPD must use DNS
+    example does not include the IP address, so httpd must use DNS
     to find the address of <code>www.abc.dom</code>. If for some
     reason DNS is not available at the time your server is parsing
     its config file, then this virtual host <strong>will not be
     configured</strong>. It won't be able to respond to any hits
-    to this virtual host (prior to HTTPD version 1.2 the server
+    to this virtual host (prior to httpd version 1.2 the server
     would not even boot).</p>
 
     <p>Suppose that <code>www.abc.dom</code> has address 192.0.2.1.
@@ -75,12 +75,12 @@
       &lt;/VirtualHost&gt;
     </code></p></div>
 
-    <p>This time HTTPD needs to use reverse DNS to find the
+    <p>This time httpd needs to use reverse DNS to find the
     <code>ServerName</code> for this virtualhost. If that reverse
     lookup fails then it will partially disable the virtualhost.
     If the virtual host is name-based then it will effectively be
     totally disabled, but if it is IP-based then it will mostly
-    work. However, if HTTPD should ever have to generate a full
+    work. However, if httpd should ever have to generate a full
     URL for the server which includes the server name, then it will
     fail to generate a valid URL.</p>
 
@@ -99,7 +99,7 @@
     
 
     <p>There are (at least) two forms that denial of service
-    can come in. If you are running a version of HTTPD prior to
+    can come in. If you are running a version of httpd prior to
     version 1.2 then your server will not even boot if one of the
     two DNS lookups mentioned above fails for any of your virtual
     hosts. In some cases this DNS lookup may not even be under your
@@ -142,7 +142,7 @@
     users typed in URLs of the form
     <code>http://www.abc.dom/whatever</code>) will all be served by
     the <code>def.dom</code> virtual host. To better understand why
-    this happens requires a more in-depth discussion of how HTTPD 
+    this happens requires a more in-depth discussion of how httpd 
     matches up incoming requests with the virtual host that will
     serve it. A rough document describing this <a href="vhosts/details.html">is available</a>.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
@@ -151,7 +151,7 @@
     
 
     <p><a href="vhosts/name-based.html">Name-based
-    virtual host support</a> requires HTTPD to know
+    virtual host support</a> requires httpd to know
     the IP address(es) of the host that <code class="program"><a href="./programs/httpd.html">httpd</a></code>
     is running on. To get this address it uses either the global
     <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
@@ -170,7 +170,7 @@
     or maybe <code>/etc/nsswitch.conf</code>.</p>
 
     <p>If your server doesn't have to perform DNS for any other
-    reason then you might be able to get away with running HTTPD 
+    reason then you might be able to get away with running httpd 
     with the <code>HOSTRESORDER</code> environment variable set to
     "local". This all depends on what OS and resolver libraries you
     are using. It also affects CGIs unless you use

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/dns-caveats.xml?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.xml (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.xml Wed Mar 17 20:26:42 2010
@@ -27,7 +27,7 @@
   <summary>
     <p>This page could be summarized with the statement: don't
     configure Apache HTTP Server in such a way that it relies on DNS resolution
-    for parsing of the configuration files. If HTTPD requires DNS
+    for parsing of the configuration files. If httpd requires DNS
     resolution to parse the configuration files then your server
     may be subject to reliability problems (ie. it might not boot),
     or denial and theft of service attacks (including users able
@@ -45,16 +45,16 @@
       &lt;/VirtualHost&gt;
     </example>
 
-    <p>In order for HTTPD to function properly, it absolutely needs
+    <p>In order for the server to function properly, it absolutely needs
     to have two pieces of information about each virtual host: the
     <directive module="core">ServerName</directive> and at least one
     IP address that the server will bind and respond to. The above
-    example does not include the IP address, so HTTPD must use DNS
+    example does not include the IP address, so httpd must use DNS
     to find the address of <code>www.abc.dom</code>. If for some
     reason DNS is not available at the time your server is parsing
     its config file, then this virtual host <strong>will not be
     configured</strong>. It won't be able to respond to any hits
-    to this virtual host (prior to HTTPD version 1.2 the server
+    to this virtual host (prior to httpd version 1.2 the server
     would not even boot).</p>
 
     <p>Suppose that <code>www.abc.dom</code> has address 192.0.2.1.
@@ -68,12 +68,12 @@
       &lt;/VirtualHost&gt;
     </example>
 
-    <p>This time HTTPD needs to use reverse DNS to find the
+    <p>This time httpd needs to use reverse DNS to find the
     <code>ServerName</code> for this virtualhost. If that reverse
     lookup fails then it will partially disable the virtualhost.
     If the virtual host is name-based then it will effectively be
     totally disabled, but if it is IP-based then it will mostly
-    work. However, if HTTPD should ever have to generate a full
+    work. However, if httpd should ever have to generate a full
     URL for the server which includes the server name, then it will
     fail to generate a valid URL.</p>
 
@@ -92,7 +92,7 @@
     <title>Denial of Service</title>
 
     <p>There are (at least) two forms that denial of service
-    can come in. If you are running a version of HTTPD prior to
+    can come in. If you are running a version of httpd prior to
     version 1.2 then your server will not even boot if one of the
     two DNS lookups mentioned above fails for any of your virtual
     hosts. In some cases this DNS lookup may not even be under your
@@ -135,7 +135,7 @@
     users typed in URLs of the form
     <code>http://www.abc.dom/whatever</code>) will all be served by
     the <code>def.dom</code> virtual host. To better understand why
-    this happens requires a more in-depth discussion of how HTTPD 
+    this happens requires a more in-depth discussion of how httpd 
     matches up incoming requests with the virtual host that will
     serve it. A rough document describing this <a
     href="vhosts/details.html">is available</a>.</p>
@@ -145,7 +145,7 @@
     <title>The "main server" Address</title>
 
     <p><a href="vhosts/name-based.html">Name-based
-    virtual host support</a> requires HTTPD to know
+    virtual host support</a> requires httpd to know
     the IP address(es) of the host that <program>httpd</program>
     is running on. To get this address it uses either the global
     <directive module="core">ServerName</directive>
@@ -164,7 +164,7 @@
     or maybe <code>/etc/nsswitch.conf</code>.</p>
 
     <p>If your server doesn't have to perform DNS for any other
-    reason then you might be able to get away with running HTTPD 
+    reason then you might be able to get away with running httpd 
     with the <code>HOSTRESORDER</code> environment variable set to
     "local". This all depends on what OS and resolver libraries you
     are using. It also affects CGIs unless you use

Modified: httpd/httpd/trunk/docs/manual/install.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/install.html.en?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.html.en (original)
+++ httpd/httpd/trunk/docs/manual/install.html.en Wed Mar 17 20:26:42 2010
@@ -187,7 +187,7 @@
 <div class="section">
 <h2><a name="extract" id="extract">Extract</a></h2>
 
-    <p>Extracting the source from the Apache HTTPD tarball is a
+    <p>Extracting the source from the Apache HTTP Server tarball is a
     simple matter of uncompressing, and then untarring:</p>
 
 <div class="example"><p><code>

Modified: httpd/httpd/trunk/docs/manual/install.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/install.xml?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/install.xml (original)
+++ httpd/httpd/trunk/docs/manual/install.xml Wed Mar 17 20:26:42 2010
@@ -185,7 +185,7 @@
 
 <section id="extract"><title>Extract</title>
 
-    <p>Extracting the source from the Apache HTTPD tarball is a
+    <p>Extracting the source from the Apache HTTP Server tarball is a
     simple matter of uncompressing, and then untarring:</p>
 
 <example>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja [utf-8] Wed Mar 17 20:26:42 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: 504183:821993 (outdated) -->
+<!-- English Revision: 504183:923735 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko [euc-kr] Wed Mar 17 20:26:42 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: 105569:821993 (outdated) -->
+<!-- English Revision: 105569:923735 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_filter.html.en Wed Mar 17 20:26:42 2010
@@ -56,7 +56,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#terms">Filter Declarations,
Providers and Chains</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#config">Configuring
the Chain</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#errordocs">Filtering
and Response Status</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#upgrade">Upgrading
from HTTPD 2.2 Configuration</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#upgrade">Upgrading
from Apache HTTP Server 2.2 Configuration</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#protocol">Protocol
Handling</a></li>
 </ul></div>
@@ -152,9 +152,9 @@
     expression conditions with <code class="directive">FilterProvider</code>.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="section">
-<h2><a name="upgrade" id="upgrade">Upgrading from HTTPD 2.2 Configuration</a></h2>
+<h2><a name="upgrade" id="upgrade">Upgrading from Apache HTTP Server 2.2 Configuration</a></h2>
     <p>The <code class="directive"><a href="#filterprovider">FilterProvider</a></code>
-    directive has changed from HTTPD 2.2: the <var>match</var> and
+    directive has changed from httpd 2.2: the <var>match</var> and
     <var>dispatch</var> arguments are replaced with a single but
     more versatile <var>expression</var>.  In general, you can convert
     a match/dispatch pair to the two sides of an expression, using

Modified: httpd/httpd/trunk/docs/manual/mod/mod_filter.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_filter.xml?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_filter.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_filter.xml Wed Mar 17 20:26:42 2010
@@ -136,9 +136,9 @@
     regardless of status.  To refine this further, you can use
     expression conditions with <directive>FilterProvider</directive>.</p>
 </section>
-<section id="upgrade"><title>Upgrading from HTTPD 2.2 Configuration</title>
+<section id="upgrade"><title>Upgrading from Apache HTTP Server 2.2 Configuration</title>
     <p>The <directive module="mod_filter">FilterProvider</directive>
-    directive has changed from HTTPD 2.2: the <var>match</var> and
+    directive has changed from httpd 2.2: the <var>match</var> and
     <var>dispatch</var> arguments are replaced with a single but
     more versatile <var>expression</var>.  In general, you can convert
     a match/dispatch pair to the two sides of an expression, using

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en Wed Mar 17 20:26:42 2010
@@ -1228,7 +1228,8 @@ request</td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available
in Apache 2.0.31 and later.</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available
in Apache 2.0.31 and later. Usable in directory
+context in 2.3.3 and later.</td></tr>
 </table>
     <p>When enabled, this option will pass the Host: line from the incoming
     request to the proxied host, instead of the hostname specified in the

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] Wed Mar 17 20:26:42 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: 344971:909323 (outdated) -->
+<!-- English Revision: 344971:923952 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/worker.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/worker.html.en?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/worker.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/worker.html.en Wed Mar 17 20:26:42 2010
@@ -75,8 +75,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">How
it Works</a></li>
 </ul><h3>See also</h3>
 <ul class="seealso">
-<li><a href="../bind.html">Setting which addresses and ports Apache
-uses</a></li>
+<li><a href="../bind.html">Setting which addresses and ports Apache HTTP Server
uses</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="section">
@@ -87,13 +86,13 @@ uses</a></li>
     as a listener thread which listens for connections and passes them
     to a server thread for processing when they arrive.</p>
 
-    <p>Apache always tries to maintain a pool of <dfn>spare</dfn> or
+    <p>Apache HTTP Server always tries to maintain a pool of <dfn>spare</dfn>
or
     idle server threads, which stand ready to serve incoming
     requests. In this way, clients do not need to wait for a new
     threads or processes to be created before their requests can be
     served. The number of processes that will initially launched is
     set by the <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>
-    directive. During operation, Apache assesses the total number
+    directive. During operation, the server assesses the total number
     of idle threads in all processes, and forks or kills processes to
     keep this number within the boundaries specified by <code class="directive"><a
href="../mod/mpm_common.html#minsparethreads">MinSpareThreads</a></code> and
<code class="directive"><a href="../mod/mpm_common.html#maxsparethreads">MaxSpareThreads</a></code>.
Since this
     process is very self-regulating, it is rarely necessary to modify
@@ -151,8 +150,8 @@ uses</a></li>
 
     <p>While the parent process is usually started as <code>root</code>
     under Unix in order to bind to port 80, the child processes and threads
-    are launched by Apache as a less-privileged user. The <code class="directive"><a
href="../mod/mod_unixd.html#user">User</a></code> and <code class="directive"><a
href="../mod/mod_unixd.html#group">Group</a></code> directives are used to
set
-    the privileges of the Apache child processes. The child processes
+    are launched by the server as a less-privileged user. The <code class="directive"><a
href="../mod/mod_unixd.html#user">User</a></code> and <code class="directive"><a
href="../mod/mod_unixd.html#group">Group</a></code> directives are used to
set
+    the privileges of the Apache HTTP Server child processes. The child processes
     must be able to read all the content that will be served, but
     should have as few privileges beyond that as possible. In
     addition, unless <code class="program"><a href="../programs/suexec.html">suexec</a></code>
is used,

Modified: httpd/httpd/trunk/docs/manual/mod/worker.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/worker.xml?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/worker.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/worker.xml Wed Mar 17 20:26:42 2010
@@ -43,8 +43,7 @@
     controls the maximum total number of threads that may be
     launched.</p>
 </summary>
-<seealso><a href="../bind.html">Setting which addresses and ports Apache
-uses</a></seealso>
+<seealso><a href="../bind.html">Setting which addresses and ports Apache HTTP
Server uses</a></seealso>
 
 <section id="how-it-works"><title>How it Works</title>
     <p>A single control process (the parent) is responsible for launching 
@@ -54,13 +53,13 @@ uses</a></seealso>
     as a listener thread which listens for connections and passes them
     to a server thread for processing when they arrive.</p>
 
-    <p>Apache always tries to maintain a pool of <dfn>spare</dfn> or
+    <p>Apache HTTP Server always tries to maintain a pool of <dfn>spare</dfn>
or
     idle server threads, which stand ready to serve incoming
     requests. In this way, clients do not need to wait for a new
     threads or processes to be created before their requests can be
     served. The number of processes that will initially launched is
     set by the <directive module="mpm_common">StartServers</directive>
-    directive. During operation, Apache assesses the total number
+    directive. During operation, the server assesses the total number
     of idle threads in all processes, and forks or kills processes to
     keep this number within the boundaries specified by <directive
     module="mpm_common">MinSpareThreads</directive> and <directive
@@ -122,10 +121,10 @@ uses</a></seealso>
 
     <p>While the parent process is usually started as <code>root</code>
     under Unix in order to bind to port 80, the child processes and threads
-    are launched by Apache as a less-privileged user. The <directive
+    are launched by the server as a less-privileged user. The <directive
     module="mod_unixd">User</directive> and <directive
     module="mod_unixd">Group</directive> directives are used to set
-    the privileges of the Apache child processes. The child processes
+    the privileges of the Apache HTTP Server child processes. The child processes
     must be able to read all the content that will be served, but
     should have as few privileges beyond that as possible. In
     addition, unless <program>suexec</program> is used,

Modified: httpd/httpd/trunk/docs/manual/stopping.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/stopping.html.en?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.html.en (original)
+++ httpd/httpd/trunk/docs/manual/stopping.html.en Wed Mar 17 20:26:42 2010
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>Stopping and Restarting Apache HTTPD - Apache HTTP Server</title>
+<title>Stopping and Restarting Apache HTTP Server - Apache HTTP Server</title>
 <link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main
stylesheet" />
 <link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all"
type="text/css" title="No Sidebar - Default font size" />
 <link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css"
/>
@@ -16,7 +16,7 @@
 <img alt="" src="./images/feather.gif" /></div>
 <div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif"
/></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP
Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a>
&gt; <a href="./">Version 2.3</a></div><div id="page-content"><div
id="preamble"><h1>Stopping and Restarting Apache HTTPD</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP
Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a>
&gt; <a href="./">Version 2.3</a></div><div id="page-content"><div
id="preamble"><h1>Stopping and Restarting Apache HTTP Server</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="./de/stopping.html" hreflang="de"
rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/stopping.html" title="English">&nbsp;en&nbsp;</a> |
@@ -27,7 +27,7 @@
 <a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
-    <p>This document covers stopping and restarting Apache HTTPD on
+    <p>This document covers stopping and restarting Apache HTTP Server on
     Unix-like systems. Windows NT, 2000 and XP users should see
     <a href="platform/windows.html#winsvc">Running httpd as a
     Service</a> and Windows 9x and ME users should see <a href="platform/windows.html#wincons">Running
httpd as a

Modified: httpd/httpd/trunk/docs/manual/stopping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/stopping.xml?rev=924467&r1=924466&r2=924467&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml Wed Mar 17 20:26:42 2010
@@ -22,10 +22,10 @@
 
 <manualpage metafile="stopping.xml.meta">
 
-  <title>Stopping and Restarting Apache HTTPD</title>
+  <title>Stopping and Restarting Apache HTTP Server</title>
 
 <summary>
-    <p>This document covers stopping and restarting Apache HTTPD on
+    <p>This document covers stopping and restarting Apache HTTP Server on
     Unix-like systems. Windows NT, 2000 and XP users should see
     <a href="platform/windows.html#winsvc">Running httpd as a
     Service</a> and Windows 9x and ME users should see <a



Mime
View raw message