Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.406
diff -u -r1.406 menu.inc
--- includes/menu.inc	22 Aug 2010 14:57:44 -0000	1.406
+++ includes/menu.inc	23 Aug 2010 09:28:39 -0000
@@ -1617,7 +1617,6 @@
     'management' => 'Management',
     'user-menu' => 'User menu',
     'main-menu' => 'Main menu',
-    'secondary-menu' => 'Secondary menu',
   );
 }
 
@@ -2077,7 +2076,7 @@
     $active = $menu_names;
   }
   elseif (!isset($active)) {
-    $active = variable_get('menu_default_active_menus', array('management', 'navigation', 'user-menu', 'main-menu'));
+    $active = variable_get('menu_default_active_menus', array_keys(menu_list_system_menus()));
   }
   return $active;
 }
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.606
diff -u -r1.606 theme.inc
--- includes/theme.inc	22 Aug 2010 12:46:21 -0000	1.606
+++ includes/theme.inc	23 Aug 2010 09:28:41 -0000
@@ -2002,7 +2002,7 @@
 
 /**
  * Returns HTML output for a single table cell for theme_table().
- * 
+ *
  * @param $cell
  *   Array of cell information, or string to display in cell.
  * @param bool $header
@@ -2258,14 +2258,45 @@
   $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
   $variables['logo']              = theme_get_setting('logo');
   $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
-  $variables['main_menu']         = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array();
-  $variables['secondary_menu']    = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array();
   $variables['action_links']      = menu_local_actions();
   $variables['site_name']         = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : '');
   $variables['site_slogan']       = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : '');
   $variables['tabs']              = theme('menu_local_tasks');
   $variables['title']             = drupal_get_title();
 
+  if (theme_get_setting('toggle_main_menu')) {
+    $variables['main_menu'] = theme('links__system_main_menu', array(
+      'links' => menu_main_menu(),
+      'attributes' => array(
+        'class' => array('links', 'main-menu'),
+      ),
+      'heading' => array(
+        'text' => t('Main menu'),
+        'level' => 'h2',
+        'class' => array('element-invisible'),
+      )
+    ));
+  }
+  else {
+    $variables['main_menu'] = FALSE;
+  }
+  if (theme_get_setting('toggle_secondary_menu')) {
+    $variables['secondary_menu'] = theme('links__system_secondary_menu', array(
+      'links' => menu_secondary_menu(),
+      'attributes' => array(
+        'class' => array('links', 'secondary-menu'),
+      ),
+      'heading' => array(
+        'text' => t('Secondary menu'),
+        'level' => 'h2',
+        'class' => array('element-invisible'),
+      )
+    ));
+  }
+  else {
+    $variables['secondary_menu'] = FALSE;
+  }
+
   if ($node = menu_get_object()) {
     $variables['node'] = $node;
   }
Index: themes/bartik/css/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/style-rtl.css,v
retrieving revision 1.4
diff -u -r1.4 style-rtl.css
--- themes/bartik/css/style-rtl.css	22 Aug 2010 14:03:57 -0000	1.4
+++ themes/bartik/css/style-rtl.css	23 Aug 2010 09:28:42 -0000
@@ -81,13 +81,17 @@
   margin-right: 10px;
 }
 
-/* --------------- Main Navigation ------------ */
+/* --------------- Main and Secondary menus ------------ */
 
-#navigation ul.links li.first {
+#main-menu ul.links li.first {
   padding-right: 2px;
   padding-left: 0;
 }
 
+#secondary-menu {
+  float: left;
+}
+
 /* ----------------- Content ------------------ */
 
 #block-system-main .submitted .user-picture img {
Index: themes/bartik/css/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/style.css,v
retrieving revision 1.5
diff -u -r1.5 style.css
--- themes/bartik/css/style.css	22 Aug 2010 14:03:57 -0000	1.5
+++ themes/bartik/css/style.css	23 Aug 2010 09:28:42 -0000
@@ -338,24 +338,24 @@
   display: none;
 }
 
-/* --------------- Main Navigation ------------ */
+/* --------------- Main Menu ------------ */
 
-#navigation {
+#main-menu {
   padding: 0 15px;
   clear: both;
 }
-#navigation a {
+#main-menu a {
   color: #d9d9d9;
   padding: 0.6em 1em 0.4em;
 }
-#navigation ul {
+#main-menu ul {
   padding: 2px 0;
 }
-#navigation ul.links {
+#main-menu ul.links {
   font-size: 105%;
   padding: 0.6em 0.6em 4px;
 }
-#navigation ul.links li a {
+#main-menu ul.links li a {
   color: #333;
   background: #ccc;
   background: rgba(255, 255, 255, 0.7);
@@ -369,31 +369,38 @@
   -webkit-border-top-right-radius: 8px;
   border-top-right-radius: 8px;
 }
-#navigation ul.links li a:hover,
-#navigation ul.links li a:focus {
+#main-menu ul.links li a:hover,
+#main-menu ul.links li a:focus {
   background: #fff;
   background: rgba(255, 255, 255, 0.95);
 }
-#navigation ul.links li a:active {
+#main-menu ul.links li a:active {
   background: #b3b3b3;
   background: rgba(255, 255, 255, 1);
 }
-#navigation ul.links li.active-trail a {
+#main-menu ul.links li.active-trail a {
   border-bottom: none;
 }
-.featured #navigation ul.links li.active-trail a {
+.featured #main-menu ul.links li.active-trail a {
   background: #f0f0f0;
   background: rgba(240, 240, 240, 1.0);
 }
-#navigation ul.links li {
+#main-menu ul.links li {
   display: inline;
   list-style-type: none;
   padding: 0.6em 0 0.4em;
 }
-#navigation ul.links li.first {
+#main-menu ul.links li.first {
   padding-left: 2px; /* LTR */
 }
 
+/* --------------- Secondary Menu ------------ */
+
+#secondary-menu {
+  float: right; /* LTR */
+  margin: 1em 0;
+}
+
 /* ------------------- Main ------------------- */
 
 #main,
@@ -678,9 +685,6 @@
 #footer .block h2 {
   margin: 0;
 }
-#footer-wrapper ul#secondary-menu {
-  margin: 1em 0;
-}
 #footer-columns h2 {
   border-bottom: 1px solid #555;
   border-color: rgba(255,255,255,0.15);  
Index: modules/menu/menu.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.install,v
retrieving revision 1.25
diff -u -r1.25 menu.install
--- modules/menu/menu.install	10 Jan 2010 17:55:19 -0000	1.25
+++ modules/menu/menu.install	23 Aug 2010 09:28:42 -0000
@@ -52,7 +52,6 @@
     'user-menu' => $t("The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link."),
     'management' => $t('The <em>Management</em> menu contains links for administrative tasks.'),
     'main-menu' => $t('The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.'),
-    'secondary-menu' => $t('The <em>Secondary</em> menu is used on many sites for legal notices and contact pages.'),
   );
   foreach ($system_menus as $menu_name => $title) {
     $menu = array(
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.83
diff -u -r1.83 menu.admin.inc
--- modules/menu/menu.admin.inc	1 Aug 2010 23:33:18 -0000	1.83
+++ modules/menu/menu.admin.inc	23 Aug 2010 09:28:42 -0000
@@ -674,7 +674,7 @@
 function menu_configure() {
   $form['intro'] = array(
     '#type' => 'item',
-    '#markup' => t('The menu module allows on-the-fly creation of menu links in the content authoring forms. The following option sets the default menu in which a new link will be added.'),
+    '#markup' => t('Drupal provides two configurable menu areas within the page template. Themes may display the menus in non-conventional locations or may choose to omit them completely.'),
   );
 
   $menu_options = menu_get_menus();
@@ -687,7 +687,7 @@
     '#default_value' => variable_get('menu_main_links_source', 'main-menu'),
     '#options' => $main_options,
     '#tree' => FALSE,
-    '#description' => t('Select what should be displayed as the Main links (typically at the top of the page).'),
+    '#description' => t('Typically displayed at the top of the page.'),
   );
 
   $secondary_options = array_merge($menu_options, array('' => t('No Secondary links')));
@@ -697,7 +697,7 @@
     '#default_value' => variable_get('menu_secondary_links_source', 'user-menu'),
     '#options' => $secondary_options,
     '#tree' => FALSE,
-    '#description' => t("Select the source for the Secondary links. An advanced option allows you to use the same source for both Main links (currently %main) and Secondary links: if your source menu has two levels of hierarchy, the top level menu links will appear in the Main links, and the children of the active link will appear in the Secondary links." , array('%main' => $main_options[$main])),
+    '#description' => t('Typically displayed as a complement to the Main links, near the top of the page. If you use the same source for the Main links and Secondary links, the Secondary links will change based on which Main link is being visited, and will always display the immediate children of that link.'),
   );
 
   return system_settings_form($form);
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.45
diff -u -r1.45 page.tpl.php
--- modules/system/page.tpl.php	8 Aug 2010 19:35:49 -0000	1.45
+++ modules/system/page.tpl.php	23 Aug 2010 09:28:42 -0000
@@ -102,9 +102,10 @@
 
     </div></div> <!-- /.section, /#header -->
 
-    <?php if ($main_menu): ?>
+    <?php if ($main_menu || $secondary_menu): ?>
       <div id="navigation"><div class="section">
-        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php if (!empty($main_menu)): print $main_menu; endif; ?>
+        <?php if (!empty($secondary_menu)): print $secondary_menu; endif; ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
 
@@ -144,7 +145,6 @@
     </div></div> <!-- /#main, /#main-wrapper -->
 
     <div id="footer"><div class="section">
-      <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       <?php print render($page['footer']); ?>
     </div></div> <!-- /.section, /#footer -->
 
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.41
diff -u -r1.41 template.php
--- themes/garland/template.php	30 Jul 2010 02:47:28 -0000	1.41
+++ themes/garland/template.php	23 Aug 2010 09:28:43 -0000
@@ -60,38 +60,6 @@
  */
 function garland_preprocess_page(&$vars) {
   $vars['tabs2'] = menu_secondary_local_tasks();
-  if (isset($vars['main_menu'])) {
-    $vars['primary_nav'] = theme('links__system_main_menu', array(
-      'links' => $vars['main_menu'],
-      'attributes' => array(
-        'class' => array('links', 'main-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Main menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['primary_nav'] = FALSE;
-  }
-  if (isset($vars['secondary_menu'])) {
-    $vars['secondary_nav'] = theme('links__system_secondary_menu', array(
-      'links' => $vars['secondary_menu'],
-      'attributes' => array(
-        'class' => array('links', 'secondary-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Secondary menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['secondary_nav'] = FALSE;
-  }
 
   // Prepare header.
   $site_fields = array();
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.43
diff -u -r1.43 page.tpl.php
--- themes/garland/page.tpl.php	28 Jul 2010 01:40:39 -0000	1.43
+++ themes/garland/page.tpl.php	23 Aug 2010 09:28:42 -0000
@@ -27,8 +27,8 @@
         <?php endif; ?>
         </div>
 
-        <?php if ($primary_nav): print $primary_nav; endif; ?>
-        <?php if ($secondary_nav): print $secondary_nav; endif; ?>
+        <?php if ($main_menu): print $main_menu; endif; ?>
+        <?php if ($secondary_menu): print $secondary_menu; endif; ?>
       </div> <!-- /#header -->
 
       <?php if ($page['sidebar_first']): ?>
Index: themes/bartik/templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/page.tpl.php,v
retrieving revision 1.4
diff -u -r1.4 page.tpl.php
--- themes/bartik/templates/page.tpl.php	22 Aug 2010 13:57:02 -0000	1.4
+++ themes/bartik/templates/page.tpl.php	23 Aug 2010 09:28:42 -0000
@@ -89,6 +89,12 @@
 
   <div id="header"><div class="section clearfix">
 
+    <?php if ($secondary_menu): ?>
+      <div id="secondary-menu" class="nav">
+        <?php if (!empty($secondary_menu)): print $secondary_menu; endif; ?>
+      </div> <!-- /#secondary-menu -->
+    <?php endif; ?>
+
     <?php if ($logo): ?>
       <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
         <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
@@ -124,20 +130,9 @@
     <?php print render($page['header']); ?>
 
     <?php if ($main_menu): ?>
-      <div id="navigation"><div class="section clearfix">
-        <?php print theme('links__system_main_menu', array(
-          'links' => $main_menu,
-          'attributes' => array(
-            'id' => 'main-menu',
-            'class' => array('links', 'clearfix'),
-          ),
-          'heading' => array(
-            'text' => t('Main menu'),
-            'level' => 'h2',
-            'class' => array('element-invisible'),
-          ),
-        )); ?>
-      </div></div> <!-- /.section, /#navigation -->
+      <div id="main-menu" class="nav clearfix">
+        <?php if (!empty($main_menu)): print $main_menu; endif; ?>
+      </div> <!-- /#navigation -->
     <?php endif; ?>
 
   </div></div> <!-- /.section, /#header -->
@@ -220,20 +215,8 @@
       </div><!-- /#footer-columns -->
     <?php endif; ?>
 
-    <?php if ($page['footer'] || $secondary_menu): ?>
+    <?php if ($page['footer']): ?>
       <div id="footer" class="clearfix">
-        <?php print theme('links__system_secondary_menu', array(
-          'links' => $secondary_menu,
-          'attributes' => array(
-            'id' => 'secondary-menu',
-            'class' => array('links', 'clearfix'),
-          ),
-          'heading' => array(
-            'text' => t('Secondary menu'),
-            'level' => 'h2',
-            'class' => array('element-invisible'),
-          ),
-        )); ?>
         <?php print render($page['footer']); ?>
     </div><!-- /#footer -->
     <?php endif; ?>