--- loncom/loncapa_apache.conf	2011/05/26 14:25:39	1.192.2.4
+++ loncom/loncapa_apache.conf	2010/08/31 15:07:16	1.199
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.192.2.4 2011/05/26 14:25:39 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.199 2010/08/31 15:07:16 raeburn Exp $
 ##
 
 #
@@ -511,16 +511,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/remote>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonremote
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/pickauthor>
 AuthType LONCAPA
 Require valid-user
@@ -648,16 +638,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/bookmarks>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::admbookmarks
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/flip>
 AuthType LONCAPA
 Require valid-user
@@ -1236,6 +1216,17 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/wishlist>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonwishlist
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/blockingstatus>
 PerlAccessHandler      Apache::publiccheck
 AuthType LONCAPA
@@ -1548,9 +1539,6 @@ PerlSetVar SSLEmail     certificate@lon-
 #-------------------------------------------------------------------------
 
 
-# ====================================== Include support for SSL rewrites
-
-Include conf/loncapa_rewrite.conf
 
 
 # ====================================== Include machine-specific configuration