Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1080 diff -u -p -r1.1080 user.module --- modules/user/user.module 13 Nov 2009 10:21:50 -0000 1.1080 +++ modules/user/user.module 16 Nov 2009 02:14:59 -0000 @@ -2731,21 +2731,30 @@ function user_help($path, $arg) { switch ($path) { case 'admin/help#user': - $output = '

' . t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The user module supports user roles which establish fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles anonymous - a user who has not logged in, and authenticated a user who has signed up and who has been authorized.') . '

'; - $output .= '

' . t("Users can use their own name or handle and can specify personal configuration settings through their individual My account page. Users must authenticate by supplying a local username and password or through their OpenID, an optional and secure method for logging into many websites with a single username and password. In some configurations, users may authenticate using a username and password from another Drupal site, or through some other site-specific mechanism.") . '

'; - $output .= '

' . 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.') . '

'; - $output .= '

' . t('For more information, see the online handbook entry for User module.', array('@user' => 'http://drupal.org/handbook/modules/user/')) . '

'; + $output = '

' . t('About') . '

'; + $output .= '

' . t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. ') . '

'; + $output .= '

' . t('Uses') . '

'; + $output .= '
'; + $output .= '
' . t('User management') . '
'; + $output .= '
' . t('Drupal makes it very easy to create users through the people admnistration page. In addition to creating users you can also change their roles, and delete users.', array('@people' => 'admin/people')) . '
'; + $output .= '
' . t('User roles and permissions') . '
'; + $output .= '
' . t('The user module supports user roles which establish fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles anonymous — a user who has not logged in, and authenticated — a user who has signed up and who has been authorized.', array('@permissions_user' => 'admin/config/people/permissions#module-user', '@roles' => 'admin/config/people/roles')) . '
'; + $output .= '
' . t('Account setting') . '
'; + $output .= '
' . t('The account setting page allows you to manage who can create users and the requirements to create users.', array('@accounts' => 'admin/config/people/accounts')) . '
'; + $output .= '
'; return $output; case 'admin/people/create': return '

' . t("This web page allows administrators to register new users. Users' e-mail addresses and usernames must be unique.") . '

'; case 'admin/config/people/permissions': return '

' . 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 Roles 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 User Settings 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/config/people/roles'), '@settings' => url('admin/config/people/accounts'))) . '

'; case 'admin/config/people/roles': - return 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 in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".

By default, Drupal comes with two user roles:

- ', array('@permissions' => url('admin/config/people/permissions'))); + $output = '

' . 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 in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose edit.', array('@permissions' => url('admin/config/people/permissions')) . '

'; + $output .= '

' . t('By default, Drupal comes with two user roles:') . '

'; + $output .= ''; + return $output; case 'admin/config/people/accounts/fields': return '

' . t('This form lets administrators add, edit, and arrange fields for storing user data.') . '

'; case 'admin/config/people/accounts/display':