define roles: MDL-16966 go back to 'Define roles' in the admin menu, rather than...

Define is a stronger verb than manage, and most of the things there are to do with defining roles. I keep finding myself looking for 'Define roles' in the menu when I am testing, which suggests changing the working in 1.9 does more harm than good.

diff --git a/admin/settings/users.php b/admin/settings/users.php
index 43a99d802fffa644be1cd5955fe9c3e47a0ab74a..c4ddfd17c99cae61e92cc635e91be28f5a349ba1 100644 (file)
--- a/admin/settings/users.php
+++ b/admin/settings/users.php
@@ -170,7 +170,7 @@ if ($hassiteconfig
     }
     $ADMIN->add('roles', $temp);
 
-    $ADMIN->add('roles', new admin_externalpage('defineroles', get_string('manageroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php", 'moodle/role:manage'));
+    $ADMIN->add('roles', new admin_externalpage('defineroles', get_string('defineroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php", 'moodle/role:manage'));
     $ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=".$systemcontext->id, 'moodle/role:assign'));
     $ADMIN->add('roles', new admin_externalpage('checkpermissions', get_string('checkglobalpermissions', 'role'), "$CFG->wwwroot/$CFG->admin/roles/check.php?contextid=".$systemcontext->id, array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage')));