From: Joshua Slive <slive@apache.org>
Date: Mon, 4 Apr 2005 20:42:31 +0000 (+0000)
Subject: Make a direct link to the index of directives in the docs,
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b46642f7b415d6fd9162ae8c47509622cb667ca;p=thirdparty%2Fapache%2Fhttpd.git

Make a direct link to the index of directives in the docs,
since that is really the place to start when working through
the config file.

Remove the concept of "sections" in the config file.  They were
not that helpful anymore.

Fix a broken reference to extra/httpd-multilang-errordocs.conf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@160098 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index 4614440587d..114297055b4 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -1,34 +1,21 @@
 #
 # 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.
+# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs-2.1/mod/directives.html>
+# for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
 # what they do.  They're here only as hints or reminders.  If you are unsure
 # consult the online docs. You have been warned.  
 #
-# The configuration directives are grouped into three basic sections:
-#  1. Directives that control the operation of the Apache server process as a
-#     whole (the 'global environment').
-#  2. Directives that define the parameters of the 'main' or 'default' server,
-#     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. 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
 # server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "@rel_logfiledir@/foo.log"
+# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
 # with ServerRoot set to "@@ServerRoot@@" will be interpreted by the
-# server as "@@ServerRoot@@/@rel_logfiledir@/foo.log".
-#
-
-### Section 1: Global Environment
+# server as "@@ServerRoot@@/logs/foo.log".
 
 #
 # ServerRoot: The top of the directory tree under which the server's
@@ -70,7 +57,7 @@ Listen @@Port@@
 #
 @@LoadModule@@
 
-### Section 2: 'Main' server configuration
+# 'Main' server configuration
 #
 # The directives in this section set up the values used by the 'main'
 # server, which responds to any requests that aren't handled by a
@@ -447,7 +434,7 @@ DefaultType text/plain
 #EnableMMAP off
 #EnableSendfile off
 
-### Section 3: Supplemental configuration
+# Supplemental configuration
 #
 # The configuration files in the @rel_sysconfdir@/extra/ directory can be included
 # to add extra features or modify the default configuration of the server, 
@@ -457,7 +444,7 @@ DefaultType text/plain
 #Include @rel_sysconfdir@/extra/httpd-mpm.conf
 
 # Multi-language error messages
-#Include @rel_sysconfdir@/extra/httpd-multilang-error.conf
+#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf
 
 # Fancy directory listings
 #Include @rel_sysconfdir@/extra/httpd-autoindex.conf