1,4c1,4
< diff --git a/core/modules/block/block-admin-display-form.tpl.php b/core/modules/block/block-admin-display-form.tpl.php
< index bb3d887..0ce2b6b 100644
< --- a/core/modules/block/block-admin-display-form.tpl.php
< +++ b/core/modules/block/block-admin-display-form.tpl.php
---
> diff --git a/modules/block/block-admin-display-form.tpl.php b/modules/block/block-admin-display-form.tpl.php
> index 94b6104..17a15e4 100644
> --- a/modules/block/block-admin-display-form.tpl.php
> +++ b/modules/block/block-admin-display-form.tpl.php
14,48c14,18
< diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc
< index 7169190..04dbbe9 100644
< --- a/core/modules/block/block.admin.inc
< +++ b/core/modules/block/block.admin.inc
< @@ -6,7 +6,11 @@
<   */
<  
<  /**
< - * Menu callback for admin/structure/block/demo.
< + * Page callback: Attaches CSS for the block region demo.
< + *
< + * Path: admin/structure/block/demo/% (for each theme)
< + *
< + * @see block_menu()
<   */
<  function block_admin_demo($theme = NULL) {
<    drupal_add_css(drupal_get_path('module', 'block') . '/block.admin.css');
< @@ -14,11 +18,15 @@ function block_admin_demo($theme = NULL) {
<  }
<  
<  /**
< - * Menu callback for admin/structure/block.
< + * Page callback: Shows the block administration page.
< + *
< + * Path: admin/structure/block
<   *
<   * @param $theme
<   *   The theme to display the administration page for. If not provided, defaults
<   *   to the currently used theme.
< + *
< + * @see block_menu()
<   */
<  function block_admin_display($theme = NULL) {
<    global $theme_key;
< @@ -57,7 +65,7 @@ function block_admin_display_prepare_blocks($theme) {
---
> diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
> index f86fe96..bd61790 100644
> --- a/modules/block/block.admin.inc
> +++ b/modules/block/block.admin.inc
> @@ -57,7 +57,7 @@ function block_admin_display_prepare_blocks($theme) {
57c27
< @@ -165,7 +173,7 @@ function block_admin_display_form($form, &$form_state, $blocks, $theme, $block_r
---
> @@ -165,7 +165,7 @@ function block_admin_display_form($form, &$form_state, $blocks, $theme, $block_r
66c36
< @@ -197,10 +205,9 @@ function block_admin_display_form_submit($form, &$form_state) {
---
> @@ -197,10 +197,9 @@ function block_admin_display_form_submit($form, &$form_state) {
79c49
< @@ -240,7 +247,9 @@ function _block_compare($a, $b) {
---
> @@ -240,7 +239,7 @@ function _block_compare($a, $b) {
84,86c54
< + * Page callback: Form constructor for the block configuration form.
< + *
< + * Path: admin/structure/block/manage/%/%
---
> + * Form constructor for the block configuration form.
90,98c58
< @@ -249,6 +258,7 @@ function _block_compare($a, $b) {
<   * @param $delta
<   *   Unique ID of the block within the context of $module.
<   *
< + * @see block_menu()
<   * @see block_admin_configure_validate()
<   * @see block_admin_configure_submit()
<   * @ingroup forms
< @@ -441,7 +451,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) {
---
> @@ -441,7 +440,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) {
107c67
< @@ -459,7 +469,7 @@ function block_admin_configure_validate($form, &$form_state) {
---
> @@ -459,7 +458,7 @@ function block_admin_configure_validate($form, &$form_state) {
116c76
< @@ -519,8 +529,11 @@ function block_admin_configure_submit($form, &$form_state) {
---
> @@ -519,7 +518,7 @@ function block_admin_configure_submit($form, &$form_state) {
121,123c81
< + * Page callback: Form constructor for the add block form.
< + *
< + * Path: admin/structure/block/add
---
> + * Form constructor for the add block form.
125d82
< + * @see block_menu()
128,129c85
<   * @ingroup forms
< @@ -530,7 +543,7 @@ function block_add_block_form($form, &$form_state) {
---
> @@ -530,7 +529,7 @@ function block_add_block_form($form, &$form_state) {
138c94
< @@ -544,7 +557,7 @@ function block_add_block_form_validate($form, &$form_state) {
---
> @@ -544,7 +543,7 @@ function block_add_block_form_validate($form, &$form_state) {
147c103
< @@ -609,7 +622,9 @@ function block_add_block_form_submit($form, &$form_state) {
---
> @@ -609,7 +608,7 @@ function block_add_block_form_submit($form, &$form_state) {
152,154c108
< + * Page callback: Form constructor for the custom block deletion form.
< + *
< + * Path: admin/structure/block/manage/%/%/delete
---
> + * Form constructor for the custom block deletion form.
158,166c112
< @@ -617,6 +632,7 @@ function block_add_block_form_submit($form, &$form_state) {
<   * @param $delta
<   *   The unique ID of the block within the context of $module.
<   *
< + * @see block_menu()
<   * @see block_custom_block_delete_submit()
<   */
<  function block_custom_block_delete($form, &$form_state, $module, $delta) {
< @@ -629,7 +645,7 @@ function block_custom_block_delete($form, &$form_state, $module, $delta) {
---
> @@ -629,7 +628,7 @@ function block_custom_block_delete($form, &$form_state, $module, $delta) {
175,178c121,124
< diff --git a/core/modules/block/block.module b/core/modules/block/block.module
< index 920090f..ff3750e 100644
< --- a/core/modules/block/block.module
< +++ b/core/modules/block/block.module
---
> diff --git a/modules/block/block.module b/modules/block/block.module
> index 754febd..2431908 100644
> --- a/modules/block/block.module
> +++ b/modules/block/block.module
212,250c158
< @@ -177,21 +177,35 @@ function block_menu() {
<  }
<  
<  /**
< - * Menu item access callback - only admin or enabled themes can be accessed.
< + * Access callback: Only admin or enabled themes can be accessed.
< + *
< + * Path:
< + * - admin/structure/block/list/% (for each theme)
< + * - admin/structure/block/demo/% (for each theme)
< + *
< + * @param $theme
< + *   Either the name of a theme or a full theme object.
< + *
< + * @see block_menu()
<   */
<  function _block_themes_access($theme) {
<    return user_access('administer blocks') && drupal_theme_access($theme);
<  }
<  
<  /**
< - * Theme callback for the block configuration pages.
< + * Theme callback: Uses the theme specified in the parameter.
< + *
< + * Path: admin/structure/block/demo/% (for each theme)
<   *
<   * @param $theme
<   *   The theme whose blocks are being configured. If not set, the default theme
<   *   is assumed.
< + *
<   * @return
<   *   The theme that should be used for the block configuration page, or NULL
<   *   to indicate that the default theme should be used.
< + *
< + * @see block_menu()
<   */
<  function _block_custom_theme($theme = NULL) {
<    // We return exactly what was passed in, to guarantee that the page will
< @@ -249,7 +263,7 @@ function block_block_view($delta = '') {
---
> @@ -249,7 +249,7 @@ function block_block_view($delta = '') {
259c167
< @@ -305,10 +319,13 @@ function block_page_build(&$page) {
---
> @@ -305,10 +305,13 @@ function block_page_build(&$page) {
274c182
< @@ -319,10 +336,11 @@ function block_get_blocks_by_region($region) {
---
> @@ -319,10 +322,11 @@ function block_get_blocks_by_region($region) {
287c195
< @@ -378,7 +396,7 @@ function _block_get_renderable_region($list = array()) {
---
> @@ -353,7 +357,7 @@ function _block_get_renderable_array($list = array()) {
296c204
< @@ -498,6 +516,7 @@ function _block_rehash($theme = NULL) {
---
> @@ -473,6 +477,7 @@ function _block_rehash($theme = NULL) {
304c212
< @@ -511,7 +530,14 @@ function block_custom_block_get($bid) {
---
> @@ -486,7 +491,14 @@ function block_custom_block_get($bid) {
320c228
< @@ -553,6 +579,7 @@ function block_custom_block_form($edit = array()) {
---
> @@ -528,6 +540,7 @@ function block_custom_block_form($edit = array()) {
328c236
< @@ -569,7 +596,7 @@ function block_custom_block_save($edit, $delta) {
---
> @@ -544,7 +557,7 @@ function block_custom_block_save($edit, $delta) {
337c245
< @@ -613,7 +640,10 @@ function block_user_presave(&$edit, $account, $category) {
---
> @@ -588,7 +601,10 @@ function block_user_presave(&$edit, $account, $category) {
349c257
< @@ -622,7 +652,7 @@ function block_themes_enabled($theme_list) {
---
> @@ -597,7 +613,7 @@ function block_themes_enabled($theme_list) {
358c266
< @@ -653,7 +683,7 @@ function block_theme_initialize($theme) {
---
> @@ -628,7 +644,7 @@ function block_theme_initialize($theme) {
367c275
< @@ -665,7 +695,7 @@ function block_theme_initialize($theme) {
---
> @@ -640,7 +656,7 @@ function block_theme_initialize($theme) {
376c284
< @@ -684,7 +714,7 @@ function block_list($region) {
---
> @@ -662,7 +678,7 @@ function block_list($region) {
385c293
< @@ -712,7 +742,10 @@ function block_load($module, $delta) {
---
> @@ -690,7 +706,10 @@ function block_load($module, $delta) {
397c305
< @@ -744,8 +777,8 @@ function _block_load_blocks() {
---
> @@ -721,8 +740,8 @@ function _block_load_blocks() {
408,424c316
< @@ -831,11 +864,13 @@ function block_block_list_alter(&$blocks) {
<  }
<  
<  /**
< - * Build the content and subject for a block. For cacheable blocks, this is
< - * called during #pre_render.
< + * Builds the content and subject for a block.
< + *
< + * For cacheable blocks, this is called during #pre_render.
<   *
<   * @param $element
<   *   A renderable array.
< + *
<   * @return
<   *   A renderable array.
<   */
< @@ -900,9 +935,9 @@ function block_flush_caches() {
---
> @@ -916,9 +935,9 @@ function block_flush_caches() {
436c328
< @@ -954,7 +989,7 @@ function template_preprocess_block(&$variables) {
---
> @@ -967,7 +986,7 @@ function template_preprocess_block(&$variables) {
445c337
< @@ -991,7 +1026,7 @@ function block_admin_paths() {
---
> @@ -1019,7 +1038,7 @@ function block_admin_paths() {
454,457c346,349
< diff --git a/core/modules/block/block.tpl.php b/core/modules/block/block.tpl.php
< index c1025c3..78387a8 100644
< --- a/core/modules/block/block.tpl.php
< +++ b/core/modules/block/block.tpl.php
---
> diff --git a/modules/block/block.tpl.php b/modules/block/block.tpl.php
> index b194637..f0bfa5c 100644
> --- a/modules/block/block.tpl.php
> +++ b/modules/block/block.tpl.php