--- /usr/pkg/share/examples/httpd/httpd-std.conf	Tue Apr 30 16:41:58 2002
+++ httpd.conf	Tue Apr 30 17:19:44 2002
@@ -291,6 +291,7 @@
 # symbolic links and aliases may be used to point to other locations.
 #
 DocumentRoot "/usr/pkg/share/httpd/htdocs"
+DocumentRoot "/home/htdocs/www"
 
 #
 # Each directory to which Apache has access can be configured with respect
@@ -315,7 +316,7 @@
 #
 # This should be changed to whatever you set DocumentRoot to.
 #
-<Directory "/usr/pkg/share/httpd/htdocs">
+<Directory "/home/htdocs/www">
 
 #
 # Possible values for the Options directive are "None", "All",
@@ -329,7 +330,7 @@
 # http://httpd.apache.org/docs-2.0/mod/core.html#options
 # for more information.
 #
-    Options Indexes FollowSymLinks
+    Options  Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI Multiviews
 
 #
 # AllowOverride controls what directives may be placed in .htaccess files.
@@ -356,18 +357,18 @@
 # 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>
-#    AllowOverride FileInfo AuthConfig Limit
-#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-#    <Limit GET POST OPTIONS PROPFIND>
-#        Order allow,deny
-#        Allow from all
-#    </Limit>
-#    <LimitExcept GET POST OPTIONS PROPFIND>
-#        Order deny,allow
-#        Deny from all
-#    </LimitExcept>
-#</Directory>
+<Directory /home/*/public_html>
+    AllowOverride FileInfo AuthConfig Limit
+    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec ExecCGI
+    <Limit GET POST OPTIONS PROPFIND>
+        Order allow,deny
+        Allow from all
+    </Limit>
+    <LimitExcept GET POST OPTIONS PROPFIND>
+        Order deny,allow
+        Deny from all
+    </LimitExcept>
+</Directory>
 
 #
 # DirectoryIndex: sets the file that Apache will serve if a directory
@@ -377,7 +378,7 @@
 # negotiated documents.  The MultiViews Option can be used for the 
 # same purpose, but it is much slower.
 #
-DirectoryIndex index.html index.html.var
+DirectoryIndex index.cgi index.shtml index.html index.html.var
 
 #
 # AccessFileName: The name of the file to look for in each directory
@@ -530,7 +531,7 @@
 # The same rules about trailing "/" apply to ScriptAlias directives as to
 # Alias.
 #
-ScriptAlias /cgi-bin/ "/usr/pkg/libexec/cgi-bin/"
+ScriptAlias /cgi-bin/ "/home/htdocs/www/cgi-bin/"
 
 <IfModule mod_cgid.c>
 #
@@ -715,7 +716,7 @@
 # Just list the languages in decreasing order of preference. We have
 # more or less alphabetized them here. You probably want to change this.
 #
-LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv tw
+LanguagePriority ja en da nl et fr de el it kr no pl pt pt-br ltz ca es sv tw
 
 #
 # ForceLanguagePriority allows you to serve a result page rather than
@@ -734,7 +735,7 @@
 # reasons in browsers, related to javascript and URL parsing
 # which encourage you to always set a default char set.
 #
-AddDefaultCharset ISO-8859-1
+AddDefaultCharset ISO-2022-JP
 
 #
 # Commonly used filename extensions to character sets. You probably
@@ -796,7 +797,7 @@
 # To use CGI scripts outside of ScriptAliased directories:
 # (You will also need to add "ExecCGI" to the "Options" directive.)
 #
-#AddHandler cgi-script .cgi
+AddHandler cgi-script .cgi
 
 #
 # For files that include their own HTTP headers:
@@ -820,7 +821,7 @@
 # To parse .shtml files for server-side includes (SSI):
 # (You will also need to add "Includes" to the "Options" directive.)
 #
-#AddOutputFilter INCLUDES .shtml
+AddOutputFilter INCLUDES .shtml
 
 #
 # Action lets you define media types that will execute a script whenever