Index: uc_store/uc_store.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/uc_store.admin.inc,v
retrieving revision 1.44
diff -u -p -r1.44 uc_store.admin.inc
--- uc_store/uc_store.admin.inc	18 Feb 2011 01:26:39 -0000	1.44
+++ uc_store/uc_store.admin.inc	18 Feb 2011 03:27:23 -0000
@@ -376,39 +376,6 @@ function uc_store_configuration_page() {
 }
 
 /**
- * Displays store help page.
- */
-function uc_store_ubercart_help() {
-  $build = array();
-  $build['description'] = array(
-    '#markup' => '<p>' . t('Use the following links to find documentation and support:') . '</p>',
-  );
-
-  $items = array();
-  $items[] = l(t("Ubercart User's Guide"), 'http://www.ubercart.org/docs/user');
-  $items[] = l(t('Support Forums'), 'http://www.ubercart.org/forum');
-  $items[] = l(t('Drupal Handbook'), 'http://drupal.org/node/258');
-  $build['links'] = array(
-    '#theme' => 'item_list',
-    '#items' => $items,
-  );
-
-  return $build;
-}
-
-/**
- * Displays the tokens help page.
- */
-function uc_store_ubercart_help_tokens() {
-  $build = array();
-  $build['description'] = array(
-    '#markup' => '<p>' . t('Tokens are bracketed phrases you can use in certain text fields and boxes as placeholders for some other text. Tokens represent things like store variables, links to certain pages, order information, etc.  Tokens are used by including the token listed below in a text field that uses them.  The description for the textfields will alert you to which groups of tokens listed below may be used.') . '</p>',
-  );
-
-  return $build;
-}
-
-/**
  * Imports settings from a country file.
  *
  * @see uc_country_import_form_submit()
Index: uc_store/uc_store.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/uc_store.module,v
retrieving revision 1.77
diff -u -p -r1.77 uc_store.module
--- uc_store/uc_store.module	18 Feb 2011 01:26:39 -0000	1.77
+++ uc_store/uc_store.module	18 Feb 2011 03:27:24 -0000
@@ -131,21 +131,6 @@ function uc_store_menu() {
     'weight' => 6,
     'file' => 'uc_store.admin.inc',
   );
-  $items['admin/store/help'] = array(
-    'title' => 'Help',
-    'description' => 'Links to get help!',
-    'page callback' => 'uc_store_ubercart_help',
-    'access arguments' => array('administer store'),
-    'weight' => 10,
-    'file' => 'uc_store.admin.inc',
-  );
-  $items['admin/store/help/tokens'] = array(
-    'title' => 'Using tokens',
-    'description' => 'Understand what tokens are and how to use them.',
-    'page callback' => 'uc_store_ubercart_help_tokens',
-    'access arguments' => array('administer store'),
-    'file' => 'uc_store.admin.inc',
-  );
   $items['admin/store/settings/countries'] = array(
     'title' => 'Country settings',
     'description' => 'Configure countries and address formats.',
@@ -368,6 +353,15 @@ function uc_store_theme() {
  */
 function uc_store_help($path, $arg) {
   switch ($path) {
+    case 'admin/help#uc_store':
+      $output = '<h3>' . t('Ubercart') . '</h3>';
+      $output .= '<p>' . t('Use the following links to find documentation and support:') . '</p>';
+      $output .= '<ul>';
+      $output .= '<li>' . l(t("Ubercart User's Guide"), 'http://www.ubercart.org/docs/user') . '</li>';
+      $output .= '<li>' . l(t('Support Forums'), 'http://www.ubercart.org/forum') . '</li>';
+      $output .= '</ul>';
+      return $output;
+
     case 'admin/store/customers':
       return t('This table lists out all users on your site who have placed orders.');
     case 'admin/store/customers/search':