From: Rich Bowen <rbowen@apache.org>
Date: Fri, 12 Mar 2010 12:36:19 +0000 (+0000)
Subject: Apache -> httpd
X-Git-Tag: 2.3.6~358
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4a73b5c27d48ad37b3f59fd1c6db5b89d234d63;p=thirdparty%2Fapache%2Fhttpd.git

Apache -> httpd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@922238 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index 7e9ebbc9d40..85456c94ade 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -26,8 +26,7 @@
 <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 the Apache
-HTTP server.</p>
+<p>This document describes the files used to configure the Apache HTTP server (httpd).</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>
@@ -41,7 +40,7 @@ HTTP server.</p>
     
     <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 is configured by placing <a href="mod/directives.html">directives</a> in plain text
+    <p>The 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>
@@ -50,7 +49,7 @@ HTTP server.</p>
     directive, and wildcards can be used to include many configuration
     files. Any directive may be placed in any of these configuration
     files.  Changes to the main configuration files are only
-    recognized by Apache when it is started or restarted.</p>
+    recognized by httpd when it is started or restarted.</p>
 
     <p>The server also reads a file containing mime document types;
     the filename is set by the <code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code> directive,
@@ -60,7 +59,7 @@ HTTP server.</p>
 <h2><a name="syntax" id="syntax">Syntax of the Configuration Files</a></h2>
     
 
-    <p>Apache configuration files contain one directive per line.
+    <p>httpd configuration files contain one directive per line.
     The back-slash "\" may be used as the last character on a line
     to indicate that the directive continues onto the next line.
     There must be no other characters or white space between the
@@ -104,16 +103,16 @@ HTTP server.</p>
 
     <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
 
-    <p>Apache is a modular server. This implies that only the most
+    <p>httpd is a modular server. This implies that only the most
     basic functionality is included in the core server. Extended
     features are available through <a href="mod/">modules</a> which can be loaded
-    into Apache. By default, a <a href="mod/module-dict.html#Status">base</a> set of modules is
+    into httpd. By default, a <a href="mod/module-dict.html#Status">base</a> set of modules is
     included in the server at compile-time. If the server is
     compiled to use <a href="dso.html">dynamically loaded</a>
     modules, then modules can be compiled separately and added at
     any time using the <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
     directive.
-    Otherwise, Apache must be recompiled to add or remove modules.
+    Otherwise, httpd must be recompiled to add or remove modules.
     Configuration directives may be included conditional on a
     presence of a particular module by enclosing them in an <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> block.</p>
 
@@ -135,7 +134,7 @@ HTTP server.</p>
     locations or URLs. They can also be nested, allowing for very
     fine grained configuration.</p>
 
-    <p>Apache has the capability to serve many different websites
+    <p>httpd has the capability to serve many different websites
     simultaneously. This is called <a href="vhosts/">Virtual
     Hosting</a>. Directives can also be scoped by placing them
     inside <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
@@ -156,7 +155,7 @@ HTTP 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/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
 
-    <p>Apache allows for decentralized management of configuration
+    <p>httpd allows for decentralized management of configuration
     via special files placed inside the web tree. The special files
     are usually called <code>.htaccess</code>, but any name can be
     specified in the <code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code>
diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml
index c0efc00e3d5..d7b0f0f1692 100644
--- a/docs/manual/configuring.xml
+++ b/docs/manual/configuring.xml
@@ -25,8 +25,7 @@
   <title>Configuration Files</title>
 
 <summary>
-<p>This document describes the files used to configure the Apache
-HTTP server.</p>
+<p>This document describes the files used to configure the Apache HTTP server (httpd).</p>
 </summary>
 
   <section id="main">
@@ -42,7 +41,7 @@ HTTP server.</p>
       </directivelist>
     </related>
 
-    <p>Apache is configured by placing <a
+    <p>The 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
@@ -52,7 +51,7 @@ HTTP server.</p>
     directive, and wildcards can be used to include many configuration
     files. Any directive may be placed in any of these configuration
     files.  Changes to the main configuration files are only
-    recognized by Apache when it is started or restarted.</p>
+    recognized by httpd when it is started or restarted.</p>
 
     <p>The server also reads a file containing mime document types;
     the filename is set by the <directive
@@ -63,7 +62,7 @@ HTTP server.</p>
   <section id="syntax">
     <title>Syntax of the Configuration Files</title>
 
-    <p>Apache configuration files contain one directive per line.
+    <p>httpd configuration files contain one directive per line.
     The back-slash "\" may be used as the last character on a line
     to indicate that the directive continues onto the next line.
     There must be no other characters or white space between the
@@ -116,18 +115,18 @@ HTTP server.</p>
       </directivelist>
     </related>
 
-    <p>Apache is a modular server. This implies that only the most
+    <p>httpd is a modular server. This implies that only the most
     basic functionality is included in the core server. Extended
     features are available through <a
     href="mod/">modules</a> which can be loaded
-    into Apache. By default, a <a
+    into httpd. By default, a <a
     href="mod/module-dict.html#Status">base</a> set of modules is
     included in the server at compile-time. If the server is
     compiled to use <a href="dso.html">dynamically loaded</a>
     modules, then modules can be compiled separately and added at
     any time using the <directive module="mod_so">LoadModule</directive>
     directive.
-    Otherwise, Apache must be recompiled to add or remove modules.
+    Otherwise, httpd must be recompiled to add or remove modules.
     Configuration directives may be included conditional on a
     presence of a particular module by enclosing them in an <directive
     module="core" type="section">IfModule</directive> block.</p>
@@ -166,7 +165,7 @@ HTTP server.</p>
     locations or URLs. They can also be nested, allowing for very
     fine grained configuration.</p>
 
-    <p>Apache has the capability to serve many different websites
+    <p>httpd has the capability to serve many different websites
     simultaneously. This is called <a href="vhosts/">Virtual
     Hosting</a>. Directives can also be scoped by placing them
     inside <directive module="core" type="section">VirtualHost</directive>
@@ -194,7 +193,7 @@ HTTP server.</p>
       </directivelist>
     </related>
 
-    <p>Apache allows for decentralized management of configuration
+    <p>httpd allows for decentralized management of configuration
     via special files placed inside the web tree. The special files
     are usually called <code>.htaccess</code>, but any name can be
     specified in the <directive module="core">AccessFileName</directive>