Index: openacs-4/packages/dotlrn/www/control-panel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v
diff -u -r1.13.6.1 -r1.13.6.2
--- openacs-4/packages/dotlrn/www/control-panel.adp	2 Aug 2004 10:14:04 -0000	1.13.6.1
+++ openacs-4/packages/dotlrn/www/control-panel.adp	2 Aug 2004 10:36:32 -0000	1.13.6.2
@@ -39,7 +39,7 @@
 	<tr><td>
 <h3>#dotlrn.General_Site_Help#</h3> 
 <ul>
-  <li><a href="/global/HELP/indice.htm">#dotlrn.help#</a></li>
+  <li><a href="@dotlrn_url@/help">#dotlrn.help#</a></li>
   <li>#dotlrn.Ask_a_question# <a href="mailto:@system_owner@">@system_owner@</a>
 </ul>
 <h3>#dotlrn.Personal_Options#</h3>
Index: openacs-4/packages/dotlrn/www/admin/departments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v
diff -u -r1.19.6.1 -r1.19.6.2
--- openacs-4/packages/dotlrn/www/admin/departments.adp	2 Aug 2004 10:14:04 -0000	1.19.6.1
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	2 Aug 2004 10:40:44 -0000	1.19.6.2
@@ -55,7 +55,7 @@
         </else>
         
         <td align="left">
-          <a href="department?department_key=@departments.department_key@">@departments.description@ (@departments.pretty_name@)</a>
+          <a href="department?department_key=@departments.department_key@">@departments.pretty_name@</a>
         </td>
         
         <td align="center" style="white-space: nowrap; font-size: x-small;">
Index: openacs-4/packages/dotlrn/www/admin/departments.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.xql,v
diff -u -r1.6.10.1 -r1.6.10.2
--- openacs-4/packages/dotlrn/www/admin/departments.xql	2 Aug 2004 10:14:04 -0000	1.6.10.1
+++ openacs-4/packages/dotlrn/www/admin/departments.xql	2 Aug 2004 10:42:37 -0000	1.6.10.2
@@ -6,7 +6,6 @@
         <querytext>
             select department_key,
                    pretty_name,
-                   description,
                    (select count(*)
                     from dotlrn_classes
                     where department_key = dotlrn_departments_full.department_key) as n_classes
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -r1.22.6.1 -r1.22.6.2
--- openacs-4/packages/dotlrn/www/admin/term.adp	2 Aug 2004 10:14:04 -0000	1.22.6.1
+++ openacs-4/packages/dotlrn/www/admin/term.adp	2 Aug 2004 10:44:33 -0000	1.22.6.2
@@ -102,7 +102,7 @@
 <if @term_id@ eq -1>
       <td align="left">@classes.term_name@ @classes.term_year@</td>
 </if>
-      <td align="left"><a href="@classes.url@">@classes.description@</a></td>
+      <td align="left"><a href="@classes.url@">@classes.pretty_name@</a></td>
       <td align="center">@classes.n_members@</td>
       <td align="center">
         <nobr>