Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.17
diff -u -p -r1.17 filter.admin.inc
--- modules/filter/filter.admin.inc	15 Nov 2008 08:23:07 -0000	1.17
+++ modules/filter/filter.admin.inc	3 Dec 2008 14:35:57 -0000
@@ -159,11 +159,13 @@ function filter_admin_format_form(&$form
 
     // Composition tips (guidelines)
     $tips = _filter_tips($format->format, FALSE);
-    $extra = '<p>' . l(t('More information about formatting options'), 'filter/tips') . '</p>';
-    $tiplist = theme('filter_tips', $tips, FALSE, $extra);
+    $tiplist = theme('filter_tips', $tips, FALSE);
     if (!$tiplist) {
       $tiplist = '<p>' . t('No guidelines available.') . '</p>';
     }
+    else {
+      $tiplist .= theme('filter_tips_more_info');
+    }
     $group = '<p>' . t('These are the guidelines that users will see for posting in this input format. They are automatically generated from the filter settings.') . '</p>';
     $group .= $tiplist;
     $form['tips'] = array('#markup' => '<h2>' . t('Formatting guidelines') . '</h2>' . $group);
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.234
diff -u -p -r1.234 filter.module
--- modules/filter/filter.module	15 Nov 2008 11:45:03 -0000	1.234
+++ modules/filter/filter.module	3 Dec 2008 14:31:46 -0000
@@ -54,7 +54,7 @@ function filter_theme() {
       'file' => 'filter.admin.inc',
     ),
     'filter_tips' => array(
-      'arguments' => array('tips' => NULL, 'long' => FALSE, 'extra' => ''),
+      'arguments' => array('tips' => NULL, 'long' => FALSE),
       'file' => 'filter.pages.inc',
     ),
     'filter_tips_more_info' => array(
@@ -516,7 +516,7 @@ function filter_form($value = FILTER_FOR
     $tips = _filter_tips(variable_get('filter_default_format', 1), FALSE);
     $form['format']['guidelines'] = array(
       '#title' => t('Formatting guidelines'),
-      '#markup' => theme('filter_tips', $tips, FALSE, $extra),
+      '#markup' => theme('filter_tips', $tips, FALSE),
     );
   }
   $form[] = array('#markup' => $extra);
Index: modules/filter/filter.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.pages.inc,v
retrieving revision 1.3
diff -u -p -r1.3 filter.pages.inc
--- modules/filter/filter.pages.inc	14 Apr 2008 17:48:37 -0000	1.3
+++ modules/filter/filter.pages.inc	3 Dec 2008 16:05:08 -0000
@@ -23,16 +23,37 @@ function filter_tips_long() {
 
 
 /**
- * Format a set of filter tips.
+ * Render HTML for a set of filter tips.
  *
+ * @param $tips
+ *   An array containing descriptions and a CSS id in the form of
+ *   'module-name/filter-id' (only used when $long is TRUE) for each input
+ *   filter in one or more input formats. Example:
+ *   @code
+ *     array(
+ *       'Full HTML' => array(
+ *         0 => array(
+ *           'tip' => 'Web page addresses and e-mail addresses turn into links automatically.',
+ *           'id' => 'filter/2',
+ *         ),
+ *       ),
+ *     );
+ *   @endcode
+ * @param $long
+ *   (optional) Whether the passed in filter tips contain extended explanations,
+ *   i.e. intented to be output on the path 'filter/tips' (TRUE), or are in a
+ *   short format, i.e. suitable to be displayed below a form element.  Defaults
+ *   to FALSE.
+ *
+ * @see _filter_tips()
  * @ingroup themeable
  */
-function theme_filter_tips($tips, $long = FALSE, $extra = '') {
+function theme_filter_tips($tips, $long = FALSE) {
   $output = '';
 
   $multiple = count($tips) > 1;
   if ($multiple) {
-    $output = t('input formats') . ':';
+    $output = t('Input formats') . ':';
   }
 
   if (count($tips)) {