--- loncom/Attic/srm.conf	2001/03/31 01:42:52	1.11
+++ loncom/Attic/srm.conf	2001/06/09 14:46:42	1.18
@@ -316,12 +316,12 @@ PerlHandler Apache::lonratparms
 
 # --------------------------------------------- Resource Space Content Handlers
 
-<LocationMatch "^/res/.*/$">
+<LocationMatch "^/res.*/$">
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 </LocationMatch>
 
-<LocationMatch "^/res/.*\.tex$">
+<LocationMatch "^/(res|\~).*\.tex$">
 SetHandler perl-script
 PerlHandler Apache::lontex
 </LocationMatch>
@@ -353,6 +353,14 @@ PerlHandler Apache::lonhomework
 
 # -------------------------------------------------------------- Admin Programs
 
+<Location /adm/statistics>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonstatistics
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/roles>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -465,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
@@ -475,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
@@ -485,6 +503,26 @@ ErrorDocument     406 /adm/unauthorized.
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/diff>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::londiff
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/upload>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonupload
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/assesscalc>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -530,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