Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1140 diff -u -r1.1140 node.module --- modules/node/node.module 8 Oct 2009 15:36:18 -0000 1.1140 +++ modules/node/node.module 8 Oct 2009 19:13:59 -0000 @@ -80,14 +80,21 @@ 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 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/structure/types'))) . '

'; - $output .= '

' . t('The administrative content page allows you to review and manage your site content. 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'), '@permissions' => url('admin/config/people/permissions'))) . '

'; - $output .= '

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

'; + $output = '

' . t('About') . '

'; + $output .= '

' . t('The node module manages the creation, editing, deletion, and display of all content on your site.') . '

'; + $output .= '

' . t('Uses') . '

'; + $output .= '
'; + $output .= '
' . t('Publishing content') . '
'; + $output .= '

' . t('When new content is created, the node module records basic information about the content item, including the author, date of creation, and the type of content. It also tracks the publishing options, which define whether or not the content is published, promoted to the front page of the site, and/or sticky at the top of content lists. Revision control of content edits is also available. Default settings can be configured for each type of content on your site.', array('@content-type' => url('admin/structure/types'))) . '

'; + $output .= '
' . t('Administering content') . '
'; + $output .= '
' . t('The administrative content page allows you to review and manage your site content.', array('@content' => url('admin/content'))) . '
'; + $output .= '
' . t('User permissions') . '
'; + $output .= '

' . t('The node module makes a number of permissions available for each content type, which may be set by role on the permissions page.', array('@permissions' => url('admin/settings/permissions'))) . '

'; + $output .= '
'; return $output; case 'admin/content': - return ' '; // Return a non-null value so that the 'more help' link is shown. + return ' '; // Return a non-null value so that the 'more help' link is shown. case 'admin/structure/types/add': return '

' . t('Each piece of content is of a specific content type. Each content type can have different fields, behaviors, and permissions assigned to it.') . '

'; @@ -99,10 +106,10 @@ return '

' . t('This form lets you configure how fields and labels are displayed when %type content is viewed in teaser and full-page mode.', array('%type' => node_type_get_name($arg[3]))) . '

'; case 'admin/structure/types/manage/' . $arg[3] . '/display/' . $arg[5]: - return '

' . t('This form lets you configure how fields should be displayed when rendered %type content in the following contexts.', array('%type' => node_type_get_name($arg[3]))) . '

'; + return '

' . t('This form lets you configure how fields should be displayed when %type content is rendered in the following contexts.', array('%type' => node_type_get_name($arg[3]))) . '

'; case 'node/%/revisions': - return '

' . t('The revisions let you track differences between multiple versions of a post.') . '

'; + return '

' . t('The revisions let you track differences between multiple versions of your content.') . '

'; case 'node/%/edit': $node = node_load($arg[1]); @@ -1617,7 +1624,7 @@ $items['admin/structure/types'] = array( 'title' => 'Content types', - 'description' => 'Manage posts by content type, including default status, front page promotion, comment settings, etc.', + 'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.', 'page callback' => 'node_overview_types', 'access arguments' => array('administer content types'), 'file' => 'content_types.inc', @@ -2996,7 +3003,7 @@ $form['keywords'] = array( '#title' => t('Keywords'), '#type' => 'textarea', - '#description' => t('The post will be unpublished if it contains any of the phrases above. Use a case-sensitive, comma-separated list of phrases. Example: funny, bungee jumping, "Company, Inc."'), + '#description' => t('The content will be unpublished if it contains any of the phrases above. Use a case-sensitive, comma-separated list of phrases. Example: funny, bungee jumping, "Company, Inc."'), '#default_value' => isset($context['keywords']) ? drupal_implode_tags($context['keywords']) : '', ); return $form; @@ -3042,7 +3049,7 @@ } else { $value = $t('Disabled'); } - $description = $t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Rebuilding will remove all privileges to posts, and replace them with permissions based on the current modules and settings. Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed posts will automatically use the new permissions.'); + $description = $t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Rebuilding will remove all privileges to content, and replace them with permissions based on the current modules and settings. Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed, content will automatically use the new permissions.'); $requirements['node_access'] = array( 'title' => $t('Node Access Permissions'),