Index: feedapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi.module,v
retrieving revision 1.23.2.119.2.17
diff -u -r1.23.2.119.2.17 feedapi.module
--- feedapi.module	5 Jun 2008 20:25:06 -0000	1.23.2.119.2.17
+++ feedapi.module	20 Jul 2008 19:30:24 -0000
@@ -30,9 +30,8 @@
         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,25 +48,27 @@
   $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(
-    'title' => 'Import OPML',
+  $items['admin/content/feed/import'] = array(
+    'title' => 'Import',
     'access arguments' => array('administer feedapi'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feedapi_import_feeds_form'),
+    'type' => MENU_LOCAL_TASK,
   );
-  $items['admin/content/feed/export_opml'] = array(
-    'title' => 'Export all feeds as OPML',
+  $items['admin/content/feed/export/opml'] = array(
+    'title' => 'Export OPML',
     'access arguments' => array('administer feedapi'),
     'page callback' => '_feedapi_export_opml',
+    'type' => MENU_CALLBACK,
   );
-  $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,
   );
   
   $items['node/%node/refresh'] = array(