Index: modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.116 diff -u -r1.116 user.admin.inc --- modules/user/user.admin.inc 29 Jul 2010 01:39:32 -0000 1.116 +++ modules/user/user.admin.inc 26 Aug 2010 02:01:21 -0000 @@ -916,7 +916,7 @@ */ 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'); + drupal_goto('admin/people/roles'); } // Display the edit role form. @@ -986,7 +986,7 @@ user_role_save($role); drupal_set_message(t('The role has been added.')); } - $form_state['redirect'] = 'admin/people/permissions/roles'; + $form_state['redirect'] = 'admin/people/roles'; return; } @@ -1005,7 +1005,7 @@ '#type' => 'value', '#value' => $role->rid, ); - return confirm_form($form, t('Are you sure you want to delete the role %name ?', array('%name' => $role->name)), 'admin/people/permissions/roles', t('This action cannot be undone.'), t('Delete')); + return confirm_form($form, t('Are you sure you want to delete the role %name ?', array('%name' => $role->name)), 'admin/people/roles', t('This action cannot be undone.'), t('Delete')); } /** @@ -1014,7 +1014,7 @@ function user_admin_role_delete_confirm_submit($form, &$form_state) { user_role_delete((int) $form_state['values']['rid']); drupal_set_message(t('The role has been deleted.')); - $form_state['redirect'] = 'admin/people/permissions/roles'; + $form_state['redirect'] = 'admin/people/roles'; } /** Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1195 diff -u -r1.1195 user.module --- modules/user/user.module 23 Aug 2010 14:53:50 -0000 1.1195 +++ modules/user/user.module 26 Aug 2010 02:01:22 -0000 @@ -48,7 +48,7 @@ $output .= '
' . t('Creating and managing users') . '
'; $output .= '
' . t('The User module allows users with the appropriate permissions to create user accounts through the People administration page, where they can also assign users to one or more roles, and block or delete user accounts. If allowed, users without accounts (anonymous users) can create their own accounts on the Create new account page.', array('@permissions' => url('admin/people/permissions', array('fragment' => 'module-user')), '@people' => url('admin/people'), '@register' => url('user/register'))) . '
'; $output .= '
' . t('User roles and permissions') . '
'; - $output .= '
' . t('Roles are used to group and classify users; each user can be assigned one or more roles. By default there are two roles: anonymous user (users that are not logged in) and authenticated user (users that are registered and logged in). Depending on choices you made when you installed Drupal, the installation process may have defined more roles, and you can create additional custom roles on the Roles page. After creating roles, you can set permissions for each role on the Permissions page. Granting a permission allows users who have been assigned a particular role to perform an action on the site, such as viewing a particular type of content, editing or creating content, administering settings for a particular module, or using a particular function of the site (such as search).', array('@permissions_user' => url('admin/people/permissions'), '@roles' => url('admin/people/permissions/roles'))) . '
'; + $output .= '
' . t('Roles are used to group and classify users; each user can be assigned one or more roles. By default there are two roles: anonymous user (users that are not logged in) and authenticated user (users that are registered and logged in). Depending on choices you made when you installed Drupal, the installation process may have defined more roles, and you can create additional custom roles on the Roles page. After creating roles, you can set permissions for each role on the Permissions page. Granting a permission allows users who have been assigned a particular role to perform an action on the site, such as viewing a particular type of content, editing or creating content, administering settings for a particular module, or using a particular function of the site (such as search).', array('@permissions_user' => url('admin/people/permissions'), '@roles' => url('admin/people/roles'))) . '
'; $output .= '
' . t('Account settings') . '
'; $output .= '
' . t('The Account settings page 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'))) . '
'; $output .= ''; @@ -56,8 +56,8 @@ 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/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/people/permissions/roles'), '@settings' => url('admin/config/people/accounts'))) . '

'; - case 'admin/people/permissions/roles': + 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/people/roles'), '@settings' => url('admin/config/people/accounts'))) . '

'; + case 'admin/people/roles': $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 on the permissions page. 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'))) . '

'; $output .= '

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

'; $output .= '