diff -urp drupal6/modules/blogapi/blogapi.install drupal-6.0-rc2/modules/blogapi/blogapi.install
--- drupal6/modules/blogapi/blogapi.install	2008-01-25 21:31:44.000000000 +0100
+++ drupal-6.0-rc2/modules/blogapi/blogapi.install	2008-01-09 10:51:34.000000000 +0100
@@ -10,7 +10,7 @@
  * Inform users about the new permission.
  */
 function blogapi_update_6000() {
-  drupal_set_message("Blog API module does not depend on blog module's permissions anymore, but provides its own 'administer content with blog api' permission instead. Until <a href=\"". url('admin/users/permissions', array('fragment' => 'module-blogapi')) .'">this permission is assigned</a> to at least one user role, only the site administrator will be able to use Blog API features.');
+  drupal_set_message("Blog API module does not depend on blog module's permissions anymore, but provides its own 'administer content with blog api' permission instead. Until <a href=\"". url('admin/user/permissions', array('fragment' => 'module-blogapi')) .'">this permission is assigned</a> to at least one user role, only the site administrator will be able to use Blog API features.');
   return array();
 }
 
Only in drupal6/modules/book: book.js
diff -urp drupal6/modules/comment/comment.module drupal-6.0-rc2/modules/comment/comment.module
--- drupal6/modules/comment/comment.module	2008-01-25 20:57:53.000000000 +0100
+++ drupal-6.0-rc2/modules/comment/comment.module	2008-01-10 16:03:53.000000000 +0100
@@ -540,7 +540,7 @@ function comment_form_alter(&$form, $for
         COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'),
         COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'),
         COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information')),
-      '#description' => t('This option is enabled when anonymous users have permission to post comments on the <a href="@url">permissions page</a>.', array('@url' => url('admin/users/permissions', array('fragment' => 'module-comment')))),
+      '#description' => t('This option is enabled when anonymous users have permission to post comments on the <a href="@url">permissions page</a>.', array('@url' => url('admin/user/permissions', array('fragment' => 'module-comment')))),
     );
     if (!user_access('post comments', user_load(array('uid' => 0)))) {
       $form['comment']['comment_anonymous']['#disabled'] = TRUE;
diff -urp drupal6/modules/node/node.module drupal-6.0-rc2/modules/node/node.module
--- drupal6/modules/node/node.module	2008-01-25 21:07:30.000000000 +0100
+++ drupal-6.0-rc2/modules/node/node.module	2008-01-10 16:57:10.000000000 +0100
@@ -38,7 +38,7 @@ function node_help($path, $arg) {
     case 'admin/help#node':
       $output = '<p>'. t('The node module manages content on your site, and stores all posts (regardless of type) as a "node". In addition to basic publishing settings, including whether the post has been published, promoted to the site front page, or should remain present (or sticky) at the top of lists, the node module also records basic information about the author of a post. Optional revision control over edits is available. For additional functionality, the node module is often extended by other modules.') .'</p>';
       $output .= '<p>'. t('Though each post on your site is a node, each post is also of a particular <a href="@content-type">content type</a>. <a href="@content-type">Content types</a> are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Each content type may have different default settings for <em>Publishing options</em> and other workflow controls. By default, the two content types in a standard Drupal installation are <em>Page</em> and <em>Story</em>. Use the <a href="@content-type">content types page</a> to add new or edit existing content types. Additional content types also become available as you enable additional core, contributed and custom modules.', array('@content-type' => url('admin/content/types'))) .'</p>';
-      $output .= '<p>'. t('The administrative <a href="@content">content page</a> allows you to review and manage your site content. The <a href="@post-settings">post settings page</a> sets certain options for the display of posts. The node module makes a number of permissions available for each content type, which may be set by role on the <a href="@permissions">permissions page</a>.', array('@content' => url('admin/content/node'), '@post-settings' => url('admin/content/node-settings'), '@permissions' => url('admin/users/permissions'))) .'</p>';
+      $output .= '<p>'. t('The administrative <a href="@content">content page</a> allows you to review and manage your site content. The <a href="@post-settings">post settings page</a> sets certain options for the display of posts. The node module makes a number of permissions available for each content type, which may be set by role on the <a href="@permissions">permissions page</a>.', array('@content' => url('admin/content/node'), '@post-settings' => url('admin/content/node-settings'), '@permissions' => url('admin/user/permissions'))) .'</p>';
       $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@node">Node module</a>.', array('@node' => 'http://drupal.org/handbook/modules/node/')) .'</p>';
       return $output;
     case 'admin/content/node':
diff -urp drupal6/modules/profile/profile.admin.inc drupal-6.0-rc2/modules/profile/profile.admin.inc
--- drupal6/modules/profile/profile.admin.inc	2008-01-25 21:10:46.000000000 +0100
+++ drupal-6.0-rc2/modules/profile/profile.admin.inc	2008-01-08 11:35:42.000000000 +0100
@@ -27,8 +27,8 @@ function profile_admin_overview() {
     $form[$field->fid]['type'] = array('#value' => $field->type);
     $form[$field->fid]['category'] = array('#type' => 'select', '#default_value' => $field->category, '#options' => array());
     $form[$field->fid]['weight'] = array('#type' => 'weight', '#default_value' => $field->weight);
-    $form[$field->fid]['edit'] = array('#value' => l(t('edit'), "admin/users/profile/edit/$field->fid"));
-    $form[$field->fid]['delete'] = array('#value' => l(t('delete'), "admin/users/profile/delete/$field->fid"));
+    $form[$field->fid]['edit'] = array('#value' => l(t('edit'), "admin/user/profile/edit/$field->fid"));
+    $form[$field->fid]['delete'] = array('#value' => l(t('delete'), "admin/user/profile/delete/$field->fid"));
   }
 
   // Add the cateogory combo boxes
@@ -55,7 +55,7 @@ function profile_admin_overview() {
   $addnewfields = '<h2>'. t('Add new field') .'</h2>';
   $addnewfields .= '<ul>';
   foreach (_profile_field_types() as $key => $value) {
-    $addnewfields .= '<li>'. l($value, "admin/users/profile/add/$key") .'</li>';
+    $addnewfields .= '<li>'. l($value, "admin/user/profile/add/$key") .'</li>';
   }
   $addnewfields .= '</ul>';
   $form['addnewfields'] = array('#value' => $addnewfields);
@@ -213,7 +213,7 @@ function profile_field_form(&$form_state
   $form['fields']['category'] = array('#type' => 'textfield',
     '#title' => t('Category'),
     '#default_value' => $edit['category'],
-    '#autocomplete_path' => 'admin/users/profile/autocomplete',
+    '#autocomplete_path' => 'admin/user/profile/autocomplete',
     '#description' => t('The category the new field should be part of. Categories are used to group fields logically. An example category is "Personal information".'),
     '#required' => TRUE,
   );
@@ -342,7 +342,7 @@ function profile_field_form_submit($form
     db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, '%s', '%s')", $form_state['values']['title'], $form_state['values']['name'], $form_state['values']['explanation'], $form_state['values']['category'], $form_state['values']['type'], $form_state['values']['weight'], $form_state['values']['required'], $form_state['values']['register'], $form_state['values']['visibility'], $form_state['values']['autocomplete'], $form_state['values']['options'], $form_state['values']['page']);
 
     drupal_set_message(t('The field has been created.'));
-    watchdog('profile', 'Profile field %field added under category %category.', array('%field' => $form_state['values']['title'], '%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/users/profile'));
+    watchdog('profile', 'Profile field %field added under category %category.', array('%field' => $form_state['values']['title'], '%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile'));
   }
   else {
     db_query("UPDATE {profile_fields} SET title = '%s', name = '%s', explanation = '%s', category = '%s', weight = %d, required = %d, register = %d, visibility = %d, autocomplete = %d, options = '%s', page = '%s' WHERE fid = %d", $form_state['values']['title'], $form_state['values']['name'], $form_state['values']['explanation'], $form_state['values']['category'], $form_state['values']['weight'], $form_state['values']['required'], $form_state['values']['register'], $form_state['values']['visibility'], $form_state['values']['autocomplete'], $form_state['values']['options'], $form_state['values']['page'], $form_state['values']['fid']);
@@ -352,7 +352,7 @@ function profile_field_form_submit($form
   cache_clear_all();
   menu_rebuild();
 
-  $form_state['redirect'] = 'admin/users/profile';
+  $form_state['redirect'] = 'admin/user/profile';
   return;
 }
 
@@ -369,8 +369,8 @@ function profile_field_delete(&$form_sta
   $form['title'] = array('#type' => 'value', '#value' => $field->title);
 
   return confirm_form($form,
-    t('Are you sure you want to delete the field %field?', array('%field' => $field->title)), 'admin/users/profile',
-    t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="@edit-field">edit this field</a> and change it to a hidden profile field so that it may only be accessed by administrators.', array('@edit-field' => url('admin/users/profile/edit/'. $fid))),
+    t('Are you sure you want to delete the field %field?', array('%field' => $field->title)), 'admin/user/profile',
+    t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="@edit-field">edit this field</a> and change it to a hidden profile field so that it may only be accessed by administrators.', array('@edit-field' => url('admin/user/profile/edit/'. $fid))),
     t('Delete'), t('Cancel'));
 }
 
@@ -384,9 +384,9 @@ function profile_field_delete_submit($fo
   cache_clear_all();
 
   drupal_set_message(t('The field %field has been deleted.', array('%field' => $form_state['values']['title'])));
-  watchdog('profile', 'Profile field %field deleted.', array('%field' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/users/profile'));
+  watchdog('profile', 'Profile field %field deleted.', array('%field' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile'));
 
-  $form_state['redirect'] = 'admin/users/profile';
+  $form_state['redirect'] = 'admin/user/profile';
   return;
 }
 
diff -urp drupal6/modules/profile/profile.module drupal-6.0-rc2/modules/profile/profile.module
--- drupal6/modules/profile/profile.module	2008-01-25 21:12:27.000000000 +0100
+++ drupal-6.0-rc2/modules/profile/profile.module	2007-12-31 09:54:37.000000000 +0100
@@ -43,7 +43,7 @@ function profile_help($path, $arg) {
       $output .= '<li>'. t('date') .'</li></ul>';
       $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@profile">Profile module</a>.', array('@profile' => 'http://drupal.org/handbook/modules/profile/')) .'</p>';
       return $output;
-    case 'admin/users/profile':
+    case 'admin/user/profile':
       return '<p>'. t("This page displays a list of the existing custom profile fields to be displayed on a user's <em>My Account</em> page. To provide structure, similar or related fields may be placed inside a category. To add a new category (or edit an existing one), edit a profile field and provide a new category name. To change the category of a field or the order of fields within a category, grab a drag-and-drop handle under the Title column and drag the field to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the <em>Save configuration</em> button at the bottom of the page.") .'</p>';
   }
 }
@@ -83,7 +83,7 @@ function profile_menu() {
     'type' => MENU_SUGGESTED_ITEM,
     'file' => 'profile.pages.inc',
   );
-  $items['admin/users/profile'] = array(
+  $items['admin/user/profile'] = array(
     'title' => 'Profiles',
     'description' => 'Create customizable fields for your users.',
     'page callback' => 'drupal_get_form',
@@ -91,27 +91,27 @@ function profile_menu() {
     'access arguments' => array('administer users'),
     'file' => 'profile.admin.inc',
   );
-  $items['admin/users/profile/add'] = array(
+  $items['admin/user/profile/add'] = array(
     'title' => 'Add field',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('profile_field_form'),
     'type' => MENU_CALLBACK,
     'file' => 'profile.admin.inc',
   );
-  $items['admin/users/profile/autocomplete'] = array(
+  $items['admin/user/profile/autocomplete'] = array(
     'title' => 'Profile category autocomplete',
     'page callback' => 'profile_admin_settings_autocomplete',
     'type' => MENU_CALLBACK,
     'file' => 'profile.admin.inc',
   );
-  $items['admin/users/profile/edit'] = array(
+  $items['admin/user/profile/edit'] = array(
     'title' => 'Edit field',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('profile_field_form'),
     'type' => MENU_CALLBACK,
     'file' => 'profile.admin.inc',
   );
-  $items['admin/users/profile/delete'] = array(
+  $items['admin/user/profile/delete'] = array(
     'title' => 'Delete field',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('profile_field_delete'),
@@ -150,7 +150,7 @@ function profile_block($op = 'list', $de
       '#title' => t('Profile fields to display'),
       '#default_value' => variable_get('profile_block_author_fields', NULL),
       '#options' => $fields,
-      '#description' => t('Select which profile fields you wish to display in the block. Only fields designated as public in the <a href="@profile-admin">profile field configuration</a> are available.', array('@profile-admin' => url('admin/users/profile'))),
+      '#description' => t('Select which profile fields you wish to display in the block. Only fields designated as public in the <a href="@profile-admin">profile field configuration</a> are available.', array('@profile-admin' => url('admin/user/profile'))),
     );
     return $form;
   }
diff -urp drupal6/modules/statistics/statistics.admin.inc drupal-6.0-rc2/modules/statistics/statistics.admin.inc
--- drupal6/modules/statistics/statistics.admin.inc	2008-01-25 21:16:02.000000000 +0100
+++ drupal-6.0-rc2/modules/statistics/statistics.admin.inc	2008-01-08 11:35:42.000000000 +0100
@@ -89,7 +89,7 @@ function statistics_top_visitors() {
   $rows = array();
   while ($account = db_fetch_object($result)) {
     $qs = drupal_get_destination();
-    $ban_link = $account->aid ? l(t('unban'), "admin/users/rules/delete/$account->aid", array('query' => $qs)) : l(t('ban'), "admin/users/rules/add/$account->hostname/host", array('query' => $qs));
+    $ban_link = $account->aid ? l(t('unban'), "admin/user/rules/delete/$account->aid", array('query' => $qs)) : l(t('ban'), "admin/user/rules/add/$account->hostname/host", array('query' => $qs));
     $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), $ban_link);
   }
 
diff -urp drupal6/modules/statistics/statistics.module drupal-6.0-rc2/modules/statistics/statistics.module
--- drupal6/modules/statistics/statistics.module	2008-01-25 21:27:58.000000000 +0100
+++ drupal-6.0-rc2/modules/statistics/statistics.module	2008-01-04 10:31:48.000000000 +0100
@@ -14,7 +14,7 @@ function statistics_help($path, $arg) {
     case 'admin/help#statistics':
       $output = '<p>'. t('The statistics module keeps track of numerous site usage statistics, including the number of times, and from where, each of your posts is viewed. These statistics are useful in determining how users are interacting with each other and with your site, and are required for the display of some Drupal blocks.') .'</p>';
       $output .= '<p>'. t('The statistics module provides:') .'</p>';
-      $output .= '<ul><li>'. t('a counter for each post on your site that increments each time the post is viewed. (Enable <em>Count content views</em> on the <a href="@accesslog">access log settings page</a>, and determine if the post access counters should be visible to any user roles on the <a href="@permissions">permissions page</a>.)', array('@accesslog' => url('admin/reports/settings'), '@permissions' => url('admin/users/permissions'))) .'</li>';
+      $output .= '<ul><li>'. t('a counter for each post on your site that increments each time the post is viewed. (Enable <em>Count content views</em> on the <a href="@accesslog">access log settings page</a>, and determine if the post access counters should be visible to any user roles on the <a href="@permissions">permissions page</a>.)', array('@accesslog' => url('admin/reports/settings'), '@permissions' => url('admin/user/permissions'))) .'</li>';
       $output .= '<li>'. t('a <a href="@recent-hits">recent hits</a> log that displays information about the latest activity on your site, including the URL and title of the page accessed, the user name (if available) and IP address of the accessing party.', array('@recent-hits' => url('admin/reports/hits'))) .'</li>';
       $output .= '<li>'. t('a <a href="@top-referrers">top referrers</a> log that displays the referring parties for your site visits (where your visitors came from).', array('@top-referrers' => url('admin/reports/referrers'))) .'</li>';
       $output .= '<li>'. t('a <a href="@top-pages">top pages</a> log that displays site content in descending order by number of views.', array('@top-pages' => url('admin/reports/pages'))) .'</li>';
diff -urp drupal6/modules/system/system.install drupal-6.0-rc2/modules/system/system.install
--- drupal6/modules/system/system.install	2008-01-25 21:35:55.000000000 +0100
+++ drupal-6.0-rc2/modules/system/system.install	2008-01-10 23:47:17.000000000 +0100
@@ -1485,7 +1485,7 @@ function system_update_6017() {
         $ret[] = array('success' => TRUE, 'query' => "variable_set($new_name)");
         $ret[] = array('success' => TRUE, 'query' => "variable_del($old_name)");
         if ($old_name == 'user_mail_approval_body') {
-          drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved. See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/users/settings'))));
+          drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved. See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/user/settings'))));
         }
       }
     }
@@ -2455,7 +2455,7 @@ function system_update_6045() {
 
   // Notify user that delete permissions may have been changed. This was in
   // effect since system_update_6039(), but there was no user notice.
-  drupal_set_message('Drupal now has separate edit and delete permissions. Previously, users who were able to edit content were automatically allowed to delete it. For added security, delete permissions for individual core content types have been <strong>removed</strong> from all roles on your site (only roles with the "administer nodes" permission can now delete these types of content). If you would like to reenable any individual delete permissions, you can do this at the <a href="'. url('admin/users/permissions', array('fragment' => 'module-node')) .'">permissions page</a>.');
+  drupal_set_message('Drupal now has separate edit and delete permissions. Previously, users who were able to edit content were automatically allowed to delete it. For added security, delete permissions for individual core content types have been <strong>removed</strong> from all roles on your site (only roles with the "administer nodes" permission can now delete these types of content). If you would like to reenable any individual delete permissions, you can do this at the <a href="'. url('admin/user/permissions', array('fragment' => 'module-node')) .'">permissions page</a>.');
   return $ret;
 }
 
diff -urp drupal6/modules/system/system.module drupal-6.0-rc2/modules/system/system.module
--- drupal6/modules/system/system.module	2008-01-25 21:36:21.000000000 +0100
+++ drupal-6.0-rc2/modules/system/system.module	2008-01-10 23:47:17.000000000 +0100
@@ -78,7 +78,7 @@ function system_help($path, $arg) {
     case 'admin/build/themes/settings':
       return '<p>'. t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') .'</p>';
     case 'admin/build/modules':
-      $output = '<p>'. t('Modules are plugins that extend Drupal\'s core functionality. Enable modules by selecting the <em>Enabled</em> checkboxes below and clicking the <em>Save configuration</em> button. Once a module is enabled, new <a href="@permissions">permissions</a> may be available. To reduce server load, modules with their <em>Throttle</em> checkbox selected are temporarily disabled when your site becomes extremely busy. (Note that the <em>Throttle</em> checkbox is only available if the Throttle module is enabled.)', array('@permissions' => url('admin/users/permissions')));
+      $output = '<p>'. t('Modules are plugins that extend Drupal\'s core functionality. Enable modules by selecting the <em>Enabled</em> checkboxes below and clicking the <em>Save configuration</em> button. Once a module is enabled, new <a href="@permissions">permissions</a> may be available. To reduce server load, modules with their <em>Throttle</em> checkbox selected are temporarily disabled when your site becomes extremely busy. (Note that the <em>Throttle</em> checkbox is only available if the Throttle module is enabled.)', array('@permissions' => url('admin/user/permissions')));
       if (module_exists('throttle')) {
         $output .= ' '. t('The auto-throttle functionality must be enabled on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.', array('@throttle' => url('admin/settings/throttle')));
       }
@@ -1191,7 +1191,7 @@ function system_get_module_admin_tasks($
   $admin_task_count = 0;
   // Check for permissions.
   if (module_hook($module, 'perm') && $admin_access) {
-    $admin_tasks[-1] = l(t('Configure permissions'), 'admin/users/permissions', array('fragment' => 'module-'. $module));
+    $admin_tasks[-1] = l(t('Configure permissions'), 'admin/user/permissions', array('fragment' => 'module-'. $module));
   }
 
   // Check for menu items that are admin links.
diff -urp drupal6/modules/translation/translation.module drupal-6.0-rc2/modules/translation/translation.module
--- drupal6/modules/translation/translation.module	2008-01-25 20:57:23.000000000 +0100
+++ drupal-6.0-rc2/modules/translation/translation.module	2008-01-09 12:51:54.000000000 +0100
@@ -33,7 +33,7 @@ function translation_help($path, $arg) {
     case 'admin/help#translation':
       $output = '<p>'. t('The content translation module allows content to be translated into different languages. Working with the <a href="@locale">locale module</a> (which manages enabled languages and provides translation for the site interface), the content translation module is key to creating and maintaining translated site content.', array('@locale' => url('admin/help/locale'))) .'</p>';
       $output .= '<p>'. t('Configuring content translation and translation-enabled content types:') .'</p>';
-      $output .= '<ul><li>'. t('Assign the <em>translate content</em> permission to the appropriate user roles at the <a href="@permissions">Permissions configuration page</a>.', array('@permissions' => url('admin/users/permissions'))) .'</li>';
+      $output .= '<ul><li>'. t('Assign the <em>translate content</em> permission to the appropriate user roles at the <a href="@permissions">Permissions configuration page</a>.', array('@permissions' => url('admin/user/permissions'))) .'</li>';
       $output .= '<li>'. t('Add and enable desired languages at the <a href="@languages">Languages configuration page</a>.', array('@languages' => url('admin/settings/language'))) .'</li>';
       $output .= '<li>'. t('Determine which <a href="@content-types">content types</a> should support translation features. To enable translation support for a content type, edit the type and at the <em>Multilingual support</em> drop down, select <em>Enabled, with translation</em>. (<em>Multilingual support</em> is located within <em>Workflow settings</em>.) Be sure to save each content type after enabling multilingual support.', array('@content-types' => url('admin/content/types'))) .'</li></ul>';
       $output .= '<p>'. t('Working with translation-enabled content types:') .'</p>';
diff -urp drupal6/modules/upload/upload.module drupal-6.0-rc2/modules/upload/upload.module
--- drupal6/modules/upload/upload.module	2008-01-25 21:34:05.000000000 +0100
+++ drupal-6.0-rc2/modules/upload/upload.module	2007-12-31 09:46:44.000000000 +0100
@@ -18,7 +18,7 @@ function upload_help($path, $arg) {
       $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@upload">Upload module</a>.', array('@upload' => 'http://drupal.org/handbook/modules/upload/')) .'</p>';
       return $output;
     case 'admin/settings/upload':
-      return '<p>'. t('Users with the <a href="@permissions">upload files permission</a> can upload attachments. Users with the <a href="@permissions">view uploaded files permission</a> can view uploaded attachments. You can choose which post types can take attachments on the <a href="@types">content types settings</a> page.', array('@permissions' => url('admin/users/permissions'), '@types' => url('admin/settings/types'))) .'</p>';
+      return '<p>'. t('Users with the <a href="@permissions">upload files permission</a> can upload attachments. Users with the <a href="@permissions">view uploaded files permission</a> can view uploaded attachments. You can choose which post types can take attachments on the <a href="@types">content types settings</a> page.', array('@permissions' => url('admin/user/permissions'), '@types' => url('admin/settings/types'))) .'</p>';
   }
 }
 
diff -urp drupal6/modules/user/user.admin.inc drupal-6.0-rc2/modules/user/user.admin.inc
--- drupal6/modules/user/user.admin.inc	2008-01-25 20:55:07.000000000 +0100
+++ drupal-6.0-rc2/modules/user/user.admin.inc	2008-01-10 22:42:59.000000000 +0100
@@ -13,7 +13,7 @@ function user_admin($callback_arg = '') 
     case 'search':
     case t('Search'):
       $keys = isset($_POST['keys']) ? $_POST['keys'] : NULL;
-      $output = drupal_get_form('search_form', url('admin/users/search'), $keys, 'user') . search_data($keys, 'user');
+      $output = drupal_get_form('search_form', url('admin/user/search'), $keys, 'user') . search_data($keys, 'user');
       break;
     case t('Create new account'):
     case 'create':
@@ -120,7 +120,7 @@ function user_filter_form_submit($form, 
       return;
   }
 
-  $form_state['redirect'] = 'admin/users/users';
+  $form_state['redirect'] = 'admin/user/user';
   return;
 }
 
@@ -620,7 +620,7 @@ function user_admin_role() {
   $rid = arg(4);
   if ($rid) {
     if ($rid == DRUPAL_ANONYMOUS_RID || $rid == DRUPAL_AUTHENTICATED_RID) {
-      drupal_goto('admin/users/roles');
+      drupal_goto('admin/user/roles');
     }
     // Display the edit role form.
     $role = db_fetch_object(db_query('SELECT * FROM {role} WHERE rid = %d', $rid));
@@ -697,7 +697,7 @@ function user_admin_role_submit($form, &
     db_query("INSERT INTO {role} (name) VALUES ('%s')", $form_state['values']['name']);
     drupal_set_message(t('The role has been added.'));
   }
-  $form_state['redirect'] = 'admin/users/roles';
+  $form_state['redirect'] = 'admin/user/roles';
   return;
 }
 
@@ -723,7 +723,7 @@ function user_admin_access_add($mask = N
       db_query("INSERT INTO {access} (mask, type, status) VALUES ('%s', '%s', %d)", $edit['mask'], $edit['type'], $edit['status']);
       $aid = db_last_insert_id('access', 'aid');
       drupal_set_message(t('The access rule has been added.'));
-      drupal_goto('admin/users/rules');
+      drupal_goto('admin/user/rules');
     }
   }
   else {
@@ -744,7 +744,7 @@ function user_admin_access_edit($aid = 0
     else {
       db_query("UPDATE {access} SET mask = '%s', type = '%s', status = '%s' WHERE aid = %d", $edit['mask'], $edit['type'], $edit['status'], $aid);
       drupal_set_message(t('The access rule has been saved.'));
-      drupal_goto('admin/users/rules');
+      drupal_goto('admin/user/rules');
     }
   }
   else {
@@ -870,7 +870,7 @@ function user_admin_access_delete_confir
   $form['aid'] = array('#type' => 'hidden', '#value' => $aid);
   $output = confirm_form($form,
                   t('Are you sure you want to delete the @type rule for %rule?', array('@type' => $access_types[$edit->type], '%rule' => $edit->mask)),
-                  'admin/users/rules',
+                  'admin/user/rules',
                   t('This action cannot be undone.'),
                   t('Delete'),
                   t('Cancel'));
@@ -880,7 +880,7 @@ function user_admin_access_delete_confir
 function user_admin_access_delete_confirm_submit($form, &$form_state) {
   db_query('DELETE FROM {access} WHERE aid = %d', $form_state['values']['aid']);
   drupal_set_message(t('The access rule has been deleted.'));
-  $form_state['redirect'] = 'admin/users/rules';
+  $form_state['redirect'] = 'admin/user/rules';
   return;
 }
 
@@ -893,7 +893,7 @@ function user_admin_access() {
   $access_types = array('user' => t('username'), 'mail' => t('e-mail'), 'host' => t('host'));
   $rows = array();
   while ($rule = db_fetch_object($result)) {
-    $rows[] = array($rule->status ? t('allow') : t('deny'), $access_types[$rule->type], $rule->mask, l(t('edit'), 'admin/users/rules/edit/'. $rule->aid), l(t('delete'), 'admin/users/rules/delete/'. $rule->aid));
+    $rows[] = array($rule->status ? t('allow') : t('deny'), $access_types[$rule->type], $rule->mask, l(t('edit'), 'admin/user/rules/edit/'. $rule->aid), l(t('delete'), 'admin/user/rules/delete/'. $rule->aid));
   }
   if (empty($rows)) {
     $rows[] = array(array('data' => '<em>'. t('There are currently no access rules.') .'</em>', 'colspan' => 5));
@@ -954,9 +954,9 @@ function theme_user_admin_account($form)
 function theme_user_admin_new_role($form) {
   $header = array(t('Name'), array('data' => t('Operations'), 'colspan' => 2));
   foreach (user_roles() as $rid => $name) {
-    $edit_permissions = l(t('edit permissions'), 'admin/users/permissions/'. $rid);
+    $edit_permissions = l(t('edit permissions'), 'admin/user/permissions/'. $rid);
     if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
-      $rows[] = array($name, l(t('edit role'), 'admin/users/roles/edit/'. $rid), $edit_permissions);
+      $rows[] = array($name, l(t('edit role'), 'admin/user/roles/edit/'. $rid), $edit_permissions);
     }
     else {
       $rows[] = array($name, t('locked'), $edit_permissions);
diff -urp drupal6/modules/user/user.js drupal-6.0-rc2/modules/user/user.js
--- drupal6/modules/user/user.js	2008-01-25 21:02:45.000000000 +0100
+++ drupal-6.0-rc2/modules/user/user.js	2007-09-12 20:29:32.000000000 +0200
@@ -176,7 +176,7 @@ Drupal.setDefaultTimezone = function() {
 };
 
 /**
- * On the admin/users/settings page, conditionally show all of the
+ * On the admin/user/settings page, conditionally show all of the
  * picture-related form elements depending on the current value of the
  * "Picture support" radio buttons.
  */
diff -urp drupal6/modules/user/user.module drupal-6.0-rc2/modules/user/user.module
--- drupal6/modules/user/user.module	2008-01-25 20:53:31.000000000 +0100
+++ drupal-6.0-rc2/modules/user/user.module	2008-01-10 21:22:57.000000000 +0100
@@ -927,7 +927,7 @@ function user_menu() {
   );
 
   // Admin user pages
-  $items['admin/users'] = array(
+  $items['admin/user'] = array(
     'title' => 'User management',
     'description' => "Manage your site's users, groups and access to site features.",
     'position' => 'left',
@@ -936,7 +936,7 @@ function user_menu() {
     'file' => 'system.admin.inc',
     'file path' => drupal_get_path('module', 'system'),
   );
-  $items['admin/userss/users'] = array(
+  $items['admin/user/user'] = array(
     'title' => 'Users',
     'description' => 'List, add, and edit users.',
     'page callback' => 'user_admin',
@@ -944,18 +944,18 @@ function user_menu() {
     'access arguments' => array('administer users'),
     'file' => 'user.admin.inc',
   );
-  $items['admin/userss/users/list'] = array(
+  $items['admin/user/user/list'] = array(
     'title' => 'List',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
-  $items['admin/userss/users/create'] = array(
+  $items['admin/user/user/create'] = array(
     'title' => 'Add user',
     'page arguments' => array('create'),
     'type' => MENU_LOCAL_TASK,
     'file' => 'user.admin.inc',
   );
-  $items['admin/users/settings'] = array(
+  $items['admin/user/settings'] = array(
     'title' => 'User settings',
     'description' => 'Configure default behavior of users, including registration requirements, e-mails, and user pictures.',
     'page callback' => 'drupal_get_form',
@@ -965,7 +965,7 @@ function user_menu() {
   );
 
   // Admin access pages
-  $items['admin/users/permissions'] = array(
+  $items['admin/user/permissions'] = array(
     'title' => 'Permissions',
     'description' => 'Determine access to features by selecting permissions for roles.',
     'page callback' => 'drupal_get_form',
@@ -973,7 +973,7 @@ function user_menu() {
     'access arguments' => array('administer permissions'),
     'file' => 'user.admin.inc',
   );
-  $items['admin/users/roles'] = array(
+  $items['admin/user/roles'] = array(
     'title' => 'Roles',
     'description' => 'List, edit, or add user roles.',
     'page callback' => 'drupal_get_form',
@@ -981,43 +981,43 @@ function user_menu() {
     'access arguments' => array('administer permissions'),
     'file' => 'user.admin.inc',
   );
-  $items['admin/users/roles/edit'] = array(
+  $items['admin/user/roles/edit'] = array(
     'title' => 'Edit role',
     'page arguments' => array('user_admin_role'),
     'type' => MENU_CALLBACK,
     'file' => 'user.admin.inc',
   );
-  $items['admin/users/rules'] = array(
+  $items['admin/user/rules'] = array(
     'title' => 'Access rules',
     'description' => 'List and create rules to disallow usernames, e-mail addresses, and IP addresses.',
     'page callback' => 'user_admin_access',
     'access arguments' => array('administer permissions'),
     'file' => 'user.admin.inc',
   );
-  $items['admin/users/rules/list'] = array(
+  $items['admin/user/rules/list'] = array(
     'title' => 'List',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
-  $items['admin/users/rules/add'] = array(
+  $items['admin/user/rules/add'] = array(
     'title' => 'Add rule',
     'page callback' => 'user_admin_access_add',
     'type' => MENU_LOCAL_TASK,
     'file' => 'user.admin.inc',
   );
-  $items['admin/users/rules/check'] = array(
+  $items['admin/user/rules/check'] = array(
     'title' => 'Check rules',
     'page callback' => 'user_admin_access_check',
     'type' => MENU_LOCAL_TASK,
     'file' => 'user.admin.inc',
   );
-  $items['admin/users/rules/edit'] = array(
+  $items['admin/user/rules/edit'] = array(
     'title' => 'Edit rule',
     'page callback' => 'user_admin_access_edit',
     'type' => MENU_CALLBACK,
     'file' => 'user.admin.inc',
   );
-  $items['admin/users/rules/delete'] = array(
+  $items['admin/user/rules/delete'] = array(
     'title' => 'Delete rule',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_admin_access_delete_confirm'),
@@ -1026,7 +1026,7 @@ function user_menu() {
   );
 
   if (module_exists('search')) {
-    $items['admin/users/search'] = array(
+    $items['admin/user/search'] = array(
       'title' => 'Search users',
       'description' => 'Search users by name or e-mail address.',
       'page callback' => 'user_admin',
@@ -1801,7 +1801,7 @@ function user_multiple_delete_confirm(&$
 
   return confirm_form($form,
                       t('Are you sure you want to delete these users?'),
-                      'admin/userss/users', t('This action cannot be undone.'),
+                      'admin/user/user', t('This action cannot be undone.'),
                       t('Delete all'), t('Cancel'));
 }
 
@@ -1812,7 +1812,7 @@ function user_multiple_delete_confirm_su
     }
     drupal_set_message(t('The users have been deleted.'));
   }
-  $form_state['redirect'] = 'admin/userss/users';
+  $form_state['redirect'] = 'admin/user/user';
   return;
 }
 
@@ -1829,22 +1829,22 @@ function user_help($path, $arg) {
       $output .= '<p>'. t('A visitor accessing your website is assigned a unique ID, or session ID, which is stored in a cookie. The cookie does not contain personal information, but acts as a key to retrieve information from your site. Users should have cookies enabled in their web browser when using your site.') .'</p>';
       $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@user">User module</a>.', array('@user' => 'http://drupal.org/handbook/modules/user/')) .'</p>';
       return $output;
-    case 'admin/userss/users':
+    case 'admin/user/user':
       return '<p>'. t('Drupal allows users to register, login, log out, maintain user profiles, etc. Users of the site may not use their own names to post content until they have signed up for a user account.') .'</p>';
-    case 'admin/userss/users/create':
-    case 'admin/userss/users/account/create':
+    case 'admin/user/user/create':
+    case 'admin/user/user/account/create':
       return '<p>'. t("This web page allows administrators to register new users. Users' e-mail addresses and usernames must be unique.") .'</p>';
-    case 'admin/users/rules':
+    case 'admin/user/rules':
       return '<p>'. t('Set up username and e-mail address access rules for new <em>and</em> existing accounts (currently logged in accounts will not be logged out). If a username or e-mail address for an account matches any deny rule, but not an allow rule, then the account will not be allowed to be created or to log in. A host rule is effective for every page view, not just registrations.') .'</p>';
-    case 'admin/users/permissions':
-      return '<p>'. t('Permissions let you control what users can do on your site. Each user role (defined on the <a href="@role">user roles page</a>) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.', array('@role' => url('admin/users/roles'))) .'</p>';
-    case 'admin/users/roles':
+    case 'admin/user/permissions':
+      return '<p>'. t('Permissions let you control what users can do on your site. Each user role (defined on the <a href="@role">user roles page</a>) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.', array('@role' => url('admin/user/roles'))) .'</p>';
+    case 'admin/user/roles':
       return t('<p>Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined in <a href="@permissions">user permissions</a>. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the <em>role names</em> of the various roles. To delete a role choose "edit".</p><p>By default, Drupal comes with two user roles:</p>
       <ul>
       <li>Anonymous user: this role is used for users that don\'t have a user account or that are not authenticated.</li>
       <li>Authenticated user: this role is automatically granted to all logged in users.</li>
-      </ul>', array('@permissions' => url('admin/users/permissions')));
-    case 'admin/users/search':
+      </ul>', array('@permissions' => url('admin/user/permissions')));
+    case 'admin/user/search':
       return '<p>'. t('Enter a simple pattern ("*" may be used as a wildcard match) to search for a username or e-mail address. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda@example.com".') .'</p>';
   }
 }
@@ -2332,7 +2332,7 @@ function user_register() {
      '#type' => 'checkbox',
      '#title' => t('Notify user of new account')
     );
-    // Redirect back to page which initiated the create request; usually admin/userss/users/create
+    // Redirect back to page which initiated the create request; usually admin/user/user/create
     $form['destination'] = array('#type' => 'hidden', '#value' => $_GET['q']);
   }
 
diff -urp drupal6/modules/user/user.pages.inc drupal-6.0-rc2/modules/user/user.pages.inc
--- drupal6/modules/user/user.pages.inc	2008-01-25 21:02:11.000000000 +0100
+++ drupal-6.0-rc2/modules/user/user.pages.inc	2008-01-08 11:35:43.000000000 +0100
@@ -319,7 +319,7 @@ function user_confirm_delete_submit($for
   drupal_set_message(t('%name has been deleted.', array('%name' => $form_state['values']['_account']->name)));
 
   if (!isset($_REQUEST['destination'])) {
-    $form_state['redirect'] = 'admin/users/user';
+    $form_state['redirect'] = 'admin/user/user';
   }
 }
 
