--- loncom/loncapa_apache.conf	2020/09/15 13:43:31	1.215.2.22.6.1
+++ loncom/loncapa_apache.conf	2019/07/28 15:26:07	1.215.2.23
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.215.2.22.6.1 2020/09/15 13:43:31 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.215.2.23 2019/07/28 15:26:07 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -131,7 +131,6 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/+userfiles.*">
-Options +FollowSymLinks -Includes
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
 PerlCleanupHandler	Apache::lonacc::cleanup
@@ -150,10 +149,6 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/+uploaded/.+/.+/(portfolio|feedback|docs|groups|supplemental)/.+">
-    Options +FollowSymLinks -Includes
-</LocationMatch>
-
 <LocationMatch "^/+editupload.*">
 AuthType LONCAPA
 Require valid-user
@@ -712,6 +707,16 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/annotation>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::admannotations
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/spellcheck>
 AuthType LONCAPA
 Require valid-user