Style guide: Replace "Apache" with "httpd" or other terms as appropriate

to context.


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

Author: rbowen

docs/manual/glossary.xml

@@ -25,7 +25,7 @@
   <title>Glossary</title>
 
   <summary>
-    <p>This glossary defines some of the common terminology related to Apache in
+    <p>This glossary defines some of the common terminology related to Apache HTTP Server in
       particular, and web serving in general. More information on each concept
       is provided in the links.</p>
   </summary>
@@ -34,7 +34,7 @@
 
   <dl>
     <dt><a name="accesscontrol" id="accesscontrol">Access Control</a></dt>
-    <dd>The restriction of access to network realms. In an Apache context
+    <dd>The restriction of access to network realms. In an httpd context
       usually the restriction of access to certain <em>URLs</em>.<br /> See:  <a
       href="howto/auth.html">Authentication, Authorization, and Access
       Control</a>
@@ -51,7 +51,7 @@
     <dd>A perl script that aids in compiling <glossary
       ref="module">module</glossary> sources into Dynamic Shared Objects
       (<glossary ref="dso">DSO</glossary>s) and helps install them in the
-      Apache Web server.<br />
+      httpd web server.<br />
       See: Manual Page: <program>apxs</program>
     </dd>
 
@@ -134,7 +134,7 @@
     <dt><a name="configurationfile" id="configurationfile">Configuration
         File</a></dt>
     <dd>A text file containing <glossary ref="directive">Directives</glossary>
-      that control the configuration of Apache.<br />
+      that control the configuration of httpd.<br />
       See: <a href="configuring.html">Configuration Files</a>
     </dd>
 
@@ -149,7 +149,7 @@
       files</glossary> where certain types of <glossary
       ref="directive">directives</glossary> are allowed.<br />
       See: <a href="mod/directive-dict.html#Context">Terms Used to Describe
-      Apache Directives</a>
+      httpd Directives</a>
     </dd>
 
     <dt><a name="digitalsignature" id="digitalsignature">Digital
@@ -165,7 +165,7 @@
     </dd>
 
     <dt><a name="directive" id="directive">Directive</a></dt>
-    <dd>A configuration command that controls one or more aspects of Apache's
+    <dd>A configuration command that controls one or more aspects of httpd's
       behavior.  Directives are placed in the <glossary
       ref="configurationfile">Configuration File</glossary><br />
     See: <a href="mod/directives.html">Directive Index</a>
@@ -182,11 +182,11 @@
         Variable</a> <a name="env-variable"
         id="env-variable">(env-variable)</a></dt>
     <dd>Named variables managed by the operating system shell and used to store
-      information and communicate between programs.  Apache also contains
+      information and communicate between programs.  httpd also contains
       internal variables that are referred to as environment variables, but are
-      stored in internal Apache structures, rather than in the shell
+      stored in internal httpd structures, rather than in the shell
       environment.<br />
-      See: <a href="env.html">Environment Variables in Apache</a>
+      See: <a href="env.html">Environment Variables in Apache httpd</a>
     </dd>
 
     <dt><a name="export-crippled" id="export-crippled">Export-Crippled</a></dt>
@@ -218,13 +218,13 @@
     </dd>
 
     <dt><a name="handler" id="handler">Handler</a></dt>
-    <dd>An internal Apache representation of the action to be performed when a
+    <dd>An internal httpd representation of the action to be performed when a
       file is called. Generally, files have implicit handlers, based on the file
       type. Normally, all files are simply served by the server, but certain
       file types are "handled" separately.  For example, the
       <code>cgi-script</code> handler designates files to be processed as
       <glossary ref="cgi">CGIs</glossary>.<br />
-      See: <a href="handler.html">Apache's Handler Use</a>
+      See: <a href="handler.html">httpd's Handler Use</a>
     </dd>
 
     <dt><a name="hash" id="hash">Hash</a></dt>
@@ -249,7 +249,7 @@
     </dd>
 
     <dt><a name="httpd.conf" id="httpd.conf">httpd.conf</a></dt>
-    <dd>The main Apache <glossary ref="configurationfile">configuration
+    <dd>The main httpd <glossary ref="configurationfile">configuration
       file</glossary>.  The default location is
       <code>/usr/local/apache2/conf/httpd.conf</code>, but it may be moved using
       run-time or compile-time configuration.<br />
@@ -259,7 +259,7 @@
     <dt><a name="hypertexttransferprotocol"
       id="hypertexttransferprotocol">HyperText Transfer Protocol</a>
       <a name="http" id="hhtp">(HTTP)</a></dt>
-    <dd>The standard transmission protocol used on the World Wide Web.  Apache
+    <dd>The standard transmission protocol used on the World Wide Web.  httpd
       implements version 1.1 of the protocol, referred to as HTTP/1.1 and
       defined by <a href="http://ietf.org/rfc/rfc2616.txt">RFC 2616</a>.
     </dd>
@@ -296,14 +296,14 @@
     </dd>
 
     <dt><a name="module" id="module">Module</a></dt>
-    <dd>An independent part of a program.  Much of Apache's functionality is
+    <dd>An independent part of a program.  Much of httpd's functionality is
       contained in modules that you can choose to include or exclude.  Modules
-      that are compiled into the Apache <program>httpd</program> binary are
+      that are compiled into the <program>httpd</program> binary are
       called <dfn>static modules</dfn>, while modules that are stored
       separately and can be optionally loaded at run-time are called
       <dfn>dynamic modules</dfn> or <glossary ref="dso">DSOs</glossary>.
       Modules that are included by default
-      are called <dfn>base modules</dfn>. Many modules are available for Apache
+      are called <dfn>base modules</dfn>. Many modules are available for httpd
       that are not distributed as part of the Apache HTTP Server <glossary
       ref="tarball">tarball</glossary>.  These are referred to as
       <dfn>third-party modules</dfn>.<br />
@@ -312,13 +312,13 @@
 
     <dt><a name="modulemagicnumber" id="modulemagicnumber">Module Magic
       Number</a> (<a name="mmn" id="mmn">MMN</a>)</dt>
-    <dd>Module Magic Number is a constant defined in the Apache source code that
+    <dd>Module Magic Number is a constant defined in the httpd source code that
       is associated with binary compatibility of modules. It is changed when
-      internal Apache structures, function calls and other significant parts of
+      internal httpd structures, function calls and other significant parts of
       API change in such a way that binary compatibility cannot be guaranteed
       any more. On MMN change, all third party modules have to be at least
       recompiled, sometimes even slightly changed in order to work with the new
-      version of Apache.
+      version of httpd.
     </dd>
 
     <dt><a name="openssl" id="openssl">OpenSSL</a></dt>
@@ -376,7 +376,7 @@
     <dd>A way of describing a pattern in text - for example, "all the words that
       begin with the letter A" or "every 10-digit phone number" or even "Every
       sentence with two commas in it, and no capital letter Q". Regular
-      expressions are useful in Apache because they let you apply certain
+      expressions are useful in httpd because they let you apply certain
       attributes against collections of files or resources in very flexible ways
       - for example, all .gif and .jpg files under any "images" directory could
       be written as "<code>/images/.*(jpg|gif)$</code>".  In places where
@@ -386,7 +386,7 @@
       to the whole matched expression. To write a literal dollar sign in a
       replacement string, it can be escaped with a backslash. Historically, the
       variable &amp; could be used as alias for $0 in some places. This is no
-      longer possible since version 2.3.6.  Apache uses Perl Compatible Regular
+      longer possible since version 2.3.6.  httpd uses Perl Compatible Regular
       Expressions provided by the <a href="http://www.pcre.org/">PCRE</a>
       library.  You can find more documentation about PCRE's regular expression
       syntax at that site, or at
@@ -434,7 +434,7 @@
     </dd>
 
     <dt><a name="subrequest" id="subrequest">Subrequest</a></dt>
-    <dd>Apache provides a subrequest API to modules that allows other
+    <dd>httpd provides a subrequest API to modules that allows other
         filesystem or URL paths to be partially or fully evaluated by
         the server. Example consumers of this API are
         <directive module="mod_dir">DirectoryIndex</directive>,
@@ -450,7 +450,7 @@
 
     <dt><a name="tarball" id="tarball">Tarball</a></dt>
     <dd>A package of files gathered together using the <code>tar</code> utility.
-      Apache distributions are stored in compressed tar archives or using
+      httpd distributions are stored in compressed tar archives or using
       pkzip.
     </dd>
 
@@ -483,11 +483,11 @@
     </dd>
 
     <dt><a name="virtualhosting" id="virtualhosting">Virtual Hosting</a></dt>
-    <dd>Serving multiple websites using a single instance of Apache.  <em>IP
+    <dd>Serving multiple websites using a single instance of httpd.  <em>IP
       virtual hosting</em> differentiates between websites based on their IP
       address, while <em>name-based virtual hosting</em> uses only the name of the
       host and can therefore host many sites on the same IP address.<br />
-      See: <a href="vhosts/">Apache Virtual Host documentation</a>
+      See: <a href="vhosts/">httpd Virtual Host documentation</a>
     </dd>
 
     <dt><a name="x.509" id="x.509">X.509</a></dt>