===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v
retrieving revision 1.24
diff -u -p -r1.24 comment.admin.inc
--- modules/comment/comment.admin.inc	19 Jun 2009 13:03:53 -0000	1.24
+++ modules/comment/comment.admin.inc	25 Jun 2009 21:14:36 -0000
@@ -116,7 +116,7 @@ function comment_admin_overview_validate
   // We can't execute any 'Update options' if no comments were selected.
   if (count($form_state['values']['comments']) == 0) {
     form_set_error('', t('Please select one or more comments to perform the update on.'));
-    drupal_goto('admin/content/comment');
+    drupal_goto('admin/content/content/comment');
   }
 }
 
@@ -147,7 +147,7 @@ function comment_admin_overview_submit($
     }
     cache_clear_all();
     drupal_set_message(t('The update has been performed.'));
-    $form_state['redirect'] = 'admin/content/comment';
+    $form_state['redirect'] = 'admin/content/content/comment';
   }
 }
 
@@ -183,12 +183,12 @@ function comment_multiple_delete_confirm
 
   if (!$comment_counter) {
     drupal_set_message(t('There do not appear to be any comments to delete, or your selected comment was deleted by another administrator.'));
-    drupal_goto('admin/content/comment');
+    drupal_goto('admin/content/content/comment');
   }
   else {
     return confirm_form($form,
                         t('Are you sure you want to delete these comments and all their children?'),
-                        'admin/content/comment', t('This action cannot be undone.'),
+                        'admin/content/content/comment', t('This action cannot be undone.'),
                         t('Delete comments'), t('Cancel'));
   }
 }
@@ -207,7 +207,7 @@ function comment_multiple_delete_confirm
     cache_clear_all();
     drupal_set_message(t('The comments have been deleted.'));
   }
-  $form_state['redirect'] = 'admin/content/comment';
+  $form_state['redirect'] = 'admin/content/content/comment';
 }
 
 /**
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.728
diff -u -p -r1.728 comment.module
--- modules/comment/comment.module	22 Jun 2009 15:35:54 -0000	1.728
+++ modules/comment/comment.module	25 Jun 2009 21:14:38 -0000
@@ -159,19 +159,20 @@ function comment_theme() {
  * Implement hook_menu().
  */
 function comment_menu() {
-  $items['admin/content/comment'] = array(
+  $items['admin/content/content/comment'] = array(
     'title' => 'Comments',
     'description' => 'List and edit site comments and the comment approval queue.',
     'page callback' => 'comment_admin',
     'access arguments' => array('administer comments'),
+    'type' => MENU_LOCAL_TASK,
   );
   // Tabs begin here.
-  $items['admin/content/comment/new'] = array(
+  $items['admin/content/content/comment/new'] = array(
     'title' => 'Published comments',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
-  $items['admin/content/comment/approval'] = array(
+  $items['admin/content/content/comment/approval'] = array(
     'title' => 'Approval queue',
     'page arguments' => array('approval'),
     'access arguments' => array('administer comments'),
Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.33
diff -u -p -r1.33 comment.test
--- modules/comment/comment.test	20 Jun 2009 07:30:17 -0000	1.33
+++ modules/comment/comment.test	25 Jun 2009 21:14:38 -0000
@@ -203,7 +203,7 @@ class CommentHelperCase extends DrupalWe
     $edit = array();
     $edit['operation'] = $operation;
     $edit['comments[' . $comment->id . ']'] = TRUE;
-    $this->drupalPost('admin/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update'));
+    $this->drupalPost('admin/content/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update'));
 
     if ($operation == 'delete') {
       $this->drupalPost(NULL, array(), t('Delete comments'));
@@ -223,7 +223,7 @@ class CommentHelperCase extends DrupalWe
    *   Comment id.
    */
   function getUnapprovedComment($subject) {
-    $this->drupalGet('admin/content/comment/approval');
+    $this->drupalGet('admin/content/content/comment/approval');
     preg_match('/href="(.*?)#comment-([^"]+)"(.*?)>(' . $subject . ')/', $this->drupalGetContent(), $match);
 
     return $match[2];
@@ -422,19 +422,19 @@ class CommentAnonymous extends CommentHe
     $this->drupalLogin($this->admin_user);
     $this->performCommentOperation($anonymous_comment3, 'unpublish');
 
-    $this->drupalGet('admin/content/comment/approval');
+    $this->drupalGet('admin/content/content/comment/approval');
     $this->assertRaw('comments[' . $anonymous_comment3->id . ']', t('Comment was unpublished.'));
 
     // Publish comment.
     $this->performCommentOperation($anonymous_comment3, 'publish', TRUE);
 
-    $this->drupalGet('admin/content/comment');
+    $this->drupalGet('admin/content/content/comment');
     $this->assertRaw('comments[' . $anonymous_comment3->id . ']', t('Comment was published.'));
 
     // Delete comment.
     $this->performCommentOperation($anonymous_comment3, 'delete');
 
-    $this->drupalGet('admin/content/comment');
+    $this->drupalGet('admin/content/content/comment');
     $this->assertNoRaw('comments[' . $anonymous_comment3->id . ']', t('Comment was deleted.'));
 
     // Reset.
@@ -562,7 +562,7 @@ class CommentApprovalTest extends Commen
   }
 
   /**
-   * Test comment approval functionality through admin/content/comment.
+   * Test comment approval functionality through admin/content/content/comment.
    */
   function testApprovalAdminInterface() {
     $this->drupalLogin($this->admin_user);
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1073
diff -u -p -r1.1073 node.module
--- modules/node/node.module	24 Jun 2009 18:16:38 -0000	1.1073
+++ modules/node/node.module	25 Jun 2009 21:14:41 -0000
@@ -1648,16 +1648,15 @@ function _node_add_access() {
  * Implement hook_menu().
  */
 function node_menu() {
-  $items['admin/content/node'] = array(
+  $items['admin/content/content'] = array(
     'title' => 'Content',
     'description' => "View, edit, and delete your site's content.",
     'page callback' => 'drupal_get_form',
     'page arguments' => array('node_admin_content'),
     'access arguments' => array('administer nodes'),
   );
-
-  $items['admin/content/node/overview'] = array(
-    'title' => 'List',
+  $items['admin/content/content/node'] = array(
+    'title' => 'Content',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );