--- doc/loncapafiles/loncapafiles.lpml	2002/05/05 18:08:33	1.126
+++ doc/loncapafiles/loncapafiles.lpml	2002/05/16 01:33:45	1.129
@@ -3,7 +3,7 @@
 <!-- loncapafiles.lpml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: loncapafiles.lpml,v 1.126 2002/05/05 18:08:33 harris41 Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.129 2002/05/16 01:33:45 harris41 Exp $ -->
 
 <!--
 
@@ -216,7 +216,7 @@ echo '**********************************
 <rpmRequires>
 <item>PreReq: LON-CAPA-setup</item>
 <item>PreReq: apache</item>
-<item>PreReq: /etc/httpd/conf/access.conf</item>
+<item>PreReq: /etc/httpd/conf/httpd.conf</item>
 </rpmRequires>
 </rpm>
 <directories>
@@ -571,25 +571,23 @@ each list element consists of only two s
 <target dist='default'>etc/httpd/conf/loncapa.conf</target>
 <categoryname>conf</categoryname>
 <description>
+<p>
 The goal of this file is to implement all LON-CAPA specific
-customization of the Apache web server.
-</description>
-</file>
-<file>
-<source>loncom/access.conf</source>
-<target dist='default'>etc/httpd/conf/access.conf</target>
-<categoryname>conf</categoryname>
-<description>
-This file has two major functions.
-For the Apache web server, it defines a global
-access configuration which defines what server options (Indexes", "Includes",
-"FollowSymLinks", "ExecCGI", or "MultiViews") are associated
-with specific directories ("/", "/home/httpd/html", "/home/httpd/cgi-bin",
-and "/usr/doc").  For the LON-CAPA network server and perl module
-handlers, it defines machine specific settings (lonHostID, lonRole,
-lonAdmEMail, lonDefDomain, lonLoadLim, lonExpire, and lonReceipt)
-and internal machine settings for specific directories, socket ports,
-and browser detection logic.
+customization of the Apache web server (most all of these values
+require manual input from the system administrator at some point).
+The values in this file, as opposed to loncapa_apache.conf, are
+meant to be machine and institution specific.
+</p>
+<p>
+For the LON-CAPA network server and perl module
+handlers, it defines machine specific settings including lonHostID, lonRole,
+lonAdmEMail, lonDefDomain, lonLoadLim, lonExpire, and lonReceipt.
+</p>
+<p>
+This file should not be viewable by regular users of the system.
+Only root and www should be able to view the contents of this file
+since lonReceipt is sensitive.
+</p>
 </description>
 <note>
 <b>configure</b>
@@ -611,6 +609,25 @@ MySQL database</td></tr>
 </note>
 </file>
 <file>
+<source>loncom/loncapa_apache.conf</source>
+<target dist='default'>etc/httpd/conf/loncapa_apache.conf</target>
+<categoryname>static conf</categoryname>
+<description>
+The goal of this file is to implement all LON-CAPA specific
+customization of the Apache web server that does not require
+user input.
+
+For the Apache web server, it defines a global
+access configuration which defines what server options (Indexes", "Includes",
+"FollowSymLinks", "ExecCGI", or "MultiViews") are associated
+with specific directories ("/", "/home/httpd/html", "/home/httpd/cgi-bin",
+and "/usr/doc").  For the LON-CAPA network server and perl module
+handlers, it defines 
+and internal machine settings for specific directories, socket ports,
+the www@localhost MySQL password, and browser detection logic.
+</description>
+</file>
+<file>
 <source>loncom/startup.pl</source>
 <target dist='default'>etc/httpd/conf/startup.pl</target>
 <categoryname>static conf</categoryname>
@@ -2805,7 +2822,6 @@ tested
 Configuration file reader (looks in /etc/httpd/conf/); accepts
 a list of *.conf files to inspect for PerlSetVar key/value
 entries.
-tested
 </description>
 <status>works/unverified</status>
 </file>