--- loncom/loncapa_apache.conf	2019/02/06 22:19:37	1.215.2.22.2.2
+++ 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.2.2 2019/02/06 22:19:37 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)
@@ -270,19 +270,6 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/ext\.tool$">
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler        Apache::lonacc
-SetHandler              perl-script
-PerlHandler             Apache::londatecheck
-PerlHandler             Apache::lonipcheck
-PerlHandler             Apache::lonexttool
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/notinit.html
-ErrorDocument     500 /adm/errorhandler
-</LocationMatch>
-
 <LocationMatch "^/+priv/.*">
 AuthType LONCAPA
 Require valid-user
@@ -720,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
@@ -1441,16 +1438,7 @@ SetHandler perl-script
 PerlHandler Apache::spellcheck
 </LocationMatch>
 
-<LocationMatch "^/tiny/[\w.-]+/\w+$">
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lontiny
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument     500 /adm/errorhandler
-</LocationMatch>
+
 
 # ------------------------------------------------- Backdoor Adm Tests/Programs