Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.298
diff -u -p -r1.298 block.module
--- modules/block/block.module	25 Jan 2008 10:56:59 -0000	1.298
+++ modules/block/block.module	1 Feb 2008 18:13:06 -0000
@@ -86,7 +86,7 @@ function block_help($path, $arg) {
       if ($throttle) {
         $output .= '<p>'. t('To reduce CPU usage, database traffic or bandwidth, blocks may be automatically disabled during high server loads by selecting their <em>Throttle</em> checkbox. Adjust throttle thresholds on the <a href="@throttleconfig">throttle configuration page</a>.', array('@throttleconfig' => url('admin/settings/throttle'))) .'</p>';
       }
-      $output .= '<p>'. t('Click the <em>configure</em> link next to each block to configure its specific title and visibility settings. Use the <a href="@add-block">add block page</a> to create a custom block.', array('@add-block' => url('admin/build/block/add'))) .'</p>';
+      $output .= '<p>'. t('Click the <em>block name</em> to configure its specific title and visibility settings. Use the <a href="@add-block">add block page</a> to create a custom block.', array('@add-block' => url('admin/build/block/add'))) .'</p>';
       return $output;
     case 'admin/build/block/add':
       return '<p>'. t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the <a href="@blocks">blocks administration page</a> to be visible.', array('@blocks' => url('admin/build/block'))) .'</p>';
Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 block.admin.inc
--- modules/block/block.admin.inc	22 Dec 2007 23:24:24 -0000	1.14
+++ modules/block/block.admin.inc	1 Feb 2008 18:13:06 -0000
@@ -55,7 +55,7 @@ function block_admin_display_form(&$form
       '#value' => $block['delta'],
     );
     $form[$key]['info'] = array(
-      '#value' => check_plain($block['info'])
+      '#value' => l($block['info'], 'admin/build/block/configure/'. $block['module'] .'/'. $block['delta']),
     );
     $form[$key]['theme'] = array(
       '#type' => 'hidden',
@@ -74,7 +74,6 @@ function block_admin_display_form(&$form
     if ($throttle) {
       $form[$key]['throttle'] = array('#type' => 'checkbox', '#default_value' => isset($block['throttle']) ? $block['throttle'] : FALSE);
     }
-    $form[$key]['configure'] = array('#value' => l(t('configure'), 'admin/build/block/configure/'. $block['module'] .'/'. $block['delta']));
     if ($block['module'] == 'block') {
       $form[$key]['delete'] = array('#value' => l(t('delete'), 'admin/build/block/delete/'. $block['delta']));
     }
Index: modules/block/block-admin-display-form.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block-admin-display-form.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 block-admin-display-form.tpl.php
--- modules/block/block-admin-display-form.tpl.php	16 Jan 2008 22:57:26 -0000	1.3
+++ modules/block/block-admin-display-form.tpl.php	1 Feb 2008 18:13:06 -0000
@@ -44,7 +44,7 @@
       <?php if ($throttle): ?>
         <th><?php print t('Throttle'); ?></th>
       <?php endif; ?>
-      <th colspan="2"><?php print t('Operations'); ?></th>
+      <th><?php print t('Operations'); ?></th>
     </tr>
   </thead>
   <tbody>
@@ -64,7 +64,6 @@
         <?php if ($throttle): ?>
           <td><?php print $data->throttle_check; ?></td>
         <?php endif; ?>
-        <td><?php print $data->configure_link; ?></td>
         <td><?php print $data->delete_link; ?></td>
       </tr>
       <?php $row++; ?>