--- loncom/Attic/srm.conf	2001/03/30 01:59:04	1.10
+++ loncom/Attic/srm.conf	2001/07/05 13:30:53	1.21
@@ -309,19 +309,22 @@ SetHandler perl-script
 PerlHandler Apache::lonratsrv
 </LocationMatch>
 
-<LocationMatch "^/\~.*\/ratparms$">
+<Location /adm/ratparms>
+PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonratparms
-</LocationMatch>
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
 
 # --------------------------------------------- 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>
@@ -351,8 +354,24 @@ SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
+<LocationMatch "^/adm/wrapper/">
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonwrapper
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
 # -------------------------------------------------------------- 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
@@ -466,7 +485,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/\~.*/$">
-PerlAccessHandler       Apache::lonacc
+PerlAccessHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -475,6 +494,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 +514,36 @@ ErrorDocument     406 /adm/unauthorized.
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/cfile>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncfile
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized.html
+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 +589,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