--- loncom/Attic/srm.conf	2001/05/21 20:26:04	1.15
+++ loncom/Attic/srm.conf	2001/06/09 14:46:42	1.18
@@ -473,8 +473,8 @@ ErrorDocument     406 /adm/unauthorized.
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<LocationMatch "^(/\~.*/|/adm/pubdir)$">
-PerlAccessHandler       Apache::lonacc
+<LocationMatch "^/\~.*/$">
+PerlAccessHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -483,6 +483,16 @@ ErrorDocument     406 /adm/unauthorized.
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<Location /adm/pubdir>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpubdir
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/retrieve>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -558,14 +568,6 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/mydesk>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonmydesk
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/printout>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script