Commit f0626e2c authored by Joshua Slive's avatar Joshua Slive
Browse files

1. Bring us back down into 80 character lines again. 

2. Change the incredibly misleading comment for .htaccess.

3. Shorten the comment for IndexOptions.


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

docs/conf/httpd-std.conf.in

+14 −15
Changes for docs/conf/httpd-std.conf.in: 14 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -174,12 +174,12 @@ MaxRequestsPerThread 10000 
</IfModule>    



# NetWare MPM

# ThreadStackSize ...... Stack size allocated for each worker thread

# StartThreads ......... Number of worker threads launched at server startup

# MinSpareThreads ...... Minimum number of idle threads, to handle request spikes

# MaxSpareThreads ...... Maximum number of idle threads

# MaxThreads ........... Maximum number of worker threads alive at the same time

# MaxRequestsPerChild .. Maximum  number of requests a thread serves. It is 

# ThreadStackSize: Stack size allocated for each worker thread

# StartThreads: Number of worker threads launched at server startup

# MinSpareThreads: Minimum number of idle threads, to handle request spikes

# MaxSpareThreads: Maximum number of idle threads

# MaxThreads: Maximum number of worker threads alive at the same time

# MaxRequestsPerChild: Maximum  number of requests a thread serves. It is 

#                      recommended that the default value of 0 be set for this

#                      directive on NetWare.  This will allow the thread to 

#                      continue to service requests indefinitely.
@@ -193,11 +193,11 @@ MaxRequestsPerChild 0 
</IfModule>



# OS/2 MPM

# StartServers ......... Number of server processes to maintain

# MinSpareThreads ...... Minimum number of idle threads per process, 

# StartServers: Number of server processes to maintain

# MinSpareThreads: Minimum number of idle threads per process, 

#                  to handle request spikes

# MaxSpareThreads ...... Maximum number of idle threads per process

# MaxRequestsPerChild .. Maximum number of connections per server process

# MaxSpareThreads: Maximum number of idle threads per process

# MaxRequestsPerChild: Maximum number of connections per server process

<IfModule mpmt_os2.c>

StartServers           2

MinSpareThreads        5
@@ -394,7 +394,8 @@ DirectoryIndex index.html index.html.var 


#

# AccessFileName: The name of the file to look for in each directory

# for access control information.  See also the AllowOverride directive.

# for additional configuration directives.  See also the AllowOverride 

# directive.

#

AccessFileName .htaccess
@@ -584,10 +585,8 @@ ScriptAlias /cgi-bin/ "@exp_cgidir@/" 
#



#

# FancyIndexing is whether you want fancy directory indexing or standard.

# VersionSort is whether files containing version numbers should be 

# compared in the natural way, so that `apache-1.3.9.tar' is placed before

# `apache-1.3.12.tar'.

# IndexOptions: Controls the appearance of server-generated directory

# listings.

#

IndexOptions FancyIndexing VersionSort