Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.230
diff -u -F^f -r1.230 theme.inc
--- includes/theme.inc	24 Apr 2005 16:22:30 -0000	1.230
+++ includes/theme.inc	30 Apr 2005 09:57:29 -0000
@@ -26,20 +26,6 @@
  */
 
 /**
- * Hook Help - returns theme specific help and information.
- *
- * @param section defines the @a section of the help to be returned.
- *
- * @return a string containing the help output.
- */
-function theme_help($section) {
-  switch ($section) {
-    case 'admin/themes#description':
-      return t('The base theme');
-  }
-}
-
-/**
  * Initialize the theme system by loading the theme.
  *
  * @return
@@ -395,11 +381,9 @@ function theme_page($content) {
    $output .= $tabs;
   }
 
-  if ($help = menu_get_active_help()) {
-    $output .= '<small>'. $help .'</small><hr />';
-  }
+  $output .= theme('help');
 
-  $output .= theme_status_messages();
+  $output .= theme('status_messages');
 
   $output .= "\n<!-- begin content -->\n";
   $output .= $content;
@@ -489,6 +473,17 @@ function theme_breadcrumb($breadcrumb) {
 }
 
 /**
+ * Return a themed help message.
+ *
+ * @return a string containing the helptext for the current page.
+ */
+function theme_help() {
+  if ($help = menu_get_active_help()) {
+    return '<div class="help">'. $help .'</div>';
+  }
+}
+
+/**
  * Return a themed node.
  *
  * @param $node
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.25
diff -u -F^f -r1.25 chameleon.theme
--- themes/chameleon/chameleon.theme	31 Mar 2005 09:25:33 -0000	1.25
+++ themes/chameleon/chameleon.theme	30 Apr 2005 09:57:29 -0000
@@ -74,11 +74,9 @@ function chameleon_page($content) {
     $output .= $tabs;
   }
 
-  if ($help = menu_get_active_help()) {
-    $output .= "<div id=\"help\">$help</div><hr />";
-  }
+  $output .= theme('help');
 
-  $output .= theme_status_messages();
+  $output .= theme('status_messages');
 
   $output .= "\n<!-- begin content -->\n";
   $output .= $content;
@@ -140,7 +138,6 @@ function chameleon_node($node, $main = 0
 }
 
 function chameleon_comment($comment, $link = "") {
-
   $submitted = array(t('By %author at %date', array('%author' => format_name($comment), '%date' => format_date($comment->timestamp. 'small'))));
   $links = array($link);
 
@@ -152,4 +149,11 @@ function chameleon_comment($comment, $li
 
   return $output;
 }
+
+function chameleon_help() {
+  if ($help = menu_get_active_help()) {
+    return '<div class="help">'. $help .'</div><hr />';
+  }
+}
+
 ?>
Index: themes/engines/xtemplate/xtemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/xtemplate/xtemplate.engine,v
retrieving revision 1.12
diff -u -F^f -r1.12 xtemplate.engine
--- themes/engines/xtemplate/xtemplate.engine	31 Mar 2005 09:25:33 -0000	1.12
+++ themes/engines/xtemplate/xtemplate.engine	30 Apr 2005 09:57:29 -0000
@@ -150,12 +150,12 @@ function xtemplate_page($content) {
     $xtemplate->template->parse("header.title");
   }
 
-  if ($help = menu_get_active_help()) {
+  if ($help = theme('help')) {
     $xtemplate->template->assign("help", $help);
     $xtemplate->template->parse("header.help");
   }
 
-  if ($message = theme_status_messages()) {
+  if ($message = theme('status_messages')) {
     $xtemplate->template->assign("message", $message);
     $xtemplate->template->parse("header.message");
   }
Index: themes/bluemarine/xtemplate.xtmpl
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/xtemplate.xtmpl,v
retrieving revision 1.6
diff -u -F^f -r1.6 xtemplate.xtmpl
--- themes/bluemarine/xtemplate.xtmpl	14 Nov 2004 19:34:09 -0000	1.6
+++ themes/bluemarine/xtemplate.xtmpl	30 Apr 2005 09:57:29 -0000
@@ -62,9 +62,9 @@
         <div class="tabs">{tabs}</div>
         <!-- END: tabs -->
         <!-- END: title -->
-        <!-- BEGIN: help -->
-        <div id="help">{help}</div>
-        <!-- END: help -->
+        <!-- BEGIN: help -->
+        {help}
+        <!-- END: help -->
         <!-- BEGIN: message -->
         {message}
         <!-- END: message -->
Index: themes/pushbutton/xtemplate.xtmpl
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/xtemplate.xtmpl,v
retrieving revision 1.5
diff -u -F^f -r1.5 xtemplate.xtmpl
--- themes/pushbutton/xtemplate.xtmpl	31 Oct 2004 03:03:27 -0000	1.5
+++ themes/pushbutton/xtemplate.xtmpl	30 Apr 2005 09:57:29 -0000
@@ -79,8 +79,8 @@
         <!-- END: tabs -->
 
         <!-- END: title -->
-          <!-- BEGIN: help -->
-        <div id="help">{help}</div>
+        <!-- BEGIN: help -->
+        {help}
         <!-- END: help -->
         <!-- BEGIN: message -->
         {message}