Index: openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-default-master.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl	5 Jul 2002 08:13:46 -0000	1.17
+++ openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl	13 Jul 2002 19:36:22 -0000	1.18
@@ -166,7 +166,7 @@
     
     if {$have_portal_id_p && $show_navbar_p} {
         if {$link_control_panel} {
-            set extra_td_html " &nbsp; <a href=${link}preferences>Control Panel</a>"
+            set extra_td_html " &nbsp; <a href=${link}control-panel>Control Panel</a>"
         } else {
             set extra_td_html " &nbsp; Control Panel"
         }
Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/dotlrn-master.adp	13 Jul 2002 17:49:25 -0000	1.5
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp	13 Jul 2002 19:36:22 -0000	1.6
@@ -44,7 +44,7 @@
 
     <td width="40%" class="header-buttons" align="right">
       <a href="@dotlrn_url@"><img class="header-img" border="0" src="@dotlrn_graphics_url@/myspace-@color_hack_name@.gif" width="98" height="25" alt="MySloanSpace"></a>
-      <a href="@dotlrn_url@/preferences"><img class="header-img" border="0" src="@dotlrn_graphics_url@/help-@color_hack_name@.gif" width="67" height="25" alt="Help"></a>
+      <a href="@dotlrn_url@/control-panel"><img class="header-img" border="0" src="@dotlrn_graphics_url@/help-@color_hack_name@.gif" width="67" height="25" alt="Help"></a>
       <a href="/register/logout"><img class="header-img" border="0" src="@dotlrn_graphics_url@/logout-@color_hack_name@.gif" width="62" height="25" alt="Logout"></a>
     </td>
 
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	13 Jul 2002 18:30:07 -0000	1.5
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	13 Jul 2002 19:36:22 -0000	1.6
@@ -108,7 +108,7 @@
 if {!$no_navbar_p} {
     
     set community_id [dotlrn_community::get_community_id]
-    set control_panel_name preferences
+    set control_panel_name control-panel
 
     if {[empty_string_p $community_id]} {
         #
Fisheye: Tag 1.20 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/preferences.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.15 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/preferences.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/spam.tcl	11 Jul 2002 04:58:34 -0000	1.15
+++ openacs-4/packages/dotlrn/www/spam.tcl	13 Jul 2002 19:36:22 -0000	1.16
@@ -14,16 +14,14 @@
 #  details.
 #
 
-# dotlrn/www/spam.tcl
-
 ad_page_contract {
     @author yon (yon@openforce.net)
     @creation-date Jan 19, 2002
     @version $Id$
 } -query {
     {community_id ""}
     {rel_type "dotlrn_member_rel"}
-    {referer "preferences"}
+    {referer "control-panel"}
 } -properties {
     context_bar:onevalue
     portal_id:onevalue