Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.289 diff -u -p -r1.289 block.module --- modules/block/block.module 8 Dec 2007 14:06:20 -0000 1.289 +++ modules/block/block.module 11 Dec 2007 17:05:23 -0000 @@ -68,32 +68,30 @@ function block_help($path, $arg) { switch ($path) { 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('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 region each block appears in depends both on the settings in the block administration section and on which theme you are using (some themes allow greater control over where you can place your blocks).') .'

'; $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:

- -"); + $output .= '

' . t('A block\'s visibility depends on:') . '

'; + $output .= ''; $output .= '

'. t('Module blocks') .'

'; $output .= '

'. t('Some modules generate blocks that become available when the modules are enabled. These blocks can be administered via the blocks administration page.', array('@admin-block' => url('admin/build/block'))) .'

'; - $output .= '

'. t('Administrator defined blocks') .'

'; - $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('Administrator-defined blocks') .'

'; + $output .= '

'. t('Administrators can also define custom blocks. These blocks consist of a title, a description, and a body. The body 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; 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.

-

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 behavior 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'))); + $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.') . '

'; + $output .= '

' . t('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.') . '

'; + $output .= '

' . t('You can auto-disable certain blocks during high server load to reduce stress by enabling the "Throttle" option. This option is available if the throttle module is enabled. You can set the throttle thresholds on the throttle configuration page.') . '

'; + $output .= '

' . t('You can configure the behavior 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'))) . '

'; + return $output; 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'))) .'

'; + return '

'. t('Here you can create a new block. Once you have created this block you must enable it and position it on the page using blocks. The description is used in the "block" column on the blocks page.', array('@overview' => url('admin/build/block'))) .'

'; } }