### Eclipse Workspace Patch 1.0
#P drupal-HEAD
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.204
diff -u -r1.204 menu.module
--- modules/menu/menu.module	18 Sep 2009 00:04:22 -0000	1.204
+++ modules/menu/menu.module	2 Oct 2009 22:46:41 -0000
@@ -361,7 +361,7 @@
 function menu_node_prepare($node) {
   if (empty($node->menu)) {
     // Prepare the node for the edit form so that $node->menu always exists.
-    $menu_name = variable_get('menu_default_node_menu', 'main-menu');
+    $menu_name = variable_get('menu_default_node_menu', 'navigation');
     $item = array();
     if (isset($node->nid)) {
       // Give priority to the default menu
@@ -445,7 +445,7 @@
     $options = menu_parent_options(menu_get_menus(), $item);
     $default = $item['menu_name'] . ':' . $item['plid'];
     if (!isset($options[$default])) {
-      $default = 'main-menu:0';
+      $default = 'navigation:0';
     }
     $form['menu']['parent'] = array(
       '#type' => 'select',
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.59
diff -u -r1.59 menu.admin.inc
--- modules/menu/menu.admin.inc	18 Sep 2009 00:12:46 -0000	1.59
+++ modules/menu/menu.admin.inc	2 Oct 2009 22:46:41 -0000
@@ -325,7 +325,7 @@
   $options = menu_parent_options(menu_get_menus(), $item);
   $default = $item['menu_name'] . ':' . $item['plid'];
   if (!isset($options[$default])) {
-    $default = 'main-menu:0';
+    $default = 'navigation:0';
   }
   $form['menu']['parent'] = array(
     '#type' => 'select',
@@ -687,17 +687,17 @@
   $form['menu_default_node_menu'] = array(
     '#type' => 'select',
     '#title' => t('Default menu for content'),
-    '#default_value' => 'main-menu',
+    '#default_value' => 'navigation',
     '#options' => $menu_options,
     '#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
   );
 
-  $main = variable_get('menu_main_links_source', 'main-menu');
+  $main = variable_get('menu_main_links_source', 'navigation');
   $main_options = array_merge($menu_options, array('' => t('No Main links')));
   $form['menu_main_links_source'] = array(
     '#type' => 'select',
     '#title' => t('Source for the Main links'),
-    '#default_value' => 'main-menu',
+    '#default_value' => 'navigation',
     '#options' => $main_options,
     '#tree' => FALSE,
     '#description' => t('Select what should be displayed as the Main links (typically at the top of the page).'),