Convert to proper tabs, fix the trailing comment's.

1 files changed, 116 insertions, 154 deletions

diff --git a/2.2/conf/httpd.conf b/2.2/conf/httpd.conf
index b12c047..ad0ee47 100644
--- a/2.2/conf/httpd.conf
+++ b/2.2/conf/httpd.conf
@@ -1,4 +1,3 @@
-# 
 # This is a modification of the default Apache 2.2 configuration file
 # for Gentoo Linux. 
 #
@@ -31,7 +30,6 @@
 # with ServerRoot set to "/usr" will be interpreted by the
 # server as "/usr/var/log/apache2/foo.log".
 
-#
 # ServerRoot: The top of the directory tree under which the server's
 # configuration, error, and log files are kept.
 #
@@ -39,7 +37,6 @@
 # ServerRoot at a non-local disk, be sure to point the LockFile directive
 # at a local disk.  If you wish to share the same ServerRoot for multiple
 # httpd daemons, you will need to change at least LockFile and PidFile.
-#
 ServerRoot "/usr/lib/apache2"
 
 #
@@ -72,7 +69,6 @@ Listen 80
 # configuration directives.
 #
 # Change these at your own risk!
-#
 %%LOAD_MODULE%%
 
 # If you wish httpd to run as a different user or group, you must run
@@ -81,7 +77,6 @@ Listen 80
 # User/Group: The name (or #number) of the user/group to run httpd as.
 # It is usually good practice to create a dedicated user and group for
 # running httpd, as with most system services.
-#
 User apache
 Group apache
 
@@ -95,12 +90,10 @@ Group apache
 # All of these directives may appear inside <VirtualHost> containers,
 # in which case these default settings will be overridden for the
 # virtual host being defined.
-#
 
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
-#
 ServerAdmin root@localhost
 
 # ServerName gives the name and port that the server uses to identify itself.
@@ -117,7 +110,6 @@ ServerAdmin root@localhost
 #
 # If you change this to something that isn't under /var/www then suexec
 # will no longer work. See /etc/apache2/suexec-conf for more details.
-#
 DocumentRoot "/var/www/localhost/htdocs"
 
 # Each directory to which Apache has access can be configured with respect
@@ -126,12 +118,11 @@ DocumentRoot "/var/www/localhost/htdocs"
 #
 # First, we configure the "default" to be a very restrictive set of 
 # features.  
-#
 <Directory />
-    Options FollowSymLinks
-    AllowOverride None
-    Order deny,allow
-    Deny from all
+	Options FollowSymLinks
+	AllowOverride None
+	Order deny,allow
+	Deny from all
 </Directory>
 
 # Note that from this point forward you must specifically allow
@@ -140,31 +131,27 @@ DocumentRoot "/var/www/localhost/htdocs"
 # below.
 
 # This should be changed to whatever you set DocumentRoot to.
-#
 <Directory "/var/www/localhost/htdocs">
-    # 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 None
-
-    # Controls who can get stuff from this server.
-    Order allow,deny
-    Allow from all
-
+	# 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 None
+
+	# Controls who can get stuff from this server.
+	Order allow,deny
+	Allow from all
 </Directory>
 
 # DirectoryIndex: sets the file that Apache will serve if a directory
@@ -173,17 +160,15 @@ DocumentRoot "/var/www/localhost/htdocs"
 # The index.html.var file (a type-map) is used to deliver content-
 # negotiated documents. The MultiViews Options can be used for the
 # same purpose, but it is much slower.
-#
 <IfModule dir_module>
-    DirectoryIndex index.html index.html.var
+	DirectoryIndex index.html index.html.var
 </IfModule>
 
 # The following lines prevent .htaccess and .htpasswd files from being 
 # viewed by Web clients. 
-#
 <FilesMatch "^\.ht">
-    Order allow,deny
-    Deny from all
+	Order allow,deny
+	Deny from all
 </FilesMatch>
 
 # ErrorLog: The location of the error log file.
@@ -191,95 +176,85 @@ DocumentRoot "/var/www/localhost/htdocs"
 # container, error messages relating to that virtual host will be
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
-#
 ErrorLog /var/log/apache2/error_log
 
 # LogLevel: Control the number of messages logged to the error_log.
 # Possible values include: debug, info, notice, warn, error, crit,
 # alert, emerg.
-#
 LogLevel warn
 
 <IfModule log_config_module>
-    # The following directives define some format nicknames for use with
-    # a CustomLog directive (see below).
-    #
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+	# The following directives define some format nicknames for use with
+	# a CustomLog directive (see below).
+	LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+	LogFormat "%h %l %u %t \"%r\" %>s %b" common
 
 	LogFormat "%{Referer}i -> %U" referer
 	LogFormat "%{User-Agent}i" agent
 	LogFormat "%v %h %l %u %t \"%r\" %>s %b %T" script
 	LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i VLOG=${VLOG}e" vhost
 
-    <IfModule logio_module>
-      # You need to enable mod_logio.c to use %I and %O
-      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
-    </IfModule>
+	<IfModule logio_module>
+		# You need to enable mod_logio.c to use %I and %O
+		LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+	</IfModule>
 
-    # The location and format of the access logfile (Common Logfile Format).
-    # If you do not define any access logfiles within a <VirtualHost>
-    # container, they will be logged here.  Contrariwise, if you *do*
-    # define per-<VirtualHost> access logfiles, transactions will be
-    # logged therein and *not* in this file.
-    #
-    CustomLog /var/log/apache2/access_log common
+	# The location and format of the access logfile (Common Logfile Format).
+	# If you do not define any access logfiles within a <VirtualHost>
+	# container, they will be logged here.  Contrariwise, if you *do*
+	# define per-<VirtualHost> access logfiles, transactions will be
+	# logged therein and *not* in this file.
+	CustomLog /var/log/apache2/access_log common
 
 	# If you would like to have agent and referer logfiles, 
 	# uncomment the following directives.
-	#
 	#CustomLog /var/log/apache2/referer_log referer
 	#CustomLog /var/log/apache2/agent_logs agent
 
-    # If you prefer a logfile with access, agent, and referer information
-    # (Combined Logfile Format) you can use the following directive.
-    #
-    #CustomLog /var/log/apache2/access_log combined
+	# If you prefer a logfile with access, agent, and referer information
+	# (Combined Logfile Format) you can use the following directive.
+	#CustomLog /var/log/apache2/access_log combined
 </IfModule>
 
 <IfModule alias_module>
-    # Redirect: Allows you to tell clients about documents that used to 
-    # exist in your server's namespace, but do not anymore. The client 
-    # will make a new request for the document at its new location.
-    # Example:
-    # Redirect permanent /foo http://www.example.com/bar
-
-    # Alias: Maps web paths into filesystem paths and is used to
-    # access content that does not live under the DocumentRoot.
-    # Example:
-    # Alias /webpath /full/filesystem/path
-    #
-    # If you include a trailing / on /webpath then the server will
-    # require it to be present in the URL.  You will also likely
-    # need to provide a <Directory> section to allow access to
-    # the filesystem path.
-
-    # ScriptAlias: This controls which directories contain server scripts. 
-    # ScriptAliases are essentially the same as Aliases, except that
-    # documents in the target directory are treated as applications and
-    # run by the server when requested rather than as documents sent to the
-    # client.  The same rules about trailing "/" apply to ScriptAlias
-    # directives as to Alias.
-    #
-    ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/"
-
+	# Redirect: Allows you to tell clients about documents that used to
+	# exist in your server's namespace, but do not anymore. The client
+	# will make a new request for the document at its new location.
+	# Example:
+	#   Redirect permanent /foo http://www.example.com/bar
+
+	# Alias: Maps web paths into filesystem paths and is used to
+	# access content that does not live under the DocumentRoot.
+	# Example:
+	#   Alias /webpath /full/filesystem/path
+	#
+	# If you include a trailing / on /webpath then the server will
+	# require it to be present in the URL.  You will also likely
+	# need to provide a <Directory> section to allow access to
+	# the filesystem path.
+
+	# ScriptAlias: This controls which directories contain server scripts. 
+	# ScriptAliases are essentially the same as Aliases, except that
+	# documents in the target directory are treated as applications and
+	# run by the server when requested rather than as documents sent to the
+	# client.  The same rules about trailing "/" apply to ScriptAlias
+	# directives as to Alias.
+	ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/"
 </IfModule>
 
 <IfModule cgid_module>
-    # ScriptSock: On threaded servers, designate the path to the UNIX
-    # socket used to communicate with the CGI daemon of mod_cgid.
-    #
-    #Scriptsock /var/run/cgisock
+	# ScriptSock: On threaded servers, designate the path to the UNIX
+	# socket used to communicate with the CGI daemon of mod_cgid.
+	#Scriptsock /var/run/cgisock
 </IfModule>
 
 # "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
-#
 <Directory "/var/www/localhost/cgi-bin">
-    AllowOverride None
-    Options None
-    Order allow,deny
-    Allow from all
+	AllowOverride None
+	Options None
+	Order allow,deny
+	Allow from all
 </Directory>
 
 # DefaultType: the default MIME type the server will use for a document
@@ -289,65 +264,56 @@ LogLevel warn
 # or images, you may want to use "application/octet-stream" instead to
 # keep browsers from trying to display binary files as though they are
 # text.
-#
 DefaultType text/plain
 
 <IfModule mime_module>
-    # TypesConfig points to the file containing the list of mappings from
-    # filename extension to MIME-type.
-    #
-    TypesConfig /etc/mime.types
-
-    # AddType allows you to add to or override the MIME configuration
-    # file specified in TypesConfig for specific file types.
-    #
-    #AddType application/x-gzip .tgz
-    #
-    # AddEncoding allows you to have certain browsers uncompress
-    # information on the fly. Note: Not all browsers support this.
-    #
-    #AddEncoding x-compress .Z
-    #AddEncoding x-gzip .gz .tgz
-    #
-    # If the AddEncoding directives above are commented-out, then you
-    # probably should define those extensions to indicate media types:
-    #
-    AddType application/x-compress .Z
-    AddType application/x-gzip .gz .tgz
-
-    # AddHandler allows you to map certain file extensions to "handlers":
-    # actions unrelated to filetype. These can be either built into the server
-    # or added with the Action directive (see below)
-    #
-    # To use CGI scripts outside of ScriptAliased directories:
-    # (You will also need to add "ExecCGI" to the "Options" directive.)
-    #
-    #AddHandler cgi-script .cgi
-
-    # For files that include their own HTTP headers:
-    #AddHandler send-as-is asis
-
-    # For server-parsed imagemap files:
-    #AddHandler imap-file map
-
-    # For type maps (negotiated resources):
-    AddHandler type-map var
-
-    # Filters allow you to process content before it is sent to the client.
-    #
-    # To parse .shtml files for server-side includes (SSI):
-    # (You will also need to add "Includes" to the "Options" directive.)
-    #
-    #AddType text/html .shtml
-    #AddOutputFilter INCLUDES .shtml
-</IfModule>
+	# TypesConfig points to the file containing the list of mappings from
+	# filename extension to MIME-type.
+	TypesConfig /etc/mime.types
+
+	# AddType allows you to add to or override the MIME configuration
+	# file specified in TypesConfig for specific file types.
+	#AddType application/x-gzip .tgz
+
+	# AddEncoding allows you to have certain browsers uncompress
+	# information on the fly. Note: Not all browsers support this.
+	#AddEncoding x-compress .Z
+	#AddEncoding x-gzip .gz .tgz
+
+	# If the AddEncoding directives above are commented-out, then you
+	# probably should define those extensions to indicate media types:
+	AddType application/x-compress .Z
+	AddType application/x-gzip .gz .tgz
+
+	# AddHandler allows you to map certain file extensions to "handlers":
+	# actions unrelated to filetype. These can be either built into the server
+	# or added with the Action directive (see below)
+
+	# To use CGI scripts outside of ScriptAliased directories:
+	# (You will also need to add "ExecCGI" to the "Options" directive.)
+	#AddHandler cgi-script .cgi
+
+	# For files that include their own HTTP headers:
+	#AddHandler send-as-is asis
+
+	# For server-parsed imagemap files:
+	#AddHandler imap-file map
 
+	# For type maps (negotiated resources):
+	AddHandler type-map var
+
+	# Filters allow you to process content before it is sent to the client.
+	#
+	# To parse .shtml files for server-side includes (SSI):
+	# (You will also need to add "Includes" to the "Options" directive.)
+	#AddType text/html .shtml
+	#AddOutputFilter INCLUDES .shtml
+</IfModule>
 
 <IfModule mime_magic_module>
 	# The mod_mime_magic module allows the server to use various hints from the
 	# contents of the file itself to determine its type.  The MIMEMagicFile
 	# directive tells the module where the hint definitions are located.
-	#
 	MIMEMagicFile /etc/apache2/magic
 </IfModule>
 
@@ -359,7 +325,6 @@ DefaultType text/plain
 #ErrorDocument 404 /missing.html
 #ErrorDocument 404 "/cgi-bin/missing_handler.pl"
 #ErrorDocument 402 http://www.example.com/subscription_info.html
-#
 
 # EnableMMAP and EnableSendfile: On systems that support it, 
 # memory-mapping or the sendfile syscall is used to deliver
@@ -367,7 +332,6 @@ DefaultType text/plain
 # be turned off when serving from networked-mounted 
 # filesystems or if support for these functions is otherwise
 # broken on your system.
-#
 #EnableMMAP off
 #EnableSendfile off
 
@@ -376,11 +340,10 @@ DefaultType text/plain
 # The configuration files in the /etc/apache2/modules.d/ directory can be 
 # turned on using APACHE2_OPTS in /etc/conf.d/apache2 to add extra features
 # or to modify the default configuration of the server.
-#
+
 # To know which flag to add to APACHE2_OPTS, look at the first line of the
 # the file, which will usually be an <IfDefine OPTION> where OPTIONS is the
 # flag to use.
-#
 Include /etc/apache2/modules.d/*.conf
 
 # Virtual-host support
@@ -389,5 +352,4 @@ Include /etc/apache2/modules.d/*.conf
 # a default vhost (enabled by adding -D DEFAULT_VHOST to
 # APACHE2_OPTS in /etc/conf.d/apache2), and an example virtual host
 # to use as a template for creating your own virtual host.
-#
 Include /etc/apache2/vhosts.d/*.conf