From 82b51dff1d2fd90b439129c70b415d30a06d1bce Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 10 Sep 2009 06:32:54 +0000
Subject: - Patch #569282 by joshmiller: removal of Site configuration and
 fixed a number of broken links.

---
 CHANGELOG.txt                          | 2 +-
 modules/block/block.module             | 2 +-
 modules/contact/contact.module         | 2 +-
 modules/help/help.api.php              | 5 ++---
 modules/help/help.module               | 2 +-
 modules/system/system.admin.inc        | 4 ++--
 modules/system/system.module           | 9 ---------
 modules/translation/translation.module | 2 +-
 modules/update/update.module           | 4 ++--
 9 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 641696b5d..47914f0b1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -74,7 +74,7 @@ Drupal 7.0, xxxx-xx-xx (development version)
       to time zone names, e.g. Africa/Abidjan.
     * In some cases the upgrade and install scripts do not choose the preferred
       site default time zone. The automatically-selected time zone can be
-      corrected at admin/settings/date-time.
+      corrected at admin/config/regional/settings.
     * If your site is being upgraded from Drupal 6 and you do not have the
       contributed date or event modules installed, user time zone settings will
       fallback to the system time zone and will have to be reconfigured by each user.
diff --git a/modules/block/block.module b/modules/block/block.module
index 803c477fe..55f34ac2b 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -18,7 +18,7 @@ function block_help($path, $arg) {
   switch ($path) {
     case 'admin/help#block':
       $output = '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The <a href="@blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/structure/block'))) . '</p>';
-      $output .= '<p>' . t('Although blocks are usually generated automatically by modules (like the <em>User login</em> block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available <a href="@text-format">text format</a>.', array('@text-format' => url('admin/settings/filter'))) . '</p>';
+      $output .= '<p>' . t('Although blocks are usually generated automatically by modules (like the <em>User login</em> block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available <a href="@text-format">text format</a>.', array('@text-format' => url('admin/config/content/formats'))) . '</p>';
       $output .= '<p>' . t('When working with blocks, remember that:') . '</p>';
       $output .= '<ul><li>' . t('since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis.') . '</li>';
       $output .= '<li>' . t('disabled blocks, or blocks not in a region, are never shown.') . '</li>';
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index 57a63dff8..80388d049 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -22,7 +22,7 @@ function contact_help($path, $arg) {
     case 'admin/structure/contact':
       $output = '<p>' . t('This page lets you set up <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/structure/contact/settings'), '@form' => url('contact'))) . '</p>';
       if (!module_exists('menu')) {
-        $menu_note = t('The menu item can be customized and configured only once the menu module has been <a href="@modules-page">enabled</a>.', array('@modules-page' => url('admin/settings/modules')));
+        $menu_note = t('The menu item can be customized and configured only once the menu module has been <a href="@modules-page">enabled</a>.', array('@modules-page' => url('admin/config/modules')));
       }
       else {
         $menu_note = '';
diff --git a/modules/help/help.api.php b/modules/help/help.api.php
index 17962a63a..7c7f05cf8 100644
--- a/modules/help/help.api.php
+++ b/modules/help/help.api.php
@@ -46,7 +46,7 @@
  *   $output .= 'A role defines a group of users that have certain
  *     privileges as defined in %permission.';
  *   $output = t($output, array('%permission' => l(t('user permissions'),
- *     'admin/settings/permission')));
+ *     'admin/config/people/permissions')));
  *
  * For a detailed usage example, see page_example.module.
  */
@@ -57,8 +57,7 @@ function hook_help($path, $arg) {
 
     case 'admin/structure/block':
       return t('<p>Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.</p>
-<p>If you want certain blocks to disable themselves temporarily during high server loads, check the "Throttle" box. You can configure the auto-throttle on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.</p>
-<p>You can configure the behavior of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.</p>', array('@throttle' => url('admin/settings/throttle')));
+<p>You can configure the behavior of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.</p>');
   }
 }
 
diff --git a/modules/help/help.module b/modules/help/help.module
index 525b173a7..e8a3c7389 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -40,7 +40,7 @@ function help_help($path, $arg) {
     case 'admin/help':
       $output = '<p>' . t('Please follow these steps to set up and start using your website:') . '</p>';
       $output .= '<ol>';
-      $output .= '<li>' . t('<strong>Configure your website</strong> Once logged in, visit the <a href="@admin">administration section</a>, where you can <a href="@config">customize and configure</a> all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/settings'))) . '</li>';
+      $output .= '<li>' . t('<strong>Configure your website</strong> Once logged in, visit the <a href="@admin">administration section</a>, where you can <a href="@config">customize and configure</a> all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/config'))) . '</li>';
       $output .= '<li>' . t('<strong>Enable additional functionality</strong> Next, visit the <a href="@modules">module list</a> and enable features which suit your specific needs. You can find additional modules in the <a href="@download_modules">Drupal modules download section</a>.', array('@modules' => url('admin/config/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '</li>';
       $output .= '<li>' . t('<strong>Customize your website design</strong> To change the "look and feel" of your website, visit the <a href="@themes">themes section</a>. You may choose from one of the included themes or download additional themes from the <a href="@download_themes">Drupal themes download section</a>.', array('@themes' => url('admin/appearance'), '@download_themes' => 'http://drupal.org/project/themes')) . '</li>';
       $output .= '<li>' . t('<strong>Start posting content</strong> Finally, you can <a href="@content">add new content</a> for your website.', array('@content' => url('node/add'))) . '</li>';
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 0f98ef355..37d1fc2a0 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -184,7 +184,7 @@ function system_settings_overview() {
     db_check_setup();
   }
 
-  $item = menu_get_item('admin/settings');
+  $item = menu_get_item('admin/config');
   $content = system_admin_menu_block($item);
 
   $output = theme('admin_block_content', $content);
@@ -1417,7 +1417,7 @@ function system_performance_settings() {
   $disabled = !$is_writable;
   $disabled_message = '';
   if(!$is_writable) {
-    $disabled_message = ' ' . t('<strong class="error">Please set up the <a href="!file-system">public files directory</a> to make these optimizations available.</strong>', array('!file-system' => url('admin/settings/file-system')));
+    $disabled_message = ' ' . t('<strong class="error">Please set up the <a href="!file-system">public files directory</a> to make these optimizations available.</strong>', array('!file-system' => url('admin/config/media/file-system')));
   }
 
   $form['bandwidth_optimization'] = array(
diff --git a/modules/system/system.module b/modules/system/system.module
index ff4cf4ed3..7d04cffa9 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -534,15 +534,6 @@ function system_menu() {
   );
 
   // Menu items that are basically just menu blocks.
-  $items['admin/settings'] = array(
-    'title' => 'Site configuration',
-    'description' => 'Configure site settings.',
-    'position' => 'right',
-    'weight' => -2,
-    'page callback' => 'system_settings_overview',
-    'access arguments' => array('access administration pages'),
-    'file' => 'system.admin.inc',
-  );
   $items['admin/structure'] = array(
     'title' => 'Structure',
     'description' => 'Control how your site looks and feels.',
diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index 8c1b5b07f..4684c7f2f 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -34,7 +34,7 @@ function translation_help($path, $arg) {
       $output = '<p>' . t('The content translation module allows content to be translated into different languages. Working with the <a href="@locale">locale module</a> (which manages enabled languages and provides translation for the site interface), the content translation module is key to creating and maintaining translated site content.', array('@locale' => url('admin/help/locale'))) . '</p>';
       $output .= '<p>' . t('Configuring content translation and translation-enabled content types:') . '</p>';
       $output .= '<ul><li>' . t('Assign the <em>translate content</em> permission to the appropriate user roles at the <a href="@permissions">Permissions configuration page</a>.', array('@permissions' => url('admin/config/people/permissions'))) . '</li>';
-      $output .= '<li>' . t('Add and enable desired languages at the <a href="@languages">Languages configuration page</a>.', array('@languages' => url('admin/settings/language'))) . '</li>';
+      $output .= '<li>' . t('Add and enable desired languages at the <a href="@languages">Languages configuration page</a>.', array('@languages' => url('admin/config/regional/language'))) . '</li>';
       $output .= '<li>' . t('Determine which <a href="@content-types">content types</a> should support translation features. To enable translation support for a content type, edit the type and at the <em>Multilingual support</em> drop down, select <em>Enabled, with translation</em>. (<em>Multilingual support</em> is located within <em>Publishing options</em>.) Be sure to save each content type after enabling multilingual support.', array('@content-types' => url('admin/structure/types'))) . '</li></ul>';
       $output .= '<p>' . t('Working with translation-enabled content types:') . '</p>';
       $output .= '<ul><li>' . t('Use the <em>Language</em> drop down to select the appropriate language when creating or editing posts.') . '</li>';
diff --git a/modules/update/update.module b/modules/update/update.module
index 7f474d24e..80849031a 100644
--- a/modules/update/update.module
+++ b/modules/update/update.module
@@ -95,7 +95,7 @@ function update_help($path, $arg) {
 
     case 'admin/help#update':
       $output = '<p>' . t("The Update status module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts you to available updates.") . '</p>';
-      $output .= '<p>' . t('The <a href="@update-report">report of available updates</a> will alert you when new releases are available for download. You may configure options for update checking frequency and notifications at the <a href="@update-settings">Update status module settings page</a>.', array('@update-report' => url('admin/reports/updates'), '@update-settings' => url('admin/settings/updates'))) . '</p>';
+      $output .= '<p>' . t('The <a href="@update-report">report of available updates</a> will alert you when new releases are available for download. You may configure options for update checking frequency and notifications at the <a href="@update-settings">Update status module settings page</a>.', array('@update-report' => url('admin/reports/updates'), '@update-settings' => url('admin/reports/updates/settings'))) . '</p>';
       $output .= '<p>' . t('Please note that in order to provide this information, anonymous usage statistics are sent to drupal.org. If desired, you may disable the Update status module from the <a href="@modules">module administration page</a>.', array('@modules' => url('admin/config/modules'))) . '</p>';
       $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@update">Update status module</a>.', array('@update' => 'http://drupal.org/handbook/modules/update')) . '</p>';
       return $output;
@@ -428,7 +428,7 @@ function update_mail($key, &$message, $params) {
   }
   $message['body'][] = t('See the available updates page for more information:', array(), array('langcode' => $langcode)) . "\n" . url('admin/reports/updates', array('absolute' => TRUE, 'language' => $language));
 
-  $settings_url = url('admin/settings/updates', array('absolute' => TRUE));
+  $settings_url = url('admin/reports/updates/settings', array('absolute' => TRUE));
   if (variable_get('update_notification_threshold', 'all') == 'all') {
     $message['body'][] = t('Your site is currently configured to send these emails when any updates are available. To get notified only for security updates, please visit !url.', array('!url' => $settings_url));
   }
-- 
cgit v1.2.3