Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.63
diff -u -p -r1.63 block.admin.inc
--- modules/block/block.admin.inc	19 Nov 2009 04:00:47 -0000	1.63
+++ modules/block/block.admin.inc	21 Nov 2009 14:54:40 -0000
@@ -495,17 +495,21 @@ function block_add_block_form_submit($fo
   
   // Store regions per theme for this block
   foreach ($form_state['values']['regions'] as $theme => $region) {
+    $assigned = ($region != BLOCK_REGION_NONE);
     db_merge('block')
       ->key(array('theme' => $theme, 'delta' => $delta, 'module' => $form_state['values']['module']))
       ->fields(array(
         'region' => $region,
         'pages' => trim($form_state['values']['pages']),
-        'status' => (int) ($region != BLOCK_REGION_NONE),
+        'status' => (int) $assigned,
       ))
       ->execute();
   }
 
   drupal_set_message(t('The block has been created.'));
+  if (!$assigned) {
+      drupal_set_message(t('The block has not yet been assigned to a region. Manage <a href="#disabled-blocks-region">disabled blocks</a> to move the new block into one of the regions demonstrated on this page.'));
+  }
   cache_clear_all();
   $form_state['redirect'] = 'admin/structure/block';
 }
@@ -551,7 +555,7 @@ function block_custom_block_delete_submi
 function template_preprocess_block_admin_display_form(&$variables) {
 
   $block_regions = system_region_list($variables['form']['edited_theme']['#value'], REGIONS_VISIBLE);
-  $variables['block_regions'] = $block_regions + array(BLOCK_REGION_NONE => t('Disabled'));
+  $variables['block_regions'] = $block_regions + array(BLOCK_REGION_NONE => '<span id="disabled-blocks-region">' . t('Disabled blocks') . '</span>');
 
   foreach ($block_regions as $key => $value) {
     // Initialize an empty array for the region.
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.399
diff -u -p -r1.399 block.module
--- modules/block/block.module	19 Nov 2009 05:54:42 -0000	1.399
+++ modules/block/block.module	21 Nov 2009 14:54:41 -0000
@@ -36,7 +36,8 @@ function block_help($path, $arg) {
   if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) {
     $demo_theme = !empty($arg[4]) ? $arg[4] : variable_get('theme_default', 'garland');
     $themes = list_themes();
-    $output = '<p>' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the <em>Save blocks</em> button at the bottom of the page. Click the <em>configure</em> link next to each block to configure its specific title and visibility settings.') . '</p>';
+    $output = '<p>' . t('Assign blocks to appear in regions demonstrated on this page, as listed below. Drag and drop to rearrange their order. Changes appear after you save.') . '</p>';
+    $output .= '<p>' . t('Click the <em>configure</em> link next to each block to configure settings. Manage <a href="#disabled-blocks-region">disabled blocks</a> at the bottom of this page. <a href="@add-block">Add a custom block</a>.', array('@add-block' => url('admin/structure/block/add'))) . '</p>';
     $output .= '<p>' . l(t('Demonstrate block regions (@theme)', array('@theme' => $themes[$demo_theme]->info['name'])), 'admin/structure/block/demo/' . $demo_theme) . '</p>';
     return $output;
   }
@@ -241,7 +242,7 @@ function block_page_build(&$page) {
     if ($item['path'] == 'admin/structure/block/demo/' . $theme) {
       $visible_regions = array_keys(system_region_list($theme, REGIONS_VISIBLE));
       foreach ($visible_regions as $region) {
-        $description = '<div class="block-region">' . $all_regions[$region] . '</div>';
+        $description = '<div class="block-region">' . t('%region region', array('%region' => $all_regions[$region])) . '</div>';
         $page[$region]['block_description'] = array(
           '#markup' => $description,
           '#weight' => 15,