Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.413
diff -u -p -r1.413 aggregator.module
--- modules/aggregator/aggregator.module	7 Jun 2009 02:27:26 -0000	1.413
+++ modules/aggregator/aggregator.module	5 Jul 2009 00:45:24 -0000
@@ -270,9 +270,9 @@ function _aggregator_has_categories() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function aggregator_perm() {
+function aggregator_permission() {
   return array(
     'administer news feeds' => array(
       'title' => t('Administer news feeds'),
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.347
diff -u -p -r1.347 block.module
--- modules/block/block.module	1 Jul 2009 08:04:19 -0000	1.347
+++ modules/block/block.module	5 Jul 2009 00:45:25 -0000
@@ -105,9 +105,9 @@ function block_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function block_perm() {
+function block_permission() {
   return array(
     'administer blocks' => array(
       'title' => t('Administer blocks'),
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.326
diff -u -p -r1.326 blog.module
--- modules/blog/blog.module	2 Jul 2009 04:27:22 -0000	1.326
+++ modules/blog/blog.module	5 Jul 2009 00:45:25 -0000
@@ -20,9 +20,9 @@ function blog_node_info() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function blog_perm() {
+function blog_permission() {
   return node_list_permissions('blog');
 }
 
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.157
diff -u -p -r1.157 blogapi.module
--- modules/blogapi/blogapi.module	2 Jul 2009 20:23:28 -0000	1.157
+++ modules/blogapi/blogapi.module	5 Jul 2009 00:45:24 -0000
@@ -21,9 +21,9 @@ function blogapi_help($path, $arg) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function blogapi_perm() {
+function blogapi_permission() {
   return array(
     'administer content with blog api' => array(
       'title' => t('Administer content with blog API'),
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.498
diff -u -p -r1.498 book.module
--- modules/book/book.module	2 Jul 2009 04:27:22 -0000	1.498
+++ modules/book/book.module	5 Jul 2009 00:45:25 -0000
@@ -37,9 +37,9 @@ function book_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function book_perm() {
+function book_permission() {
   return array(
     'administer book outlines' => array(
       'title' => t('Administer book outlines'),
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.737
diff -u -p -r1.737 comment.module
--- modules/comment/comment.module	3 Jul 2009 19:21:54 -0000	1.737
+++ modules/comment/comment.module	5 Jul 2009 00:45:25 -0000
@@ -224,9 +224,9 @@ function comment_node_type($op, $info) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function comment_perm() {
+function comment_permission() {
   return array(
     'administer comments' => array(
       'title' => t('Administer comments'),
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.117
diff -u -p -r1.117 contact.module
--- modules/contact/contact.module	13 Jun 2009 20:40:07 -0000	1.117
+++ modules/contact/contact.module	5 Jul 2009 00:45:25 -0000
@@ -33,9 +33,9 @@ function contact_help($path, $arg) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function contact_perm() {
+function contact_permission() {
   return array(
     'administer site-wide contact form' => array(
       'title' => t('Administer site-wide contact form'),
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.261
diff -u -p -r1.261 filter.module
--- modules/filter/filter.module	13 Jun 2009 19:37:27 -0000	1.261
+++ modules/filter/filter.module	5 Jul 2009 00:45:25 -0000
@@ -145,9 +145,9 @@ function filter_admin_format_title($form
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function filter_perm() {
+function filter_permission() {
   return array(
     'administer filters' => array(
       'title' => t('Administer filters'),
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.502
diff -u -p -r1.502 forum.module
--- modules/forum/forum.module	22 Jun 2009 09:10:05 -0000	1.502
+++ modules/forum/forum.module	5 Jul 2009 00:45:25 -0000
@@ -419,9 +419,9 @@ function forum_access($op, $node, $accou
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function forum_perm() {
+function forum_permission() {
   $perms = array(
     'administer forums' => array(
       'title' => t('Administer forums'),
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.242
diff -u -p -r1.242 locale.module
--- modules/locale/locale.module	8 Jun 2009 05:00:11 -0000	1.242
+++ modules/locale/locale.module	5 Jul 2009 00:45:24 -0000
@@ -184,9 +184,9 @@ function locale_inc_callback() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function locale_perm() {
+function locale_permission() {
   return array(
     'administer languages' => array(
       'title' => t('Administer languages'),
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.193
diff -u -p -r1.193 menu.module
--- modules/menu/menu.module	28 Jun 2009 13:08:15 -0000	1.193
+++ modules/menu/menu.module	5 Jul 2009 00:45:25 -0000
@@ -33,9 +33,9 @@ function menu_help($path, $arg) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function menu_perm() {
+function menu_permission() {
   return array(
     'administer menu' => array(
       'title' => t('Administer menu'),
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1078
diff -u -p -r1.1078 node.module
--- modules/node/node.module	3 Jul 2009 10:57:46 -0000	1.1078
+++ modules/node/node.module	5 Jul 2009 00:45:25 -0000
@@ -1261,9 +1261,9 @@ function theme_node_log_message($log) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function node_perm() {
+function node_permission() {
   $perms = array(
     'administer content types' => array(
       'title' => t('Administer content types'),
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.160
diff -u -p -r1.160 path.module
--- modules/path/path.module	30 Jun 2009 18:21:06 -0000	1.160
+++ modules/path/path.module	5 Jul 2009 00:45:25 -0000
@@ -256,9 +256,9 @@ function path_form_alter(&$form, $form_s
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function path_perm() {
+function path_permission() {
   return array(
     'administer url aliases' => array(
       'title' => t('Administer URL aliases'),
Index: modules/php/php.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.module,v
retrieving revision 1.14
diff -u -p -r1.14 php.module
--- modules/php/php.module	27 May 2009 18:34:00 -0000	1.14
+++ modules/php/php.module	5 Jul 2009 00:45:24 -0000
@@ -22,9 +22,9 @@ function php_help($path, $arg) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function php_perm() {
+function php_permission() {
   return array(
     'use PHP for settings' => array(
       'title' => t('Use PHP for settings'),
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.300
diff -u -p -r1.300 poll.module
--- modules/poll/poll.module	22 Jun 2009 09:10:06 -0000	1.300
+++ modules/poll/poll.module	5 Jul 2009 00:45:24 -0000
@@ -51,9 +51,9 @@ function poll_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function poll_perm() {
+function poll_permission() {
   $perms = node_list_permissions('poll');
   $perms += array(
     'vote on polls' => array(
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.300
diff -u -p -r1.300 search.module
--- modules/search/search.module	1 Jul 2009 20:39:20 -0000	1.300
+++ modules/search/search.module	5 Jul 2009 00:45:25 -0000
@@ -141,9 +141,9 @@ function search_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function search_perm() {
+function search_permission() {
   return array(
     'administer search' => array(
       'title' => t('Administer search'),
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.118
diff -u -p -r1.118 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php	1 Jul 2009 12:47:30 -0000	1.118
+++ modules/simpletest/drupal_web_test_case.php	5 Jul 2009 00:51:32 -0000
@@ -876,7 +876,7 @@ class DrupalWebTestCase extends DrupalTe
     static $available;
 
     if (!isset($available) || $reset) {
-      $available = array_keys(module_invoke_all('perm'));
+      $available = array_keys(module_invoke_all('permission'));
     }
 
     $valid = TRUE;
Index: modules/simpletest/simpletest.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.module,v
retrieving revision 1.55
diff -u -p -r1.55 simpletest.module
--- modules/simpletest/simpletest.module	13 Jun 2009 11:29:25 -0000	1.55
+++ modules/simpletest/simpletest.module	5 Jul 2009 00:45:24 -0000
@@ -44,9 +44,9 @@ function simpletest_menu() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function simpletest_perm() {
+function simpletest_permission() {
   return array(
     'administer unit tests' => array(
       'title' => t('Administer unit tests'),
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.10
diff -u -p -r1.10 field_test.module
--- modules/simpletest/tests/field_test.module	2 Jul 2009 20:19:48 -0000	1.10
+++ modules/simpletest/tests/field_test.module	5 Jul 2009 00:45:24 -0000
@@ -5,9 +5,9 @@ define('FIELD_TEST_ELEMENT_ID', 1);
 define('FIELD_TEST_BUNDLE', 'test_bundle');
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function field_test_perm() {
+function field_test_permission() {
   $perms = array(
     'access field_test content' => array(
       'title' => t('Access field_test content'),
Index: modules/simpletest/tests/module_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/module_test.module,v
retrieving revision 1.1
diff -u -p -r1.1 module_test.module
--- modules/simpletest/tests/module_test.module	1 Jul 2009 08:39:55 -0000	1.1
+++ modules/simpletest/tests/module_test.module	5 Jul 2009 00:45:24 -0000
@@ -2,9 +2,9 @@
 // $Id: module_test.module,v 1.1 2009/07/01 08:39:55 dries Exp $
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function module_test_perm() {
+function module_test_permission() {
   return array(
     'module_test perm' => t('example perm for module_test module'),
   );
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.306
diff -u -p -r1.306 statistics.module
--- modules/statistics/statistics.module	2 Jul 2009 04:27:23 -0000	1.306
+++ modules/statistics/statistics.module	5 Jul 2009 00:45:25 -0000
@@ -81,9 +81,9 @@ function statistics_exit() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function statistics_perm() {
+function statistics_permission() {
   return array(
     'access statistics' => array(
       'title' => t('Access statistics'),
Index: modules/system/system.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v
retrieving revision 1.46
diff -u -p -r1.46 system.api.php
--- modules/system/system.api.php	4 Jul 2009 18:26:42 -0000	1.46
+++ modules/system/system.api.php	5 Jul 2009 01:28:21 -0000
@@ -668,7 +668,7 @@ function hook_system_info_alter(&$info, 
  *
  * For a detailed usage example, see page_example.module.
  */
-function hook_perm() {
+function hook_permission() {
   return array(
     'administer my module' =>  array(
       'title' => t('Administer my module'),
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.721
diff -u -p -r1.721 system.module
--- modules/system/system.module	4 Jul 2009 18:26:42 -0000	1.721
+++ modules/system/system.module	5 Jul 2009 00:51:32 -0000
@@ -193,9 +193,9 @@ function system_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function system_perm() {
+function system_permission() {
   return array(
     'administer site configuration' => array(
       'title' => t('Administer site configuration'),
@@ -2206,7 +2206,7 @@ function system_get_module_admin_tasks($
   $admin_tasks = array();
   $admin_task_count = 0;
   // Check for permissions.
-  if (in_array($module, module_implements('perm')) && $admin_access) {
+  if (in_array($module, module_implements('permission')) && $admin_access) {
     $admin_tasks[-1] = l(t('Configure permissions'), 'admin/user/permissions', array('fragment' => 'module-' . $module));
   }
 
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.483
diff -u -p -r1.483 taxonomy.module
--- modules/taxonomy/taxonomy.module	2 Jul 2009 20:23:28 -0000	1.483
+++ modules/taxonomy/taxonomy.module	5 Jul 2009 00:45:24 -0000
@@ -7,9 +7,9 @@
  */
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function taxonomy_perm() {
+function taxonomy_permission() {
   return array(
     'administer taxonomy' => array(
       'title' => t('Administer taxonomy'),
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.1
diff -u -p -r1.1 toolbar.module
--- modules/toolbar/toolbar.module	4 Jul 2009 05:37:30 -0000	1.1
+++ modules/toolbar/toolbar.module	5 Jul 2009 00:45:25 -0000
@@ -7,9 +7,9 @@
  */
 
 /**
- * Implementation of hook_perm().
+ * Implementation of hook_permission().
  */
-function toolbar_perm() {
+function toolbar_permission() {
   return array(
     'access toolbar' => array(
       'title' => t('Access administration toolbar'),
Index: modules/translation/translation.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v
retrieving revision 1.50
diff -u -p -r1.50 translation.module
--- modules/translation/translation.module	2 Jul 2009 04:27:23 -0000	1.50
+++ modules/translation/translation.module	5 Jul 2009 00:45:24 -0000
@@ -82,9 +82,9 @@ function _translation_tab_access($node) 
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function translation_perm() {
+function translation_permission() {
   return array(
     'translate content' => array(
       'title' => t('Translate content'),
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.243
diff -u -p -r1.243 upload.module
--- modules/upload/upload.module	2 Jul 2009 04:27:23 -0000	1.243
+++ modules/upload/upload.module	5 Jul 2009 00:45:25 -0000
@@ -40,9 +40,9 @@ function upload_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function upload_perm() {
+function upload_permission() {
   return array(
     'upload files' => array(
       'title' => t('Upload files'),
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.60
diff -u -p -r1.60 user.admin.inc
--- modules/user/user.admin.inc	1 Jul 2009 08:39:56 -0000	1.60
+++ modules/user/user.admin.inc	5 Jul 2009 01:08:26 -0000
@@ -606,8 +606,8 @@ function user_admin_perm($form_state, $r
   // Render role/permission overview:
   $options = array();
   $hide_descriptions = !system_admin_compact_mode();
-  foreach (module_implements('perm') as $module) {
-    if ($permissions = module_invoke($module, 'perm')) {
+  foreach (module_implements('permission') as $module) {
+    if ($permissions = module_invoke($module, 'permission')) {
       $info = drupal_parse_info_file(drupal_get_path('module', $module) . "/$module.info");
       $form['permission'][] = array(
         '#markup' => $info['name'],
@@ -933,7 +933,7 @@ function user_modules_installed($modules
   $rid = variable_get('user_admin_role', 0);
   if ($rid) {
     foreach ($modules as $module) {
-      if ($permissions = module_invoke($module, 'perm')) {
+      if ($permissions = module_invoke($module, 'permission')) {
         foreach (array_keys($permissions) as $permission) {
           db_insert('role_permission')
             ->fields(array(
@@ -952,7 +952,7 @@ function user_modules_installed($modules
 function user_modules_uninstalled($modules) {
   $permissions = array();
   foreach ($modules as $module) {
-    $permissions = array_merge($permissions, array_keys(module_invoke($module, 'perm')));
+    $permissions = array_merge($permissions, array_keys(module_invoke($module, 'permission')));
   }
   if (!empty($permissions)) {
     db_delete('role_permission')
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1006
diff -u -p -r1.1006 user.module
--- modules/user/user.module	2 Jul 2009 15:07:37 -0000	1.1006
+++ modules/user/user.module	5 Jul 2009 01:12:03 -0000
@@ -745,9 +745,9 @@ function user_is_blocked($name) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function user_perm() {
+function user_permission() {
   return array(
     'administer permissions' =>  array(
       'title' => t('Administer permissions'),
@@ -2394,9 +2394,9 @@ function user_filters() {
   }
 
   $options = array();
-  foreach (module_implements('perm') as $module) {
-    $function = $module . '_perm';
-    if ($permissions = $function('perm')) {
+  foreach (module_implements('permission') as $module) {
+    $function = $module . '_permission';
+    if ($permissions = $function('permission')) {
       asort($permissions);
       foreach ($permissions as $permission => $description) {
         $options[t('@module module', array('@module' => $module))][$permission] = t($permission);
Index: profiles/default/default.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v
retrieving revision 1.52
diff -u -p -r1.52 default.profile
--- profiles/default/default.profile	4 Jul 2009 13:39:52 -0000	1.52
+++ profiles/default/default.profile	5 Jul 2009 00:51:32 -0000
@@ -222,7 +222,7 @@ function default_profile_tasks(&$task, $
   variable_set('user_admin_role', $rid);
 
   // Assign all available permissions to this role.
-  foreach (module_invoke_all('perm') as $key => $value) {
+  foreach (module_invoke_all('permission') as $key => $value) {
     db_insert('role_permission')
       ->fields(array(
         'rid' => $rid,