Index: modules/statistics/statistics.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.admin.inc,v
retrieving revision 1.29
diff -u -r1.29 statistics.admin.inc
--- modules/statistics/statistics.admin.inc	22 Aug 2009 14:34:21 -0000	1.29
+++ modules/statistics/statistics.admin.inc	24 Aug 2009 03:00:24 -0000
@@ -132,7 +132,7 @@
   $rows = array();
   foreach ($result as $account) {
     $qs = drupal_get_destination();
-    $ban_link =  $account->iid ? l(t('unblock IP address'), "admin/settings/ip-blocking/delete/$account->iid", array('query' => $qs)) : l(t('block IP address'), "admin/settings/ip-blocking/$account->hostname", array('query' => $qs));
+    $ban_link =  $account->iid ? l(t('unblock IP address'), "admin/config/people/ip-blocking/delete/$account->iid", array('query' => $qs)) : l(t('block IP address'), "admin/config/people/ip-blocking/$account->hostname", array('query' => $qs));
     $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), (user_access('block IP addresses') && !$account->uid) ? $ban_link : '');
   }
 
Index: modules/statistics/statistics.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.test,v
retrieving revision 1.11
diff -u -r1.11 statistics.test
--- modules/statistics/statistics.test	22 Aug 2009 09:44:55 -0000	1.11
+++ modules/statistics/statistics.test	24 Aug 2009 03:00:24 -0000
@@ -53,7 +53,7 @@
     $this->assertText(t('IP address blocking'), t('IP blocking page displayed.'));
     $edit = array();
     $edit['ip'] = $test_ip_address;
-    $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
+    $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
     $ip = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $edit['ip']))->fetchField();
     $this->assertNotEqual($ip, FALSE, t('IP address found in database'));
     $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])), t('IP address was blocked.'));
@@ -66,7 +66,7 @@
     $this->clickLink('unblock IP address');
     $this->assertRaw(t('Are you sure you want to delete %ip?', array('%ip' => $test_ip_address)), t('IP address deletion confirmation found.'));
     $edit = array();
-    $this->drupalPost('admin/settings/ip-blocking/delete/1', NULL, t('Delete'));
+    $this->drupalPost('admin/config/people/ip-blocking/delete/1', NULL, t('Delete'));
     $this->assertRaw(t('The IP address %ip was deleted.', array('%ip' => $test_ip_address)), t('IP address deleted.'));
   }
 }
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.191
diff -u -r1.191 system.admin.inc
--- modules/system/system.admin.inc	24 Aug 2009 00:14:22 -0000	1.191
+++ modules/system/system.admin.inc	24 Aug 2009 04:11:25 -0000
@@ -1161,7 +1161,7 @@
   foreach ($result as $ip) {
     $rows[] = array(
       $ip->ip,
-      l(t('delete'), "admin/settings/ip-blocking/delete/$ip->iid"),
+      l(t('delete'), "admin/config/people/ip-blocking/delete/$ip->iid"),
     );
   }
 
@@ -1220,7 +1220,7 @@
     ->fields(array('ip' => $ip))
     ->execute();
   drupal_set_message(t('The IP address %ip has been blocked.', array('%ip' => $ip)));
-  $form_state['redirect'] = 'admin/settings/ip-blocking';
+  $form_state['redirect'] = 'admin/config/people/ip-blocking';
   return;
 }
 
@@ -1234,7 +1234,7 @@
     '#type' => 'value',
     '#value' => $iid,
   );
-  return confirm_form($form, t('Are you sure you want to delete %ip?', array('%ip' => $iid['ip'])), 'admin/settings/ip-blocking', t('This action cannot be undone.'), t('Delete'), t('Cancel'));
+  return confirm_form($form, t('Are you sure you want to delete %ip?', array('%ip' => $iid['ip'])), 'admin/config/people/ip-blocking', t('This action cannot be undone.'), t('Delete'), t('Cancel'));
 }
 
 /**
@@ -1247,7 +1247,7 @@
     ->execute();
   watchdog('user', 'Deleted %ip', array('%ip' => $blocked_ip['ip']));
   drupal_set_message(t('The IP address %ip was deleted.', array('%ip' => $blocked_ip['ip'])));
-  $form_state['redirect'] = 'admin/settings/ip-blocking';
+  $form_state['redirect'] = 'admin/config/people/ip-blocking';
 }
 
 /**
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.766
diff -u -r1.766 system.module
--- modules/system/system.module	24 Aug 2009 00:14:22 -0000	1.766
+++ modules/system/system.module	24 Aug 2009 04:10:39 -0000
@@ -143,7 +143,7 @@
       return $output;
     case 'admin/settings/actions/configure':
       return t('An advanced action offers additional configuration options which may be filled out below. Changing the <em>Description</em> field is recommended, in order to better identify the precise action taking place. This description will be displayed in modules such as the trigger module when assigning actions to system events, so it is best if it is as descriptive as possible (for example, "Send e-mail to Moderation Team" rather than simply "Send e-mail").');
-    case 'admin/settings/ip-blocking':
+    case 'admin/config/people/ip-blocking':
       return '<p>' . t('IP addresses listed here are blocked from your site before any modules are loaded. You may add IP addresses to the list, or delete existing entries.') . '</p>';
     case 'admin/reports/status':
       return '<p>' . t("Here you can find a short overview of your site's parameters as well as any problems detected with your installation. It may be useful to copy and paste this information into support requests filed on drupal.org's support forums and project issue queues.") . '</p>';
@@ -714,14 +714,14 @@
   );
 
   // IP address blocking.
-  $items['admin/settings/ip-blocking'] = array(
+  $items['admin/config/people/ip-blocking'] = array(
     'title' => 'IP address blocking',
     'description' => 'Manage blocked IP addresses.',
     'page callback' => 'system_ip_blocking',
     'access arguments' => array('block IP addresses'),
     'file' => 'system.admin.inc',
   );
-  $items['admin/settings/ip-blocking/%'] = array(
+  $items['admin/config/people/ip-blocking/%'] = array(
     'title' => 'IP address blocking',
     'description' => 'Manage blocked IP addresses.',
     'page callback' => 'system_ip_blocking',
@@ -729,10 +729,10 @@
     'type' => MENU_CALLBACK,
     'file' => 'system.admin.inc',
   );
-  $items['admin/settings/ip-blocking/delete/%blocked_ip'] = array(
+  $items['admin/config/people/ip-blocking/delete/%blocked_ip'] = array(
     'title' => 'Delete IP address',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('system_ip_blocking_delete', 4),
+    'page arguments' => array('system_ip_blocking_delete', 5),
     'access arguments' => array('block IP addresses'),
     'type' => MENU_CALLBACK,
     'file' => 'system.admin.inc',
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.71
diff -u -r1.71 system.test
--- modules/system/system.test	23 Aug 2009 13:02:38 -0000	1.71
+++ modules/system/system.test	24 Aug 2009 03:00:24 -0000
@@ -312,12 +312,12 @@
    * Test a variety of user input to confirm correct validation and saving of data.
    */
   function testIPAddressValidation() {
-    $this->drupalGet('admin/settings/ip-blocking');
+    $this->drupalGet('admin/config/people/ip-blocking');
 
     // Block a valid IP address.
     $edit = array();
     $edit['ip'] = '192.168.1.1';
-    $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
+    $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
     $ip = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $edit['ip']))->fetchField();
     $this->assertNotNull($ip, t('IP address found in database'));
     $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])), t('IP address was blocked.'));
@@ -325,32 +325,32 @@
     // Try to block an IP address that's already blocked.
     $edit = array();
     $edit['ip'] = '192.168.1.1';
-    $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
+    $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
     $this->assertText(t('This IP address is already blocked.'));
 
     // Try to block a reserved IP address.
     $edit = array();
     $edit['ip'] = '255.255.255.255';
-    $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
+    $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
     $this->assertText(t('Please enter a valid IP address.'));
 
     // Try to block a reserved IP address.
     $edit = array();
     $edit['ip'] = 'test.example.com';
-    $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
+    $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
     $this->assertText(t('Please enter a valid IP address.'));
 
     // Submit an empty form.
     $edit = array();
     $edit['ip'] = '';
-    $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
+    $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
     $this->assertText(t('Please enter a valid IP address.'));
 
     // Submit your own IP address. This fails, although it works when testing manually.
      // TODO: on some systems this test fails due to a bug or inconsistency in cURL.
      // $edit = array();
      // $edit['ip'] = ip_address();
-     // $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
+     // $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
      // $this->assertText(t('You may not block your own IP address.'));
   }
 }