X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-httpd.conf;h=de4003fa58b2a67bedf2fa55c0a3e7d418ace551;hb=cf87e23956f552f8e45e75ca5c5875558147915d;hp=d4d4ae5823e91e0a03c8c8c5989e7bac72e057d6;hpb=888bfddeac9f6d3af5178645214ef95a8923533a;p=packages%2Fapache.git

diff --git a/apache-httpd.conf b/apache-httpd.conf
index d4d4ae5..de4003f 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -150,12 +150,6 @@ Listen 80
 
 #BindAddress *
 
-### ExtendedStatus
-# controls whether Apache will generate "full" status information
-# (ExtendedStatus On) or just basic information (ExtendedStatus Off) when
-# the "server-status" handler is called. The default is Off.
-
-#ExtendedStatus On
 
 ### Section 2: Dynamic Shared Object (DSO) Support
 #
@@ -168,6 +162,13 @@ Listen 80
 ClearModuleList
 AddModule mod_so.c
 
+### ExtendedStatus
+# controls whether Apache will generate "full" status information
+# (ExtendedStatus On) or just basic information (ExtendedStatus Off) when
+# the "server-status" handler is called. The default is Off.
+
+#ExtendedStatus On
+
 ### Section 3: 'Main' server configuration
 #
 # The directives in this section set up the values used by the 'main'
@@ -290,7 +291,7 @@ UserDir public_html
 # Control access to UserDir directories.  The following is an example
 # for a site where these directories are restricted to read-only.
 #
-#<Directory /home/*/public_html>
+#<Directory /home/users/*/public_html>
 #    AllowOverride FileInfo AuthConfig Limit
 #    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
 #    <Limit GET POST OPTIONS PROPFIND>
@@ -300,7 +301,7 @@ UserDir public_html
 #    <LimitExcept GET POST OPTIONS PROPFIND>
 #        Order deny,allow
 #        Deny from all
-#    </Limit>
+#    </LimitExcept>
 #</Directory>
 
 #
@@ -331,6 +332,7 @@ AccessFileName .htaccess
 <Files ~ "^\.ht">
 	Order allow,deny
 	Deny from all
+	Satisfy All
 </Files>
 
 #
@@ -454,6 +456,18 @@ Alias /icons/ "/home/httpd/icons/"
 	Allow from all
 </Directory>
 
+
+
+
+Alias /manual "/home/httpd/manual"
+
+<Directory "/home/httpd/manual">
+	Options Indexes MultiViews
+	AllowOverride None
+</Directory>
+
+
+
 #
 # ScriptAlias: This controls which directories contain server scripts.
 # ScriptAliases are essentially the same as Aliases, except that
@@ -613,13 +627,15 @@ AddLanguage ja .ja
 AddLanguage kr .kr
 AddLanguage ltz .lu
 AddLanguage nl .nl
+AddLanguage nn .nn
 AddLanguage no .no
 AddLanguage pl .po
 AddLanguage pt .pt
 AddLanguage pt-br .pt-br
 AddLanguage ru .ru
-AddLanguage sv .se
+AddLanguage sv .sv
 AddLanguage tw .tw
+AddLanguage zh-tw .tw
 
 AddCharset Big5 .Big5 .big5
 AddCharset CP866 .cp866
@@ -719,7 +735,7 @@ MetaSuffix .meta
 #
 #    1) plain text
 #ErrorDocument 500 "The server made a boo boo.
-#  n.b.  the (") marks it as text, it does not get output
+#  n.b.  the single leading (") marks it as text, it does not get output
 #
 #    2) local redirects
 #ErrorDocument 404 /missing.html
@@ -728,7 +744,7 @@ MetaSuffix .meta
 #  N.B.: You can redirect to a script or a document using server-side-includes.
 #
 #    3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.
 
@@ -773,14 +789,14 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 
 #
 # Allow remote server configuration reports, with the URL of
-#  http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# http://servername/server-info (requires that mod_info.c be loaded).
+# Change the ".your-domain.com" to match your domain to enable.
 #
 #<Location /server-info>
 #	SetHandler server-info
 #	Order deny,allow
 #	Deny from all
-#	Allow from .your_domain.com
+#	Allow from .your-domain.com
 #</Location>
 
 #