Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.104
diff -u -p -r1.104 user.admin.inc
--- modules/user/user.admin.inc	24 Mar 2010 07:34:10 -0000	1.104
+++ modules/user/user.admin.inc	24 Mar 2010 14:14:13 -0000
@@ -904,10 +904,6 @@ function theme_user_admin_roles($variabl
  * @see user_admin_role_submit()
  */
 function user_admin_role($form, $form_state, $role) {
-  if ($role->rid == DRUPAL_ANONYMOUS_RID || $role->rid == DRUPAL_AUTHENTICATED_RID) {
-    drupal_goto('admin/people/permissions/roles');
-  }
-
   // Display the edit role form.
   $form['name'] = array(
     '#type' => 'textfield',
@@ -935,6 +931,11 @@ function user_admin_role($form, $form_st
     '#type' => 'submit',
     '#value' => t('Delete role'),
   );
+  $form['actions']['cancel'] = array(
+    '#type' => 'link',
+    '#title' => t('Cancel'),
+    '#href' => 'admin/people/permissions/roles',
+  );
 
   return $form;
 }
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1146
diff -u -p -r1.1146 user.module
--- modules/user/user.module	24 Mar 2010 10:13:26 -0000	1.1146
+++ modules/user/user.module	24 Mar 2010 14:13:20 -0000
@@ -20,8 +20,6 @@ define('EMAIL_MAX_LENGTH', 254);
  * Implement hook_help().
  */
 function user_help($path, $arg) {
-  global $user;
-
   switch ($path) {
     case 'admin/help#user':
       $output = '';
@@ -37,22 +35,27 @@ function user_help($path, $arg) {
       $output .= '<dd>' . t('The <a href="@accounts">Account settings page</a> allows you to manage settings for the displayed name of the anonymous user role, personal contact forms, user registration, and account cancellation. On this page you can also manage settings for account personalization (including signatures and user pictures), and adapt the text for the e-mail messages that are sent automatically during the user registration process.', array('@accounts'  => url('admin/config/people/accounts'))) . '</dd>';
       $output .= '</dl>';
       return $output;
+
     case 'admin/people/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/people/permissions':
       return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href="@role">Roles</a> page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the <a href="@settings">User Settings</a> page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/people/permissions/roles'), '@settings' => url('admin/config/people/accounts'))) . '</p>';
+
     case 'admin/people/permissions/roles':
-      $output = '<p>' . t('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 on the <a href="@permissions">permissions page</a>. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the names and order of the roles on your site. It is recommended to order your roles from least permissive (anonymous user) to most permissive (administrator). To delete a role choose "edit role".', array('@permissions' => url('admin/people/permissions'))) . '</p>';
-      $output .= '<p>'. t('By default, Drupal comes with two user roles:') . '</p>';
-      $output .= '<ul>';
-      $output .= '<li>' . t("Anonymous user: this role is used for users that don't have a user account or that are not authenticated.") . '</li>';
-      $output .= '<li>' . t('Authenticated user: this role is automatically granted to all logged in users.') . '</li>';
-      $output .= '</ul>';
+      $roles = user_roles();
+      $output = '<p>' . t('Roles are used to grant certain privileges to users, as defined on the <a href="@permissions">permissions page</a>. It is recommended to order roles from least permissive (%anonymous-role) to most permissive (administrator). To delete a role choose "edit role".', array(
+        '@permissions' => url('admin/people/permissions'),
+        '%anonymous-role' => $roles[DRUPAL_ANONYMOUS_RID],
+      )) . '</p>';
       return $output;
+
     case 'admin/config/people/accounts/fields':
       return '<p>' . t('This form lets administrators add, edit, and arrange fields for storing user data.') . '</p>';
+
     case 'admin/config/people/accounts/display':
       return '<p>' . t('This form lets administrators configure how fields should be displayed when rendering a user profile page.') . '</p>';
+
     case 'admin/people/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>';
   }
@@ -2504,15 +2507,17 @@ function user_roles($membersonly = FALSE
 
   foreach ($result as $role) {
     switch ($role->rid) {
-      // We only translate the built in role names
+      // We only translate the built in role names.
       case DRUPAL_ANONYMOUS_RID:
         if (!$membersonly) {
           $roles[$role->rid] = t($role->name);
         }
         break;
+
       case DRUPAL_AUTHENTICATED_RID:
         $roles[$role->rid] = t($role->name);
         break;
+
       default:
         $roles[$role->rid] = $role->name;
     }