Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.145
diff -u -p -r1.145 menu.module
--- modules/menu/menu.module	7 Oct 2007 09:50:01 -0000	1.145
+++ modules/menu/menu.module	20 Oct 2007 20:54:47 -0000
@@ -78,7 +78,7 @@ function menu_menu() {
     'weight' => 5,
     'file' => 'menu.admin.inc',
   );
-  $items['admin/build/menu-customize/%menu'] = array(
+  $items['admin/build/menu/%menu'] = array(
     'title' => 'Customize menu',
     'page callback' => 'menu_overview',
     'page arguments' => array(3),
@@ -88,27 +88,27 @@ function menu_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'menu.admin.inc',
   );
-  $items['admin/build/menu-customize/%menu/list'] = array(
+  $items['admin/build/menu/%menu/list'] = array(
     'title' => 'List items',
     'weight' => -10,
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'file' => 'menu.admin.inc',
   );
-  $items['admin/build/menu-customize/%menu/add'] = array(
+  $items['admin/build/menu/%menu/add'] = array(
     'title' => 'Add item',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('menu_edit_item', 'add', NULL, 3),
     'type' => MENU_LOCAL_TASK,
     'file' => 'menu.admin.inc',
   );
-  $items['admin/build/menu-customize/%menu/edit'] = array(
+  $items['admin/build/menu/%menu/edit'] = array(
     'title' => 'Edit menu',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('menu_edit_menu', 'edit', 3),
     'type' => MENU_LOCAL_TASK,
     'file' => 'menu.admin.inc',
   );
-  $items['admin/build/menu-customize/%menu/delete'] = array(
+  $items['admin/build/menu/%menu/delete'] = array(
     'title' => 'Delete menu',
     'page callback' => 'menu_delete_menu_page',
     'page arguments' => array(3),
@@ -163,13 +163,13 @@ function menu_enable() {
   menu_rebuild();
   $result = db_query("SELECT * FROM {menu_custom}");
   $link = db_fetch_array(db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'"));
-  $link['router_path'] = 'admin/build/menu-customize/%';
+  $link['router_path'] = 'admin/build/menu/%';
   $link['module'] = 'menu';
   $result = db_query("SELECT * FROM {menu_custom}");
   while ($menu = db_fetch_array($result)) {
     $link['mlid'] = 0;
     $link['link_title'] = $menu['title'];
-    $link['link_path'] = 'admin/build/menu-customize/'. $menu['menu_name'];
+    $link['link_path'] = 'admin/build/menu/'. $menu['menu_name'];
     if (!db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_path = '%s' AND plid = %d", $link['link_path'], $link['plid']))) {
       menu_link_save($link);
     }
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.3
diff -u -p -r1.3 menu.admin.inc
--- modules/menu/menu.admin.inc	27 Sep 2007 16:59:54 -0000	1.3
+++ modules/menu/menu.admin.inc	20 Oct 2007 20:54:47 -0000
@@ -13,7 +13,7 @@ function menu_overview_page() {
   $result = db_query("SELECT * FROM {menu_custom} ORDER BY title");
   $content = array();
   while ($menu = db_fetch_array($result)) {
-    $menu['href'] = 'admin/build/menu-customize/'. $menu['menu_name'];
+    $menu['href'] = 'admin/build/menu/'. $menu['menu_name'];
     $menu['options'] = array();
     $content[] = $menu;
   }
@@ -111,7 +111,7 @@ function menu_flip_item($hide, $item) {
   $item['customized'] = 1;
   menu_link_save($item);
   drupal_set_message($hide ? t('The menu item has been disabled.') : t('The menu item has been enabled.'));
-  drupal_goto('admin/build/menu-customize/'. $item['menu_name']);
+  drupal_goto('admin/build/menu/'. $item['menu_name']);
 }
 
 /**
@@ -253,7 +253,7 @@ function menu_edit_item_submit($form, &$
   if (!menu_link_save($item)) {
     drupal_set_message(t('There was an error saving the menu link.'), 'error');
   }
-  $form_state['redirect'] = 'admin/build/menu-customize/'. $item['menu_name'];
+  $form_state['redirect'] = 'admin/build/menu/'. $item['menu_name'];
 }
 
 /**
@@ -306,7 +306,7 @@ function menu_edit_menu(&$form_state, $t
  * Submit function for the 'Delete' button on the menu editing form.
  */
 function menu_custom_delete_submit($form, &$form_state) {
-  $form_state['redirect'] = 'admin/build/menu-customize/'. $form_state['values']['menu_name'] .'/delete';
+  $form_state['redirect'] = 'admin/build/menu/'. $form_state['values']['menu_name'] .'/delete';
 }
 
 /**
@@ -332,7 +332,7 @@ function menu_delete_menu_confirm(&$form
     $caption .= '<p>'. format_plural($num_links, '<strong>Warning:</strong> There is currently 1 menu item in %title. It will be deleted (system-defined items will be reset).', '<strong>Warning:</strong> There are currently @count menu items in %title. They will be deleted (system-defined items will be reset).', array('%title' => $menu['title'])) .'</p>';
   }
   $caption .= '<p>'. t('This action cannot be undone.') .'</p>';
-  return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/build/menu-customize/'. $menu['menu_name'], $caption, t('Delete'));
+  return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/build/menu/'. $menu['menu_name'], $caption, t('Delete'));
 }
 
 /**
@@ -351,7 +351,7 @@ function menu_delete_menu_confirm_submit
     menu_reset_item($item);
   }
   // Delete all links to the overview page for this menu.
-  $result = db_query("SELECT mlid FROM {menu_links} ml WHERE ml.link_path = '%s'", 'admin/build/menu-customize/'. $menu['menu_name']);
+  $result = db_query("SELECT mlid FROM {menu_links} ml WHERE ml.link_path = '%s'", 'admin/build/menu/'. $menu['menu_name']);
   while ($m = db_fetch_array($result)) {
     menu_link_delete($m['mlid']);
   }
@@ -394,7 +394,7 @@ function menu_edit_menu_validate($form, 
  */
 function menu_edit_menu_submit($form, &$form_state) {
   $menu = $form_state['values'];
-  $path = 'admin/build/menu-customize/';
+  $path = 'admin/build/menu/';
   if ($form['#insert']) {
     // Add 'menu-' to the menu name to help avoid name-space conflicts.
     $menu['menu_name'] = 'menu-'. $menu['menu_name'];
@@ -435,7 +435,7 @@ function menu_item_delete_page($item) {
  */
 function menu_item_delete_form(&$form_state, $item) {
   $form['#item'] = $item;
-  return confirm_form($form, t('Are you sure you want to delete the custom menu item %item?', array('%item' => $item['link_title'])), 'admin/build/menu-customize/'. $item['menu_name']);
+  return confirm_form($form, t('Are you sure you want to delete the custom menu item %item?', array('%item' => $item['link_title'])), 'admin/build/menu/'. $item['menu_name']);
 }
 
 /**
@@ -447,7 +447,7 @@ function menu_item_delete_form_submit($f
   $t_args = array('%title' => $item['link_title']);
   drupal_set_message(t('The menu item %title has been deleted.', $t_args));
   watchdog('menu', 'Deleted menu item %title.', $t_args, WATCHDOG_NOTICE);
-  $form_state['redirect'] = 'admin/build/menu-customize/'. $item['menu_name'];
+  $form_state['redirect'] = 'admin/build/menu/'. $item['menu_name'];
 }
 
 /**
@@ -455,7 +455,7 @@ function menu_item_delete_form_submit($f
  */
 function menu_reset_item_confirm(&$form_state, $item) {
   $form['item'] = array('#type' => 'value', '#value' => $item);
-  return confirm_form($form, t('Are you sure you want to reset the item %item to its default values?', array('%item' => $item['link_title'])), 'admin/build/menu-customize/'. $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset'));
+  return confirm_form($form, t('Are you sure you want to reset the item %item to its default values?', array('%item' => $item['link_title'])), 'admin/build/menu/'. $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset'));
 }
 
 /**
@@ -465,7 +465,7 @@ function menu_reset_item_confirm_submit(
   $item = $form_state['values']['item'];
   $new_item = menu_reset_item($item);
   drupal_set_message(t('The menu item was reset to its default settings.'));
-  $form_state['redirect'] = 'admin/build/menu-customize/'. $new_item['menu_name'];
+  $form_state['redirect'] = 'admin/build/menu/'. $new_item['menu_name'];
 }
 
 /**