summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Slive <slive@apache.org>2005-04-02 19:29:46 +0000
committerJoshua Slive <slive@apache.org>2005-04-02 19:29:46 +0000
commit3cd64d7b3bba1c6dd778b9d23345bc1f4b03bda7 (patch)
treebb27f89d929924a2039ee1fef3b2dbf9a41401d7
parent93aca0822ab64cdbfbe5773eada2188b660513f5 (diff)
downloadhttpd-3cd64d7b3bba1c6dd778b9d23345bc1f4b03bda7.tar.gz
A couple tweaks of the comments at the top, including:
- Remove the NCSA/Rob McCool reference, which is really meaningless at this point. The only thing left from those days is the idea behind the config format. They get proper attribution elsewhere. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@159800 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/conf/httpd-std.conf.in13
1 files changed, 6 insertions, 7 deletions
diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 540b1101fa..39a152bec4 100644
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -1,7 +1,5 @@
#
-# Based upon the NCSA server configuration files originally by Rob McCool.
-#
-# This is the main Apache server configuration file. It contains the
+# This is the main Apache HTTP server configuration file. It contains the
# configuration directives that give the server its instructions.
# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information about
# the directives.
@@ -17,9 +15,10 @@
# which responds to requests that aren't handled by a virtual host.
# These directives also provide default values for the settings
# of all virtual hosts.
-# 3. Settings for virtual hosts, which allow Web requests to be sent to
-# different IP addresses or hostnames and have them handled by the
-# same Apache server process.
+# 3. Supplemental configuration specific to your site, such as virtual
+# hosts and SSL. Examples of some possible configurations are stored
+# in the @rel_sysconfdir@/extra/ directory and can be directly included
+# in this file or referenced using the Include directive.
#
# Configuration and logfile names: If the filenames you specify for many
# of the server's control files begin with "/" (or "drive:/" for Win32), the
@@ -599,7 +598,7 @@ ServerSignature On
</IfModule>
-##### Supplemental configuration
+### Section 3: Supplemental configuration
#
# The configuration files in the @relsysconfdir@/extra/ directory can be included
# to add extra features, or you may simply copy their contents