? includes/database/install.inc
? sites/all/modules/cvs
Index: modules/node/node.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v
retrieving revision 1.38
diff -u -p -r1.38 node.admin.inc
--- modules/node/node.admin.inc	3 Feb 2009 18:55:30 -0000	1.38
+++ modules/node/node.admin.inc	9 Feb 2009 00:11:35 -0000
@@ -29,19 +29,12 @@ function node_configure() {
     );
   }
 
-  $form['default_nodes_main'] = array(
-    '#type' => 'select', '#title' => t('Number of posts on main page'),
-    '#default_value' => 10,
-    '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
-    '#description' => t('The default maximum number of posts to display per page on overview pages such as the main page.')
-  );
   $form['teaser_length'] = array(
     '#type' => 'select', '#title' => t('Length of trimmed posts'),
     '#default_value' => 600,
     '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_node_characters'),
     '#description' => t("The maximum number of characters used in the trimmed version of a post. Drupal will use this setting to determine at which offset long posts should be trimmed. The trimmed version of a post is typically used as a teaser when displaying the post on the main page, in XML feeds, etc. To disable teasers, set to 'Unlimited' . Note that this setting will only affect new or updated content and will not affect existing teasers.")
   );
-
   $form['node_preview'] = array(
     '#type' => 'radios',
     '#title' => t('Preview post'),
@@ -50,7 +43,7 @@ function node_configure() {
     '#description' => t('Must users preview posts before submitting?'),
   );
 
-  return system_settings_form($form, TRUE);
+  return system_settings_form($form);
 }
 
 /**
@@ -64,7 +57,7 @@ function _node_characters($length) {
  * Form button submit callback.
  */
 function node_configure_access_submit($form, &$form_state) {
-  $form_state['redirect'] = 'admin/content/node-settings/rebuild';
+  $form_state['redirect'] = 'admin/content/node/rebuild';
 }
 
 /**
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1023
diff -u -p -r1.1023 node.module
--- modules/node/node.module	6 Feb 2009 16:25:08 -0000	1.1023
+++ modules/node/node.module	9 Feb 2009 00:11:37 -0000
@@ -1692,14 +1692,15 @@ function node_menu() {
     'weight' => -10,
   );
 
-  $items['admin/content/node-settings'] = array(
-    'title' => 'Post settings',
+  $items['admin/build/types/settings'] = array(
+    'title' => 'Settings',
     'description' => 'Control posting behavior, such as teaser length, requiring previews before posting, and the number of posts on the front page.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('node_configure'),
     'access arguments' => array('administer nodes'),
+    'type' => MENU_LOCAL_TASK,
   );
-  $items['admin/content/node-settings/rebuild'] = array(
+  $items['admin/content/node/rebuild'] = array(
     'title' => 'Rebuild permissions',
     'page arguments' => array('node_configure_rebuild_confirm'),
     // Any user than can potentially trigger a node_access_needs_rebuild(TRUE)
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.124
diff -u -p -r1.124 system.admin.inc
--- modules/system/system.admin.inc	3 Feb 2009 18:55:31 -0000	1.124
+++ modules/system/system.admin.inc	9 Feb 2009 00:11:39 -0000
@@ -1224,13 +1224,20 @@ function system_site_information_setting
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
     '#required' => TRUE,
   );
+  $form['default_nodes_main'] = array(
+    '#type' => 'select',
+    '#title' => t('Number of posts on main page'),
+    '#default_value' => 10,
+    '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
+    '#description' => t('The default maximum number of posts to display per page.'),
+  );
   $form['site_403'] = array(
     '#type' => 'textfield',
     '#title' => t('Default 403 (access denied) page'),
     '#default_value' => '',
     '#size' => 40,
     '#description' => t('This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.'),
-    '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
+    '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
   );
   $form['site_404'] = array(
     '#type' => 'textfield',
@@ -1238,7 +1245,7 @@ function system_site_information_setting
     '#default_value' => '',
     '#size' => 40,
     '#description' => t('This page is displayed when no other content matches the requested document. If unsure, specify nothing.'),
-    '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
+    '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
   );
   $form['#validate'][] = 'system_site_information_settings_validate';