Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.88
diff -u -p -r1.88 menu.admin.inc
--- modules/menu/menu.admin.inc	13 Oct 2010 13:43:21 -0000	1.88
+++ modules/menu/menu.admin.inc	18 Oct 2010 15:31:18 -0000
@@ -652,32 +652,25 @@ function menu_reset_item_confirm_submit(
  * Menu callback; Build the form presenting menu configuration options.
  */
 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. To configure these settings for a particular content type, visit the <a href="@content-types">Content types</a> page, click the <em>edit</em> link for the content type, and go to the <em>Menu settings</em> section.', array('@content-types' => url('admin/structure/types'))),
-  );
-
   $menu_options = menu_get_menus();
 
-  $main = variable_get('menu_main_links_source', 'main-menu');
   $form['menu_main_links_source'] = array(
     '#type' => 'select',
-    '#title' => t('Source for the Main links'),
+    '#title' => t('Source menu for the Main links'),
     '#default_value' => variable_get('menu_main_links_source', 'main-menu'),
     '#empty_option' => t('No Main links'),
     '#options' => $menu_options,
     '#tree' => FALSE,
-    '#description' => t('Select what should be displayed as the Main links (typically at the top of the page).'),
+    '#description' => t('Typically shown at the top of the page.'),
   );
-
   $form['menu_secondary_links_source'] = array(
     '#type' => 'select',
-    '#title' => t('Source for the Secondary links'),
+    '#title' => t('Source menu for the Secondary links'),
     '#default_value' => variable_get('menu_secondary_links_source', 'user-menu'),
     '#empty_option' => t('No Secondary links'),
     '#options' => $menu_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 shown to complement the Main links near the top of the page. Use the same source as Main links to show the child links of the active Main link.'),
   );
 
   return system_settings_form($form);
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.233
diff -u -p -r1.233 menu.module
--- modules/menu/menu.module	24 Sep 2010 00:37:43 -0000	1.233
+++ modules/menu/menu.module	18 Oct 2010 15:32:05 -0000
@@ -31,6 +31,14 @@ function menu_help($path, $arg) {
       return $output;
     case 'admin/structure/menu/add':
       return '<p>' . t('You can enable the newly-created block for this menu on the <a href="@blocks">Blocks administration page</a>.', array('@blocks' => url('admin/structure/block'))) . '</p>';
+
+    case 'admin/structure/menu/settings':
+      $output = '<p>';
+      $output .= t('Two configurable menu areas are provided within the page template. <a href="@theme-settings-url">Themes</a> may display the menus in non-conventional locations or may choose to omit them completely.', array(
+        '@theme-settings-url' => url('admin/appearance/settings'),
+      ));
+      $output .= '</p>';
+      return $output;
   }
   if ($path == 'admin/structure/menu' && module_exists('block')) {
     return '<p>' . t('Each menu has a corresponding block that is managed on the <a href="@blocks">Blocks administration page</a>.', array('@blocks' => url('admin/structure/block'))) . '</p>';
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.320
diff -u -p -r1.320 system.admin.inc
--- modules/system/system.admin.inc	15 Oct 2010 04:23:18 -0000	1.320
+++ modules/system/system.admin.inc	18 Oct 2010 15:33:19 -0000
@@ -407,8 +407,8 @@ function system_theme_settings($form, &$
     'comment_user_picture'      => t('User pictures in comments'),
     'comment_user_verification' => t('User verification status in comments'),
     'favicon'                   => t('Shortcut icon'),
-    'main_menu'                 => t('Main menu'),
-    'secondary_menu'            => t('Secondary menu'),
+    'main_menu'                 => t('Main links'),
+    'secondary_menu'            => t('Secondary links'),
   );
 
   // Some features are not always available
@@ -429,7 +429,11 @@ function system_theme_settings($form, &$
   );
   foreach ($toggles as $name => $title) {
     if ((!$key) || in_array($name, $features)) {
-      $form['theme_settings']['toggle_' . $name] = array('#type' => 'checkbox', '#title' => $title, '#default_value' => theme_get_setting('toggle_' . $name, $key));
+      $form['theme_settings']['toggle_' . $name] = array(
+        '#type' => 'checkbox',
+        '#title' => $title,
+        '#default_value' => theme_get_setting('toggle_' . $name, $key),
+      );
       // Disable checkboxes for features not supported in the current configuration.
       if (isset($disabled['toggle_' . $name])) {
         $form['theme_settings']['toggle_' . $name]['#disabled'] = TRUE;