Index: feedapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi.module,v
retrieving revision 1.23.2.119.2.12
diff -u -r1.23.2.119.2.12 feedapi.module
--- feedapi.module	29 Apr 2008 17:11:39 -0000	1.23.2.119.2.12
+++ feedapi.module	7 May 2008 17:05:14 -0000
@@ -30,7 +30,7 @@
         the content type edit form. Then choose the processors and parsers that you would like to use.
         At least one parser and one processor must be enabled.
       ');
-    case 'admin/settings/feedapi':
+    case 'admin/content/feed/settings':
       return t("You can find more configuration options on the content type edit form of !admin-link.", array('!admin-link' => l(t('FeedAPI-enabled content-types'), 'admin/content/types')));
       
   }
@@ -49,7 +49,6 @@
   $items['admin/content/feed/list'] = array(
     'title' => 'List',
     'type' => MENU_DEFAULT_LOCAL_TASK,
-    'access arguments' => array('administer feedapi'),
     'weight' => -15,
   );
   $items['admin/content/feed/import_opml'] = array(
@@ -63,11 +62,13 @@
     'access arguments' => array('administer feedapi'),
     'page callback' => '_feedapi_export_opml',
   );
-  $items['admin/settings/feedapi'] = array(
-    'title' => 'FeedAPI settings',
+  $items['admin/content/feed/settings'] = array(
+    'title' => 'Settings',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feedapi_admin_settings'),
     'access arguments' => array('administer feedapi'),
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 10,
   );
   
   $items['node/%node/refresh'] = array(
@@ -790,33 +791,41 @@
 }
 
 /**
- * Settings: allowed HTML tags, number of feeds refreshed in one round
+ * Form builder; configure the FeedAPI system.
+ *
+ * @ingroup forms
+ * @see system_settings_form()
  */
 function feedapi_admin_settings() {
   $form['feedapi_allowed_html_tags'] = array(
-    '#type' => 'textfield', '#title' => t('Allowed HTML tags'), '#size' => 80, '#maxlength' => 255,
+    '#type' => 'textfield',
+    '#title' => t('Allowed HTML tags'),
+    '#maxlength' => 255,
     '#default_value' => variable_get('feedapi_allowed_html_tags', '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>'),
-    '#description' => t('The list of tags which are allowed in feeds, i.e., which will not be removed by Drupal.')
+    '#description' => t('A space-separated list of HTML tags allowed in the content of feeds and feed items. (Tags in this list are not removed by FeedAPI.)'),
   );
   $form['feedapi_allow_html_all'] = array(
-    '#type' => 'checkbox', '#title' => t('Allow all HTML tags'),
+    '#type' => 'checkbox',
+    '#title' => t('Allow all HTML tags'),
     '#default_value' => variable_get('feedapi_allow_html_all', FALSE),
-    '#description' => t('In this case the module does\'t filter any HTML elements from the incoming fields. This checkbox overrides the above list of allowed tags.')
+    '#description' => t("In this case the module does't filter any HTML elements from the incoming fields. This checkbox overrides the above list of allowed tags."),
   );
+  
   if (variable_get('feedapi_allow_html_all', FALSE)) {
     $form['feedapi_allowed_html_tags']['#disabled'] = TRUE;
   }
-  // Drupal will try to overwrite this value at cron time
+  
+  // Drupal will try to overwrite this value at cron time.
   $max_exec = !ini_get('safe_mode') ? 240 : ini_get('max_execution_time');
   $form['feedapi_cron_percentage'] = array(
     '#type' => 'select', 
     '#title' => t('Cron time for FeedAPI [%]'),
     '#options' => drupal_map_assoc(array(15, 25, 50, 75)),
     '#default_value' => variable_get('feedapi_cron_percentage', 15),
-    '#description' => t('Percentage of maximal PHP execution time (currently !exec seconds).
-                         At current settings, the FeedAPI cron process can run for up to !now seconds.',
-                         array("!exec" => $max_exec, "!now" => (variable_get('feedapi_cron_percentage', 15) / 100) * $max_exec)),
+    '#description' => t('Percentage of maximal PHP execution time (currently !exec seconds). At current settings, the FeedAPI cron process can run for up to !now seconds.',
+      array('!exec' => $max_exec, '!now' => (variable_get('feedapi_cron_percentage', 15) / 100) * $max_exec)),
   );
+  
   return system_settings_form($form);
 }