- Patch #550228 by Bojhan: added 'Media' category on 'Configuration and modules' page.

10 files changed, 71 insertions, 62 deletions

diff --git a/includes/image.inc b/includes/image.inc
index e425d1251..e7734463d 100644
--- a/includes/image.inc
+++ b/includes/image.inc
@@ -24,7 +24,7 @@
  * Image toolkits are discovered based on the associated module's
  * hook_image_toolkits. Additionally the image toolkit include file
  * must be identified in the files array in the module.info file. The
- * toolkit must then be enabled using the admin/settings/image-toolkit
+ * toolkit must then be enabled using the admin/config/media/image-toolkit
  * form.
  *
  * Only one toolkit may be selected at a time. If a module author wishes to call
diff --git a/modules/color/color.module b/modules/color/color.module
index 3f278a39c..691025289 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -7,7 +7,7 @@
 function color_help($path, $arg) {
   switch ($path) {
     case 'admin/help#color':
-      $output = '<p>' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements.', array('@url' => url('admin/settings/file-system'))) . '</p>';
+      $output = '<p>' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements.', array('@url' => url('admin/config/media/file-system'))) . '</p>';
       $output .= '<p>' . t("It is important to remember that color module saves a modified copy of the theme's specified stylesheets in the files directory. This means that if you make any manual changes to your theme's stylesheet, you must save your color settings again, even if they haven't changed. This causes the color module generated version of the stylesheets in the files directory to be recreated using the new version of the original file.") . '</p>';
       $output .= '<p>' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the <a href="@themes">themes administration page</a>.', array('@themes' => url('admin/appearance'))) . '</p>';
       $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@color">Color module</a>.', array('@color' => 'http://drupal.org/handbook/modules/color/')) . '</p>';
diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc
index 1702997f7..79279fcb2 100644
--- a/modules/image/image.admin.inc
+++ b/modules/image/image.admin.inc
@@ -75,10 +75,10 @@ function image_style_form(&$form_state, $style) {
       '#default_value' => $effect['weight'],
     );
     $form['effects'][$ieid]['configure'] = array(
-      '#markup' => isset($effect['form callback']) ? l(t('configure'), 'admin/settings/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] ) : '',
+      '#markup' => isset($effect['form callback']) ? l(t('configure'), 'admin/config/media/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] ) : '',
     );
     $form['effects'][$ieid]['remove'] = array(
-      '#markup' => l(t('delete'), 'admin/settings/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] . '/delete'),
+      '#markup' => l(t('delete'), 'admin/config/media/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] . '/delete'),
     );
   }
 
@@ -140,7 +140,7 @@ function image_style_form_add_submit($form, &$form_state) {
 
   // Load the configuration form for this option.
   if (isset($effect['form callback'])) {
-    $path = 'admin/settings/image-styles/edit/' . $form_state['image_style']['name'] . '/add/' . $form_state['values']['new'];
+    $path = 'admin/config/media/image-styles/edit/' . $form_state['image_style']['name'] . '/add/' . $form_state['values']['new'];
     $form_state['redirect'] = array($path, array('weight' => $form_state['values']['weight']));
   }
   // If there's no form, immediately add the image effect.
@@ -177,7 +177,7 @@ function image_style_form_submit($form, &$form_state) {
   if ($form_state['values']['op'] == t('Update style')) {
     drupal_set_message('Changes to the style have been saved.');
   }
-  $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name'];
+  $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name'];
 }
 
 /**
@@ -215,7 +215,7 @@ function image_style_add_form_submit($form, &$form_state) {
   $style = array('name' => $form_state['values']['name']);
   $style = image_style_save($style);
   drupal_set_message(t('Style %name was created.', array('%name' => $style['name'])));
-  $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name'];
+  $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name'];
 }
 
 /**
@@ -258,7 +258,7 @@ function image_style_delete_form($form_state, $style) {
   return confirm_form(
     $form,
     t('Optionally select a style before deleting %style', array('%style' => $style['name'])),
-    'admin/settings/image-styles',
+    'admin/config/media/image-styles',
     t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted.'),
     t('Delete'),  t('Cancel')
   );
@@ -272,7 +272,7 @@ function image_style_delete_form_submit($form, &$form_state) {
 
   image_style_delete($style, $form_state['values']['replacement']);
   drupal_set_message(t('Style %name was deleted.', array('%name' => $style['name'])));
-  $form_state['redirect'] = 'admin/settings/image-styles';
+  $form_state['redirect'] = 'admin/config/media/image-styles';
 }
 
 /**
@@ -314,7 +314,7 @@ function image_effect_form(&$form_state, $style, $effect) {
 
   // If no configuration for this image effect, return to the image style page.
   if (!isset($effect['form callback'])) {
-    drupal_goto('admin/settings/image-styles/edit/' . $style['name']);
+    drupal_goto('admin/config/media/image-styles/edit/' . $style['name']);
   }
 
   $form = array(
@@ -337,7 +337,7 @@ function image_effect_form(&$form_state, $style, $effect) {
     '#value' => isset($effect['ieid']) ? t('Update effect') : t('Add effect'),
   );
   $form['buttons']['cancel'] = array(
-    '#markup' => l(t('Cancel'), 'admin/settings/image-styles/edit/' . $style['name']),
+    '#markup' => l(t('Cancel'), 'admin/config/media/image-styles/edit/' . $style['name']),
   );
 
   return $form;
@@ -352,7 +352,7 @@ function image_effect_form_submit($form, &$form_state) {
   $effect['isid'] = $style['isid'];
   image_effect_save($effect);
   drupal_set_message(t('The image effect was successfully applied.'));
-  $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name'];
+  $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name'];
 }
 
 /**
@@ -371,7 +371,7 @@ function image_effect_delete_form(&$form_state, $style, $effect) {
 
   $form = array();
   $question = t('Are you sure you want to delete the @effect effect from the %style style?', array('%style' => $style['name'], '@effect' => $effect['label']));
-  return confirm_form($form, $question, 'admin/settings/image-styles/edit/' . $style['name'], '', t('Delete'));
+  return confirm_form($form, $question, 'admin/config/media/image-styles/edit/' . $style['name'], '', t('Delete'));
 }
 
 /**
@@ -383,7 +383,7 @@ function image_effect_delete_form_submit($form, &$form_state) {
 
   image_effect_delete($effect);
   drupal_set_message(t('The image effect %name has been deleted.', array('%name' => $effect['label'])));
-  $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name'];
+  $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name'];
 }
 
 /**
@@ -577,21 +577,21 @@ function theme_image_style_list($styles) {
   $rows = array();
   foreach ($styles as $style) {
     $row = array();
-    $row[] = l($style['name'], 'admin/settings/image-styles/edit/' . $style['name']);
+    $row[] = l($style['name'], 'admin/config/media/image-styles/edit/' . $style['name']);
     $link_attributes = array(
       'attributes' => array(
         'class' => 'image-style-link',
       ),
     );
-    $row[] = l(t('edit'), 'admin/settings/image-styles/edit/' . $style['name'], $link_attributes);
-    $row[] = l(t('delete'), 'admin/settings/image-styles/delete/' . $style['name'], $link_attributes);
+    $row[] = l(t('edit'), 'admin/config/media/image-styles/edit/' . $style['name'], $link_attributes);
+    $row[] = l(t('delete'), 'admin/config/media/image-styles/delete/' . $style['name'], $link_attributes);
     $rows[] = $row;
   }
 
   if (empty($rows)) {
     $rows[] = array(array(
       'colspan' => 4,
-      'data' => t('There are currently no styles. <a href="!url">Add a new one</a>.', array('!url' => url('admin/settings/image-styles/add'))),
+      'data' => t('There are currently no styles. <a href="!url">Add a new one</a>.', array('!url' => url('admin/config/media/image-styles/add'))),
     ));
   }
 
diff --git a/modules/image/image.module b/modules/image/image.module
index 10c6a39ec..42689cd02 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -16,7 +16,7 @@ function image_help($path, $arg) {
       $naming_approaches[] =  t('Based on where it will be used: !name', array('!name' => '<code>profile-picture</code>'));
       $naming_approaches[] =  t('Describing its appearance: !name', array('!name' => '<code>square-85x85</code>'));
       $output = '';
-      $output .= '<p>' . t('The Image module provides functionality for displaying images on your site though <a href="!url">image styles</a>.', array('!url' => url('admin/settings/image-styles'))) .'</p>';
+      $output .= '<p>' . t('The Image module provides functionality for displaying images on your site though <a href="!url">image styles</a>.', array('!url' => url('admin/config/media/image-styles'))) .'</p>';
       $output .= '<h3>' . t('Image styles') . '</h3>';
       $output .= '<p>' . t('Image <em>styles</em> allow your site to output an image in several different ways without affecting the original image. Any created images will automatically be refreshed if any changes are made to the image style.') .'</p>';
       $output .= '<p>' . t('Every image style must have a name, which will be used in the URL of generated images. There are two common approaches to naming image styles:') . '</p>';
@@ -24,10 +24,10 @@ function image_help($path, $arg) {
       $output .= '<p>' . t('Both approaches are common and which you choose depends on how you use the image style.') . '</p>';
       $output .= '<p>' . t('After creating an image style, <em>effects</em> may be added to the style. Image module comes with some basic effects such as <em>crop</em>, <em>scale</em>, <em>desaturate</em>, and <em>rotate</em>. In addition to the effects included with Image, other modules may provide additional effects. Multiple effects may be combined together, such as using the <em>crop and scale</em> effect and the <em>desaturate</em> effect, you could create square, grayscale thumbnails.');
       return $output;
-    case 'admin/settings/image-styles':
+    case 'admin/config/media/image-styles':
       return '<p>' . t('Image styles commonly provide thumbnail sizes by scaling and cropping images, but can also add various effects before an image is displayed. When an image is displayed with a style, a new file is created and the original image is left unchanged.') . '</p>';
-    case 'admin/settings/image-styles/edit/%/add/%':
-    case 'admin/settings/image-styles/edit/%/effects/%':
+    case 'admin/config/media/image-styles/edit/%/add/%':
+    case 'admin/config/media/image-styles/edit/%/effects/%':
       $effect = ($arg[5] == 'add') ? image_effect_definition_load($arg[6]) : image_effect_load($arg[6]);
       return isset($effect['help']) ? ('<p>' . $effect['help'] . '</p>') : NULL;
   }
@@ -46,13 +46,13 @@ function image_menu() {
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
   );
-  $items['admin/settings/image-styles'] = array(
+  $items['admin/config/media/image-styles'] = array(
     'title' => 'Image styles',
     'description' => 'Configure styles that can be used for resizing or adjusting images on display.',
     'page callback' => 'image_style_list',
     'access arguments' => array('administer image styles'),
   );
-  $items['admin/settings/image-styles/list'] = array(
+  $items['admin/config/media/image-styles/list'] = array(
     'title' => 'List',
     'description' => 'List the current image styles on the site.',
     'page callback' => 'image_style_list',
@@ -60,7 +60,7 @@ function image_menu() {
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 1,
   );
-  $items['admin/settings/image-styles/add'] = array(
+  $items['admin/config/media/image-styles/add'] = array(
     'title' => 'Add style',
     'description' => 'Add a new image style.',
     'page callback' => 'drupal_get_form',
@@ -69,53 +69,53 @@ function image_menu() {
     'type' => MENU_LOCAL_TASK,
     'weight' => 2,
   );
-  $items['admin/settings/image-styles/edit/%image_style'] = array(
+  $items['admin/config/media/image-styles/edit/%image_style'] = array(
     'title' => 'Edit style',
     'title callback' => 'image_style_title',
     'title arguments' => array('!name', 4),
     'description' => 'Configure an image style.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('image_style_form', 4),
+    'page arguments' => array('image_style_form', 5),
     'access arguments' => array('administer image styles'),
     'type' => MENU_CALLBACK,
   );
-  $items['admin/settings/image-styles/delete/%image_style'] = array(
+  $items['admin/config/media/image-styles/delete/%image_style'] = array(
     'title' => 'Delete style',
     'title callback' => 'image_style_title',
     'title arguments' => array('Delete !name', 4),
     'description' => 'Delete an image style.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('image_style_delete_form', 4, TRUE),
+    'page arguments' => array('image_style_delete_form', 5, TRUE),
     'access arguments' => array('administer image styles'),
     'type' => MENU_CALLBACK,
   );
-  $items['admin/settings/image-styles/edit/%image_style/effects/%image_effect'] = array(
+  $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect'] = array(
     'title' => 'Edit image effect',
     'title callback' => 'image_effect_title',
     'title arguments' => array('!label effect', 6),
     'description' => 'Edit an exiting effect within a style.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('image_effect_form', 4, 6),
+    'page arguments' => array('image_effect_form', 5, 7),
     'access arguments' => array('administer image styles'),
     'type' => MENU_CALLBACK,
   );
-  $items['admin/settings/image-styles/edit/%image_style/effects/%image_effect/delete'] = array(
+  $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect/delete'] = array(
     'title' => 'Delete image effect',
     'title callback' => 'image_effect_title',
     'title arguments' => array('Delete !label', 6),
     'description' => 'Delete an exiting effect from a style.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('image_effect_delete_form', 4, 6),
+    'page arguments' => array('image_effect_delete_form', 5, 7),
     'access arguments' => array('administer image styles'),
     'type' => MENU_CALLBACK,
   );
-  $items['admin/settings/image-styles/edit/%image_style/add/%image_effect_definition'] = array(
+  $items['admin/config/media/image-styles/edit/%image_style/add/%image_effect_definition'] = array(
     'title' => 'Add image effect',
     'title callback' => 'image_effect_title',
     'title arguments' => array('Add !label effect', 6),
     'description' => 'Add a new effect to a style.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('image_effect_form', 4, 6),
+    'page arguments' => array('image_effect_form', 5, 7),
     'access arguments' => array('administer image styles'),
     'type' => MENU_CALLBACK,
   );
diff --git a/modules/image/image.test b/modules/image/image.test
index 31e489cdf..94ce353d3 100644
--- a/modules/image/image.test
+++ b/modules/image/image.test
@@ -282,7 +282,7 @@ class ImageAdminStylesUnitTest extends DrupalWebTestCase {
   function testStyle() {
     // Setup a style to be created and effects to add to it.
     $style_name = strtolower($this->randomName(10));
-    $style_path = 'admin/settings/image-styles/edit/' . $style_name;
+    $style_path = 'admin/config/media/image-styles/edit/' . $style_name;
     $effect_edits = array(
       'image_resize' => array(
         'data[width]' => 100,
@@ -317,7 +317,7 @@ class ImageAdminStylesUnitTest extends DrupalWebTestCase {
     $edit = array(
       'name' => $style_name,
     );
-    $this->drupalPost('admin/settings/image-styles/add', $edit, t('Create new style'));
+    $this->drupalPost('admin/config/media/image-styles/add', $edit, t('Create new style'));
     $this->assertRaw(t('Style %name was created.', array('%name' => $style_name)), t('Image style successfully created.'));
 
     // Add effect form.
@@ -376,7 +376,7 @@ class ImageAdminStylesUnitTest extends DrupalWebTestCase {
     $this->drupalPost($style_path, $edit, t('Update style'));
 
     // Note that after changing the style name, the style path is changed.
-    $style_path = 'admin/settings/image-styles/edit/' . $style_name;
+    $style_path = 'admin/config/media/image-styles/edit/' . $style_name;
 
     // Check that the URL was updated.
     $this->drupalGet($style_path);
@@ -416,7 +416,7 @@ class ImageAdminStylesUnitTest extends DrupalWebTestCase {
     // Style deletion form.
 
     // Delete the style.
-    $this->drupalPost('admin/settings/image-styles/delete/' . $style_name, array(), t('Delete'));
+    $this->drupalPost('admin/config/media/image-styles/delete/' . $style_name, array(), t('Delete'));
 
     // Confirm the style directory has been removed.
     $directory = file_directory_path() . '/styles/' . $style_name;
diff --git a/modules/system/system.install b/modules/system/system.install
index 83a0f268b..594f311bd 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -205,7 +205,7 @@ function system_requirements($phase) {
       }
       // The files directory requirement check is done only during install and runtime.
       if ($phase == 'runtime') {
-        $description = $error . $t('You may need to set the correct directory at the <a href="@admin-file-system">file system settings page</a> or change the current directory\'s permissions so that it is writable.', array('@admin-file-system' => url('admin/settings/file-system')));
+        $description = $error . $t('You may need to set the correct directory at the <a href="@admin-file-system">file system settings page</a> or change the current directory\'s permissions so that it is writable.', array('@admin-file-system' => url('admin/config/media/file-system')));
       }
       elseif ($phase == 'install') {
         // For the installer UI, we need different wording. 'value' will
diff --git a/modules/system/system.module b/modules/system/system.module
index 14083caba..2eb1fafb4 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -96,7 +96,7 @@ function system_help($path, $arg) {
       $output .= '<li>' . t('support for enabling and disabling <a href="@themes">themes</a>, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the <a href="@drupal-themes">Drupal.org theme page</a>.', array('@themes' => url('admin/appearance'), '@drupal-themes' => 'http://drupal.org/project/themes')) . '</li>';
       $output .= '<li>' . t('a robust <a href="@cache-settings">caching system</a> that allows the efficient re-use of previously-constructed web pages and web page components. Drupal stores the pages requested by anonymous users in a compressed format; depending on your site configuration and the amount of your web traffic tied to anonymous visitors, Drupal\'s caching system may significantly increase the speed of your site.', array('@cache-settings' => url('admin/config/development/performance'))) . '</li>';
       $output .= '<li>' . t('a set of routine administrative operations that rely on a correctly-configured <a href="@cron">cron maintenance task</a> to run automatically. A number of other modules, including the feed aggregator, and search also rely on <a href="@cron">cron maintenance tasks</a>. For more information, see the online handbook entry for <a href="@handbook">configuring cron jobs</a>.', array('@cron' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron')) . '</li>';
-      $output .= '<li>' . t('basic configuration options for your site, including <a href="@regional-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@site-info">site name and other information</a>, and a <a href="@maintenance-mode">maintenance mode</a> for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '</li></ul>';
+      $output .= '<li>' . t('basic configuration options for your site, including <a href="@regional-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@site-info">site name and other information</a>, and a <a href="@maintenance-mode">maintenance mode</a> for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/config/media/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '</li></ul>';
       $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@system">System module</a>.', array('@system' => 'http://drupal.org/handbook/modules/system/')) . '</p>';
       return $output;
     case 'admin/by-module':
@@ -703,34 +703,43 @@ function system_menu() {
     'page arguments' => array('system_performance_settings'),
     'access arguments' => array('administer site configuration'),
   );
-
-  // Settings.
-  $items['admin/settings/site-information'] = array(
-    'title' => 'Site information',
-    'description' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.',
+  $items['admin/config/media'] = array(
+   'title' => 'Media',
+   'description' => 'Media tools.',
+   'position' => 'left',
+   'weight' => 10,
+   'page callback' => 'system_admin_menu_block_page',
+   'access callback' => 'system_admin_menu_block_access',
+   'access arguments' => array('admin/config/media', 'access administration pages'),
+  );
+  $items['admin/config/media/file-system'] = array(
+    'title' => 'File-system',
+    'description' => 'Tell Drupal where to store uploaded files and how they are accessed.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('system_site_information_settings'),
+    'page arguments' => array('system_performance_settings'),
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/config/development/logging'] = array(
-    'title' => 'Logging and errors',
-    'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.",
+    $items['admin/config/media/image-toolkit'] = array(
+    'title' => 'Image toolkit',
+    'description' => 'Choose which image toolkit to use if you have installed optional toolkits.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('system_logging_settings'),
+    'page arguments' => array('system_image_toolkit_settings'),
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/settings/file-system'] = array(
-    'title' => 'File system',
-    'description' => 'Tell Drupal where to store uploaded files and how they are accessed.',
+    $items['admin/config/development/logging'] = array(
+    'title' => 'Logging and errors',
+    'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.",
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('system_file_system_settings'),
+    'page arguments' => array('system_logging_settings'),
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/settings/image-toolkit'] = array(
-    'title' => 'Image toolkit',
-    'description' => 'Choose which image toolkit to use if you have installed optional toolkits.',
+  
+  // Settings.
+  $items['admin/settings/site-information'] = array(
+    'title' => 'Site information',
+    'description' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('system_image_toolkit_settings'),
+    'page arguments' => array('system_site_information_settings'),
     'access arguments' => array('administer site configuration'),
   );
   $items['admin/settings/rss-publishing'] = array(
diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc
index 6552f95a0..fbd2d7b0f 100644
--- a/modules/upload/upload.admin.inc
+++ b/modules/upload/upload.admin.inc
@@ -75,7 +75,7 @@ function upload_admin_settings() {
     '#default_value' => variable_get('upload_max_resolution', 0),
     '#size' => 15,
     '#maxlength' => 10,
-    '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an <a href="!image-toolkit-link">image toolkit</a> is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))),
+    '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an <a href="!image-toolkit-link">image toolkit</a> is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/config/media/image-toolkit'))),
     '#field_suffix' => '<kbd>' . t('WIDTHxHEIGHT') . '</kbd>'
   );
   $form['settings_general']['upload_list_default'] = array(
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index eec81dbe7..5682c6cf0 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -249,7 +249,7 @@ function upload_form_alter(&$form, $form_state, $form_id) {
       if (!file_prepare_directory($path, FILE_CREATE_DIRECTORY) || !file_prepare_directory($temp, FILE_CREATE_DIRECTORY)) {
         $form['attachments']['#description'] =  t('File attachments are disabled. The file directories have not been properly configured.');
         if (user_access('administer site configuration')) {
-          $form['attachments']['#description'] .= ' ' . t('Please visit the <a href="@admin-file-system">file system configuration page</a>.', array('@admin-file-system' => url('admin/settings/file-system')));
+          $form['attachments']['#description'] .= ' ' . t('Please visit the <a href="@admin-file-system">file system configuration page</a>.', array('@admin-file-system' => url('admin/config/media/file-system')));
         }
         else {
           $form['attachments']['#description'] .= ' ' . t('Please contact the site administrator.');
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 3ab3e79e7..8f6dd919f 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -369,7 +369,7 @@ function user_admin_settings() {
       '#title' => t('Picture display style'),
       '#options' => image_style_options(TRUE),
       '#default_value' => variable_get('user_picture_style', ''),
-      '#description' => t('The style selected will be used on display, while the original image is retained. Styles may be configured in the <a href="!url">Image styles</a> administration area.', array('!url' => url('admin/settings/image-styles'))),
+      '#description' => t('The style selected will be used on display, while the original image is retained. Styles may be configured in the <a href="!url">Image styles</a> administration area.', array('!url' => url('admin/config/media/image-styles'))),
     );
   }
   $form['personalization']['pictures']['user_picture_dimensions'] = array(