Index: modules/shortcut/shortcut.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.module,v
retrieving revision 1.6
diff -u -r1.6 shortcut.module
--- modules/shortcut/shortcut.module	19 Nov 2009 03:57:15 -0000	1.6
+++ modules/shortcut/shortcut.module	30 Nov 2009 22:05:41 -0000
@@ -15,6 +15,26 @@
 define('SHORTCUT_DEFAULT_SET_NAME', 'shortcut-set-1');
 
 /**
+ * Implement hook_help().
+ */
+function shortcut_help($path, $arg) {
+  switch ($path) {
+    case 'admin/help#shortcut':
+      $output = '<h3>' . t('About') . '</h3>';
+      $output = '<p>' . t('The Shortcut module allows users to create sets of <em>shortcut</em> links to commonly-visited pages of your site. Shortcuts are contained within <em>sets</em>, and each user with "switch shortcut sets" permissions can select their preferred set of shortcuts.') . '</p>';
+      $output .= '<h3>' . t('Uses') . '</h3>';
+      $output .= '<dl><dt>' . t('Creating and modifying shortcuts and sets') . '</dt>';
+      $output .= '<dd>' . t('Manage your shortcut sets, choose your preferred shortcut set, and edit the shortcuts within sets from the <a href="@shortcuts">Shortcuts administration page</a>.', array( '@shortcuts' => url('admin/config/system/shortcut'))) . '</dd>';
+      $output .= '<dt>' . t('Adding and removing shortcuts') . '</dt>';
+      $output .= '<dd>' . t('The Shortcut module creates an add/remove link for each page on your site; the link lets you add or remove the current page from the currently-enabled set of shortcuts, if your theme displays it. The core Seven theme (enabled by default as the theme for administration pages) displays this link next to the page title, as a small + or - sign. If you click on the + sign, you will add that page to your preferred set of shortcuts. If the page is already part of your shortcut set, the link will be a - sign, and will allow you to remove the current page from your shortcut set. The other core Drupal themes do not display the shortcut link, since shortcuts are primarily for administration pages.') . '</dd>';
+      $output .= '<dt>' . t('Displaying shortcuts') . '</dt>';
+      $output .= '<dd>' . t('You can display your shortcuts by enabling the Shortcuts block on the <a href="@blocks">Blocks administration page</a>. If you have the <a href="@toolbar-help">Toolbar module</a> enabled, your shortcuts will also be displayed within the toolbar section of your page, along with an <em>edit shortcuts</em> link, which will let you edit your preferred set of shortcuts.', array('@blocks' => url('admin/structure/block'), '@toolbar-help' => url('admin/help/toolbar'))) . '</dd>';
+      $output .= '</dl>';
+      return $output;
+  }
+}
+  
+/**
  * Implement hook_permission().
  */
 function shortcut_permission() {
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.22
diff -u -r1.22 toolbar.module
--- modules/toolbar/toolbar.module	19 Nov 2009 03:57:15 -0000	1.22
+++ modules/toolbar/toolbar.module	30 Nov 2009 22:05:41 -0000
@@ -7,6 +7,19 @@
  */
 
 /**
+ * Implements hook_help().
+ */
+function toolbar_help($path, $arg) {
+  switch ($path) {
+    case 'admin/help#toolbar':
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('The Toolbar module provides links to top-level administration menu items and displays the configured <a href="@shortcuts-help">shortcuts</a> at the top of the screen for any user with proper permissions.', array('@shortcuts-help' => url('admin/help/shortcut'))) . '</p>';
+      return $output;
+  }
+}
+
+/**
  * Implementation of hook_permission().
  */
 function toolbar_permission() {
Index: modules/toolbar/toolbar.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.info,v
retrieving revision 1.3
diff -u -r1.3 toolbar.info
--- modules/toolbar/toolbar.info	17 Oct 2009 00:51:53 -0000	1.3
+++ modules/toolbar/toolbar.info	30 Nov 2009 22:05:41 -0000
@@ -1,6 +1,6 @@
 ; $Id: toolbar.info,v 1.3 2009/10/17 00:51:53 dries Exp $
 name = Toolbar
-description = Toolbar exposing the top level administration menu items.
+description = Provides a toolbar that shows the top-level administration menu items and configured shortcuts.
 core = 7.x
 package = Core
 version = VERSION