--- doc/loncapafiles/loncapafiles.lpml	2002/03/01 01:45:39	1.104
+++ doc/loncapafiles/loncapafiles.lpml	2002/04/27 21:38:57	1.122
@@ -1,7 +1,9 @@
+<!DOCTYPE lpml PUBLIC "-//TUX/DTD lpml 1.0 Final//EN"
+ "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: loncapafiles.lpml,v 1.104 2002/03/01 01:45:39 harris41 Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.122 2002/04/27 21:38:57 harris41 Exp $ -->
 
 <!--
 
@@ -46,7 +48,7 @@ http://www.lon-capa.org/
 !!! 127.0.0.1  localhost.localdomain  localhost !!!
 !!! 35.2.3.80  computer1 computer1.notreal.msu.edu !!!
 </specialnotice>
-<specialnotice dist='redhat7.0 redhat7.1'>
+<specialnotice dist='redhat7 redhat7.1'>
 !!!!!!!!!  REDHAT 7.*   NOTICE   !!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!  LINE IN Cookie.pm     !!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!  MUST BE REPLACED DUE  !!!!!!!!!!!!!!!!!!!!
@@ -218,108 +220,114 @@ echo '**********************************
 </rpmRequires>
 </rpm>
 <directories>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc</targetdir>
   <categoryname>standard</categoryname>
   <description>standard linux directory for configuration files</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/atalk</targetdir>
   <categoryname>standard</categoryname>
   <description>appletalk configuration files</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/cron.d</targetdir>
   <categoryname>standard</categoryname>
   <description>standard linux directory for running time-based "jobs"
   </description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/httpd/conf</targetdir>
   <categoryname>standard</categoryname>
   <description>web configuration files</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/ntp</targetdir>
   <categoryname>standard</categoryname>
   <description>configuration directory for network time protocol</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/pam.d</targetdir>
   <categoryname>standard</categoryname>
   <description>configuration directory for password authentication mechanism
   </description>
 </directory>
-<directory>
+<directory dist='default'>
+  <targetdir dist='redhat7 redhat7.1'>etc/samba</targetdir>
+  <categoryname>standard</categoryname>
+  <description>configuration directory for samba authentication
+  </description>
+</directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/rc.d/init.d</targetdir>
-  <targetdir dist='redhat7.1 debian2.2'>etc/init.d</targetdir>
+  <targetdir dist='debian2.2'>etc/init.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run during system startup</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/rc.d/rc0.d</targetdir>
-  <targetdir dist='redhat7.1 debian2.2'>etc/rc0.d</targetdir>
+  <targetdir dist='debian2.2'>etc/rc0.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 0</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/rc.d/rc1.d</targetdir>
-  <targetdir dist='redhat7.1 debian2.2'>etc/rc1.d</targetdir>
+  <targetdir dist='debian2.2'>etc/rc1.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 1</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/rc.d/rc2.d</targetdir>
-  <targetdir dist='redhat7.1 debian2.2'>etc/rc2.d</targetdir>
+  <targetdir dist='debian2.2'>etc/rc2.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 2</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/rc.d/rc3.d</targetdir>
-  <targetdir dist='redhat7.1 debian2.2'>etc/rc3.d</targetdir>
+  <targetdir dist='debian2.2'>etc/rc3.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 3</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/rc.d/rc4.d</targetdir>
-  <targetdir dist='redhat7.1 debian2.2'>etc/rc4.d</targetdir>
+  <targetdir dist='debian2.2'>etc/rc4.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 4</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/rc.d/rc5.d</targetdir>
-  <targetdir dist='redhat7.1 debian2.2'>etc/rc5.d</targetdir>
+  <targetdir dist='debian2.2'>etc/rc5.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 5</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>etc/rc.d/rc6.d</targetdir>
-  <targetdir dist='redhat7.1 debian2.2'>etc/rc6.d</targetdir>
+  <targetdir dist='debian2.2'>etc/rc6.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 6</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/lonTabs</targetdir>
   <categoryname>standard</categoryname>
   <description>tab-formatted reference files</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd</targetdir>
   <categoryname>standard</categoryname>
   <description>start of the web server tree</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/perl</targetdir>
   <categoryname>server readonly</categoryname>
   <description>perl scripts for managing the LON-CAPA system</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/perl/logs</targetdir>
   <categoryname>server standard</categoryname>
   <description>location where system performance and error logs are kept
   </description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/lon-status/londchld</targetdir>
   <categoryname>server standard</categoryname>
   <description>
@@ -327,114 +335,121 @@ Used by lond parent to check if children
 (otherwise they are killed and replaced).
   </description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/perl/tmp</targetdir>
   <categoryname>server standard</categoryname>
   <description>location where temporary files (for caching) are stored
   </description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/prtspool</targetdir>
   <categoryname>server standard</categoryname>
   <description>for the output of lonprintout.pm
   </description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/lib/perl</targetdir>
   <categoryname>server readonly</categoryname>
   <description>location of LON-CAPA non web mod-perl handlers</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/lib/perl/Apache</targetdir>
   <categoryname>server readonly</categoryname>
   <description>location of LON-CAPA web mod-perl handlers</description>
 </directory>
-<directory>
+<directory dist='default'>
+  <targetdir dist='default'>home/httpd/lib/perl/HTML</targetdir>
+  <categoryname>server readonly</categoryname>
+  <description>location of HTML specific perl module fixes and additions
+  </description>
+</directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/lonIDs</targetdir>
   <categoryname>server standard</categoryname>
   <description>cookie jar</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/sockets</targetdir>
   <categoryname>server standard</categoryname>
   <description>lonc's sockets</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/sockets/delayed</targetdir>
   <categoryname>server standard</categoryname>
   <description>lonc's sockets (delayed)</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/cgi-bin</targetdir>
   <categoryname>standard</categoryname>
   <description>location of cgi scripts</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html</targetdir>
   <categoryname>server standard</categoryname>
   <description>location of web-accessible file tree</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/res</targetdir>
   <categoryname>server standard</categoryname>
   <description>root of resource tree</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/adm</targetdir>
   <categoryname>server readonly</categoryname>
   <description>unauthenticated resources</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/adm/rat</targetdir>
   <categoryname>server readonly</categoryname>
   <description>home of the rat</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/adm/help</targetdir>
   <categoryname>server readonly</categoryname>
   <description>online help documentation</description>
 </directory>
-<directory>
-  <targetdir dist='default'>home/httpd/html/adm/help/api</targetdir>
+<directory dist='default'>
+  <targetdir dist='default'>home/httpd/html/adm/help/lib/perl</targetdir>
   <categoryname>server readonly</categoryname>
   <description>online help documentation for the LON-CAPA programming
 interface</description>
 </directory>
-<directory>
-  <targetdir dist='default'>home/httpd/html/adm/help/api/Apache</targetdir>
+<directory dist='default'>
+  <targetdir dist='default'>home/httpd/html/adm/help/lib/perl/Apache
+  </targetdir>
   <categoryname>server readonly</categoryname>
   <description>online help documentation for the LON-CAPA programming
 interface, Apache (mod_perl) handlers</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/adm/help/scripts</targetdir>
   <categoryname>server readonly</categoryname>
   <description>online help documentation for the LON-CAPA programming
 interface, Apache (mod_perl) handlers</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/adm/lonIcons</targetdir>
   <categoryname>server readonly</categoryname>
   <description>graphic widgets</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/adm/lonMisc</targetdir>
   <categoryname>server readonly</categoryname>
   <description>miscellaneous resources</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/adm/lonKaputt</targetdir>
   <categoryname>server readonly</categoryname>
   <description>error warnings and icons</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/lonUsers</targetdir>
   <categoryname>server standard</categoryname>
   <description>Home directories of local users.  There is a five-tier
 structure to the directories:
 [domain]/[firstletter]/[secondletter]/[thirdletter]/[userid].  For example,
 a user fredflint at MSU would have his information located in
-lonUsers/msu/f/r/e/fredflint.<br />&nbsp;<br />Within this directory there are
+lonUsers/msu/f/r/e/fredflint.<br />&#160;<br />Within this directory there are
 a variety of files which govern the scope of what a user can do within the
 LON-CAPA system.  A passwd file determines the type of authentication
 mechanism to use.
@@ -442,80 +457,80 @@ mechanism to use.
 roles.db) which specify the roles and privileges for a user in the
 LON-CAPA system.</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/adm/MathML</targetdir>
   <categoryname>server readonly</categoryname>
   <description>mathematics markup language resources</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/res/adm/includes</targetdir>
   <categoryname>server readonly</categoryname>
   <description>files useful for including within customized scripting
   </description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/res/adm/includes/templates
   </targetdir>
   <categoryname>server readonly</categoryname>
   <description>template files useful for customized scripts</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/lon-status</targetdir>
   <categoryname>server standard</categoryname>
   <description>status reports</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/res/adm/pages</targetdir>
   <categoryname>server readonly</categoryname>
   <description>web user interface resources</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu
   </targetdir>
   <categoryname>server readonly</categoryname>
   <description>bookmark user interface code</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/res/adm/pages/annotations
   </targetdir>
   <categoryname>server readonly</categoryname>
   <description></description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>home/httpd/html/res/adm/pages/indexericons
   </targetdir>
   <categoryname>server readonly</categoryname>
   <description>icons that help depict the file system (outdated)</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>usr/lib/perl5/site_perl/5.005</targetdir>
-  <targetdir dist='redhat7.1'>usr/lib/perl5/site_perl/5.6.0</targetdir>
+  <targetdir dist='redhat7 redhat7.1'>usr/lib/perl5/site_perl/5.6.0</targetdir>
   <targetdir dist='debian2.2'>usr/local/lib/perl/5.6.0</targetdir>
   <categoryname>standard</categoryname>
   <description>system perl tree (usually present on linux systems)
   </description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>usr/local/bin</targetdir>
   <categoryname>standard</categoryname>
   <description>local binary files</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>usr/local/man/man1</targetdir>
   <categoryname>standard</categoryname>
   <description>local manual pages</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>usr/man/man1</targetdir>
   <categoryname>standard</categoryname>
   <description>manual pages</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>usr/man/man3</targetdir>
   <categoryname>standard</categoryname>
   <description>manual pages</description>
 </directory>
-<directory>
+<directory dist='default'>
   <targetdir dist='default'>usr/sbin</targetdir>
   <categoryname>standard</categoryname>
   <description>standard linux directory for superuser executables</description>
@@ -590,41 +605,6 @@ MySQL database</td></tr>
 </note>
 </file>
 <file>
-<source>loncom/httpd.conf</source>
-<target dist='default'>etc/httpd/conf/httpd.conf</target>
-<categoryname>static conf</categoryname>
-<description>
-This is the main server configuration file.  The settings here are
-more or less standard for the Apache web server.  Most notably (and
-importantly!), perl handling and mod_perl are enabled in this configuration
-file.
-</description>
-</file>
-<file>
-<source>loncom/srm.conf</source>
-<target dist='default'>etc/httpd/conf/srm.conf</target>
-<categoryname>static conf</categoryname>
-<description>
-<p>
-This file configures the "name space" of the Apache web server.  
-<tt>srm.conf</tt>
-defines when specific perl modules should be called to handle a given
-request.  This definition is a function of both the name of the perl module,
-and a specific regular expression associated with the URL, such as
-"^/res/.*\.page".
-</p>
-<p>
-Here is an example entry:
-<pre>
-&lt;LocationMatch "^/res/.*\.page$&gt;
-SetHandler perl-script
-PerlHandler Apache::lonpage
-&lt;/LocationMatch&gt;
-</pre>
-</p>
-</description>
-</file>
-<file>
 <source>loncom/startup.pl</source>
 <target dist='default'>etc/httpd/conf/startup.pl</target>
 <categoryname>static conf</categoryname>
@@ -889,7 +869,7 @@ Basic auth password to access /lon-statu
 <file>
 <source>loncom/smb.conf</source>
 <target dist='default'>etc/smb.conf</target>
-<target dist='redhat7.1'>etc/samba/smb.conf</target>
+<target dist='redhat7 redhat7.1'>etc/samba/smb.conf</target>
 <categoryname>conf</categoryname>
 <description>
 configuration file to make LON-CAPA server file space accessible to network
@@ -936,7 +916,8 @@ proxy server
 <categoryname>doc</categoryname>
 <description>man page for lonc</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../lonc > ../../doc/man/lonc.1 && echo 'manifying lonc'
+loncom/build/pod2man.sh ../lonc &gt; ../../doc/man/lonc.1 &amp;&amp; \
+echo 'manifying lonc'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -949,7 +930,8 @@ loncom/build/pod2man.sh ../lonc > ../../
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonc</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../lonc > ../../doc/scripts/lonc.html && echo 'pod2html lonc'
+loncom/build/pod2html.sh ../lonc &gt; ../../doc/scripts/lonc.html &amp;&amp; \
+echo 'pod2html lonc'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -966,7 +948,7 @@ It accepts and processes incoming reques
 on the network.  lond's functionality is self-contained in the sense
 that it does not reference (import, require, use) any other file
 described in this document.  There are only 15 subroutines in this
-script, however the <TT>make_new_child</TT> subroutine is quite
+script, however the <tt>make_new_child</tt> subroutine is quite
 complex since it parses and responds about 29 different types of 
 network requests (i.e. enc, ping, pong, ekey, load, auth, passwd,
 makeuser, home, update, unsub, sub, log, put, rolesput, get, eget,
@@ -980,7 +962,8 @@ tmpput, tmpget, and ls).
 <categoryname>doc</categoryname>
 <description>man page for lond</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../lond > ../../doc/man/lond.1 && echo 'manifying lond'
+loncom/build/pod2man.sh ../lond &gt; ../../doc/man/lond.1 &amp;&amp; \
+echo 'manifying lond'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -993,7 +976,8 @@ loncom/build/pod2man.sh ../lond > ../../
 <categoryname>doc</categoryname>
 <description>POD-derived page for lond</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../lond > ../../doc/scripts/lond.html && echo 'pod2html lond'
+loncom/build/pod2html.sh ../lond &gt; ../../doc/scripts/lond.html &amp;&amp; \
+echo 'pod2html lond'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1024,7 +1008,8 @@ loncom/build/pod2html.sh ../lond > ../..
 <categoryname>doc</categoryname>
 <description>man page for lonsql</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../lonsql > ../../doc/man/lonsql.1 && echo 'manifying lonsql'
+loncom/build/pod2man.sh ../lonsql &gt; ../../doc/man/lonsql.1 &amp;&amp; \
+echo 'manifying lonsql'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1037,7 +1022,8 @@ loncom/build/pod2man.sh ../lonsql > ../.
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonsql</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../lonsql > ../../doc/scripts/lonsql.html && echo 'pod2html lonsql'
+loncom/build/pod2html.sh ../lonsql &gt; ../../doc/scripts/lonsql.html &amp;&amp; \
+echo 'pod2html lonsql'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1146,7 +1132,8 @@ The relevant conditions and metadata to
 </file>
 <file>
 <source>loncom/homework/lectureonline.sty</source>
-<target dist='default'>home/httpd/html/res/adm/includes/lectureonline.sty</target>
+<target dist='default'>home/httpd/html/res/adm/includes/lectureonline.sty
+</target>
 <categoryname>static conf</categoryname>
 <description>
 The relevant conditions and metadata to attach to LectureOnline-specific tags.
@@ -1249,7 +1236,8 @@ Handler to upload files through browser
 <categoryname>doc</categoryname>
 <description>man page for lonupload.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../publisher/lonupload.pm > ../../doc/man/Apache__lonupload.3 && echo 'manifying lonupload.pm'
+loncom/build/pod2man.sh ../publisher/lonupload.pm &gt; \
+../../doc/man/Apache__lonupload.3 &amp;&amp; echo 'manifying lonupload.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1257,12 +1245,15 @@ loncom/build/pod2man.sh ../publisher/lon
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonupload.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonupload.html</target>
+<source>doc/lib/perl/Apache/lonupload.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/lonupload.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonupload.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../publisher/lonupload.pm > ../../doc/api/Apache/lonupload.html && echo 'pod2html lonupload.pm'
+loncom/build/pod2html.sh ../publisher/lonupload.pm &gt; \
+../../doc/lib/perl/Apache/lonupload.html &amp;&amp; \
+echo 'pod2html lonupload.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1310,7 +1301,8 @@ Handler to publish directories.
 <categoryname>doc</categoryname>
 <description>man page for lonpubdir.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../publisher/lonpubdir.pm > ../../doc/man/Apache__lonpubdir.3 && echo 'manifying lonpubdir.pm'
+loncom/build/pod2man.sh ../publisher/lonpubdir.pm &gt; \
+../../doc/man/Apache__lonpubdir.3 &amp;&amp; echo 'manifying lonpubdir.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1318,12 +1310,15 @@ loncom/build/pod2man.sh ../publisher/lon
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonpubdir.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonpubdir.html</target>
+<source>doc/lib/perl/Apache/lonpubdir.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/lonpubdir.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonpubdir.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../publisher/lonpubdir.pm > ../../doc/api/Apache/lonpubdir.html && echo 'pod2html lonpubdir.pm'
+loncom/build/pod2html.sh ../publisher/lonpubdir.pm &gt; \
+../../doc/lib/perl/Apache/lonpubdir.html &amp;&amp; \
+echo 'pod2html lonpubdir.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1345,7 +1340,8 @@ Handler to retrieve old versions from re
 <categoryname>doc</categoryname>
 <description>man page for lonretrieve.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../publisher/lonretrieve.pm > ../../doc/man/Apache__lonretrieve.3 && echo 'manifying lonretrieve.pm'
+loncom/build/pod2man.sh ../publisher/lonretrieve.pm &gt; \
+../../doc/man/Apache__lonretrieve.3 &amp;&amp; echo 'manifying lonretrieve.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1353,12 +1349,16 @@ loncom/build/pod2man.sh ../publisher/lon
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonretrieve.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonretrieve.html</target>
+<source>doc/lib/perl/Apache/lonretrieve.html</source>
+<target dist='default'>
+home/httpd/html/adm/help/lib/perl/Apache/lonretrieve.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonretrieve.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../publisher/lonretrieve.pm > ../../doc/api/Apache/lonretrieve.html && echo 'pod2html lonretrieve.pm'
+loncom/build/pod2html.sh ../publisher/lonretrieve.pm &gt; \
+../../doc/lib/perl/Apache/lonretrieve.html &amp;&amp; \
+echo 'pod2html lonretrieve.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1379,7 +1379,8 @@ Helper functions when in homework edit m
 <categoryname>doc</categoryname>
 <description>man page for edit.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../homework/edit.pm > ../../doc/man/Apache__edit.3 && echo 'manifying edit.pm'
+loncom/build/pod2man.sh ../homework/edit.pm &gt; ../../doc/man/Apache__edit.3 &amp;&amp; \
+echo 'manifying edit.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1387,12 +1388,15 @@ loncom/build/pod2man.sh ../homework/edit
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/edit.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/edit.html</target>
+<source>doc/lib/perl/Apache/edit.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/edit.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for edit.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../homework/edit.pm > ../../doc/api/Apache/edit.html && echo 'pod2html edit.pm'
+loncom/build/pod2html.sh ../homework/edit.pm &gt; \
+../../doc/lib/perl/Apache/edit.html \
+&amp;&amp; echo 'pod2html edit.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1477,7 +1481,8 @@ user, domain, home_server, course_id.
 <categoryname>doc</categoryname>
 <description>man page for loncommon.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../interface/loncommon.pm > ../../doc/man/Apache__loncommon.3 && echo 'manifying loncommon.pm'
+loncom/build/pod2man.sh ../interface/loncommon.pm &gt; \
+../../doc/man/Apache__loncommon.3 &amp;&amp; echo 'manifying loncommon.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1485,12 +1490,15 @@ loncom/build/pod2man.sh ../interface/lon
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/loncommon.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/loncommon.html</target>
+<source>doc/lib/perl/Apache/loncommon.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/loncommon.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for loncommon.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../interface/loncommon.pm > ../../doc/api/Apache/loncommon.html && echo 'pod2html loncommon.pm'
+loncom/build/pod2html.sh ../interface/loncommon.pm &gt; \
+../../doc/lib/perl/Apache/loncommon.html &amp;&amp; \
+echo 'pod2html loncommon.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1640,7 +1648,8 @@ Handles a searchable catalogue.
 <categoryname>doc</categoryname>
 <description>man page for lonsearchcat.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../interface/lonsearchcat.pm > ../../doc/man/Apache__lonsearchcat.3 && echo 'manifying lonsearchcat.pm'
+loncom/build/pod2man.sh ../interface/lonsearchcat.pm &gt; \
+../../doc/man/Apache__lonsearchcat.3 &amp;&amp; echo 'manifying lonsearchcat.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1648,12 +1657,16 @@ loncom/build/pod2man.sh ../interface/lon
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonsearchcat.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonsearchcat.html</target>
+<source>doc/lib/perl/Apache/lonsearchcat.html</source>
+<target dist='default'>
+home/httpd/html/adm/help/lib/perl/Apache/lonsearchcat.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonsearchcat.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../interface/lonsearchcat.pm > ../../doc/api/Apache/lonsearchcat.html && echo 'pod2html lonsearchcat.pm'
+loncom/build/pod2html.sh ../interface/lonsearchcat.pm &gt; \
+../../doc/lib/perl/Apache/lonsearchcat.html &amp;&amp; \
+echo 'pod2html lonsearchcat.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1722,7 +1735,8 @@ Handler to resolve ambiguous file locati
 <categoryname>doc</categoryname>
 <description>man page for lonparmset.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../interface/lonparmset.pm > ../../doc/man/Apache__lonparmset.3 && echo 'manifying lonparmset.pm'
+loncom/build/pod2man.sh ../interface/lonparmset.pm &gt; \
+../../doc/man/Apache__lonparmset.3 &amp;&amp; echo 'manifying lonparmset.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1730,12 +1744,15 @@ loncom/build/pod2man.sh ../interface/lon
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonparmset.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonparmset.html</target>
+<source>doc/lib/perl/Apache/lonparmset.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/lonparmset.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonparmset.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../interface/lonparmset.pm > ../../doc/api/Apache/lonparmset.html && echo 'pod2html lonparmset.pm'
+loncom/build/pod2html.sh ../interface/lonparmset.pm &gt; \
+../../doc/lib/perl/Apache/lonparmset.html &amp;&amp; \
+echo 'pod2html lonparmset.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1767,7 +1784,8 @@ Publishes an LON-CAPA educational resour
 <categoryname>doc</categoryname>
 <description>man page for lonpublisher.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../publisher/lonpublisher.pm > ../../doc/man/Apache__lonpublisher.3 && echo 'manifying lonpublisher.pm'
+loncom/build/pod2man.sh ../publisher/lonpublisher.pm &gt; \
+../../doc/man/Apache__lonpublisher.3 &amp;&amp; echo 'manifying lonpublisher.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1775,12 +1793,16 @@ loncom/build/pod2man.sh ../publisher/lon
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonpublisher.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonpublisher.html</target>
+<source>doc/lib/perl/Apache/lonpublisher.html</source>
+<target dist='default'>
+home/httpd/html/adm/help/lib/perl/Apache/lonpublisher.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonpublisher.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../publisher/lonpublisher.pm > ../../doc/api/Apache/lonpublisher.html && echo 'pod2html lonpublisher.pm'
+loncom/build/pod2html.sh ../publisher/lonpublisher.pm &gt; \
+../../doc/lib/perl/Apache/lonpublisher.html &amp;&amp; \
+echo 'pod2html lonpublisher.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1866,7 +1888,8 @@ bundles pages into one page
 <categoryname>doc</categoryname>
 <description>man page for lonpage.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../../rat/lonpage.pm > ../../doc/man/Apache__lonpage.3 && echo 'manifying lonpage.pm'
+loncom/build/pod2man.sh ../../rat/lonpage.pm &gt; \
+../../doc/man/Apache__lonpage.3 &amp;&amp; echo 'manifying lonpage.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1874,12 +1897,14 @@ loncom/build/pod2man.sh ../../rat/lonpag
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonpage.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonpage.html</target>
+<source>doc/lib/perl/Apache/lonpage.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/lonpage.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonnet.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../../rat/lonpage.pm > ../../doc/api/Apache/lonpage.html && echo 'pod2html lonpage.pm'
+loncom/build/pod2html.sh ../../rat/lonpage.pm &gt; \
+../../doc/lib/perl/Apache/lonpage.html &amp;&amp; echo 'pod2html lonpage.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1901,7 +1926,8 @@ compile course into binary data structur
 <categoryname>doc</categoryname>
 <description>man page for lonnet.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../../rat/lonuserstate.pm > ../../doc/man/Apache__lonuserstate.3 && echo 'manifying lonuserstate.pm'
+loncom/build/pod2man.sh ../../rat/lonuserstate.pm &gt; \
+../../doc/man/Apache__lonuserstate.3 &amp;&amp; echo 'manifying lonuserstate.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -1909,12 +1935,16 @@ loncom/build/pod2man.sh ../../rat/lonuse
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonuserstate.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonuserstate.html</target>
+<source>doc/lib/perl/Apache/lonuserstate.html</source>
+<target dist='default'>
+home/httpd/html/adm/help/lib/perl/Apache/lonuserstate.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonuserstate.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../../rat/lonuserstate.pm > ../../doc/api/Apache/lonuserstate.html && echo 'pod2html lonuserstate.pm'
+loncom/build/pod2html.sh ../../rat/lonuserstate.pm &gt; \
+../../doc/lib/perl/Apache/lonuserstate.html &amp;&amp; \
+echo 'pod2html lonuserstate.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2051,6 +2081,17 @@ handles request to the CAPA homework pro
 <status>works/unverified</status>
 </file>
 <file>
+<source>loncom/xml/Safe.pm</source>
+<target dist='default'>home/httpd/lib/perl/Safe.pm</target>
+<categoryname>handler</categoryname>
+<description>
+Meant to safely substitute for CPAN version of Safe.
+Allows for safely executing embedded perl comands in
+a way that does not threaten the operating system.
+</description>
+<status>works/unverified</status>
+</file>
+<file>
 <source>loncom/auth/localauth.pm</source>
 <target dist='default'>home/httpd/lib/perl/localauth.pm</target>
 <categoryname>handler</categoryname>
@@ -2077,7 +2118,8 @@ as coordinating access to educational re
 <categoryname>doc</categoryname>
 <description>man page for lonacc.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../auth/lonacc.pm > ../../doc/man/Apache__lonacc.3 && echo 'manifying lonacc.pm'
+loncom/build/pod2man.sh ../auth/lonacc.pm &gt; \
+../../doc/man/Apache__lonacc.3 &amp;&amp; echo 'manifying lonacc.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2085,12 +2127,14 @@ loncom/build/pod2man.sh ../auth/lonacc.p
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonacc.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonacc.html</target>
+<source>doc/lib/perl/Apache/lonacc.html</source>
+<target dist='default'>
+home/httpd/html/adm/help/lib/perl/Apache/lonacc.html</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonacc.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../auth/lonacc.pm > ../../doc/api/Apache/lonacc.html && echo 'pod2html lonacc.pm'
+loncom/build/pod2html.sh ../auth/lonacc.pm &gt; \
+../../doc/lib/perl/Apache/lonacc.html &amp;&amp; echo 'pod2html lonacc.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2112,7 +2156,8 @@ access handler for file transfers
 <categoryname>doc</categoryname>
 <description>man page for lonracc.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../auth/lonracc.pm > ../../doc/man/Apache__lonracc.3 && echo 'manifying lonracc.pm'
+loncom/build/pod2man.sh ../auth/lonracc.pm &gt; \
+../../doc/man/Apache__lonracc.3 &amp;&amp; echo 'manifying lonracc.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2120,12 +2165,14 @@ loncom/build/pod2man.sh ../auth/lonracc.
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonracc.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonracc.html</target>
+<source>doc/lib/perl/Apache/lonracc.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/lonracc.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonracc.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../auth/lonracc.pm > ../../doc/api/Apache/lonracc.html && echo 'pod2html lonracc.pm'
+loncom/build/pod2html.sh ../auth/lonracc.pm &gt; \
+../../doc/lib/perl/Apache/lonracc.html &amp;&amp; echo 'pod2html lonracc.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2156,7 +2203,8 @@ for the "priv"-type access, the resource
 <categoryname>doc</categoryname>
 <description>man page for loncacc.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../auth/loncacc.pm > ../../doc/man/Apache__loncacc.3 && echo 'manifying loncacc.pm'
+loncom/build/pod2man.sh ../auth/loncacc.pm &gt; ../../doc/man/Apache__loncacc.3 \
+&amp;&amp; echo 'manifying loncacc.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2164,12 +2212,14 @@ loncom/build/pod2man.sh ../auth/loncacc.
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/loncacc.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/loncacc.html</target>
+<source>doc/lib/perl/Apache/loncacc.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/loncacc.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for loncacc.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../auth/loncacc.pm > ../../doc/api/Apache/loncacc.html && echo 'pod2html loncacc.pm'
+loncom/build/pod2html.sh ../auth/loncacc.pm &gt; \
+../../doc/lib/perl/Apache/loncacc.html &amp;&amp; echo 'pod2html loncacc.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2223,7 +2273,8 @@ class.
 <categoryname>doc</categoryname>
 <description>man page for lonroles.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../auth/lonroles.pm > ../../doc/man/Apache__lonroles.3 && echo 'manifying lonroles.pm'
+loncom/build/pod2man.sh ../auth/lonroles.pm &gt; \
+../../doc/man/Apache__lonroles.3 &amp;&amp; echo 'manifying lonroles.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2231,12 +2282,14 @@ loncom/build/pod2man.sh ../auth/lonroles
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonroles.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonroles.html</target>
+<source>doc/lib/perl/Apache/lonroles.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/lonroles.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonroles.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../auth/lonroles.pm > ../../doc/api/Apache/lonroles.html && echo 'pod2html lonroles.pm'
+loncom/build/pod2html.sh ../auth/lonroles.pm &gt; \
+../../doc/lib/perl/Apache/lonroles.html &amp;&amp; echo 'pod2html lonroles.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2258,7 +2311,8 @@ cross server filesystem browser
 <categoryname>doc</categoryname>
 <description>man page for lonindexer.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../interface/lonindexer.pm > ../../doc/man/Apache__lonindexer.3 && echo 'manifying lonindexer.pm'
+loncom/build/pod2man.sh ../interface/lonindexer.pm &gt; \
+../../doc/man/Apache__lonindexer.3 &amp;&amp; echo 'manifying lonindexer.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2266,12 +2320,15 @@ loncom/build/pod2man.sh ../interface/lon
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonindexer.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonindexer.html</target>
+<source>doc/lib/perl/Apache/lonindexer.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/lonindexer.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonindexer.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../interface/lonindexer.pm > ../../doc/api/Apache/lonindexer.html && echo 'pod2html lonindexer.pm'
+loncom/build/pod2html.sh ../interface/lonindexer.pm &gt; \
+../../doc/lib/perl/Apache/lonindexer.html &amp;&amp; \
+echo 'pod2html lonindexer.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2312,7 +2369,8 @@ symbols to and from more descriptive phr
 <categoryname>doc</categoryname>
 <description>man page for lonnet.pm</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh ../lonnet/perl/lonnet.pm > ../../doc/man/Apache__lonnet.3 && echo 'manifying lonnet.pm'
+loncom/build/pod2man.sh ../lonnet/perl/lonnet.pm &gt; \
+../../doc/man/Apache__lonnet.3 &amp;&amp; echo 'manifying lonnet.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2320,12 +2378,14 @@ loncom/build/pod2man.sh ../lonnet/perl/l
 </dependencies>
 </file>
 <file>
-<source>doc/api/Apache/lonnet.html</source>
-<target dist='default'>home/httpd/html/adm/help/api/Apache/lonnet.html</target>
+<source>doc/lib/perl/Apache/lonnet.html</source>
+<target dist='default'>home/httpd/html/adm/help/lib/perl/Apache/lonnet.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for lonnet.pm</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh ../lonnet/perl/lonnet.pm > ../../doc/api/Apache/lonnet.html && echo 'pod2html lonnet.pm'
+loncom/build/pod2html.sh ../lonnet/perl/lonnet.pm &gt; \
+../../doc/lib/perl/Apache/lonnet.html &amp;&amp; echo 'pod2html lonnet.pm'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -2563,6 +2623,8 @@ logos
 </description>
 <filenames>
 SMETE_white.gif;
+aboutlon.gif;
+accessbutton.gif;
 arrow_up.gif;
 cab.gif;
 cab_big.gif;
@@ -2575,6 +2637,10 @@ eps.gif;
 eps_big.gif;
 exam.gif;
 exam_big.gif;
+fillbottom.gif;
+fillleft.gif;
+fillright.gif;
+filltop.gif;
 folder_closed.gif;
 folder_opened.gif;
 folder_pointer_closed.gif;
@@ -2583,6 +2649,7 @@ form.gif;
 form_big.gif;
 gif.gif;
 gif_big.gif;
+header.gif;
 htm.gif;
 html.gif;
 html_big.gif;
@@ -2591,14 +2658,19 @@ jar_big.gif;
 jpg.gif;
 jpg_big.gif;
 latex.gif;
+lite.gif;
 liteani.gif;
+litetext.gif;
 lolpanel.gif;
 lonanim.gif;
 lonanimend.gif;
+loncapalogo.gif;
 lonhelplogos.gif;
 lonhelptop.gif;
 lonlogo.gif;
 lonlogos.gif;
+lowerleft.gif;
+lowerright.gif;
 meta.gif;
 meta_big.gif;
 mov.gif;
@@ -2636,8 +2708,11 @@ txt.gif;
 txt_big.gif;
 unknown.gif;
 unknown_big.gif;
+upperleft.gif;
+upperright.gif;
 user.gif;
 user_big.gif;
+userauthentication.gif;
 wav.gif;
 wav_big.gif;
 white_space_20_22.gif;
@@ -2672,6 +2747,7 @@ authorfeed.gif;
 bomb.gif;
 cat_button.gif;
 chat.gif;
+eval_button.gif;
 feedback.gif;
 pprm_button.gif;
 pgrd_button.gif;
@@ -2681,7 +2757,7 @@ subm_button.gif
 <file>
 <source>loncom/xml/tth.pm</source>
 <target dist='default'>usr/lib/perl5/site_perl/5.005/tth.pm</target>
-<target dist='redhat7.1'>usr/lib/perl5/site_perl/5.6.0/tth.pm</target>
+<target dist='redhat7 redhat7.1'>usr/lib/perl5/site_perl/5.6.0/tth.pm</target>
 <categoryname>system file</categoryname>
 <description>
 perl module for invoking functions specific to TeX-to-HTML conversion
@@ -2695,9 +2771,19 @@ and in this way is treated as though it
 <status>works/unverified</status>
 </file>
 <file>
+<source>loncom/xml/LCParser.pm</source>
+<target dist='default'>home/httpd/lib/perl/HTML/LCParser.pm</target>
+<categoryname>system file</categoryname>
+<description>
+perl module for parsing HTML in a way that really works and is thoroughly
+tested
+</description>
+<status>works/unverified</status>
+</file>
+<file>
 <source>modules/TexConvert/tthperl/tth.so</source>
 <target dist='default'>usr/lib/perl5/site_perl/5.005/tth.so</target>
-<target dist='redhat7.1'>usr/lib/perl5/site_perl/5.6.0/tth.so</target>
+<target dist='redhat7 redhat7.1'>usr/lib/perl5/site_perl/5.6.0/tth.so</target>
 <categoryname>system file</categoryname>
 <description>
 shared library file for dynamic loading and unloading
@@ -2720,7 +2806,7 @@ modules/TexConvert/tthperl/commands
 <file>
 <source>loncom/homework/caparesponse/capa.pm</source>
 <target dist='default'>usr/lib/perl5/site_perl/5.005/capa.pm</target>
-<target dist='redhat7.1'>usr/lib/perl5/site_perl/5.6.0/capa.pm</target>
+<target dist='redhat7 redhat7.1'>usr/lib/perl5/site_perl/5.6.0/capa.pm</target>
 <categoryname>system file</categoryname>
 <description>
 perl module for invoking functions specific to CAPA
@@ -2735,7 +2821,7 @@ the build process however.
 <file>
 <source>loncom/homework/caparesponse/capa.bs</source>
 <target dist='default'>usr/lib/perl5/site_perl/5.005/capa.bs</target>
-<target dist='redhat7.1'>usr/lib/perl5/site_perl/5.6.0/capa.bs</target>
+<target dist='redhat7 redhat7.1'>usr/lib/perl5/site_perl/5.6.0/capa.bs</target>
 <categoryname>system file</categoryname>
 <description>
 bootstrap file associated with dynamic loading of this module on multiple
@@ -2751,7 +2837,7 @@ the build process however.
 <file>
 <source>loncom/homework/caparesponse/capa.so</source>
 <target dist='default'>usr/lib/perl5/site_perl/5.005/capa.so</target>
-<target dist='redhat7.1'>usr/lib/perl5/site_perl/5.6.0/capa.so</target>
+<target dist='redhat7 redhat7.1'>usr/lib/perl5/site_perl/5.6.0/capa.so</target>
 <categoryname>system file</categoryname>
 <description>
 shared library file for dynamic loading and unloading
@@ -2761,7 +2847,26 @@ loncom/homework/caparesponse/commands
 </build>
 <dependencies>
 caparesponse.c;
-caparesponse.pm
+caparesponse.pm;
+README;
+Makefile.PL;
+capa.i;
+commands;
+../../../CAPA/pProj/capaGrammarDef.y;
+../../../CAPA/pProj/capaFormula.y;
+../../../CAPA/pProj/capaLexerDef.flex;
+../../../CAPA/pProj/capaFunction.c;
+../../../CAPA/pProj/capaParserUtils.c;
+../../../CAPA/pProj/capaMapExpr.c;
+../../../CAPA/pProj/capaUnit.c;
+../../../CAPA/pProj/com.c;
+../../../CAPA/pProj/linpack.c;
+../../../CAPA/pProj/ranlib.c;
+../../../CAPA/pProj/capaCgiUtils.c;
+../../../CAPA/pProj/capaSubjective.c;
+../../../CAPA/pProj/capaRQO.c;
+../../../CAPA/pProj/capaFormulaLexer.c;
+../../../CAPA/pProj/capaCommon.c
 </dependencies>
 </file>
 <fileglob>
@@ -2831,8 +2936,8 @@ javascript.
 </target>
 <categoryname>handler</categoryname>
 <description>
-Intended for providing perl functions for the <script></script> environment
-in a problem that was converted from lectureonline.
+Intended for providing perl functions for the &lt;script&gt;&lt;/script&gt;
+environment in a problem that was converted from lectureonline.
 </description>
 </file>
 <file>
@@ -2856,7 +2961,7 @@ Define unit prefixing and conversion for
 <fileglob>
 <glob>*.gif</glob>
 <sourcedir>loncom/html/res/adm/pages/</sourcedir>
-<targetdir>home/httpd/html/res/adm/pages/</targetdir>
+<targetdir dist='default'>home/httpd/html/res/adm/pages/</targetdir>
 <categoryname>graphic file</categoryname>
 <description>icons used for the entire LON-CAPA user interface</description>
 <filenames>
@@ -2969,7 +3074,8 @@ renders the HTML (including image maps)
 <fileglob>
 <glob>*.gif</glob>
 <sourcedir>loncom/html/res/adm/pages/indexericons/</sourcedir>
-<targetdir>home/httpd/html/res/adm/pages/indexericons/</targetdir>
+<targetdir dist='default'>home/httpd/html/res/adm/pages/indexericons/
+</targetdir>
 <categoryname>graphic file</categoryname>
 <description>
 icons used for the bookmark portion of the LON-CAPA user interface
@@ -3069,7 +3175,8 @@ world2.gif
 <fileglob>
 <glob>*.gif</glob>
 <sourcedir>loncom/html/res/adm/pages/bookmarkmenu/</sourcedir>
-<targetdir>home/httpd/html/res/adm/pages/bookmarkmenu/</targetdir>
+<targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu/
+</targetdir>
 <categoryname>graphic file</categoryname>
 <description>
 icons used for directory indexing and login screen
@@ -3103,7 +3210,8 @@ ur_corner.gif
 <fileglob>
 <glob>*.html</glob>
 <sourcedir>loncom/html/res/adm/pages/bookmarkmenu/</sourcedir>
-<targetdir>home/httpd/html/res/adm/pages/bookmarkmenu/</targetdir>
+<targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu/
+</targetdir>
 <categoryname>interface file</categoryname>
 <description>
 associated with the frameset scheme of displaying bookmarks
@@ -3138,7 +3246,8 @@ compare installed rpms with up-to-date d
 <categoryname>doc</categoryname>
 <description>man page for check-rpms</description>
 <build trigger='always run'>
-loncom/build/pod2man.sh check-rpms > ../../doc/man/check-rpms.1 && echo 'manifying check-rpms'
+loncom/build/pod2man.sh check-rpms &gt; ../../doc/man/check-rpms.1 &amp;&amp; \
+echo 'manifying check-rpms'
 </build>
 <status>beta</status>
 <dependencies>
@@ -3147,11 +3256,13 @@ loncom/build/pod2man.sh check-rpms > ../
 </file>
 <file>
 <source>doc/scripts/check-rpms.html</source>
-<target dist='default'>home/httpd/html/adm/help/scripts/check-rpms.html</target>
+<target dist='default'>home/httpd/html/adm/help/scripts/check-rpms.html
+</target>
 <categoryname>doc</categoryname>
 <description>POD-derived page for check-rpms</description>
 <build trigger='always run'>
-loncom/build/pod2html.sh check-rpms > ../../doc/scripts/check-rpms.html && echo 'pod2html checkrpms'
+loncom/build/pod2html.sh check-rpms &gt; ../../doc/scripts/check-rpms.html \
+&amp;&amp; echo 'pod2html checkrpms'
 </build>
 <status>works/unverified</status>
 <dependencies>
@@ -3213,7 +3324,7 @@ Controls the launching/halting of lonc,
 </description>
 </file>
 <link>
-<linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
+<linkto>etc/rc.d/init.d/loncontrol</linkto>
 <target dist='default'>
 etc/rc.d/rc0.d/K05loncontrol;
 etc/rc.d/rc1.d/K05loncontrol;