=== modified file 'modules/node.module'
--- modules/node.module	
+++ modules/node.module	
@@ -27,9 +27,9 @@
       $output .= t('<p>You can</p>
 <ul>
 <li>search for content at <a href="%search">search</a>.</li>
-<li>administer nodes at <a href="%admin-settings-content-types">administer &gt;&gt; settings &gt;&gt; content types</a>.</li>
+<li>administer nodes at <a href="%admin-node">administer &gt;&gt; content</a>.</li>
 </ul>
-', array('%search' => url('search'), '%admin-settings-content-types' => url('admin/settings/content-types')));
+', array('%search' => url('search'), '%admin-node' => url('admin/node')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%node">Node page</a>.', array('%node' => 'http://www.drupal.org/handbook/modules/node/')) .'</p>';
       return $output;
     case 'admin/modules#description':
@@ -877,11 +877,18 @@
         'type' => MENU_LOCAL_TASK);
     }
 
-    $items[] = array('path' => 'admin/settings/node', 'title' => t('posts'),
+    // Node configuration tabs and subtabs
+    $items[] = array('path' => 'admin/node/settings', 'title' => t('configure'),
       'callback' => 'node_configure',
+      'type' => MENU_LOCAL_TASK, 'weight' => -9,
       'access' => user_access('administer nodes'));
-    $items[] = array('path' => 'admin/settings/content-types', 'title' => t('content types'),
+    $items[] = array('path' => 'admin/node/settings/global', 'title' => t('global options'),
+      'callback' => 'node_configure',
+      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10,
+      'access' => user_access('administer nodes'));
+    $items[] = array('path' => 'admin/node/settings/types', 'title' => t('node types'),
       'callback' => 'node_types_configure',
+      'type' => MENU_LOCAL_TASK,
       'access' => user_access('administer nodes'));
 
     $items[] = array('path' => 'node', 'title' => t('content'),
@@ -926,8 +933,8 @@
           'type' => MENU_LOCAL_TASK);
       }
     }
-    else if (arg(0) == 'admin' && arg(1) == 'settings' && arg(2) == 'content-types' && is_string(arg(3))) {
-      $items[] = array('path' => 'admin/settings/content-types/'. arg(3),
+    else if (arg(0) == 'admin' && arg(1) == 'node' && arg(2) == 'settings' && arg(3) == 'types' && is_string(arg(4))) {
+      $items[] = array('path' => 'admin/node/settings/types/'. arg(3),
         'title' => t("'%name' content type", array('%name' => node_get_name(arg(3)))),
         'type' => MENU_CALLBACK);
     }
@@ -1255,7 +1262,7 @@
 
     $rows = array();
     foreach (node_get_types() as $type => $name) {
-      $rows[] = array($name, l(t('configure'), 'admin/settings/content-types/'. $type));
+      $rows[] = array($name, l(t('configure'), 'admin/node/settings/types/'. $type));
     }
 
     return theme('table', $header, $rows);