--- conf/httpd.conf-dist.orig	Thu Nov  4 21:24:29 1999
+++ conf/httpd.conf-dist	Thu Nov  4 22:02:00 1999
@@ -97,6 +97,9 @@
 #ResourceConfig conf/srm.conf
 #AccessConfig conf/access.conf
 
+ResourceConfig @@ServerRoot@@/srm.conf
+AccessConfig @@ServerRoot@@/access.conf
+
 #
 # Timeout: The number of seconds before receives and sends time out.
 #
@@ -239,10 +242,13 @@
 ##  When we also provide SSL we have to listen to the 
 ##  standard HTTP port (see above) and to the HTTPS port
 ##
-<IfDefine SSL>
 Listen 80
+<IfDefine SSL>
 Listen 443
 </IfDefine>
+# We need to Listen to port 8080, as that is were the Apache Docs
+# can be accessed.
+Listen 8080
 
 #
 # If you wish httpd to run as a different user or group, you must run
@@ -257,7 +263,7 @@
 #  don't use Group #-1 on these systems!
 #
 User nobody
-Group #-1
+Group nogroup
 
 #
 # ServerAdmin: Your address, where problems with the server should be
@@ -285,7 +291,7 @@
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "@@ServerRoot@@/htdocs"
+DocumentRoot @@ServerRoot@@/htdocs
 
 #
 # Each directory to which Apache has access, can be configured with respect
@@ -326,7 +332,16 @@
 # override. Can also be "All", or any combination of "Options", "FileInfo", 
 # "AuthConfig", and "Limit"
 #
+<IfDefine FRONTPAGE>
+### These are the Minimum options need by the FrontPage Module.
+### With out these options set the FrontPage Client will not be
+### able to access the server.
+    AllowOverride AuthConfig Limit Indexes Options
+</IfDefine>
+
+<IfDefine !FRONTPAGE>
-    AllowOverride None
+#    AllowOverride None
+</IfDefine>
 
 #
 # Controls who can get stuff from this server.
@@ -358,6 +373,15 @@
 #    </Limit>
 #</Directory>
 
+### In Order for FrontPage to work in User and Virtual ###
+### Web Directories, they need to be set up as shown:  ###
+<IfDefine FRONTPAGE>
+    <Directory /*/public_html>
+ 	AllowOverride AuthConfig Limit Indexes Options
+	Options ExecCGI
+    </Directory>
+</IfDefine>
+
 #
 # DirectoryIndex: Name of the file or files to use as a pre-written HTML
 # directory index.  Separate multiple entries with spaces.
@@ -478,7 +502,7 @@
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog logs/access_log common
+#CustomLog logs/access_log common
 
 #
 # If you would like to have agent and referer logfiles, uncomment the
@@ -491,7 +515,7 @@
 # If you prefer a single logfile with access, agent, and referer information
 # (Combined Logfile Format) you can use the following directive.
 #
-#CustomLog logs/access_log combined
+CustomLog logs/access_log combined
 
 #
 # Optionally add a line containing the server version and virtual host
@@ -1077,4 +1101,48 @@
 </VirtualHost>                                  
 
 </IfDefine>
+
+# This virtual Host allows access to the Apache & Frontpage Docs on port 8080
+<VirtualHost _default_:8080>
+    ServerAdmin webmaster@@@HOSTNAME@@
+    DocumentRoot @@MANUAL@@
+    ServerName @@HOSTNAME@@
+
+    <Directory "@@MANUAL@@">
+
+	#
+	# This may also be "None", "All", or any combination of "Indexes",
+	# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
+	#
+	# Note that "MultiViews" must be named *explicitly* --- "Options All"
+	# doesn't give it to you.
+	#
+	Options Indexes FollowSymLinks
+
+	#
+	# This controls which options the .htaccess files in directories can
+	# override. Can also be "All", or any combination of "Options",
+	# "FileInfo", "AuthConfig", and "Limit"
+	#
+	AllowOverride None
+
+	#
+	# Controls who can get stuff from this server.
+	#
+	Order allow,deny
+	Allow from all
+    </Directory>
+
+</VirtualHost>
+
+# This Virtual Host makes it so FrontPage will display pages from the
+# root web.  Without this virtual host, Frontpage accesses the pages
+# on the default virtual host (port 8080) instead.
+#
+#NOTE: This Virtual Host Entry must be kept as the last _default_
+#      virtual host entry.
+<VirtualHost _default_:80>
+    ServerAdmin webmaster@@@HOSTNAME@@
+    ServerName @@HOSTNAME@@
+</VirtualHost>
 
