--- loncom/loncapa_apache.conf	2004/12/10 14:57:47	1.101
+++ loncom/loncapa_apache.conf	2005/03/15 22:17:20	1.106
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.101 2004/12/10 14:57:47 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.106 2005/03/15 22:17:20 albertel Exp $
 ##
 
 #
@@ -69,13 +69,6 @@ SetHandler perl-script
 PerlHandler Apache::portfolio
 </Location>
 
-<LocationMatch "\.portfolio$">
-SetHandler perl-script
-PerlHandler Apache::portfolio
-</LocationMatch>
-
-
-
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
@@ -90,6 +83,13 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+editupload.*">
+PerlAccessHandler	Apache::lonacc
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
 <LocationMatch "^/+uploaded/.*/.*/internal/.*">
 PerlAccessHandler	Apache::lonuploadedacc
 </LocationMatch>
@@ -244,7 +244,7 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$">
+<LocationMatch "^/+(res|\~|public|uploaded|editupload|adm).*\.meta$">
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 ErrorDocument     413 /adm/overloaded.txt
@@ -536,16 +536,6 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/pubmenu>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonpubmenu
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <Location /adm/unauthorized>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -754,15 +744,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/assignments>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonassignments
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/communicate>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -979,8 +960,8 @@ PerlSetVar       lonSockDir   /home/http
 PerlSetVar       lonDocRoot   /home/httpd/html
 PerlSetVar       lonPrtDir    /home/httpd/prtspool
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
-PerlSetVar       lonBrowsDet  explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&netscape:netscape:msie:netscape\/(\d+\.\d+):9999:7&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1&safari:safari:msie:safari\/(\d+\.\d+):9999:9999
-PerlSetVar       lonTextBrowsers opera:windows\s+ce:lynx
+PerlSetVar       lonBrowsDet  explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&netscape:netscape:msie:netscape\/(\d+\.\d+):9999:7&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1&safari:safari:msie:safari\/([\d\.]+):9999:84
+PerlSetVar       lonTextBrowsers windows\s+ce:lynx
 PerlSetVar       lonScansDir  /home/httpd/scantron
 PerlSetVar       lonScriptTimeout 10
 PerlSetVar	 BugzillaHost	http://bugs.lon-capa.org/