Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.897
diff -u -p -r1.897 user.module
--- modules/user/user.module	19 Mar 2008 07:35:15 -0000	1.897
+++ modules/user/user.module	30 Mar 2008 15:07:07 -0000
@@ -1835,14 +1835,15 @@ function user_help($path, $arg) {
       return '<p>'. t("This web page allows administrators to register new users. Users' e-mail addresses and usernames must be unique.") .'</p>';
     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>';
+      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/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>';
+      return '<p>' . t('Permissions work together with <a href="!url">user roles</a> to let you control what users can do on your site.  Each user role has its own set of permissions.  For example, you can give users classified as "administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. This allows trusted users to share the administrative burden of running your site. You can also use permissions to let privileged users access special features and content.', array('!url' => url('admin/user/roles', array('absolute' => TRUE)))) . '</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/user/permissions')));
+      return '<p>' . t('Roles work together with <a href="!url">user permissions</a> to let you control what users can do on your site.  For example, you might give the "administrators" role special administrative permissions or let "subscribers" access restricted content. Once a role is created, you assign users to them by editing the user\'s profile. Users given more than one role and will enjoy the combined permissions of each assigned role.', array('!url' => url('admin/user/permissions', array('absolute' => TRUE)))) . '</p><p>' . t('By default, Drupal comes with two user roles:') . '</p>' . 
+      '<ul>' . 
+      '<li>' . t('Anonymous user: this role is used for users that don\'t have a user account or that are not authenticated.') . '</li>' .
+      '<li>' . t('Authenticated user: this role is automatically granted to all logged in users.') . '</li>' . 
+      '</ul>';
     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>';
   }
