Index: modules/dblog/dblog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.test,v
retrieving revision 1.25
diff -u -p -r1.25 dblog.test
--- modules/dblog/dblog.test	11 Aug 2009 11:47:58 -0000	1.25
+++ modules/dblog/dblog.test	14 Aug 2009 12:51:22 -0000
@@ -50,7 +50,7 @@ class DBLogTestCase extends DrupalWebTes
     // Change the dblog row limit.
     $edit = array();
     $edit['dblog_row_limit'] = $row_limit;
-    $this->drupalPost('admin/settings/logging', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/development/logging', $edit, t('Save configuration'));
     $this->assertResponse(200);
 
     // Check row limit variable.
Index: modules/syslog/syslog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/syslog/syslog.test,v
retrieving revision 1.8
diff -u -p -r1.8 syslog.test
--- modules/syslog/syslog.test	13 Jul 2009 21:51:42 -0000	1.8
+++ modules/syslog/syslog.test	14 Aug 2009 12:51:30 -0000
@@ -29,10 +29,10 @@ class SyslogTestCase extends DrupalWebTe
     else {
       $edit['syslog_facility'] = LOG_USER;
     }
-    $this->drupalPost('admin/settings/logging', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/development/logging', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
 
-    $this->drupalGet('admin/settings/logging');
+    $this->drupalGet('admin/config/development/logging');
     if ($this->parse()) {
       $field = $this->xpath('//option[@value="' . $edit['syslog_facility'] . '"]'); // Should be one field.
       $this->assertTrue($field[0]['selected'] == 'selected', t('Facility value saved.'));
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.744
diff -u -p -r1.744 system.module
--- modules/system/system.module	13 Aug 2009 11:31:26 -0000	1.744
+++ modules/system/system.module	14 Aug 2009 12:51:35 -0000
@@ -706,19 +706,13 @@ function system_menu() {
     'page arguments' => array('system_site_information_settings'),
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/settings/logging'] = array(
+  $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_logging_settings'),
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/settings/logging/settings'] = array(
-    'title' => 'Settings',
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-    'weight' => -1,
-  );
   $items['admin/settings/file-system'] = array(
     'title' => 'File system',
     'description' => 'Tell Drupal where to store uploaded files and how they are accessed.',