'. t('The news aggregator is a powerful on-site RSS syndicator/news reader that can gather fresh content from news sites and weblogs around the web.') .'
'; + $output .= ''. t('The news aggregator is a powerful on-site RSS syndicator/news reader that can gather fresh content from news sites and weblogs around the web.') .'
'; $output .= ''. t('Users can view the latest news chronologically in the main news aggregator display or by source. Administrators can add, edit and delete feeds and choose how often to check for newly updated news for each individual feed. Administrators can also tag individual feeds with categories, offering selective grouping of some feeds into separate displays. Listings of the latest news for individual sources or categorized sources can be enabled as blocks for display in the sidebar through the block administration page. The news aggregator requires cron to check for the latest news from the sites to which you have subscribed. Drupal also provides a machine-readable OPML file of all of your subscribed feeds.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'))) .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Aggregator page.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'
'; - return $output; + break; case 'admin/content/aggregator': - return ''. t('Thousands of sites (particularly news sites and weblogs) publish their latest headlines and/or stories in a machine-readable format so that other sites can easily link to them. This content is usually in the form of an RSS feed (which is an XML-based syndication standard). To display the feed or category in a block you must decide how many items to show by editing the feed or block and turning on the feed\'s block.', array('@block' => url('admin/build/block'))) .'
'; + $output .= ''. t('Thousands of sites (particularly news sites and weblogs) publish their latest headlines and/or stories in a machine-readable format so that other sites can easily link to them. This content is usually in the form of an RSS feed (which is an XML-based syndication standard). To display the feed or category in a block you must decide how many items to show by editing the feed or block and turning on the feed\'s block.', array('@block' => url('admin/build/block'))) .'
'; + break; case 'admin/content/aggregator/add/feed': - return ''. t('Add a site that has an RSS/RDF/Atom feed. The URL is the full path to the feed file. For the feed to update automatically you must run "cron.php" on a regular basis. If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.') .'
'; + $output .= ''. t('Add a site that has an RSS/RDF/Atom feed. The URL is the full path to the feed file. For the feed to update automatically you must run "cron.php" on a regular basis. If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.') .'
'; + break; case 'admin/content/aggregator/add/category': - return ''. t('Categories provide a way to group items from different news feeds together. Each news category has its own feed page and block. For example, you could tag various sport-related feeds as belonging to a category called Sports. News items can be added to a category automatically by setting a feed to automatically place its item into that category, or by using the categorize items link in any listing of news items.') .'
'; + $output .= ''. t('Categories provide a way to group items from different news feeds together. Each news category has its own feed page and block. For example, you could tag various sport-related feeds as belonging to a category called Sports. News items can be added to a category automatically by setting a feed to automatically place its item into that category, or by using the categorize items link in any listing of news items.') .'
'; + break; } + return $output; } /** Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.241 diff -u -p -r1.241 block.module --- modules/block/block.module 1 Dec 2006 22:47:53 -0000 1.241 +++ modules/block/block.module 5 Dec 2006 21:06:31 -0000 @@ -12,9 +12,10 @@ define('BLOCK_REGION_NONE', -1); * Implementation of hook_help(). */ function block_help($section) { + $output = ''; switch ($section) { case 'admin/help#block': - $output = ''. t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. Blocks are usually generated automatically by modules (e.g., Recent Forum Topics), but administrators can also define custom blocks.') .'
'; + $output .= ''. t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. Blocks are usually generated automatically by modules (e.g., Recent Forum Topics), but administrators can also define custom blocks.') .'
'; $output .= ''. t('The region each block appears in depends on both which theme you are using (some themes allow greater control over block placement than others), and on the settings in the block administration section.') .'
'; $output .= ''. t('The block administration screen lets you specify the vertical placement of the blocks within a region. You do this by assigning a weight to each block. Lighter blocks (those having a smaller weight) "float up" towards the top of the region; heavier ones "sink".') .'
'; $output .= t("A block's visibility depends on:
@@ -33,15 +34,18 @@ function block_help($section) { $output .= ''. t('Administrators can also define custom blocks. These blocks consist of a title, a description, and a body which can be as long as you wish. Block content can be in any of the input formats supported for other content.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Block page.', array('@block' => 'http://drupal.org/handbook/modules/block/')) .'
'; - return $output; + break; case 'admin/build/block': - return t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.
+ $output .= t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.
Only enabled blocks are shown. You can position blocks by specifying which area of the page they should appear in (e.g., a sidebar). Highlighted labels on this page show the regions into which blocks can be rendered. You can specify where within a region a block will appear by adjusting its weight.
If you want certain blocks to disable themselves temporarily during high server loads, check the "Throttle" box. You can configure the auto-throttle on the throttle configuration page after having enabled the throttle module.
You can configure the behaviour of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.
', array('@throttle' => url('admin/settings/throttle'))); + break; case 'admin/build/block/add': - return ''. t('Here you can create a new block. Once you have created this block you must make it active and give it a place on the page using blocks. The description is used in the "block" column on the blocks page.', array('@overview' => url('admin/build/block'))) .'
'; + $output .= ''. t('Here you can create a new block. Once you have created this block you must make it active and give it a place on the page using blocks. The description is used in the "block" column on the blocks page.', array('@overview' => url('admin/build/block'))) .'
'; + break; } + return $output; } /** Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.270 diff -u -p -r1.270 blog.module --- modules/blog/blog.module 23 Nov 2006 11:06:53 -0000 1.270 +++ modules/blog/blog.module 5 Dec 2006 21:06:32 -0000 @@ -60,14 +60,16 @@ function blog_user($type, &$edit, &$user * Implementation of hook_help(). */ function blog_help($section) { + $output = ''; switch ($section) { case 'admin/help#blog': - $output = ''. t('The blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. Blogs are made up of individual posts that are time stamped and are typically viewed by date as you would a diary. Blogs often contain links to web pages users have read and/or agree/disagree with.') .'
'; + $output .= ''. t('The blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. Blogs are made up of individual posts that are time stamped and are typically viewed by date as you would a diary. Blogs often contain links to web pages users have read and/or agree/disagree with.') .'
'; $output .= ''. t('The blog module adds a user blogs navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. The navigation menu has a create a blog entry link (which takes you to a submission form) and a view personal blog link (which displays your blog entries as other people will see them). The blog module also creates a recent blog posts block that can be enabled.') .'
'; $output .= ''. t('If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link next to each news item in its lists. Clicking on this takes the user to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for the user to add a comment or explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the website and from your syndicated partner sites.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Blog page.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) .'
'; - return $output; + break; } + return $output; } /** Index: modules/blogapi/blogapi.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v retrieving revision 1.99 diff -u -p -r1.99 blogapi.module --- modules/blogapi/blogapi.module 21 Nov 2006 20:14:17 -0000 1.99 +++ modules/blogapi/blogapi.module 5 Dec 2006 21:06:32 -0000 @@ -10,14 +10,16 @@ * Implementation of hook_help(). */ function blogapi_help($section) { + $output = ''; switch ($section) { case 'admin/help#blogapi': - $output = ''. t('The blog API module enables a post to be posted to a site via external GUI applications. Many users prefer to use external tools to improve their ability to read and post responses in a customized way. The blog api provides users the freedom to use the blogging tools they want but still have the blogging server of choice.') .'
'; + $output .= ''. t('The blog API module enables a post to be posted to a site via external GUI applications. Many users prefer to use external tools to improve their ability to read and post responses in a customized way. The blog api provides users the freedom to use the blogging tools they want but still have the blogging server of choice.') .'
'; $output .= ''. t('When this module is enabled and configured you can use programs like Ecto to create and publish posts from your desktop. Blog API module supports several XML-RPC based blogging APIs such as the Blogger API, MetaWeblog API, and most of the Movable Type API. Any desktop blogging tools or other services (e.g. Flickr\'s "post to blog") that support these APIs should work with this site.', array('@external-http-ecto-kung-foo-tv' => 'http://ecto.kung-foo.tv/', '@-' => url('http://www.blogger.com/developers/api/1_docs/'), '@external-http-www-xmlrpc-com-metaWeblogApi' => 'http://www.xmlrpc.com/metaWeblogApi', '@external-http-www-movabletype-org-docs-mtmanual_programmatic-html' => 'http://www.movabletype.org/docs/mtmanual_programmatic.html', '@external-http-www-flickr-com' => 'http://www.flickr.com')) .'
'; $output .= ''. t('This module also allows site administrators to configure which content types can be posted via the external applications. So, for instance, users can post forum topics as well as blog posts. Where supported, the external applications will display each content type as a separate "blog".') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook BlogApi page.', array('@blogapi' => 'http://drupal.org/handbook/modules/blogapi/')) .'
'; - return $output; + break; } + return $output; } /** Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.403 diff -u -p -r1.403 book.module --- modules/book/book.module 30 Nov 2006 02:04:31 -0000 1.403 +++ modules/book/book.module 5 Dec 2006 21:06:32 -0000 @@ -971,24 +971,27 @@ function book_admin_overview() { * Implementation of hook_help(). */ function book_help($section) { + $output = ''; switch ($section) { case 'admin/help#book': - $output = ''. t('The book module is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book, placing them into the existing document by adding them to a table of contents menu.') .'
'; + $output .= ''. t('The book module is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book, placing them into the existing document by adding them to a table of contents menu.') .'
'; $output .= ''. t('Book pages have navigation elements at the bottom of the page for moving through the text. These link to the previous and next pages in the book, as well as a link labeled up, leading to the level above in the structure. More comprehensive navigation may be provided by enabling the book navigation block on the block administration page.', array('@admin-block' => url('admin/build/block'))) .'
'; $output .= ''. t('Users can select the printer-friendly version link visible at the bottom of a book page to generate a printer-friendly display of the page and all of its subsections. ') .'
'; $output .= ''. t("Posts of type %book are automatically added to the book hierarchy. Users with the outline posts in books permission can also add content of any other type to a book, placing it into the existing book structure through the interface that's available by clicking on the outline tab while viewing that post.", array('%book' => node_get_types('name', 'book'))) .'
'; $output .= ''. t('Administrators can view a list of all books on the book administration page. In this list there is a link to an outline page for each book, from which is it possible to change the titles of sections, or to change their weight, thus reordering sections. From this administrative interface, it is also possible to determine whether there are any orphan pages - pages that have become disconnected from the rest of the book structure.', array('@admin-node-book' => url('admin/content/book'))) .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Book page.', array('@book' => 'http://drupal.org/handbook/modules/book/')) .'
'; - return $output; + break; case 'admin/content/book': - return ''. t('The book module offers a means to organize content, authored by many users, in an online manual, outline or FAQ.'). '
'; + $output .= ''. t('The book module offers a means to organize content, authored by many users, in an online manual, outline or FAQ.'). '
'; + break; case 'admin/content/book/orphan': - return ''. t('Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are referred to as "orphan pages". On this page, administrators can review their books for orphans and reattach those pages as desired.'). '
'; - } - - if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'outline') { - return ''. t('The outline feature allows you to include posts in the book hierarchy.', array('@book' => url('book'))) .'
'; + $output .= ''. t('Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are referred to as "orphan pages". On this page, administrators can review their books for orphans and reattach those pages as desired.'). '
'; + break; + case 'node/'. arg(1) .'/outline': + $output .= ''. t('The outline feature allows you to include posts in the book hierarchy.', array('@book' => url('book'))) .'
'; + break; } + return $output; } Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.506 diff -u -p -r1.506 comment.module --- modules/comment/comment.module 5 Dec 2006 17:48:03 -0000 1.506 +++ modules/comment/comment.module 5 Dec 2006 21:06:33 -0000 @@ -68,20 +68,26 @@ define('COMMENT_PREVIEW_REQUIRED', 1); * Implementation of hook_help(). */ function comment_help($section) { + $output = ''; switch ($section) { case 'admin/help#comment': - $output = ''. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a community dialogue.') .'
'; + $output .= ''. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a community dialogue.') .'
'; $output .= ''. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since. Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Comments behave like other user submissions. Filters, smileys and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Comment page.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) .'
'; - return $output; + break; case 'admin/content/comment': + break; case 'admin/content/comment/new': - return ''. t("Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information , 'edit' to modify the text, and 'delete' to remove their submission.") .'
'; + $output .= ''. t("Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information , 'edit' to modify the text, and 'delete' to remove their submission.") .'
'; + break; case 'admin/content/comment/approval': - return ''. t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on 'edit' and then change its 'moderation status' to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") .'
'; + $output .= ''. t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on 'edit' and then change its 'moderation status' to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") .'
'; + break; case 'admin/content/comment/settings': - return ''. t("Comments can be attached to any node, and their settings are below. The display comes in two types: a 'flat list' where everything is flush to the left side, and comments come in chronological order, and a 'threaded list' where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: 'expanded', where you see both the title and the contents, and 'collapsed' where you only see the title. Preview comment forces a user to look at their comment by clicking on a 'Preview' button before they can actually add the comment.") .'
'; + $output .= ''. t("Comments can be attached to any node, and their settings are below. The display comes in two types: a 'flat list' where everything is flush to the left side, and comments come in chronological order, and a 'threaded list' where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: 'expanded', where you see both the title and the contents, and 'collapsed' where you only see the title. Preview comment forces a user to look at their comment by clicking on a 'Preview' button before they can actually add the comment.") .'
'; + break; } + return $output; } /** Index: modules/contact/contact.module =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v retrieving revision 1.72 diff -u -p -r1.72 contact.module --- modules/contact/contact.module 4 Dec 2006 10:43:34 -0000 1.72 +++ modules/contact/contact.module 5 Dec 2006 21:06:34 -0000 @@ -10,16 +10,17 @@ * Implementation of hook_help(). */ function contact_help($section) { + $output = ''; switch ($section) { case 'admin/help#contact': - $output = ''. t('The contact module enables the use of both personal and site-wide contact forms, thereby facilitating easy communication within the community. While personal contact forms allow users to contact each other by e-mail, site-wide forms allow community members to contact the site administration from a central location. Users can specify a subject and message in the contact form, and also request that a copy of the e-mail be sent to their own address.') .'
'; + $output .= ''. t('The contact module enables the use of both personal and site-wide contact forms, thereby facilitating easy communication within the community. While personal contact forms allow users to contact each other by e-mail, site-wide forms allow community members to contact the site administration from a central location. Users can specify a subject and message in the contact form, and also request that a copy of the e-mail be sent to their own address.') .'
'; $output .= ''. t("Users can activate/deactivate their personal contact forms in their account settings. Upon activation, a contact tab will appear in their user profiles. Privileged users such as site administrators are able to contact users even if they have chosen not to enable this feature.") .'
'; $output .= ''. t("Note that the contact tab will not appear when a user views his or her own profile; only when viewing another user's profile, if that user's contact form is enabled.") .'
'; $output .= ''. t('If the menu module is enabled, a menu item linking to the site-wide contact page is added to the navigation block. It is disabled by default, but can be enabled via the menu management page. Links to the contact page may also be added to the primary and secondary links using the same page.', array('@menu-module' => url('admin/build/menu'))) .'
'; $output .= ''. t('For more information, please read the configuration and customization handbook page for the contact module.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', NULL, NULL, TRUE))) .'
'; - return $output; + break; case 'admin/build/contact': - $output = ''. t('This page lets you setup your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'
'; + $output .= ''. t('This page lets you setup your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'
'; if (!module_exists('menu')) { $menu_note = t('The menu item can be customized and configured only once the menu module has been enabled.', array('@modules-page' => url('admin/settings/modules'))); } @@ -27,8 +28,9 @@ function contact_help($section) { $menu_note = ''; } $output .= ''. t('The contact module also adds a menu item (disabled by default) to the navigation block.', array('@menu-settings' => url('admin/build/menu'))) .' '. $menu_note .'
'; - return($output); + break; } + return $output; } /** Index: modules/drupal/drupal.module =================================================================== RCS file: /cvs/drupal/drupal/modules/drupal/drupal.module,v retrieving revision 1.136 diff -u -p -r1.136 drupal.module --- modules/drupal/drupal.module 26 Nov 2006 02:20:00 -0000 1.136 +++ modules/drupal/drupal.module 5 Dec 2006 21:06:34 -0000 @@ -10,9 +10,10 @@ * Implementation of hook_help(). */ function drupal_help($section) { + $output = ''; switch ($section) { case 'admin/help#drupal': - $output = ''. t('The Drupal module uses the XML-RPC network communication protocol to connect your site with a central server that maintains a directory of client sites.') .'
'; + $output .= ''. t('The Drupal module uses the XML-RPC network communication protocol to connect your site with a central server that maintains a directory of client sites.') .'
'; $output .= t('Enabling the Drupal module will allow you to:
'. t('For more information please read the configuration and customization handbook Drupal page.', array('@drupal' => 'http://drupal.org/handbook/modules/drupal/')) .'
'; - return $output; + break; case 'admin/settings/distributed-authentication': - return ''. t('Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the site information settings page and set the site name, the e-mail address, the slogan, and the mission statement.', array('@site-settings' => url('admin/settings/site-information'))) .'
'; + $output .= ''. t('Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the site information settings page and set the site name, the e-mail address, the slogan, and the mission statement.', array('@site-settings' => url('admin/settings/site-information'))) .'
'; + break; case 'user/help#drupal': - return variable_get('drupal_authentication_service', 0) ? t('Drupal is the name of the software that powers %this-site. There are Drupal websites all over the world, and many of them share their registration databases so that users may freely log in to any Drupal site using a single Drupal ID.
+ $output .= variable_get('drupal_authentication_service', 0) ? t('Drupal is the name of the software that powers %this-site. There are Drupal websites all over the world, and many of them share their registration databases so that users may freely log in to any Drupal site using a single Drupal ID.
So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: username@server. An example of a valid Drupal ID is mwlily@drupal.org.
', array('@Drupal' => 'http://drupal.org', '%this-site' => variable_get('site_name', 'Drupal'))) : ''; + break; } + return $output; } function drupal_sites_registry_settings() { Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.152 diff -u -p -r1.152 filter.module --- modules/filter/filter.module 26 Nov 2006 23:01:42 -0000 1.152 +++ modules/filter/filter.module 5 Dec 2006 21:06:34 -0000 @@ -18,34 +18,36 @@ define('FILTER_HTML_ESCAPE', 2); * Implementation of hook_help(). */ function filter_help($section) { + $output = ''; switch ($section) { case 'admin/help#filter': - $output = ''. t("The filter module allows administrators to configure text input formats for the site. For example, an administrator may want a filter to strip out malicious HTML from user's comments. Administrators may also want to make URLs linkable even if they are only entered in an unlinked format.") .'
'; + $output .= ''. t("The filter module allows administrators to configure text input formats for the site. For example, an administrator may want a filter to strip out malicious HTML from user's comments. Administrators may also want to make URLs linkable even if they are only entered in an unlinked format.") .'
'; $output .= ''. t('Users can choose between the available input formats when creating or editing content. Administrators can configure which input formats are available to which user roles, as well as choose a default input format. Administrators can also create new input formats. Each input format can be configured to use a selection of filters.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Filter page.', array('@filter' => 'http://drupal.org/handbook/modules/filter/')) .'
'; - return $output; - + break; case 'admin/settings/filters': - return t(' + $output .= t('Input formats define a way of processing user-supplied text in Drupal. Every input format has its own settings of which filters to apply. Possible filters include stripping out malicious HTML and making URLs clickable.
Users can choose between the available input formats when submitting content.
Below you can configure which input formats are available to which roles, as well as choose a default input format (used for imported content, for example).
Note that (1) the default format is always available to all roles, and (2) all filter formats can always be used by roles with the "administer filters" permission even if they are not explicitly listed in the Roles column of this table.
'); - + break; case 'admin/settings/filters/'. arg(3): - return t(' + $output .= t('Every filter performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this input format.
If you notice some filters are causing conflicts in the output, you can rearrange them.
', array('@rearrange' => url('admin/settings/filters/'. arg(3) .'/order'))); - + break; case 'admin/settings/filters/'. arg(3) .'/configure': - return t(' + $output .= t('If you cannot find the settings for a certain filter, make sure you have enabled it on the view tab first.
', array('@url' => url('admin/settings/filters/'. arg(3)))); - + break; case 'admin/settings/filters/'. arg(3) .'/order': - return t(' + $output .= t('Because of the flexible filtering system, you might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted in a clickable link. When this happens, you will need to rearrange the order in which filters get executed.
Filters are executed from top-to-bottom. You can use the weight column to rearrange them: heavier filters "sink" to the bottom.
'); + break; } + return $output; } /** Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.370 diff -u -p -r1.370 forum.module --- modules/forum/forum.module 1 Dec 2006 23:17:26 -0000 1.370 +++ modules/forum/forum.module 5 Dec 2006 21:06:35 -0000 @@ -10,22 +10,28 @@ * Implementation of hook_help(). */ function forum_help($section) { + $output = ''; switch ($section) { case 'admin/help#forum': - $output = ''. t('The forum module lets you create threaded discussion forums for a particular topic on your site. This is similar to a message board system such as phpBB. Forums are very useful because they allow community members to discuss topics with one another, and they are archived for future reference.') .'
'; + $output .= ''. t('The forum module lets you create threaded discussion forums for a particular topic on your site. This is similar to a message board system such as phpBB. Forums are very useful because they allow community members to discuss topics with one another, and they are archived for future reference.') .'
'; $output .= ''. t('Forums can be organized under what are called containers. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them. Forum topics can be moved by selecting a different forum and can be left in the existing forum by selecting leave a shadow copy. Forum topics can also have their own URL.') .'
'; $output .= ''. t('Forums module requires Taxonomy and Comments module be enabled.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Forum page.', array('@forum' => 'http://drupal.org/handbook/modules/forum/')) .'
'; - return $output; + break; case 'admin/content/forum': - return ''. t('This is a list of existing containers and forums that you can edit. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them.') .'
'; + $output .= ''. t('This is a list of existing containers and forums that you can edit. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them.') .'
'; + break; case 'admin/content/forum/add/container': - return ''. t('Containers help you organize your forums. The job of a container is to hold, or contain, other forums that are related. For example, a container named "Food" might hold two forums named "Fruit" and "Vegetables".') .'
'; + $output .= ''. t('Containers help you organize your forums. The job of a container is to hold, or contain, other forums that are related. For example, a container named "Food" might hold two forums named "Fruit" and "Vegetables".') .'
'; + break; case 'admin/content/forum/add/forum': - return ''. t('A forum holds discussion topics that are related. For example, a forum named "Fruit" might contain topics titled "Apples" and "Bananas".') .'
'; + $output .= ''. t('A forum holds discussion topics that are related. For example, a forum named "Fruit" might contain topics titled "Apples" and "Bananas".') .'
'; + break; case 'admin/content/forum/settings': - return ''. t('These settings provide the ability to fine tune the display of your forum topics.') .'
'; + $output .= ''. t('These settings provide the ability to fine tune the display of your forum topics.') .'
'; + break; } + return $output; } /** Index: modules/help/help.module =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.module,v retrieving revision 1.66 diff -u -p -r1.66 help.module --- modules/help/help.module 1 Dec 2006 22:47:53 -0000 1.66 +++ modules/help/help.module 5 Dec 2006 21:06:35 -0000 @@ -88,14 +88,15 @@ function help_links_as_list() { * Implementation of hook_help(). */ function help_help($section) { + $output = ''; switch ($section) { case 'admin/help': - $output = t('This guide explains what the various modules in Drupal do and how to configure them. Additionally, you will find a glossary of basic Drupal terminology to help get you started.
+ $output .= t('This guide explains what the various modules in Drupal do and how to configure them. Additionally, you will find a glossary of basic Drupal terminology to help get you started.
It is not a substitute for the Drupal handbook available online and should be used in conjunction with it. The online reference handbook might be more up-to-date and has helpful user-contributed comments. It is your definitive reference point for all Drupal documentation.
', array('@Drupal' => 'http://drupal.org', '@handbook' => 'http://drupal.org/handbook')); - return $output; + break; case 'admin/help#help': - $output = ''. t('The help module displays context sensitive help information. Users can learn how to use modules and accomplish tasks quicker with less errors by clicking on links in provided by the help module.') .'
'; + $output .= ''. t('The help module displays context sensitive help information. Users can learn how to use modules and accomplish tasks quicker with less errors by clicking on links in provided by the help module.') .'
'; $output .= t("Modules can make documentation available to other modules with this module. All user help should be presented using this module. Some examples of help:
'. t('For more information please read the configuration and customization handbook Help page.', array('@help' => 'http://drupal.org/handbook/modules/help/')) .'
'; - return $output; + break; } + return $output; } /** Index: modules/legacy/legacy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/legacy/legacy.module,v retrieving revision 1.15 diff -u -p -r1.15 legacy.module --- modules/legacy/legacy.module 21 Nov 2006 20:14:18 -0000 1.15 +++ modules/legacy/legacy.module 5 Dec 2006 21:06:35 -0000 @@ -10,9 +10,10 @@ * Implementation of hook_help(). */ function legacy_help($section) { + $output = ''; switch ($section) { case 'admin/help#legacy': - $output = ''. t('The legacy module provides legacy handlers for upgrades from older installations. These handlers help automatically redirect references to pages from old installations and prevent page not found errors for your site.') .'
'; + $output .= ''. t('The legacy module provides legacy handlers for upgrades from older installations. These handlers help automatically redirect references to pages from old installations and prevent page not found errors for your site.') .'
'; $output .= ''. t('The legacy module handles legacy style taxonomy page, taxonomy feed, and blog feed paths. It also handles URL upgrades from Drupal 4.1. It rewrites old-style URLs to new-style URLs (clean URLs). ') .'
'; $output .= t('Example Mappings:
'. t('For more information please read the configuration and customization handbook Legacy page.', array('@legacy' => 'http://drupal.org/handbook/modules/legacy/')) .'
'; - return $output; + break; } + return $output; } /** Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.154 diff -u -p -r1.154 locale.module --- modules/locale/locale.module 1 Dec 2006 22:47:53 -0000 1.154 +++ modules/locale/locale.module 5 Dec 2006 21:06:35 -0000 @@ -17,25 +17,33 @@ * Implementation of hook_help(). */ function locale_help($section) { + $output = ''; switch ($section) { case 'admin/help#locale': - $output = ''. t('The locale module allows you to present your Drupal site in a language other than the default English. You can use it to set up a multi-lingual web site or replace given built-in text with text which has been customized for your site. Whenever the locale module encounters text which needs to be displayed, it tries to translate it into the currently selected language. If a translation is not available, then the string is remembered, so you can look up untranslated strings easily.') .'
'; + $output .= ''. t('The locale module allows you to present your Drupal site in a language other than the default English. You can use it to set up a multi-lingual web site or replace given built-in text with text which has been customized for your site. Whenever the locale module encounters text which needs to be displayed, it tries to translate it into the currently selected language. If a translation is not available, then the string is remembered, so you can look up untranslated strings easily.') .'
'; $output .= ''. t('The locale module provides two options for providing translations. The first is the integrated web interface, via which you can search for untranslated strings, and specify their translations. An easier and less time-consuming method is to import existing translations for your language. These translations are available as GNU gettext Portable Object files (.po files for short). Translations for many languages are available for download from the translation page.') .'
'; $output .= ''. t("If an existing translation does not meet your needs, the .po files are easily edited with special editing tools. The locale module's import feature allows you to add strings from such files into your site's database. The export functionality enables you to share your translations with others, generating Portable Object files from your site strings.") .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Locale page.', array('@locale' => 'http://drupal.org/handbook/modules/locale/')) .'
'; - return $output; + break; case 'admin/settings/locale': + break; case 'admin/settings/locale/language/overview': - return t("Drupal provides support for the translation of its interface text into different languages. This page provides an overview of the installed languages. You can add a language on the add language page, or directly by importing a translation. If multiple languages are enabled, registered users will be able to set their preferred language. The site default will be used for anonymous visitors and for users without their own settings.
Drupal interface translations may be added or extended by several courses: by importing an existing translation, by translating everything from scratch, or by a combination of these approaches.
", array("@search" => url("admin/settings/locale/string/search"), "@import" => url("admin/settings/locale/language/import"), "@add-language" => url("admin/settings/locale/language/add"))); + $output .= t("Drupal provides support for the translation of its interface text into different languages. This page provides an overview of the installed languages. You can add a language on the add language page, or directly by importing a translation. If multiple languages are enabled, registered users will be able to set their preferred language. The site default will be used for anonymous visitors and for users without their own settings.
Drupal interface translations may be added or extended by several courses: by importing an existing translation, by translating everything from scratch, or by a combination of these approaches.
", array("@search" => url("admin/settings/locale/string/search"), "@import" => url("admin/settings/locale/language/import"), "@add-language" => url("admin/settings/locale/language/add"))); + break; case 'admin/settings/locale/language/add': - return ''. t("You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardised for the desired language. You can also add a language by importing a translation.", array("@import" => url("admin/settings/locale/language/import"))) .'
'; + $output .= ''. t("You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardised for the desired language. You can also add a language by importing a translation.", array("@import" => url("admin/settings/locale/language/import"))) .'
'; + break; case 'admin/settings/locale/language/import': - return ''. t("This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the Drupal translation page. Note that importing a translation file might take a while.", array('@url' => 'http://drupal.org/project/translations')) .'
'; + $output .= ''. t("This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the Drupal translation page. Note that importing a translation file might take a while.", array('@url' => 'http://drupal.org/project/translations')) .'
'; + break; case 'admin/settings/locale/language/export': - return ''. t("This page allows you to export Drupal strings. The first option is to export a translation so it can be shared. The second option generates a translation template, which contains all Drupal strings, but without their translations. You can use this template to start a new translation using various software packages designed for this task.") .'
'; + $output .= ''. t("This page allows you to export Drupal strings. The first option is to export a translation so it can be shared. The second option generates a translation template, which contains all Drupal strings, but without their translations. You can use this template to start a new translation using various software packages designed for this task.") .'
'; + break; case 'admin/settings/locale/string/search': - return ''. t("It is often convenient to get the strings from your setup on the export page, and use a desktop Gettext translation editor to edit the translations. On this page you can search in the translated and untranslated strings, and the default English texts provided by Drupal.", array("@export" => url("admin/settings/locale/language/export"))) .'
'; + $output .= ''. t("It is often convenient to get the strings from your setup on the export page, and use a desktop Gettext translation editor to edit the translations. On this page you can search in the translated and untranslated strings, and the default English texts provided by Drupal.", array("@export" => url("admin/settings/locale/language/export"))) .'
'; + break; } + return $output; } /** Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.99 diff -u -p -r1.99 menu.module --- modules/menu/menu.module 30 Nov 2006 01:55:31 -0000 1.99 +++ modules/menu/menu.module 5 Dec 2006 21:06:36 -0000 @@ -10,9 +10,10 @@ * Implementation of hook_help(). */ function menu_help($section) { + $output = ''; switch ($section) { case 'admin/help#menu': - $output = t('Menus are a collection of links (menu items) used to navigate a website. The menu module provides an interface to control and customize the powerful menu system that comes with Drupal. Menus are primarily displayed as a hierarchical list of links using Drupal\'s highly flexible blocks feature. Each menu automatically creates a block of the same name. By default, new menu items are placed inside a built-in menu labelled %navigation, but administrators can also create custom menus.
+ $output .= t('Menus are a collection of links (menu items) used to navigate a website. The menu module provides an interface to control and customize the powerful menu system that comes with Drupal. Menus are primarily displayed as a hierarchical list of links using Drupal\'s highly flexible blocks feature. Each menu automatically creates a block of the same name. By default, new menu items are placed inside a built-in menu labelled %navigation, but administrators can also create custom menus.
Drupal themes generally provide out-of-the-box support for two menus commonly labelled %primary-links and %secondary-links. These are sets of links which are usually displayed in the header or footer of each page (depending on the currently active theme). Any menu can be designated as the primary or secondary links menu via the menu settings page.
Menu administration tabs:'. t('For more information please read the configuration and customization handbook Menu page.', array('@menu' => 'http://drupal.org/handbook/modules/menu/')) .'
'; - return $output; + break; case 'admin/build/menu': - return ''. t('Menus are a collection of links (menu items) used to navigate a website. The list(s) below display the currently available menus along with their menu items. Select an operation from the list to manage each menu or menu item.', array('@admin-settings-menus' => url('admin/build/menu/settings'), '@admin-block'=> url('admin/build/block'))) .'
'; + $output .= ''. t('Menus are a collection of links (menu items) used to navigate a website. The list(s) below display the currently available menus along with their menu items. Select an operation from the list to manage each menu or menu item.', array('@admin-settings-menus' => url('admin/build/menu/settings'), '@admin-block'=> url('admin/build/block'))) .'
'; + break; case 'admin/build/menu/menu/add': - return ''. t('Enter the name for your new menu. Remember to enable the newly created block in the blocks administration page.', array('@blocks' => url('admin/build/block'))) .'
'; + $output .= ''. t('Enter the name for your new menu. Remember to enable the newly created block in the blocks administration page.', array('@blocks' => url('admin/build/block'))) .'
'; + break; case 'admin/build/menu/item/add': - return ''. t('Enter the title, path, position and the weight for your new menu item.') .'
'; + $output .= ''. t('Enter the title, path, position and the weight for your new menu item.') .'
'; + break; } + return $output; } /** Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.743 diff -u -p -r1.743 node.module --- modules/node/node.module 5 Dec 2006 05:55:04 -0000 1.743 +++ modules/node/node.module 5 Dec 2006 21:06:37 -0000 @@ -13,9 +13,10 @@ define('NODE_NEW_LIMIT', time() - 30 * 2 * Implementation of hook_help(). */ function node_help($section) { + $output = ''; switch ($section) { case 'admin/help#node': - $output = ''. t('All content in a website is stored and treated as nodes. Therefore nodes are any postings such as blogs, stories, polls and forums. The node module manages these content types and is one of the strengths of Drupal over other content management systems.') .'
'; + $output .= ''. t('All content in a website is stored and treated as nodes. Therefore nodes are any postings such as blogs, stories, polls and forums. The node module manages these content types and is one of the strengths of Drupal over other content management systems.') .'
'; $output .= ''. t('Treating all content as nodes allows the flexibility of creating new types of content. It also allows you to painlessly apply new features or changes to all content. Comments are not stored as nodes but are always associated with a node.') .'
'; $output .= t('Node module features
'. t('For more information please read the configuration and customization handbook Node page.', array('@node' => 'http://drupal.org/handbook/modules/node/')) .'
'; - return $output; + break; case 'admin/content/search': - return ''. t('Enter a simple pattern to search for a post. Words are matched exactly. Phrases can be surrounded by quotes to do an exact search.') .'
'; + $output .= ''. t('Enter a simple pattern to search for a post. Words are matched exactly. Phrases can be surrounded by quotes to do an exact search.') .'
'; + break; case 'admin/content/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.') .'
'; + $output .= ''. 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.') .'
'; + break; case 'admin/content/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.'); - } - - if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'revisions') { - return t('The revisions let you track differences between multiple versions of a post.'); - } - - if (arg(0) == 'node' && arg(1) == 'add' && $type = arg(2)) { + $output .= '
'. 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.'); + break; + case 'node/'. arg(1) .'/revisions': + $output .= t('The revisions let you track differences between multiple versions of a post.'); + break; + case 'node/add/'. $type = arg(2): $type = node_get_types('type', arg(2)); - return filter_xss_admin($type->help); + $output .= filter_xss_admin($type->help); + break; } + return $output; } /** Index: modules/path/path.module =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.module,v retrieving revision 1.103 diff -u -p -r1.103 path.module --- modules/path/path.module 26 Nov 2006 02:20:01 -0000 1.103 +++ modules/path/path.module 5 Dec 2006 21:06:37 -0000 @@ -10,9 +10,10 @@ * Implementation of hook_help(). */ function path_help($section) { + $output = ''; switch ($section) { case 'admin/help#path': - $output = '
'. t('The path module allows you to specify aliases for Drupal URLs. Such aliases improve readability of URLs for your users and may help internet search engines to index your content more effectively. More than one alias may be created for a given page.') .'
'; + $output .= ''. t('The path module allows you to specify aliases for Drupal URLs. Such aliases improve readability of URLs for your users and may help internet search engines to index your content more effectively. More than one alias may be created for a given page.') .'
'; $output .= t('Some examples of URL aliases are:
'. t('The path module enables an extra field for aliases in all node input and editing forms (when users have the appropriate permissions). It also provides an interface to view and edit all URL aliases. The two permissions are related to URL aliasing are "administer a list of URL aliases" and "add url aliases". ') .'
'; $output .= ''. t('This module also comes with user-defined mass URL aliasing capabilities, which is useful if you wish to uniformly use URLs different from the default. For example, you may want to have your URLs presented in a different language. Access to the Drupal source code on the web server is required to set up these kinds of aliases. ') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Path page.', array('@path' => 'http://drupal.org/handbook/modules/path/')) .'
'; - return $output; + break; case 'admin/build/path': - return ''. t("Drupal provides users complete control over URLs through aliasing. This feature is typically used to make URLs human-readable or easy to remember. For example, one could map the relative URL 'node/1' onto 'about'. Each system path can have multiple aliases.") .'
'; + $output .= ''. t("Drupal provides users complete control over URLs through aliasing. This feature is typically used to make URLs human-readable or easy to remember. For example, one could map the relative URL 'node/1' onto 'about'. Each system path can have multiple aliases.") .'
'; + break; case 'admin/build/path/add': - return ''. t('Enter the path you wish to create the alias for, followed by the name of the new alias.') .'
'; + $output .= ''. t('Enter the path you wish to create the alias for, followed by the name of the new alias.') .'
'; + break; } + return $output; } /** Index: modules/ping/ping.module =================================================================== RCS file: /cvs/drupal/drupal/modules/ping/ping.module,v retrieving revision 1.45 diff -u -p -r1.45 ping.module --- modules/ping/ping.module 21 Nov 2006 20:14:18 -0000 1.45 +++ modules/ping/ping.module 5 Dec 2006 21:06:38 -0000 @@ -10,13 +10,15 @@ * Implementation of hook_help(). */ function ping_help($section) { + $output = ''; switch ($section) { case 'admin/help#ping': - $output = ''. t('The ping module is useful for notifying interested sites that your site has changed. It automatically sends notifications (called "pings") to the pingomatic service to tell it that your site has changed. In turn pingomatic will ping other services such as weblogs.com, Technorati, blo.gs, BlogRolling, Feedster.com, Moreover, etc.', array('@external-http-pingomatic-com' => 'http://pingomatic.com/')) .'
'; + $output .= ''. t('The ping module is useful for notifying interested sites that your site has changed. It automatically sends notifications (called "pings") to the pingomatic service to tell it that your site has changed. In turn pingomatic will ping other services such as weblogs.com, Technorati, blo.gs, BlogRolling, Feedster.com, Moreover, etc.', array('@external-http-pingomatic-com' => 'http://pingomatic.com/')) .'
'; $output .= ''. t('The ping module requires cron or a similar periodic job scheduler to be enabled.') .'
'. t('For more information please read the configuration and customization handbook Ping page.', array('@ping' => 'http://drupal.org/handbook/modules/ping/')) .'
'; - return $output; + break; } + return $output; } /** Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.220 diff -u -p -r1.220 poll.module --- modules/poll/poll.module 21 Nov 2006 20:14:18 -0000 1.220 +++ modules/poll/poll.module 5 Dec 2006 21:06:38 -0000 @@ -11,13 +11,15 @@ * Implementation of hook_help(). */ function poll_help($section) { + $output = ''; switch ($section) { case 'admin/help#poll': - $output = ''. t('The poll module can be used to create simple polls for site users. A poll is a simple multiple choice questionnaire which displays the cumulative results of the answers to the poll. Having polls on the site is a good way to get instant feedback from community members.') .'
'; + $output .= ''. t('The poll module can be used to create simple polls for site users. A poll is a simple multiple choice questionnaire which displays the cumulative results of the answers to the poll. Having polls on the site is a good way to get instant feedback from community members.') .'
'; $output .= ''. t('Users can create a poll. The title of the poll should be the question, then enter the answers and the "base" vote counts. You can also choose the time period over which the vote will run.The poll item in the navigation menu will take you to a page where you can see all the current polls, vote on them (if you haven\'t already) and view the results.', array('@poll' => url('poll'))) .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Poll page.', array('@poll' => 'http://drupal.org/handbook/modules/poll/')) .'
'; - return $output; + break; } + return $output; } /** Index: modules/profile/profile.module =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v retrieving revision 1.182 diff -u -p -r1.182 profile.module --- modules/profile/profile.module 1 Dec 2006 23:17:26 -0000 1.182 +++ modules/profile/profile.module 5 Dec 2006 21:06:38 -0000 @@ -18,9 +18,10 @@ define('PROFILE_HIDDEN', 4); * Implementation of hook_help(). */ function profile_help($section) { + $output = ''; switch ($section) { case 'admin/help#profile': - $output = ''. t('The profile module allows you to define custom fields (such as country, real name, age, ...) in the user profile. This permits users of a site to share more information about themselves, and can help community-based sites to organize users around profile fields.') .'
'; + $output .= ''. t('The profile module allows you to define custom fields (such as country, real name, age, ...) in the user profile. This permits users of a site to share more information about themselves, and can help community-based sites to organize users around profile fields.') .'
'; $output .= t('The following types of fields can be added to the user profile:
'. t('For more information please read the configuration and customization handbook Profile page.', array('@profile' => 'http://drupal.org/handbook/modules/profile/')) .'
'; - return $output; + break; case 'admin/user/profile': - return ''. t('Here you can define custom fields that users can fill in in their user profile (such as country, real name, age, ...).') .'
'; + $output .= ''. t('Here you can define custom fields that users can fill in in their user profile (such as country, real name, age, ...).') .'
'; + break; } + return $output; } /** Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.204 diff -u -p -r1.204 search.module --- modules/search/search.module 1 Dec 2006 22:47:53 -0000 1.204 +++ modules/search/search.module 5 Dec 2006 21:06:39 -0000 @@ -94,23 +94,27 @@ define('PREG_CLASS_CJK', '\x{3041}-\x{30 * Implementation of hook_help(). */ function search_help($section) { + $output = ''; switch ($section) { case 'admin/help#search': - $output = ''. t('The search module adds the ability to search for content by keywords. Search is often the only practical way to find content on a large site. Search is useful for finding users and posts by searching on keywords.') .'
'; + $output .= ''. t('The search module adds the ability to search for content by keywords. Search is often the only practical way to find content on a large site. Search is useful for finding users and posts by searching on keywords.') .'
'; $output .= ''. t('The search engine works by maintaining an index of the words in your site\'s content. It indexes the posts and users. You can adjust the settings to tweak the indexing behaviour. Note that the search requires cron to be set up correctly. The index percentage sets the maximum amount of items that will be indexed in one cron run. Set this number lower if your cron is timing out or if PHP is running out of memory.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Search page.', array('@search' => 'http://drupal.org/handbook/modules/search/')) .'
'; - return $output; + break; case 'admin/settings/search': - return t(' + $output .= t('The search engine works by maintaining an index of the words in your site\'s content. You can adjust the settings below to tweak the indexing behaviour. Note that the search requires cron to be set up correctly.
'); + break; case 'search#noresults': - return t(''. t('The statistics module keeps track of numerous statistics of site usage. It counts how many times, and from where each of your posts is viewed. The statistics module can be used to learn many useful things about how users are interacting with each other and with your site.') .'
'; + $output .= ''. t('The statistics module keeps track of numerous statistics of site usage. It counts how many times, and from where each of your posts is viewed. The statistics module can be used to learn many useful things about how users are interacting with each other and with your site.') .'
'; $output .= t('Statistics module features
'. t('For more information please read the configuration and customization handbook Statistics page.', array('@statistics' => 'http://drupal.org/handbook/modules/statistics/')) .'
'; - return $output; + break; case 'admin/logs/settings': - return ''. t('Settings for the statistical information that Drupal will keep about the site. See site statistics for the actual information.', array('@statistics' => url('admin/logs/hits'))) .'
'; + $output .= ''. t('Settings for the statistical information that Drupal will keep about the site. See site statistics for the actual information.', array('@statistics' => url('admin/logs/hits'))) .'
'; + break; case 'admin/logs/hits': - return ''. t('This page shows you the most recent hits.') .'
'; + $output .= ''. t('This page shows you the most recent hits.') .'
'; + break; case 'admin/logs/referrers': - return ''. t('This page shows you all external referrers. These are links pointing to your web site from outside your web site.') .'
'; + $output .= ''. t('This page shows you all external referrers. These are links pointing to your web site from outside your web site.') .'
'; + break; case 'admin/logs/visitors': - return ''. t("When you ban a visitor, you prevent the visitor's IP address from accessing your site. Unlike blocking a user, banning a visitor works even for anonymous users. The most common use for this is to block bots/web crawlers that are consuming too many resources.") .'
'; + $output .= ''. t("When you ban a visitor, you prevent the visitor's IP address from accessing your site. Unlike blocking a user, banning a visitor works even for anonymous users. The most common use for this is to block bots/web crawlers that are consuming too many resources.") .'
'; + break; } + return $output; } /** Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.418 diff -u -p -r1.418 system.module --- modules/system/system.module 5 Dec 2006 05:47:37 -0000 1.418 +++ modules/system/system.module 5 Dec 2006 21:06:40 -0000 @@ -14,35 +14,46 @@ define('VERSION', '5.0-dev'); function system_help($section) { global $base_url; + $output = ''; switch ($section) { case 'admin/help#system': - $output = ''. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency. The ability to run scheduled jobs makes administering the web site more usable, as administrators do not have to manually start jobs. The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve web site performance. The settings module provides control over preferences, behaviours including visual and operational settings.') .'
'; + $output .= ''. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency. The ability to run scheduled jobs makes administering the web site more usable, as administrators do not have to manually start jobs. The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve web site performance. The settings module provides control over preferences, behaviours including visual and operational settings.') .'
'; $output .= ''. t('Some modules require regularly scheduled actions, such as cleaning up logfiles. Cron, which stands for chronograph, is a periodic command scheduler executing commands at intervals specified in seconds. It can be used to control the execution of daily, weekly and monthly jobs (or anything with a period measured in seconds). The aggregator module periodically updates feeds using cron. Ping periodically notifies services of new content on your site. Search periodically indexes the content on your site. Automating tasks is one of the best ways to keep a system running smoothly, and if most of your administration does not require your direct involvement, cron is an ideal solution. Cron can, if necessary, also be run manually.') .'
'; $output .= ''. t("There is a caching mechanism which stores dynamically generated web pages in a database. By caching a web page, the system module does not have to create the page each time someone wants to view it, instead it takes only one SQL query to display it, reducing response time and the server's load. Only pages requested by anonymous users are cached. In order to reduce server load and save bandwidth, the system module stores and sends cached pages compressed.") .'
'; $output .= ''. t('For more information please read the configuration and customization handbook System page.', array('@system' => 'http://drupal.org/handbook/modules/system/')) .'
'; - return $output; + break; case 'admin': - return ''. t('Welcome to the administration section. Here you may control how your site functions.') .'
'; + $output .= ''. t('Welcome to the administration section. Here you may control how your site functions.') .'
'; + break; case 'admin/by-module': - return ''. t('This page shows you all available administration tasks for each module.') .'
'; + $output .= ''. t('This page shows you all available administration tasks for each module.') .'
'; + break; case 'admin/settings/page-caching': - return ''. t('Enabling the cache will offer a sufficient performance boost. Drupal can store and send compressed cached pages requested by "anonymous" users. By caching a web page, Drupal does not have to create the page each time someone wants to view it.') .'
'; + $output .= ''. t('Enabling the cache will offer a sufficient performance boost. Drupal can store and send compressed cached pages requested by "anonymous" users. By caching a web page, Drupal does not have to create the page each time someone wants to view it.') .'
'; + break; case 'admin/build/themes': - return ''. t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternately, to override these settings in a specific theme, click the "configure" link for the corresponding theme. Note that different themes may have different regions available for rendering content like blocks. If you want consistency in what your users see, you may wish to enable only one theme.') .'
'; + $output .= ''. t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternately, to override these settings in a specific theme, click the "configure" link for the corresponding theme. Note that different themes may have different regions available for rendering content like blocks. If you want consistency in what your users see, you may wish to enable only one theme.') .'
'; + break; case 'admin/build/themes/settings': - return ''. t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') .'
'; + $output .= ''. t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') .'
'; + break; case 'admin/build/themes/settings/'. arg(3): $reference = explode('.', arg(3), 2); $theme = array_pop($reference); - return ''. t('These options control the display settings for the %template theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the global settings for this theme.', array('%template' => $theme, '@global' => url('admin/build/themes/settings'))) .'
'. t('These options control the display settings for the %template theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the global settings for this theme.', array('%template' => $theme, '@global' => url('admin/build/themes/settings'))) .'
Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Click on the name of the module in the navigation menu for their individual configuration pages. Once a module is enabled, new permissions might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle. The auto-throttle functionality must be enabled on the throttle configuration page after having enabled the throttle module.
+ $output .= t('Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Click on the name of the module in the navigation menu for their individual configuration pages. Once a module is enabled, new permissions might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle. The auto-throttle functionality must be enabled on the throttle configuration page after having enabled the throttle module.
It is important that update.php is run every time a module is updated to a newer version.
You can find all administration tasks belonging to a particular module on the administration by module page.
', array('@permissions' => url('admin/user/access'), '@throttle' => url('admin/settings/throttle'), '@update-php' => $base_url .'/update.php', '@by-module' => url('admin/by-module'))); + break; case 'admin/build/modules/uninstall': - return ''. t('The uninstall process removes all data related to a module. To uninstall a module, you must first disable it. Not all modules support this feature.') .'
'; + $output .= ''. t('The uninstall process removes all data related to a module. To uninstall a module, you must first disable it. Not all modules support this feature.') .'
'; + break; case 'admin/logs/status': - return ''. t("Here you can find a short overview of your Drupal site's parameters as well as any problems detected with your installation. It is useful to copy/paste this information when you need support.") .'
'; + $output .= ''. t("Here you can find a short overview of your Drupal site's parameters as well as any problems detected with your installation. It is useful to copy/paste this information when you need support.") .'
'; + break; } + return $output; } /** Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.328 diff -u -p -r1.328 taxonomy.module --- modules/taxonomy/taxonomy.module 30 Nov 2006 07:05:57 -0000 1.328 +++ modules/taxonomy/taxonomy.module 5 Dec 2006 21:06:42 -0000 @@ -1372,18 +1372,22 @@ function taxonomy_rss_item($node) { * Implementation of hook_help(). */ function taxonomy_help($section) { + $output = ''; switch ($section) { case 'admin/help#taxonomy': - $output = ''. t('The taxonomy module is one of the most popular features because users often want to create categories to organize content by type. It can automatically classify new content, which is very useful for organizing content on-the-fly. A simple example would be organizing a list of music reviews by musical genre.') .'
'; + $output .= ''. t('The taxonomy module is one of the most popular features because users often want to create categories to organize content by type. It can automatically classify new content, which is very useful for organizing content on-the-fly. A simple example would be organizing a list of music reviews by musical genre.') .'
'; $output .= ''. t('Taxonomy is also the study of classification. The taxonomy module allows you to define vocabularies (sets of categories) which are used to classify content. The module supports hierarchical classification and association between terms, allowing for truly flexible information retrieval and classification. The taxonomy module allows multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms) and taxonomies (controlled vocabularies where relationships are indicated hierarchically). To view and manage the terms of each vocabulary, click on the associated list terms link. To delete a vocabulary and all its terms, choose edit vocabulary.') .'
'; $output .= ''. t('A controlled vocabulary is a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot\'s sections. For more complex implementations, you might create a hierarchical list of categories.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Taxonomy page.', array('@taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) .'
'; - return $output; + break; case 'admin/content/taxonomy': - return ''. t('The taxonomy module allows you to classify content into categories and subcategories; it allows multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms), taxonomies (controlled vocabularies where relationships are indicated hierarchically), and free vocabularies where terms, or tags, are defined during content creation. To view and manage the terms of each vocabulary, click on the associated list terms link. To delete a vocabulary and all its terms, choose "edit vocabulary".') .'
'; + $output .= ''. t('The taxonomy module allows you to classify content into categories and subcategories; it allows multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms), taxonomies (controlled vocabularies where relationships are indicated hierarchically), and free vocabularies where terms, or tags, are defined during content creation. To view and manage the terms of each vocabulary, click on the associated list terms link. To delete a vocabulary and all its terms, choose "edit vocabulary".') .'
'; + break; case 'admin/content/taxonomy/add/vocabulary': - return ''. t("When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot.org's or Kuro5hin.org's sections. For more complex implementations, you might create a hierarchical list of categories.") .'
'; + $output .= ''. t("When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot.org's or Kuro5hin.org's sections. For more complex implementations, you might create a hierarchical list of categories.") .'
'; + break; } + return $output; } /** Index: modules/throttle/throttle.module =================================================================== RCS file: /cvs/drupal/drupal/modules/throttle/throttle.module,v retrieving revision 1.71 diff -u -p -r1.71 throttle.module --- modules/throttle/throttle.module 4 Dec 2006 10:56:21 -0000 1.71 +++ modules/throttle/throttle.module 5 Dec 2006 21:06:42 -0000 @@ -112,15 +112,18 @@ function throttle_exit() { * Implementation of hook_help(). */ function throttle_help($section) { + $output = ''; switch ($section) { case 'admin/help#throttle': - $output = ''. t('The throttle module provides a congestion control throttling mechanism for automatically detecting a surge in incoming traffic. If the site gets linked to by a popular website, or otherwise comes under a "Denial of Service" (DoS) attack, your webserver might become overwhelmed. This mechanism is utilized by other modules to automatically optimize their performance by temporarily disabling CPU-intensive functionality. For example, in the site theme, you might choose to disable pictures when the site is too busy (reducing bandwidth), or in modules, you might choose to disable some complicated logic (reducing CPU utilization).') .'
'; + $output .= ''. t('The throttle module provides a congestion control throttling mechanism for automatically detecting a surge in incoming traffic. If the site gets linked to by a popular website, or otherwise comes under a "Denial of Service" (DoS) attack, your webserver might become overwhelmed. This mechanism is utilized by other modules to automatically optimize their performance by temporarily disabling CPU-intensive functionality. For example, in the site theme, you might choose to disable pictures when the site is too busy (reducing bandwidth), or in modules, you might choose to disable some complicated logic (reducing CPU utilization).') .'
'; $output .= ''. t('The congestion control throttle can be automatically enabled when the number of anonymous or authenticated users currently visiting the site exceeds the specified threshold. ') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Throttle page.', array('@throttle' => 'http://drupal.org/handbook/modules/throttle/')) .'
'; - return $output; + break; case 'admin/settings/throttle': - return ''. t('If your site gets linked to by a popular website, or otherwise comes under a "Denial of Service" (DoS) attack, your webserver might become overwhelmed. This module provides a congestion control throttling mechanism for automatically detecting a surge in incoming traffic. This mechanism is utilized by other Drupal modules to automatically optimize their performance by temporarily disabling CPU-intensive functionality.') .'
'; + $output .= ''. t('If your site gets linked to by a popular website, or otherwise comes under a "Denial of Service" (DoS) attack, your webserver might become overwhelmed. This module provides a congestion control throttling mechanism for automatically detecting a surge in incoming traffic. This mechanism is utilized by other Drupal modules to automatically optimize their performance by temporarily disabling CPU-intensive functionality.') .'
'; + break; } + return $output; } function throttle_admin_settings() { Index: modules/tracker/tracker.module =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v retrieving revision 1.140 diff -u -p -r1.140 tracker.module --- modules/tracker/tracker.module 5 Dec 2006 17:53:26 -0000 1.140 +++ modules/tracker/tracker.module 5 Dec 2006 21:06:42 -0000 @@ -10,13 +10,15 @@ * Implementation of hook_help(). */ function tracker_help($section) { + $output = ''; switch ($section) { case 'admin/help#tracker': - $output = ''. t('The tracker module displays the most recently added or updated content to the website allowing users to see the most recent contributions. The tracker module provides user level tracking for those who like to follow the contributions of particular authors.') .'
'; + $output .= ''. t('The tracker module displays the most recently added or updated content to the website allowing users to see the most recent contributions. The tracker module provides user level tracking for those who like to follow the contributions of particular authors.') .'
'; $output .= ''. t('The "recent posts" page is available via a link in the navigation menu block and contains a reverse chronological list of new and recently-updated content. The table displays the content type, the title, the author\'s name, how many comments that item has received, and when it was last updated. Updates include any changes to the text, either by the original author or someone else, as well as any new comments added to an item. To use the tracker module to watch for a user\'s updated content, click on that user\'s profile, then the track tab.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Tracker page.', array('@tracker' => 'http://drupal.org/handbook/modules/tracker/')) .'
'; - return $output; + break; } + return $output; } /** Index: modules/upload/upload.module =================================================================== RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v retrieving revision 1.142 diff -u -p -r1.142 upload.module --- modules/upload/upload.module 28 Nov 2006 02:38:28 -0000 1.142 +++ modules/upload/upload.module 5 Dec 2006 21:06:42 -0000 @@ -11,15 +11,18 @@ * Implementation of hook_help(). */ function upload_help($section) { + $output = ''; switch ($section) { case 'admin/help#upload': - $output = ''. t('The upload module allows users to upload files to the site. The ability to upload files to a site is important for members of a community who want to share work. It is also useful to administrators who want to keep uploaded files connected to a node or page.') .'
'; + $output .= ''. t('The upload module allows users to upload files to the site. The ability to upload files to a site is important for members of a community who want to share work. It is also useful to administrators who want to keep uploaded files connected to a node or page.') .'
'; $output .= ''. t('Users with the upload files permission can upload attachments. You can choose which post types can take attachments on the content types settings page. Each user role can be customized for the file size of uploads, and the dimension of image files.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Upload page.', array('@upload' => 'http://drupal.org/handbook/modules/upload/')) .'
'; - return $output; + break; case 'admin/settings/upload': - return ''. t('Users with the upload files permission can upload attachments. Users with the view uploaded files permission can view uploaded attachments. You can choose which post types can take attachments on the content types settings page.', array('@permissions' => url('admin/user/access'), '@types' => url('admin/settings/types'))) .'
'; + $output .= ''. t('Users with the upload files permission can upload attachments. Users with the view uploaded files permission can view uploaded attachments. You can choose which post types can take attachments on the content types settings page.', array('@permissions' => url('admin/user/access'), '@types' => url('admin/settings/types'))) .'
'; + break; } + return $output; } /** Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.726 diff -u -p -r1.726 user.module --- modules/user/user.module 5 Dec 2006 05:47:37 -0000 1.726 +++ modules/user/user.module 5 Dec 2006 21:06:43 -0000 @@ -2330,29 +2330,37 @@ function user_admin($callback_arg = '') function user_help($section) { global $user; + $output = ''; switch ($section) { case 'admin/help#user': - $output = ''. t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The user module supports user roles which can setup fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles anonymous - a user who has not logged in, and authenticated a user who has signed up and who has been authorized.') .'
'; + $output .= ''. t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The user module supports user roles which can setup fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles anonymous - a user who has not logged in, and authenticated a user who has signed up and who has been authorized.') .'
'; $output .= ''. t('Users can use their own name or handle and can fine tune some personal configuration settings through their individual my account page. Registered users need to authenticate by supplying either a local username and password, or a remote username and password such as DelphiForums ID, or one from a Drupal powered website. A visitor accessing your website is assigned an unique ID, the so-called session ID, which is stored in a cookie. For security\'s sake, the cookie does not contain personal information but acts as a key to retrieve the information stored on your server.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook User page.', array('@user' => 'http://drupal.org/handbook/modules/user/')) .'
'; - return $output; + break; case 'admin/user/user': - return ''. t('Drupal allows users to register, login, log out, maintain user profiles, etc. Users of the site may not use their own names to post content until they have signed up for a user account.') .'
'; + $output .= ''. t('Drupal allows users to register, login, log out, maintain user profiles, etc. Users of the site may not use their own names to post content until they have signed up for a user account.') .'
'; + break; case 'admin/user/user/create': + break; case 'admin/user/user/account/create': - return ''. t('This web page allows the administrators to register a new users by hand. Note that you cannot have a user where either the e-mail address or the username match another user in the system.') .'
'; + $output .= ''. t('This web page allows the administrators to register a new users by hand. Note that you cannot have a user where either the e-mail address or the username match another user in the system.') .'
'; + break; case 'admin/user/rules': - return ''. t('Set up username and e-mail address access rules for new and existing accounts (currently logged in accounts will not be logged out). If a username or e-mail address for an account matches any deny rule, but not an allow rule, then the account will not be allowed to be created or to log in. A host rule is effective for every page view, not just registrations.') .'
'; + $output .= ''. t('Set up username and e-mail address access rules for new and existing accounts (currently logged in accounts will not be logged out). If a username or e-mail address for an account matches any deny rule, but not an allow rule, then the account will not be allowed to be created or to log in. A host rule is effective for every page view, not just registrations.') .'
'; + break; case 'admin/user/access': - return ''. t('Permissions let you control what users can do on your site. Each user role (defined on the user roles page) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.', array('@role' => url('admin/user/roles'))) .'
'; + $output .= ''. t('Permissions let you control what users can do on your site. Each user role (defined on the user roles page) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.', array('@role' => url('admin/user/roles'))) .'
'; + break; case 'admin/user/roles': - return t('Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".
By default, Drupal comes with two user roles:
+ $output .= t('Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".
By default, Drupal comes with two user roles:
'. t('Enter a simple pattern ("*" may be used as a wildcard match) to search for a username. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda".') .'
'; + $output .= ''. t('Enter a simple pattern ("*" may be used as a wildcard match) to search for a username. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda".') .'
'; + break; case 'user/help#user': $site = variable_get('site_name', 'Drupal'); @@ -2364,7 +2372,7 @@ function user_help($section) { $affiliate_info = t('one of our affiliates'); } - $output = t(' + $output .= t('One of the more tedious moments in visiting a new website is filling out the registration form. Here at @site, you do not have to fill out a registration form if you are already a member of !affiliate-info. This capability is called distributed authentication, and Drupal, the software which powers @site, fully supports it.
Distributed authentication enables a new user to input a username and password into the login box, and immediately be recognized, even if that user never registered at @site. This works because Drupal knows how to communicate with external registration databases. For example, lets say that new user \'Joe\' is already a registered member of Delphi Forums. Drupal informs Joe on registration and login screens that he may login with his Delphi ID instead of registering with @site. Joe likes that idea, and logs in with a username of joe@remote.delphiforums.com and his usual Delphi password. Drupal then contacts the remote.delphiforums.com server behind the scenes (usually using XML-RPC, HTTP POST, or SOAP) and asks: "Is the password for user Joe correct?". If Delphi replies yes, then we create a new @site account for Joe and log him into it. Joe may keep on logging into @site in the same manner, and he will always be logged into the same account.
', array('!affiliate-info' => $affiliate_info, '@site' => $site, '@drupal' => 'http://drupal.org', '@delphi-forums' => 'http://www.delphiforums.com', '@xml' => 'http://www.xmlrpc.com', '@http-post' => 'http://www.w3.org/Protocols/', '@soap' => 'http://www.soapware.org')); @@ -2375,10 +2383,9 @@ function user_help($section) { $output .= module_invoke($module, 'help', "user/help#$module"); } } - - return $output; + break; } - + return $output; } /** Index: modules/watchdog/watchdog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/watchdog/watchdog.module,v retrieving revision 1.163 diff -u -p -r1.163 watchdog.module --- modules/watchdog/watchdog.module 1 Dec 2006 23:17:26 -0000 1.163 +++ modules/watchdog/watchdog.module 5 Dec 2006 21:06:44 -0000 @@ -16,15 +16,18 @@ * Implementation of hook_help(). */ function watchdog_help($section) { + $output = ''; switch ($section) { case 'admin/help#watchdog': - $output = ''. t('The watchdog module monitors your system, capturing system events in a log to be reviewed by an authorized individual at a later time. This is useful for site administrators who want a quick overview of activities on their site. The logs also record the sequence of events, so it can be useful for debugging site errors.') .'
'; + $output .= ''. t('The watchdog module monitors your system, capturing system events in a log to be reviewed by an authorized individual at a later time. This is useful for site administrators who want a quick overview of activities on their site. The logs also record the sequence of events, so it can be useful for debugging site errors.') .'
'; $output .= ''. t('The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the watchdog report on a regular basis to ensure their site is working properly.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Watchdog page.', array('@watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'
'; - return $output; + break; case 'admin/logs': - return ''. t('The watchdog module monitors your web site, capturing system events in a log to be reviewed by an authorized individual at a later time. The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the watchdog report on a regular basis as it is often the only way to tell what is going on.') .'
'; + $output .= ''. t('The watchdog module monitors your web site, capturing system events in a log to be reviewed by an authorized individual at a later time. The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the watchdog report on a regular basis as it is often the only way to tell what is going on.') .'
'; + break; } + return $output; } /**