- Patch #465398 by akahn: move aggregator settings to 'site configuration'. Yay.

2 files changed, 14 insertions, 15 deletions

diff --git a/modules/aggregator/aggregator.api.php b/modules/aggregator/aggregator.api.php
index 5903cf862..9d758aedf 100644
--- a/modules/aggregator/aggregator.api.php
+++ b/modules/aggregator/aggregator.api.php
@@ -21,7 +21,7 @@
  * data.
  *
  * Modules that define this hook can be set as active fetcher on
- * admin/content/aggregator/settings. Only one fetcher can be active at a time.
+ * admin/settings/aggregator. Only one fetcher can be active at a time.
  *
  * @param $feed
  *   The $feed object that describes the resource to be downloaded.
@@ -43,7 +43,7 @@ function hook_aggregator_fetch($feed) {
  * fetcher.
  *
  * The title and the description provided are shown on
- * admin/content/aggregator/settings among other places. Use as title the human
+ * admin/settings/aggregator among other places. Use as title the human
  * readable name of the fetcher and as description a brief (40 to 80 characters)
  * explanation of the fetcher's functionality.
  *
@@ -75,7 +75,7 @@ function hook_aggregator_fetch_info() {
  * data.
  *
  * Modules that define this hook can be set as active parser on
- * admin/content/aggregator/settings. Only one parser can be active at a time.
+ * admin/settings/aggregator. Only one parser can be active at a time.
  *
  * @param $feed
  *   The $feed object that describes the resource to be parsed.
@@ -108,10 +108,10 @@ function hook_aggregator_parse($feed) {
  * Implement this hook to expose the title and a short description of your
  * parser.
  *
- * The title and the description provided are shown on
- * admin/content/aggregator/settings among other places. Use as title the human
- * readable name of the parser and as description a brief (40 to 80 characters)
- * explanation of the parser's functionality.
+ * The title and the description provided are shown on admin/settings/aggregator
+ * among other places. Use as title the human readable name of the parser and 
+ * as description a brief (40 to 80 characters) explanation of the parser's 
+ * functionality.
  *
  * This hook is only called if your module implements hook_aggregator_parse().
  * If this hook is not implemented aggregator will use your module's file name
@@ -141,7 +141,7 @@ function hook_aggregator_parse_info() {
  * data.
  *
  * Modules that define this hook can be activated as processor on
- * admin/content/aggregator/settings.
+ * admin/settings/aggregator.
  *
  * @param $feed
  *   The $feed object that describes the resource to be processed. $feed->items
@@ -167,9 +167,9 @@ function hook_aggregator_process($feed) {
  * processor.
  *
  * The title and the description provided are shown most importantly on
- * admin/content/aggregator/settings . Use as title the natural name of the
- * processor and as description a brief (40 to 80 characters) explanation of
- * the functionality.
+ * admin/settings/aggregator. Use as title the natural name of the processor 
+ * and as description a brief (40 to 80 characters) explanation of the 
+ * functionality.
  *
  * This hook is only called if your module implements
  * hook_aggregator_process(). If this hook is not implemented aggregator
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index b3e2deec6..09c5f8a4e 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -122,12 +122,11 @@ function aggregator_menu() {
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
-  $items['admin/content/aggregator/settings'] = array(
-    'title' => 'Settings',
+  $items['admin/settings/aggregator'] = array(
+    'title' => 'Aggregator',
+    'description' => 'Configure the behavior of the feed aggregator, including when to discard feed items and how to present feed items and categories.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('aggregator_admin_form'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 10,
     'access arguments' => array('administer news feeds'),
   );
   $items['aggregator'] = array(