- sync with upstream

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.
+# 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
@@ -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