[httpd] - sync with upstream

[jorton]

commit dd4efa94e8876589a26a9ac8a6251461acd8666f
Author: Joe Orton <jorton at redhat.com>
Date:   Mon Mar 21 22:38:03 2011 +0000

    - sync with upstream

 httpd.conf |   55 +++++++++++++++++++++++++++----------------------------
 1 files changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/httpd.conf b/httpd.conf
index 78cdc37..d56c2dc 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -1,12 +1,11 @@
 #
-# 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.2/> for detailed information.
-# In particular, see
+# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
+# In particular, see 
 # <URL:http://httpd.apache.org/docs/2.2/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.  
@@ -126,11 +125,11 @@ MaxRequestsPerChild  0
 
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, in addition to the default. See also the <VirtualHost>
+# ports, instead of the default. See also the <VirtualHost>
 # directive.
 #
 # Change this to Listen on specific IP addresses as shown below to 
-# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+# prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
 Listen 80
@@ -316,30 +315,30 @@ DocumentRoot "/var/www/html"
 #
 <Directory "/var/www/html">
 
-#
-# Possible values for the Options directive are "None", "All",
-# or any combination of:
-#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-#
-# Note that "MultiViews" must be named *explicitly* --- "Options All"
-# doesn't give it to you.
-#
-# The Options directive is both complicated and important.  Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#options
-# for more information.
-#
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.2/mod/core.html#options
+    # for more information.
+    #
     Options Indexes FollowSymLinks
 
-#
-# AllowOverride controls what directives may be placed in .htaccess files.
-# It can be "All", "None", or any combination of the keywords:
-#   Options FileInfo AuthConfig Limit
-#
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   Options FileInfo AuthConfig Limit
+    #
     AllowOverride None
 
-#
-# Controls who can get stuff from this server.
-#
+    #
+    # Controls who can get stuff from this server.
+    #
     Order allow,deny
     Allow from all
 
@@ -412,11 +411,11 @@ AccessFileName .htaccess
 # The following lines prevent .htaccess and .htpasswd files from being 
 # viewed by Web clients. 
 #
-<Files ~ "^\.ht">
+<FilesMatch "^\.ht">
     Order allow,deny
     Deny from all
     Satisfy All
-</Files>
+</FilesMatch>
 
 #
 # TypesConfig describes where the mime.types file (or equivalent) is