Remove the obsolete ResourceConfig and AccessConfig directives

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

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index 8b5425ea2f9044697347aed5a778442f5c2dbdf3..c62c4ed8764e9870b0af7b01a9d02aa645a9a372 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -10,11 +10,6 @@
 # what they do.  They're here only as hints or reminders.  If you are unsure
 # consult the online docs. You have been warned.  
 #
-# After this file is processed, the server will look for and process
-# @@ServerRoot@@/conf/srm.conf and then @@ServerRoot@@/conf/access.conf
-# unless you have overridden these with ResourceConfig and/or
-# AccessConfig directives here.
-#
 # 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').
@@ -81,18 +76,6 @@ PidFile logs/httpd.pid
 ScoreBoardFile logs/apache_runtime_status
 </IfModule>
 
-#
-# In the standard configuration, the server will process this file,
-# srm.conf, and access.conf in that order.  The latter two files are
-# now distributed empty, as it is recommended that all directives
-# be kept in a single file for simplicity.  The commented-out values
-# below are the built-in defaults.  You can have the server ignore
-# these files altogether by using "/dev/null" (for Unix) or
-# "nul" (for Win32) for the arguments to the directives.
-#
-#ResourceConfig conf/srm.conf
-#AccessConfig conf/access.conf
-
 #
 # Timeout: The number of seconds before receives and sends time out.
 #

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index d3d0b8f2c8bc686771588b8be15060493648b840..12b4d768c794742c54dd65dc0c1d4905144fab8a 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -10,11 +10,6 @@
 # what they do.  They're here only as hints or reminders.  If you are unsure
 # consult the online docs. You have been warned.  
 #
-# After this file is processed, the server will look for and process
-# @@ServerRoot@@/conf/srm.conf and then @@ServerRoot@@/conf/access.conf
-# unless you have overridden these with ResourceConfig and/or
-# AccessConfig directives here.
-#
 # 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').
@@ -70,18 +65,6 @@ PidFile logs/httpd.pid
 #
 #ScoreBoardFile logs/apache_status
 
-#
-# In the standard configuration, the server will process httpd.conf,
-# srm.conf, and access.conf in that order.  The latter two files are
-# now distributed empty, as it is recommended that all directives
-# be kept in a single file for simplicity.  The commented-out values
-# below are the built-in defaults.  You can have the server ignore
-# these files altogether by using "/dev/null" (for Unix) or
-# "nul" (for Win32) for the arguments to the directives.
-#
-#ResourceConfig conf/srm.conf
-#AccessConfig conf/access.conf
-
 #
 # Timeout: The number of seconds before receives and sends time out.
 #