- Patch #569282 by joshmiller: removal of Site configuration and fixed a number of broken links.

2 files changed, 3 insertions, 4 deletions

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>';