Style guide: Replace 'Apache' with 'Apache HTTP Server', 'Apache httpd',

or 'httpd', depending on context.
Note, however, that this guide is grossly out of date, and needs a major
revision.


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

Author: rbowen

docs/manual/howto/cgi.xml

@@ -23,7 +23,7 @@
 <manualpage metafile="cgi.xml.meta">
   <parentdocument href="./">How-To / Tutorials</parentdocument>
 
-  <title>Apache Tutorial: Dynamic Content with CGI</title>
+  <title>Apache HTTP Server Tutorial: Dynamic Content with CGI</title>
 
   <section id="intro">
     <title>Introduction</title>
@@ -48,18 +48,18 @@
     is a simple way to put dynamic content on
     your web site, using whatever programming language you're most
     familiar with. This document will be an introduction to setting
-    up CGI on your Apache web server, and getting started writing
+    up CGI on your httpd web server, and getting started writing
     CGI programs.</p>
   </section>
 
   <section id="configuring">
-    <title>Configuring Apache to permit CGI</title>
+    <title>Configuring httpd to permit CGI</title>
 
     <p>In order to get your CGI programs to work properly, you'll
-    need to have Apache configured to permit CGI execution. There
+    need to have httpd configured to permit CGI execution. There
     are several ways to do this.</p>
 
-    <note type="warning">Note: If Apache has been built with shared module
+    <note type="warning">Note: If httpd has been built with shared module
     support you need to ensure that the module is loaded; in your
     <code>httpd.conf</code> you need to make sure the
     <directive module="mod_so">LoadModule</directive>
@@ -85,8 +85,8 @@
       <p>The
       <directive module="mod_alias">ScriptAlias</directive>
 
-      directive tells Apache that a particular directory is set
-      aside for CGI programs. Apache will assume that every file in
+      directive tells httpd that a particular directory is set
+      aside for CGI programs. httpd will assume that every file in
       this directory is a CGI program, and will attempt to execute
       it, when that particular resource is requested by a
       client.</p>
@@ -99,7 +99,7 @@ ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"
       </highlight>
 
       <p>The example shown is from your default <code>httpd.conf</code>
-      configuration file, if you installed Apache in the default
+      configuration file, if you installed httpd in the default
       location. The <directive module="mod_alias">ScriptAlias</directive>
       directive is much like the <directive module="mod_alias"
       >Alias</directive> directive, which defines a URL prefix that
@@ -110,18 +110,18 @@ ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"
       <directive>Alias</directive> and <directive>ScriptAlias</directive>
       is that <directive>ScriptAlias</directive> has the added meaning
       that everything under that URL prefix will be considered a CGI
-      program. So, the example above tells Apache that any request for a
+      program. So, the example above tells httpd that any request for a
       resource beginning with <code>/cgi-bin/</code> should be served from
       the directory  <code>/usr/local/apache2/cgi-bin/</code>, and should be
       treated as a CGI program.</p>
 
       <p>For example, if the URL
       <code>http://www.example.com/cgi-bin/test.pl</code>
-      is requested, Apache will attempt to execute the file
+      is requested, httpd will attempt to execute the file
       <code>/usr/local/apache2/cgi-bin/test.pl</code>
       and return the output. Of course, the file will have to
       exist, and be executable, and return output in a particular
-      way, or Apache will return an error message.</p>
+      way, or httpd will return an error message.</p>
     </section>
 
     <section id="nonscriptalias">
@@ -162,7 +162,7 @@ ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"
 &lt;/Directory&gt;
       </highlight>
 
-      <p>The above directive tells Apache to permit the execution
+      <p>The above directive tells httpd to permit the execution
       of CGI files. You will also need to tell the server what
       files are CGI files. The following <directive module="mod_mime"
       >AddHandler</directive> directive tells the server to treat all
@@ -250,7 +250,7 @@ print "Hello, World.";
       </highlight>
 
       <p>Even if you are not familiar with Perl, you should be able
-      to see what is happening here. The first line tells Apache
+      to see what is happening here. The first line tells httpd
       (or whatever shell you happen to be running under) that this
       program can be executed by feeding the file to the
       interpreter found at the location <code>/usr/bin/perl</code>.
@@ -289,19 +289,19 @@ print "Hello, World.";
 
       <dt>The source code of your CGI program or a "POST Method Not
       Allowed" message</dt>
-      <dd>That means that you have not properly configured Apache
+      <dd>That means that you have not properly configured httpd
       to process your CGI program. Reread the section on
       <a href="#configuring">configuring
-      Apache</a> and try to find what you missed.</dd>
+      httpd</a> and try to find what you missed.</dd>
 
       <dt>A message starting with "Forbidden"</dt>
       <dd>That means that there is a permissions problem. Check the
-      <a href="#errorlogs">Apache error log</a> and the section below on
+      <a href="#errorlogs">httpd error log</a> and the section below on
       <a href="#permissions">file permissions</a>.</dd>
 
       <dt>A message saying "Internal Server Error"</dt>
       <dd>If you check the
-      <a href="#errorlogs">Apache error log</a>, you will probably
+      <a href="#errorlogs">httpd error log</a>, you will probably
       find that it says "Premature end of
       script headers", possibly along with an error message
       generated by your CGI program. In this case, you will want to
@@ -372,7 +372,7 @@ print "Hello, World.";
 
       <p>If your CGI program depends on non-standard <a
       href="#env">environment variables</a>, you will need to
-      assure that those variables are passed by Apache.</p>
+      assure that those variables are passed by httpd.</p>
 
       <p>When you miss HTTP headers from the environment, make
       sure they are formatted according to
@@ -399,13 +399,13 @@ print "Hello, World.";
       </example>
 
       <p>(Do not call the <code>perl</code> interpreter.  The shell
-      and Apache should find the interpreter using the <a
+      and httpd should find the interpreter using the <a
       href="#pathinformation">path information</a> on the first line of
       the script.)</p>
 
       <p>The first thing you see written by your program should be
       a set of HTTP headers, including the <code>Content-Type</code>,
-      followed by a blank line.  If you see anything else, Apache will
+      followed by a blank line.  If you see anything else, httpd will
       return the <code>Premature end of script headers</code> error if
       you try to run it through the server. See <a
       href="#writing">Writing a CGI program</a> above for more
@@ -436,7 +436,7 @@ print "Hello, World.";
 
       <p>To check if you are using suexec, run <code>apachectl
       -V</code> and check for the location of <code>SUEXEC_BIN</code>.
-      If Apache finds an <program>suexec</program> binary there on startup,
+      If httpd finds an <program>suexec</program> binary there on startup,
       suexec will be activated.</p>
 
       <p>Unless you fully understand suexec, you should not be using it.
@@ -473,7 +473,7 @@ print "Hello, World.";
       <p>During the CGI transaction, the server and the browser
       also set environment variables, so that they can communicate
       with one another. These are things like the browser type
-      (Netscape, IE, Lynx), the server type (Apache, IIS, WebSite),
+      (Chrome, Firefox, Lynx), the server type (Apache httpd, Nginx, IIS),
       the name of the CGI program that is being run, and so on.</p>
 
       <p>These variables are available to the CGI programmer, and
@@ -487,10 +487,10 @@ print "Hello, World.";
       similar programs are included in the
       <code>cgi-bin</code>
 
-      directory of the Apache distribution. Note that some
+      directory of the httpd distribution. Note that some
       variables are required, while others are optional, so you may
       see some variables listed that were not in the official list.
-      In addition, Apache provides many different ways for you to
+      In addition, httpd provides many different ways for you to
       <a href="../env.html">add your own environment variables</a>
       to the basic ones provided by default.</p>
 
@@ -584,7 +584,7 @@ foreach my $key (keys %ENV) {
     make finding your problem much simpler.</p>
 
     <p>Note that questions about CGI problems should <strong>never</strong>
-    be posted to the Apache bug database unless you are sure you
-    have found a problem in the Apache source code.</p>
+    be posted to the httpd bug database unless you are sure you
+    have found a problem in the httpd source code.</p>
   </section>
 </manualpage>