diff -urp drupal6/modules/blogapi/blogapi.install drupal-6.0-rc2/modules/blogapi/blogapi.install --- drupal6/modules/blogapi/blogapi.install 2008-01-25 21:31:44.000000000 +0100 +++ drupal-6.0-rc2/modules/blogapi/blogapi.install 2008-01-09 10:51:34.000000000 +0100 @@ -10,7 +10,7 @@ * Inform users about the new permission. */ function blogapi_update_6000() { - drupal_set_message("Blog API module does not depend on blog module's permissions anymore, but provides its own 'administer content with blog api' permission instead. Until 'module-blogapi')) .'">this permission is assigned to at least one user role, only the site administrator will be able to use Blog API features.'); + drupal_set_message("Blog API module does not depend on blog module's permissions anymore, but provides its own 'administer content with blog api' permission instead. Until 'module-blogapi')) .'">this permission is assigned to at least one user role, only the site administrator will be able to use Blog API features.'); return array(); } Only in drupal6/modules/book: book.js diff -urp drupal6/modules/comment/comment.module drupal-6.0-rc2/modules/comment/comment.module --- drupal6/modules/comment/comment.module 2008-01-25 20:57:53.000000000 +0100 +++ drupal-6.0-rc2/modules/comment/comment.module 2008-01-10 16:03:53.000000000 +0100 @@ -540,7 +540,7 @@ function comment_form_alter(&$form, $for COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'), COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'), COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information')), - '#description' => t('This option is enabled when anonymous users have permission to post comments on the permissions page.', array('@url' => url('admin/users/permissions', array('fragment' => 'module-comment')))), + '#description' => t('This option is enabled when anonymous users have permission to post comments on the permissions page.', array('@url' => url('admin/user/permissions', array('fragment' => 'module-comment')))), ); if (!user_access('post comments', user_load(array('uid' => 0)))) { $form['comment']['comment_anonymous']['#disabled'] = TRUE; diff -urp drupal6/modules/node/node.module drupal-6.0-rc2/modules/node/node.module --- drupal6/modules/node/node.module 2008-01-25 21:07:30.000000000 +0100 +++ drupal-6.0-rc2/modules/node/node.module 2008-01-10 16:57:10.000000000 +0100 @@ -38,7 +38,7 @@ function node_help($path, $arg) { case 'admin/help#node': $output = '

'. t('The node module manages content on your site, and stores all posts (regardless of type) as a "node". In addition to basic publishing settings, including whether the post has been published, promoted to the site front page, or should remain present (or sticky) at the top of lists, the node module also records basic information about the author of a post. Optional revision control over edits is available. For additional functionality, the node module is often extended by other modules.') .'

'; $output .= '

'. t('Though each post on your site is a node, each post is also of a particular content type. Content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Each content type may have different default settings for Publishing options and other workflow controls. By default, the two content types in a standard Drupal installation are Page and Story. Use the content types page to add new or edit existing content types. Additional content types also become available as you enable additional core, contributed and custom modules.', array('@content-type' => url('admin/content/types'))) .'

'; - $output .= '

'. t('The administrative content page allows you to review and manage your site content. The post settings page sets certain options for the display of posts. The node module makes a number of permissions available for each content type, which may be set by role on the permissions page.', array('@content' => url('admin/content/node'), '@post-settings' => url('admin/content/node-settings'), '@permissions' => url('admin/users/permissions'))) .'

'; + $output .= '

'. t('The administrative content page allows you to review and manage your site content. The post settings page sets certain options for the display of posts. The node module makes a number of permissions available for each content type, which may be set by role on the permissions page.', array('@content' => url('admin/content/node'), '@post-settings' => url('admin/content/node-settings'), '@permissions' => url('admin/user/permissions'))) .'

'; $output .= '

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

'; return $output; case 'admin/content/node': diff -urp drupal6/modules/profile/profile.admin.inc drupal-6.0-rc2/modules/profile/profile.admin.inc --- drupal6/modules/profile/profile.admin.inc 2008-01-25 21:10:46.000000000 +0100 +++ drupal-6.0-rc2/modules/profile/profile.admin.inc 2008-01-08 11:35:42.000000000 +0100 @@ -27,8 +27,8 @@ function profile_admin_overview() { $form[$field->fid]['type'] = array('#value' => $field->type); $form[$field->fid]['category'] = array('#type' => 'select', '#default_value' => $field->category, '#options' => array()); $form[$field->fid]['weight'] = array('#type' => 'weight', '#default_value' => $field->weight); - $form[$field->fid]['edit'] = array('#value' => l(t('edit'), "admin/users/profile/edit/$field->fid")); - $form[$field->fid]['delete'] = array('#value' => l(t('delete'), "admin/users/profile/delete/$field->fid")); + $form[$field->fid]['edit'] = array('#value' => l(t('edit'), "admin/user/profile/edit/$field->fid")); + $form[$field->fid]['delete'] = array('#value' => l(t('delete'), "admin/user/profile/delete/$field->fid")); } // Add the cateogory combo boxes @@ -55,7 +55,7 @@ function profile_admin_overview() { $addnewfields = '

'. t('Add new field') .'

'; $addnewfields .= ''; $form['addnewfields'] = array('#value' => $addnewfields); @@ -213,7 +213,7 @@ function profile_field_form(&$form_state $form['fields']['category'] = array('#type' => 'textfield', '#title' => t('Category'), '#default_value' => $edit['category'], - '#autocomplete_path' => 'admin/users/profile/autocomplete', + '#autocomplete_path' => 'admin/user/profile/autocomplete', '#description' => t('The category the new field should be part of. Categories are used to group fields logically. An example category is "Personal information".'), '#required' => TRUE, ); @@ -342,7 +342,7 @@ function profile_field_form_submit($form db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, '%s', '%s')", $form_state['values']['title'], $form_state['values']['name'], $form_state['values']['explanation'], $form_state['values']['category'], $form_state['values']['type'], $form_state['values']['weight'], $form_state['values']['required'], $form_state['values']['register'], $form_state['values']['visibility'], $form_state['values']['autocomplete'], $form_state['values']['options'], $form_state['values']['page']); drupal_set_message(t('The field has been created.')); - watchdog('profile', 'Profile field %field added under category %category.', array('%field' => $form_state['values']['title'], '%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/users/profile')); + watchdog('profile', 'Profile field %field added under category %category.', array('%field' => $form_state['values']['title'], '%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile')); } else { db_query("UPDATE {profile_fields} SET title = '%s', name = '%s', explanation = '%s', category = '%s', weight = %d, required = %d, register = %d, visibility = %d, autocomplete = %d, options = '%s', page = '%s' WHERE fid = %d", $form_state['values']['title'], $form_state['values']['name'], $form_state['values']['explanation'], $form_state['values']['category'], $form_state['values']['weight'], $form_state['values']['required'], $form_state['values']['register'], $form_state['values']['visibility'], $form_state['values']['autocomplete'], $form_state['values']['options'], $form_state['values']['page'], $form_state['values']['fid']); @@ -352,7 +352,7 @@ function profile_field_form_submit($form cache_clear_all(); menu_rebuild(); - $form_state['redirect'] = 'admin/users/profile'; + $form_state['redirect'] = 'admin/user/profile'; return; } @@ -369,8 +369,8 @@ function profile_field_delete(&$form_sta $form['title'] = array('#type' => 'value', '#value' => $field->title); return confirm_form($form, - t('Are you sure you want to delete the field %field?', array('%field' => $field->title)), 'admin/users/profile', - t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to edit this field and change it to a hidden profile field so that it may only be accessed by administrators.', array('@edit-field' => url('admin/users/profile/edit/'. $fid))), + t('Are you sure you want to delete the field %field?', array('%field' => $field->title)), 'admin/user/profile', + t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to edit this field and change it to a hidden profile field so that it may only be accessed by administrators.', array('@edit-field' => url('admin/user/profile/edit/'. $fid))), t('Delete'), t('Cancel')); } @@ -384,9 +384,9 @@ function profile_field_delete_submit($fo cache_clear_all(); drupal_set_message(t('The field %field has been deleted.', array('%field' => $form_state['values']['title']))); - watchdog('profile', 'Profile field %field deleted.', array('%field' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/users/profile')); + watchdog('profile', 'Profile field %field deleted.', array('%field' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile')); - $form_state['redirect'] = 'admin/users/profile'; + $form_state['redirect'] = 'admin/user/profile'; return; } diff -urp drupal6/modules/profile/profile.module drupal-6.0-rc2/modules/profile/profile.module --- drupal6/modules/profile/profile.module 2008-01-25 21:12:27.000000000 +0100 +++ drupal-6.0-rc2/modules/profile/profile.module 2007-12-31 09:54:37.000000000 +0100 @@ -43,7 +43,7 @@ function profile_help($path, $arg) { $output .= '
  • '. t('date') .'
  • '; $output .= '

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

    '; return $output; - case 'admin/users/profile': + case 'admin/user/profile': return '

    '. t("This page displays a list of the existing custom profile fields to be displayed on a user's My Account page. To provide structure, similar or related fields may be placed inside a category. To add a new category (or edit an existing one), edit a profile field and provide a new category name. To change the category of a field or the order of fields within a category, grab a drag-and-drop handle under the Title column and drag the field to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the Save configuration button at the bottom of the page.") .'

    '; } } @@ -83,7 +83,7 @@ function profile_menu() { 'type' => MENU_SUGGESTED_ITEM, 'file' => 'profile.pages.inc', ); - $items['admin/users/profile'] = array( + $items['admin/user/profile'] = array( 'title' => 'Profiles', 'description' => 'Create customizable fields for your users.', 'page callback' => 'drupal_get_form', @@ -91,27 +91,27 @@ function profile_menu() { 'access arguments' => array('administer users'), 'file' => 'profile.admin.inc', ); - $items['admin/users/profile/add'] = array( + $items['admin/user/profile/add'] = array( 'title' => 'Add field', 'page callback' => 'drupal_get_form', 'page arguments' => array('profile_field_form'), 'type' => MENU_CALLBACK, 'file' => 'profile.admin.inc', ); - $items['admin/users/profile/autocomplete'] = array( + $items['admin/user/profile/autocomplete'] = array( 'title' => 'Profile category autocomplete', 'page callback' => 'profile_admin_settings_autocomplete', 'type' => MENU_CALLBACK, 'file' => 'profile.admin.inc', ); - $items['admin/users/profile/edit'] = array( + $items['admin/user/profile/edit'] = array( 'title' => 'Edit field', 'page callback' => 'drupal_get_form', 'page arguments' => array('profile_field_form'), 'type' => MENU_CALLBACK, 'file' => 'profile.admin.inc', ); - $items['admin/users/profile/delete'] = array( + $items['admin/user/profile/delete'] = array( 'title' => 'Delete field', 'page callback' => 'drupal_get_form', 'page arguments' => array('profile_field_delete'), @@ -150,7 +150,7 @@ function profile_block($op = 'list', $de '#title' => t('Profile fields to display'), '#default_value' => variable_get('profile_block_author_fields', NULL), '#options' => $fields, - '#description' => t('Select which profile fields you wish to display in the block. Only fields designated as public in the profile field configuration are available.', array('@profile-admin' => url('admin/users/profile'))), + '#description' => t('Select which profile fields you wish to display in the block. Only fields designated as public in the profile field configuration are available.', array('@profile-admin' => url('admin/user/profile'))), ); return $form; } diff -urp drupal6/modules/statistics/statistics.admin.inc drupal-6.0-rc2/modules/statistics/statistics.admin.inc --- drupal6/modules/statistics/statistics.admin.inc 2008-01-25 21:16:02.000000000 +0100 +++ drupal-6.0-rc2/modules/statistics/statistics.admin.inc 2008-01-08 11:35:42.000000000 +0100 @@ -89,7 +89,7 @@ function statistics_top_visitors() { $rows = array(); while ($account = db_fetch_object($result)) { $qs = drupal_get_destination(); - $ban_link = $account->aid ? l(t('unban'), "admin/users/rules/delete/$account->aid", array('query' => $qs)) : l(t('ban'), "admin/users/rules/add/$account->hostname/host", array('query' => $qs)); + $ban_link = $account->aid ? l(t('unban'), "admin/user/rules/delete/$account->aid", array('query' => $qs)) : l(t('ban'), "admin/user/rules/add/$account->hostname/host", array('query' => $qs)); $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), $ban_link); } diff -urp drupal6/modules/statistics/statistics.module drupal-6.0-rc2/modules/statistics/statistics.module --- drupal6/modules/statistics/statistics.module 2008-01-25 21:27:58.000000000 +0100 +++ drupal-6.0-rc2/modules/statistics/statistics.module 2008-01-04 10:31:48.000000000 +0100 @@ -14,7 +14,7 @@ function statistics_help($path, $arg) { case 'admin/help#statistics': $output = '

    '. t('The statistics module keeps track of numerous site usage statistics, including the number of times, and from where, each of your posts is viewed. These statistics are useful in determining how users are interacting with each other and with your site, and are required for the display of some Drupal blocks.') .'

    '; $output .= '

    '. t('The statistics module provides:') .'

    '; - $output .= '