--- loncom/loncapa_apache.conf	2002/07/05 16:12:31	1.7
+++ loncom/loncapa_apache.conf	2002/08/02 14:45:04	1.12
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.7 2002/07/05 16:12:31 bowersj2 Exp $
+## $Id: loncapa_apache.conf,v 1.12 2002/08/02 14:45:04 www Exp $
 ##
 ## 1/11/2002 - Scott Harrison
 ## 2/19/2002 - Scott Harrison
@@ -12,7 +12,7 @@
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
 #
-# ======================================================================== User
+# ================================================================ DocumentRoot
 
 DocumentRoot "/home/httpd/html"
 
@@ -37,11 +37,14 @@ ExtendedStatus On
 # ===================================================================== Aliases
 
 Alias /prtspool/ /home/httpd/prtspool/
+ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
 
 # ================================================================= Directories
 
 # ------------------------------------------------------------- Access Handlers
 
+PerlTransHandler	Apache::lontrans
+
 <LocationMatch "^/res.*">
 PerlAccessHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
@@ -51,6 +54,18 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/userfiles.*">
+PerlAccessHandler       Apache::lontokacc
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "/^uploaded.*">
+PerlAccessHandler	Apache::lonuploadedacc
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
 <LocationMatch "^/priv.*">
 PerlAccessHandler Apache::loncacc
 SetHandler        perl-script
@@ -121,7 +136,7 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/res/.*\.meta$>
+<LocationMatch "^/(res|\~).*\.meta$>
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
@@ -353,15 +368,6 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/chart>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonchart
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/dropadd>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -387,6 +393,30 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/coursedocs>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::londocs
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/announcements>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonannounce
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/chat>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonchat
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/evaluate>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -582,7 +612,7 @@ PerlSetVar       lonSqlAccess   localhos
 # -----------------------------------------------------------------------------
 
 
-# ================================================== Initiate mod_perl starting
+# ====================================== Include machine-specific configuration
 
 Include conf/loncapa.conf