- Patches by Ber: move user settings and node settings to admin/settings.

modules/node.module

@@ -639,16 +639,12 @@ function node_menu($may_cache) {
       'type' => MENU_CALLBACK);
     $items[] = array('path' => 'admin/node/overview', 'title' => t('list'),
       'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
-    $items[] = array('path' => 'admin/node/configure', 'title' => t('configure'),
+    $items[] = array('path' => 'admin/settings/node', 'title' => t('posts'),
       'callback' => 'node_configure',
-      'access' => user_access('administer nodes'),
-      'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/node/configure/settings', 'title' => t('settings'),
-      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
-    $items[] = array('path' => 'admin/node/configure/types', 'title' => t('content types'),
+      'access' => user_access('administer nodes'));
+    $items[] = array('path' => 'admin/settings/content-types', 'title' => t('content types'),
       'callback' => 'node_types_configure',
-      'access' => user_access('administer nodes'),
-      'type' => MENU_LOCAL_TASK);
+      'access' => user_access('administer nodes'));
     if (module_exist('search')) {
       $items[] = array('path' => 'admin/node/search', 'title' => t('search'),
         'callback' => 'node_admin',

modules/node/node.module

@@ -639,16 +639,12 @@ function node_menu($may_cache) {
       'type' => MENU_CALLBACK);
     $items[] = array('path' => 'admin/node/overview', 'title' => t('list'),
       'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
-    $items[] = array('path' => 'admin/node/configure', 'title' => t('configure'),
+    $items[] = array('path' => 'admin/settings/node', 'title' => t('posts'),
       'callback' => 'node_configure',
-      'access' => user_access('administer nodes'),
-      'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/node/configure/settings', 'title' => t('settings'),
-      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
-    $items[] = array('path' => 'admin/node/configure/types', 'title' => t('content types'),
+      'access' => user_access('administer nodes'));
+    $items[] = array('path' => 'admin/settings/content-types', 'title' => t('content types'),
       'callback' => 'node_types_configure',
-      'access' => user_access('administer nodes'),
-      'type' => MENU_LOCAL_TASK);
+      'access' => user_access('administer nodes'));
     if (module_exist('search')) {
       $items[] = array('path' => 'admin/node/search', 'title' => t('search'),
         'callback' => 'node_admin',

modules/user.module

@@ -671,9 +671,8 @@ function user_menu($may_cache) {
     $items[] = array('path' => 'admin/user/create', 'title' => t('add user'),
       'callback' => 'user_admin', 'access' => $admin_access,
       'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/user/configure', 'title' => t('configure'),
-      'callback' => 'user_configure', 'access' => $admin_access,
-      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/settings/user', 'title' => t('users'),
+      'callback' => 'user_configure', 'access' => $admin_access);
     $items[] = array('path' => 'admin/access', 'title' => t('access control'),
       'callback' => 'user_admin_perm', 'access' => $admin_access);
     $items[] = array('path' => 'admin/access/permissions', 'title' => t('permissions'),

modules/user/user.module

@@ -671,9 +671,8 @@ function user_menu($may_cache) {
     $items[] = array('path' => 'admin/user/create', 'title' => t('add user'),
       'callback' => 'user_admin', 'access' => $admin_access,
       'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/user/configure', 'title' => t('configure'),
-      'callback' => 'user_configure', 'access' => $admin_access,
-      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/settings/user', 'title' => t('users'),
+      'callback' => 'user_configure', 'access' => $admin_access);
     $items[] = array('path' => 'admin/access', 'title' => t('access control'),
       'callback' => 'user_admin_perm', 'access' => $admin_access);
     $items[] = array('path' => 'admin/access/permissions', 'title' => t('permissions'),