'. t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Read/Write to allow comments, or Disabled, to prevent comments. Comment display settings and other controls may also be customized for each content type (some display settings are customizable by individual users).', array('@content-type' => url('admin/content/types'))) .'
'; + $output = ''. t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Read/Write to allow comments, or Disabled, to prevent comments. Comment display settings and other controls may also be customized for each content type (some display settings are customizable by individual users).', array('@content-type' => url('admin/build/types'))) .'
'; $output .= ''. t('Comment permissions are assigned to user roles, and are used to determine whether anonymous users (or other roles) are allowed to comment on posts. If anonymous users are allowed to comment, their individual contact information may be retained in cookies stored on their local computer for use in later comment submissions. When a comment has no replies, it may be (optionally) edited by its author. The comment module uses the same input formats and HTML tags available when creating other forms of content.') .'
'; $output .= ''. t('For more information, see the online handbook entry for Comment module.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) .'
'; return $output; Index: modules/locale/locale.install =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.install,v retrieving revision 1.28 diff -u -p -r1.28 locale.install --- modules/locale/locale.install 6 Feb 2008 19:38:27 -0000 1.28 +++ modules/locale/locale.install 1 Apr 2008 20:14:59 -0000 @@ -186,7 +186,7 @@ function locale_update_6005() { // The language_negotiation setting is not reset, but // the user is alerted that this setting possibly was overwritten variable_set('language_content_type_negotiation', $setting); - drupal_set_message('The language negotiation setting was possibly overwritten by a content type of the same name. Check the '. l('language configuration page', 'admin/settings/language/configure') .' and the '. l(''. $content_type->name ." content type's multilingual support settings", 'admin/content/types/negotiation', array('html' => TRUE)) .' to configure them correctly.'); + drupal_set_message('The language negotiation setting was possibly overwritten by a content type of the same name. Check the '. l('language configuration page', 'admin/settings/language/configure') .' and the '. l(''. $content_type->name ." content type's multilingual support settings", 'admin/build/types/negotiation', array('html' => TRUE)) .' to configure them correctly.'); } elseif (!is_null($setting)) { // Change the language setting variable for any other content type. Index: modules/node/content_types.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v retrieving revision 1.50 diff -u -p -r1.50 content_types.inc --- modules/node/content_types.inc 27 Jan 2008 18:03:05 -0000 1.50 +++ modules/node/content_types.inc 1 Apr 2008 20:14:59 -0000 @@ -332,10 +332,10 @@ function node_type_form_submit($form, &$ } elseif ($status == SAVED_NEW) { drupal_set_message(t('The content type %name has been added.', $t_args)); - watchdog('node', 'Added content type %name.', $t_args, WATCHDOG_NOTICE, l(t('view'), 'admin/content/types')); + watchdog('node', 'Added content type %name.', $t_args, WATCHDOG_NOTICE, l(t('view'), 'admin/build/types')); } - $form_state['redirect'] = 'admin/content/types'; + $form_state['redirect'] = 'admin/build/types'; return; } @@ -390,7 +390,7 @@ function node_type_delete_confirm(&$form $caption .= ''. t('This action cannot be undone.') .'
'; - return confirm_form($form, $message, 'admin/content/types', $caption, t('Delete')); + return confirm_form($form, $message, 'admin/build/types', $caption, t('Delete')); } /** @@ -406,6 +406,6 @@ function node_type_delete_confirm_submit node_types_rebuild(); menu_rebuild(); - $form_state['redirect'] = 'admin/content/types'; + $form_state['redirect'] = 'admin/build/types'; return; } Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.953 diff -u -p -r1.953 node.module --- modules/node/node.module 1 Apr 2008 19:45:21 -0000 1.953 +++ modules/node/node.module 1 Apr 2008 20:15:00 -0000 @@ -37,15 +37,15 @@ function node_help($path, $arg) { switch ($path) { 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 Article. 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('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 Article. 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/build/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/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': return ' '; // Return a non-null value so that the 'more help' link is shown. - case 'admin/content/types': + case 'admin/build/types': return ''. t('Below is a list of all the content types on your site. All posts that exist on your site are instances of one of these content types.') .'
'; - case 'admin/content/types/add': + case 'admin/build/types/add': return ''. t('To create a new content type, enter the human-readable name, the machine-readable name, and all other relevant fields that are on this page. Once created, users of your site will be able to create posts that are instances of this content type.') .'
'; case 'node/%/revisions': return ''. t('The revisions let you track differences between multiple versions of a post.') .'
'; @@ -1433,19 +1433,19 @@ function node_menu() { 'type' => MENU_CALLBACK, ); - $items['admin/content/types'] = array( + $items['admin/build/types'] = array( 'title' => 'Content types', 'description' => 'Manage posts by content type, including default status, front page promotion, etc.', 'page callback' => 'node_overview_types', 'access arguments' => array('administer content types'), 'file' => 'content_types.inc', ); - $items['admin/content/types/list'] = array( + $items['admin/build/types/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); - $items['admin/content/types/add'] = array( + $items['admin/build/types/add'] = array( 'title' => 'Add content type', 'page callback' => 'drupal_get_form', 'page arguments' => array('node_type_form'), Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.66 diff -u -p -r1.66 system.admin.inc --- modules/system/system.admin.inc 23 Mar 2008 14:46:49 -0000 1.66 +++ modules/system/system.admin.inc 1 Apr 2008 20:15:02 -0000 @@ -63,7 +63,7 @@ function system_main_admin_page($arg = N /** * Provide a single block from the administration menu as a page. * This function is often a destination for these blocks. - * For example, 'admin/content/types' needs to have a destination to be valid + * For example, 'admin/build/types' needs to have a destination to be valid * in the Drupal menu system, but too much information there might be * hidden, so we supply the contents of the block. * Index: modules/translation/translation.module =================================================================== RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v retrieving revision 1.24 diff -u -p -r1.24 translation.module --- modules/translation/translation.module 20 Feb 2008 13:46:42 -0000 1.24 +++ modules/translation/translation.module 1 Apr 2008 20:15:02 -0000 @@ -35,7 +35,7 @@ function translation_help($path, $arg) { $output .= ''. t('Configuring content translation and translation-enabled content types:') .'
'; $output .= ''. t('Working with translation-enabled content types:') .'
'; $output .= '