Index: includes/update.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/update.inc,v
retrieving revision 1.66
diff -u -p -r1.66 update.inc
--- includes/update.inc	2 Sep 2010 21:07:44 -0000	1.66
+++ includes/update.inc	12 Sep 2010 16:42:55 -0000
@@ -391,11 +391,11 @@ function update_fix_d7_requirements() {
 
     // Add the cache_path table.
     require_once('./modules/system/system.install');
-    $schema['cache_path'] = system_schema_cache_7054();
+    $schema['cache_path'] = system_schema_cache_7040();
     $schema['cache_path']['description'] = 'Cache table used for path alias lookups.';
     db_create_table('cache_path', $schema['cache_path']);
 
-    // system_update_7042() renames columns, but these are needed to bootstrap.
+    // system_update_7028() renames columns, but these are needed to bootstrap.
     // Add empty columns for now.
     db_add_field('url_alias', 'source', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
     db_add_field('url_alias', 'alias', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
@@ -619,7 +619,7 @@ function update_fix_d7_requirements() {
 
     // Rename 'site_offline_message' variable to 'maintenance_mode_message'.
     // Old variable is removed in update for system.module, see
-    // system_update_7036().
+    // system_update_7023().
     if ($message = variable_get('site_offline_message', NULL)) {
       variable_set('maintenance_mode_message', $message);
     }
Index: modules/aggregator/aggregator.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v
retrieving revision 1.31
diff -u -p -r1.31 aggregator.install
--- modules/aggregator/aggregator.install	22 Aug 2010 13:55:53 -0000	1.31
+++ modules/aggregator/aggregator.install	12 Sep 2010 16:42:56 -0000
@@ -281,6 +281,11 @@ function aggregator_schema() {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Aggregator updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Add hash column to aggregator_feed table.
  */
 function aggregator_update_7000() {
@@ -307,3 +312,7 @@ function aggregator_update_7002() {
   db_add_index('aggregator_feed', 'queued', array('queued'));
 }
 
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/block/block.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.install,v
retrieving revision 1.45
diff -u -p -r1.45 block.install
--- modules/block/block.install	28 Jul 2010 01:40:39 -0000	1.45
+++ modules/block/block.install	12 Sep 2010 16:42:56 -0000
@@ -211,7 +211,7 @@ function block_update_7000() {
  * Rename {blocks} table to {block}, {blocks_roles} to {block_role} and
  * {boxes} to {block_custom}.
  */
-function block_update_7002() {
+function block_update_7001() {
   db_rename_table('blocks', 'block');
   db_rename_table('blocks_roles', 'block_role');
   db_rename_table('boxes', 'block_custom');
@@ -220,7 +220,7 @@ function block_update_7002() {
 /**
  * Change the weight column to normal int.
  */
-function block_update_7003() {
+function block_update_7002() {
   db_drop_index('block', 'list');
   db_change_field('block', 'weight', 'weight', array(
     'type' => 'int',
@@ -237,7 +237,7 @@ function block_update_7003() {
 /**
  * Add new blocks to new regions, migrate custom variables to blocks.
  */
-function block_update_7004() {
+function block_update_7003() {
   // Collect a list of themes with blocks.
   $themes_with_blocks = array();
   $result = db_query("SELECT s.name FROM {system} s INNER JOIN {block} b ON s.name = b.theme WHERE s.type = 'theme' GROUP by s.name");
@@ -396,7 +396,7 @@ function block_update_7004() {
 /**
  * Update the {block_custom}.format column.
  */
-function block_update_7005() {
+function block_update_7004() {
   // It was previously possible for a value of "0" to be stored in database
   // tables to indicate that a particular piece of text should be filtered
   // using the default text format.
@@ -413,8 +413,8 @@ function block_update_7005() {
  * Converts fields that hold serialized variables from text to blob.
  * Removes 'headers' column.
  */
-function block_update_7006() {
-  $schema = system_schema_cache_7054();
+function block_update_7005() {
+  $schema = system_schema_cache_7040();
 
   db_drop_table('cache_block');
   db_create_table('cache_block', $schema);
Index: modules/comment/comment.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.install,v
retrieving revision 1.71
diff -u -p -r1.71 comment.install
--- modules/comment/comment.install	25 Aug 2010 11:54:40 -0000	1.71
+++ modules/comment/comment.install	12 Sep 2010 16:42:56 -0000
@@ -85,16 +85,16 @@ function comment_update_dependencies() {
   // run after the Field module has been enabled, but before upgrading field
   // data.
   $dependencies['comment'][7005] = array(
-    'system' => 7049,
+    'system' => 7035,
   );
-  $dependencies['system'][7050] = array(
+  $dependencies['system'][7036] = array(
     'comment' => 7005,
   );
 
   // Comment update 7012 creates the comment body field and therefore must run
   // after text module has been enabled and entities have been updated.
   $dependencies['comment'][7012] = array(
-    'system' => 7021,
+    'system' => 7016,
   );
 
   return $dependencies;
@@ -334,9 +334,8 @@ function comment_update_7013(&$sandbox) 
     db_insert($comment_body_table)
       ->from($query)
       ->execute();
-    // Update the comment body format in a similar manner as is done for other
-    // modules in filter_update_7005(), but we do this one here since we are
-    // already migrating the data.
+    // Update the comment body format as required by filter_update_7003(). We
+    // do it here since we are already migrating the data.
     db_update($comment_body_table)
       ->fields(array('comment_body_format' => variable_get('filter_default_format', 1)))
       ->condition('comment_body_format', 0)
Index: modules/dblog/dblog.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.install,v
retrieving revision 1.23
diff -u -p -r1.23 dblog.install
--- modules/dblog/dblog.install	5 Sep 2010 19:56:03 -0000	1.23
+++ modules/dblog/dblog.install	12 Sep 2010 16:42:56 -0000
@@ -100,7 +100,7 @@ function dblog_schema() {
 /**
  * Update the {watchdog} table.
  */
-function dblog_update_7001() {
+function dblog_update_7000() {
   // Allow NULL values for links.
   db_change_field('watchdog', 'link', 'link', array(
     'type' => 'varchar',
Index: modules/filter/filter.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.install,v
retrieving revision 1.43
diff -u -p -r1.43 filter.install
--- modules/filter/filter.install	5 Sep 2010 01:05:06 -0000	1.43
+++ modules/filter/filter.install	12 Sep 2010 16:42:56 -0000
@@ -143,10 +143,10 @@ function filter_install() {
  * Implements hook_update_dependencies().
  */
 function filter_update_dependencies() {
-  // Filter update 7007 migrates permissions and therefore needs to run after
+  // Filter update 7003 migrates permissions and therefore needs to run after
   // the {role} table is properly set up.
-  $dependencies['filter'][7005] = array(
-    'user' => 7007,
+  $dependencies['filter'][7003] = array(
+    'user' => 7006,
   );
 
   return $dependencies;
@@ -201,7 +201,7 @@ function filter_update_7001() {
 /**
  * Upgrade the {filter} table for core filters.
  */
-function filter_update_7003() {
+function filter_update_7002() {
   // Duplicates the {filters} table since core cannot take care of the potential
   // contributed module filters.
   db_rename_table('filters', 'd6_upgrade_filter');
@@ -331,7 +331,7 @@ function filter_update_7003() {
  * format that is available to all users, and explicitly sets the text format
  * in cases that used to rely on a single site-wide default.
  */
-function filter_update_7005() {
+function filter_update_7003() {
   // Move role data from the filter system to the user permission system.
   $all_roles = array_keys(user_roles());
   $default_format = variable_get('filter_default_format', 1);
@@ -425,7 +425,7 @@ function filter_update_7005() {
 /**
  * Grant usage of all text formats to user roles having the 'administer filters' permission.
  */
-function filter_update_7008() {
+function filter_update_7004() {
   // Build the list of permissions to grant.
   $permissions = array();
   foreach (db_query('SELECT format FROM {filter_format}')->fetchCol() as $format_id) {
@@ -446,8 +446,8 @@ function filter_update_7008() {
 /**
  * Converts fields that store serialized variables from text to blob.
  */
-function filter_update_7009() {
-  $schema = system_schema_cache_7054();
+function filter_update_7005() {
+  $schema = system_schema_cache_7040();
   db_drop_table('cache_filter');
   db_create_table('cache_filter', $schema);
 }
Index: modules/forum/forum.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.install,v
retrieving revision 1.50
diff -u -p -r1.50 forum.install
--- modules/forum/forum.install	22 Aug 2010 13:55:53 -0000	1.50
+++ modules/forum/forum.install	12 Sep 2010 16:42:56 -0000
@@ -237,6 +237,11 @@ function forum_schema() {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Forum updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Add new index to forum table.
  */
 function forum_update_7000() {
@@ -331,3 +336,8 @@ function forum_update_7001() {
     ->from($select)
     ->execute();
 }
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/image/image.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.install,v
retrieving revision 1.13
diff -u -p -r1.13 image.install
--- modules/image/image.install	4 Sep 2010 15:40:51 -0000	1.13
+++ modules/image/image.install	12 Sep 2010 16:42:56 -0000
@@ -139,13 +139,18 @@ function image_field_schema($field) {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Image updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Install the schema for users upgrading from the contributed module.
  */
 function image_update_7000() {
   if (!db_table_exists('image_styles')) {
     $schema = array();
 
-    $schema['cache_image'] = system_schema_cache_7054();
+    $schema['cache_image'] = system_schema_cache_7040();
     $schema['cache_image']['description'] = 'Cache table used to store information about image manipulations that are in-progress.';
 
     $schema['image_styles'] = array(
@@ -227,6 +232,11 @@ function image_update_7000() {
 }
 
 /**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
+
+/**
  * Implements hook_requirements() to check the PHP GD Library.
  *
  * @param $phase
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.54
diff -u -p -r1.54 node.install
--- modules/node/node.install	11 Sep 2010 00:39:48 -0000	1.54
+++ modules/node/node.install	12 Sep 2010 16:42:56 -0000
@@ -410,9 +410,9 @@ function node_update_dependencies() {
   // Node update 7006 migrates node data to fields and therefore must run after
   // the Field module has been enabled, but before upgrading field data.
   $dependencies['node'][7006] = array(
-    'system' => 7049,
+    'system' => 7035,
   );
-  $dependencies['system'][7050] = array(
+  $dependencies['system'][7036] = array(
     'node' => 7006,
   );
   return $dependencies;
@@ -615,9 +615,8 @@ function node_update_7006(&$sandbox) {
           }
           $node->body[$langcode][0]['value'] = $revision->body;
           // Explicitly store the current default text format if the revision
-          // did not have its own text format. Similar conversions for other
-          // core modules are performed in filter_update_7005(), but we do this
-          // one here since we are already migrating the data.
+          // did not have its own text format; see filter_update_7003(). We do
+          // this here since we are already migrating the data.
           $node->body[$langcode][0]['format'] = !empty($revision->format) ? $revision->format : variable_get('filter_default_format', 1);
           // This is a core update and no contrib modules are enabled yet, so
           // we can assume default field storage for a faster update.
Index: modules/poll/poll.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.install,v
retrieving revision 1.33
diff -u -p -r1.33 poll.install
--- modules/poll/poll.install	22 Aug 2010 13:55:53 -0000	1.33
+++ modules/poll/poll.install	12 Sep 2010 16:42:56 -0000
@@ -150,12 +150,17 @@ function poll_schema() {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Poll updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Use the poll_choice primary key to record votes in poll_votes rather than
  * the choice order. Rename chorder to weight.
  *
  * Rename {poll_choices} table to {poll_choice} and {poll_votes} to {poll_vote}.
  */
-function poll_update_7001() {
+function poll_update_7000() {
   // Add chid column and convert existing votes.
   db_add_field('poll_votes', 'chid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0));
   db_add_index('poll_votes', 'chid', array('chid'));
@@ -177,7 +182,7 @@ function poll_update_7001() {
 /**
  * Add timestamp field to {poll_vote}.
  */
-function poll_update_7002() {
+function poll_update_7001() {
   $field = array(
     'type' => 'int',
     'not null' => TRUE,
@@ -189,7 +194,7 @@ function poll_update_7002() {
 /**
  * Change the weight column to normal int.
  */
-function poll_update_7003() {
+function poll_update_7002() {
   db_change_field('poll_choice', 'weight', 'weight', array(
     'type' => 'int',
     'not null' => TRUE,
@@ -197,3 +202,8 @@ function poll_update_7003() {
     'description' => 'The sort order of this choice among all choices for the same node.',
   ));
 }
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/profile/profile.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.install,v
retrieving revision 1.26
diff -u -p -r1.26 profile.install
--- modules/profile/profile.install	22 Aug 2010 13:55:53 -0000	1.26
+++ modules/profile/profile.install	12 Sep 2010 16:42:56 -0000
@@ -153,9 +153,14 @@ function profile_schema() {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Profile updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Rename {profile_fields} table to {profile_field} and {profile_values} to {profile_value}.
  */
-function profile_update_7001() {
+function profile_update_7000() {
   db_rename_table('profile_fields', 'profile_field');
   db_rename_table('profile_values', 'profile_value');
 }
@@ -163,7 +168,7 @@ function profile_update_7001() {
 /**
  * Change the weight column to normal int.
  */
-function profile_update_7002() {
+function profile_update_7001() {
   db_change_field('profile_field', 'weight', 'weight', array(
     'type' => 'int',
     'not null' => TRUE,
@@ -171,3 +176,8 @@ function profile_update_7002() {
     'description' => 'Weight of field in relation to other profile fields.',
   ));
 }
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/search/search.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.install,v
retrieving revision 1.29
diff -u -p -r1.29 search.install
--- modules/search/search.install	22 Aug 2010 13:55:53 -0000	1.29
+++ modules/search/search.install	12 Sep 2010 16:42:56 -0000
@@ -156,6 +156,11 @@ function search_schema() {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Search updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Replace unique keys in 'search_dataset' and 'search_index' by primary keys.
  */
 function search_update_7000() {
@@ -181,3 +186,7 @@ function search_update_7000() {
   db_add_primary_key('search_index', array('word', 'sid', 'type'));
 }
 
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.505
diff -u -p -r1.505 system.install
--- modules/system/system.install	7 Sep 2010 21:59:01 -0000	1.505
+++ modules/system/system.install	12 Sep 2010 16:42:56 -0000
@@ -1620,13 +1620,13 @@ function system_schema() {
 }
 
 /**
- * The cache schema corresponding to system_update_7054.
+ * The cache schema corresponding to system_update_7040.
  *
  * Drupal 7 adds several new cache tables. Since they all have identical schema
  * this helper function allows them to re-use the same definition, without
  * relying on system_schema(), which may change with future updates.
  */
-function system_schema_cache_7054() {
+function system_schema_cache_7040() {
   return array(
     'description' => 'Generic cache table for caching things not separated out into their own tables. Contributed modules may also use this to store cached items.',
     'fields' => array(
@@ -1681,9 +1681,9 @@ function system_update_last_removed() {
  * Implements hook_update_dependencies().
  */
 function system_update_dependencies() {
-  // Update 7053 adds new blocks, so make sure the block tables are updated.
-  $dependencies['system'][7053] = array(
-    'block' => 7002,
+  // Update 7039 adds new blocks, so make sure the block tables are updated.
+  $dependencies['system'][7039] = array(
+    'block' => 7001,
   );
 
   return $dependencies;
@@ -1898,17 +1898,9 @@ function system_update_7007() {
 }
 
 /**
- * Use the poll_choice primary key to record votes in poll_votes rather than
- * the choice order. Rename chorder to weight.
- */
-function system_update_7008() {
-  // Moved to poll_update_7001().
-}
-
-/**
  * Rename the variable for primary links.
  */
-function system_update_7009() {
+function system_update_7008() {
   $current_primary = variable_get('menu_primary_links_source');
   if (isset($current_primary)) {
     variable_set('menu_main_links_source', $current_primary);
@@ -1917,16 +1909,9 @@ function system_update_7009() {
 }
 
 /**
- * Moved to system_update_6048().
- */
-function system_update_7010() {
-  return '';
-}
-
-/**
  * Split the 'bypass node access' permission from 'administer nodes'.
  */
-function system_update_7011() {
+function system_update_7009() {
   // Get existing roles that can 'administer nodes'.
   $rids = array();
   $rids = db_query("SELECT rid FROM {role_permission} WHERE permission = :perm", array(':perm' => 'administer nodes'))->fetchCol();
@@ -1944,12 +1929,10 @@ function system_update_7011() {
   $insert->execute();
 }
 
-// system_update_7012() moved to block_update_7002().
-
 /**
  * Convert default time zone offset to default time zone name.
  */
-function system_update_7013() {
+function system_update_7010() {
   $timezone = NULL;
   $timezones = system_time_zones();
   // If the contributed Date module set a default time zone name, use this
@@ -1999,15 +1982,9 @@ function system_update_7013() {
 }
 
 /**
- * Drop the bootstrap column from the {system} table. This was reverted.
- */
-function system_update_7014() {
-}
-
-/**
  * Change the user logout path.
  */
-function system_update_7015() {
+function system_update_7011() {
   db_update('menu_links')
     ->fields(array('link_path' => 'user/logout'))
     ->condition('link_path', 'logout')
@@ -2022,7 +1999,7 @@ function system_update_7015() {
 /**
  * Remove custom datatype *_unsigned in PostgreSQL.
  */
-function system_update_7016() {
+function system_update_7012() {
   // Only run these queries if the driver used is pgsql.
   if (db_driver() == 'pgsql') {
     $result = db_query("SELECT c.relname AS table, a.attname AS field,
@@ -2054,7 +2031,7 @@ function system_update_7016() {
 /**
  * Change the theme setting 'toggle_node_info' into a per content type variable.
  */
-function system_update_7017() {
+function system_update_7013() {
   $types = node_type_get_types();
   if (count($types)) {
     foreach ($types as $type) {
@@ -2078,7 +2055,7 @@ function system_update_7017() {
 /**
  * Shorten the {system}.type column and modify indexes.
  */
-function system_update_7018() {
+function system_update_7014() {
   db_drop_index('system', 'modules');
   db_drop_index('system', 'type_name');
   db_change_field('system', 'type', 'type', array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => ''));
@@ -2088,7 +2065,7 @@ function system_update_7018() {
 /**
  * Enable field module.
  */
-function system_update_7020() {
+function system_update_7015() {
   $module_list = array('field_sql_storage', 'field');
   module_enable($module_list, FALSE);
 }
@@ -2096,7 +2073,7 @@ function system_update_7020() {
 /**
  * Change the PHP for settings permission.
  */
-function system_update_7021() {
+function system_update_7016() {
   db_update('role_permission')
     ->fields(array('permission' => 'use PHP for settings'))
     ->condition('permission', 'use PHP for block visibility')
@@ -2109,7 +2086,7 @@ function system_update_7021() {
  * Note: this should go into the driver itself, but we have no support
  * for driver-specific updates yet.
  */
-function system_update_7024() {
+function system_update_7017() {
   if (db_driver() == 'pgsql') {
     db_query('CREATE OR REPLACE FUNCTION "substring_index"(text, text, integer) RETURNS text AS
       \'SELECT array_to_string((string_to_array($1, $2)) [1:$3], $2);\'
@@ -2121,18 +2098,16 @@ function system_update_7024() {
 /**
  * Enable field type modules.
  */
-function system_update_7027() {
+function system_update_7018() {
   $module_list = array('text', 'number', 'list', 'options');
   module_enable($module_list, FALSE);
 }
 
-// system_update_7028() moved to taxonomy_update_7001().
-
 /**
  * Add new 'view own unpublished content' permission for authenticated users.
  * Preserves legacy behavior from Drupal 6.x.
  */
-function system_update_7029() {
+function system_update_7019() {
   db_insert('role_permission')
     ->fields(array(
       'rid' => DRUPAL_AUTHENTICATED_RID,
@@ -2142,23 +2117,9 @@ function system_update_7029() {
 }
 
 /**
- * Moved to comment_update_7011().
- */
-function system_update_7030() {
-}
-
-/**
- * Removed in favour of Drupal 6 backport.
- *
- * @see system_update_6052()
- */
-function system_update_7031() {
-}
-
-/**
 * Alter field hostname to identifier in the {flood} table.
  */
-function system_update_7032() {
+function system_update_7020() {
   db_drop_index('flood', 'allow');
   db_change_field('flood', 'hostname', 'identifier', array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => ''));
   db_add_index('flood', 'allow', array('event', 'identifier', 'timestamp'));
@@ -2167,7 +2128,7 @@ function system_update_7032() {
 /**
  * Move CACHE_AGGRESSIVE to CACHE_NORMAL.
  */
-function system_update_7033() {
+function system_update_7021() {
   if (variable_get('cache') == 2) {
     variable_set('cache', 1);
     return t('Aggressive caching was disabled and replaced with normal caching. Read the page caching section in default.settings.php for more information on how to enable similar functionality.');
@@ -2177,7 +2138,7 @@ function system_update_7033() {
 /**
  * Migrate the file_downloads setting and create the new {file_managed} table.
  */
-function system_update_7034() {
+function system_update_7022() {
   $files_directory = variable_get('file_directory_path', NULL);
   if (variable_get('file_downloads', 1) == 1) {
     // Our default is public, so we don't need to set anything.
@@ -2267,16 +2228,9 @@ function system_update_7034() {
 }
 
 /**
- * Migrate upload module files to the new {file_managed} table.
- */
-function system_update_7035() {
-  // Update merged into system_update_7059().
-}
-
-/**
  * Split the 'access site in maintenance mode' permission from 'administer site configuration'.
  */
-function system_update_7036() {
+function system_update_7023() {
   // Get existing roles that can 'administer site configuration'.
   $rids = db_query("SELECT rid FROM {role_permission} WHERE permission = :perm", array(':perm' => 'administer site configuration'))->fetchCol();
   // None found.
@@ -2300,7 +2254,7 @@ function system_update_7036() {
 /**
  * Rename action description to label.
  */
-function system_update_7037() {
+function system_update_7024() {
   db_change_field('actions', 'description', 'label', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '0'));
 }
 
@@ -2308,14 +2262,14 @@ function system_update_7037() {
  * Adds fields to the {menu_router} table to allow custom themes to be set per
  * page.
  */
-function system_update_7039() {
+function system_update_7025() {
   // Moved to update_fix_d7_requirements().
 }
 
 /**
  * Create new date format tables.
  */
-function system_update_7040() {
+function system_update_7026() {
   // Moved to update_fix_d7_requirements().
 }
 
@@ -2323,14 +2277,14 @@ function system_update_7040() {
  * Adds 'delivery_callback' field to the {menu_router} table to allow a custom
  * function to be used for final page rendering and sending to browser.
  */
-function system_update_7041() {
+function system_update_7027() {
   // Moved to update_fix_d7_requirements().
 }
 
 /**
  * Upgrade the {url_alias} table and create a cache bin for path aliases.
  */
-function system_update_7042() {
+function system_update_7028() {
   // update_fix_d7_requirements() adds 'fake' source and alias columns to
   // allow bootstrap to run without fatal errors. Remove those columns now
   // so that we can rename properly.
@@ -2352,14 +2306,14 @@ function system_update_7042() {
 /**
  * Add a 'context' field to {menu_router} to control contextual placement of local tasks.
  */
-function system_update_7043() {
+function system_update_7029() {
   // Moved to update_fix_d7_requirements().
 }
 
 /**
  * Drop the actions_aid table.
  */
-function system_update_7044() {
+function system_update_7030() {
   // The current value of the increment has been taken into account when
   // creating the sequences table in update_fix_d7_requirements().
   db_drop_table('actions_aid');
@@ -2368,7 +2322,7 @@ function system_update_7044() {
 /**
  * Add expiration field to the {flood} table.
  */
-function system_update_7045() {
+function system_update_7031() {
   db_add_field('flood', 'expiration', array('description' => 'Expiration timestamp. Expired events are purged on cron run.', 'type' => 'int', 'not null' => TRUE, 'default' => 0));
   db_add_index('flood', 'purge', array('expiration'));
 }
@@ -2376,7 +2330,7 @@ function system_update_7045() {
 /**
  * Switch from the Minnelli theme if it is the default or admin theme.
  */
-function system_update_7046() {
+function system_update_7032() {
   if (variable_get('theme_default') == 'minnelli' || variable_get('admin_theme') == 'minnelli') {
     // Make sure Garland is enabled.
     db_update('system')
@@ -2416,14 +2370,14 @@ function system_update_7046() {
 /**
  * Normalize the front page path variable.
  */
-function system_update_7047() {
+function system_update_7033() {
   variable_set('site_frontpage', drupal_get_normal_path(variable_get('site_frontpage', 'node')));
 }
 
 /**
  * Convert path languages from the empty string to LANGUAGE_NONE.
  */
-function system_update_7048() {
+function system_update_7034() {
   db_update('url_alias')
     ->fields(array('language' => LANGUAGE_NONE))
     ->condition('language', '')
@@ -2433,7 +2387,7 @@ function system_update_7048() {
 /**
  * Rename 'Default' profile to 'Standard.'
  */
-function system_update_7049() {
+function system_update_7035() {
   if (variable_get('install_profile', 'standard') == 'default') {
     variable_set('install_profile', 'standard');
   }
@@ -2442,28 +2396,28 @@ function system_update_7049() {
 /**
  * Change {batch}.id column from serial to regular int.
  */
-function system_update_7050() {
+function system_update_7036() {
   db_change_field('batch', 'bid', 'bid', array('description' => 'Primary Key: Unique batch ID.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
 }
 
 /**
  * make the IP field IPv6 compatible
  */
-function system_update_7051() {
+function system_update_7037() {
   db_change_field('blocked_ips', 'ip', 'ip', array('description' => 'IP address', 'type' => 'varchar', 'length' => 40, 'not null' => TRUE, 'default' => ''));
 }
 
 /**
  * Rename file to include_file in {menu_router} table.
  */
-function system_update_7052() {
+function system_update_7038() {
   db_change_field('menu_router', 'file', 'include_file', array('type' => 'text', 'size' => 'medium'));
 }
 
 /**
  * Upgrade standard blocks and menus.
  */
-function system_update_7053() {
+function system_update_7039() {
   if (db_table_exists('menu_custom')) {
     // Create the same menus as in menu_install().
     db_insert('menu_custom')
@@ -2502,7 +2456,7 @@ function system_update_7053() {
 /**
  * Remove {cache_*}.headers columns.
  */
-function system_update_7054() {
+function system_update_7040() {
   // Update: update_fix_d7_requirements() installs this version for cache_path
   // already, so we don't include it in this particular update. It should be
   // included in later updates though.
@@ -2512,7 +2466,7 @@ function system_update_7054() {
     'cache_page' => 'Cache table used to store compressed pages for anonymous users, if page caching is enabled.',
     'cache_menu' => 'Cache table for the menu system to store router information as well as generated link trees for various menu/page/user combinations.',
   );
-  $schema = system_schema_cache_7054();
+  $schema = system_schema_cache_7040();
   foreach ($cache_tables as $table => $description) {
     $schema['description'] = $description;
     db_drop_table($table);
@@ -2523,7 +2477,7 @@ function system_update_7054() {
 /**
  * Converts fields that store serialized variables from text to blob.
  */
-function system_update_7055() {
+function system_update_7041() {
   $spec = array(
     'description' => 'The value of the variable.',
     'type' => 'blob',
@@ -2604,7 +2558,7 @@ function system_update_7055() {
 /**
  * Increase the size of session-ids.
  */
-function system_update_7057() {
+function system_update_7042() {
   $spec = array(
     'description' => "A session ID. The value is generated by PHP's Session API.",
     'type' => 'varchar',
@@ -2618,14 +2572,14 @@ function system_update_7057() {
 /**
  * Remove cron semaphore variable.
  */
-function system_update_7058() {
+function system_update_7043() {
   variable_del('cron_semaphore');
 }
 
 /**
  * Create the {file_usage} table.
  */
-function system_update_7059() {
+function system_update_7044() {
   $spec = array(
     'description' => 'Track where a file is used.',
     'fields' => array(
@@ -2677,7 +2631,7 @@ function system_update_7059() {
 /**
  * Migrate upload.module to file.module.
  */
-function system_update_7060(&$sandbox) {
+function system_update_7045(&$sandbox) {
   if (!db_table_exists('upload')) {
     return;
   }
@@ -2886,7 +2840,7 @@ function system_update_7060(&$sandbox) {
 /**
  * Replace 'system_list' index with 'bootstrap' index on {system}.
  */
-function system_update_7061() {
+function system_update_7046() {
   db_drop_index('system', 'bootstrap');
   db_drop_index('system', 'system_list');
   db_add_index('system', 'system_list', array('status', 'bootstrap', 'type', 'weight', 'name'));
Index: modules/taxonomy/taxonomy.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.install,v
retrieving revision 1.46
diff -u -p -r1.46 taxonomy.install
--- modules/taxonomy/taxonomy.install	5 Sep 2010 17:00:04 -0000	1.46
+++ modules/taxonomy/taxonomy.install	12 Sep 2010 16:42:56 -0000
@@ -243,30 +243,35 @@ function taxonomy_field_schema($field) {
  * Implements hook_update_dependencies().
  */
 function taxonomy_update_dependencies() {
-  // Taxonomy update 7002 creates comment Field API bundles and therefore must
+  // Taxonomy update 7001 creates comment Field API bundles and therefore must
   // run after the Field module has been enabled, but before upgrading field
   // data.
-  $dependencies['taxonomy'][7002] = array(
-    'system' => 7049,
+  $dependencies['taxonomy'][7001] = array(
+    'system' => 7035,
   );
-  $dependencies['user'][7006] = array(
-    'taxonomy' => 7002,
+  $dependencies['user'][7005] = array(
+    'taxonomy' => 7001,
   );
-  $dependencies['system'][7050] = array(
-    'taxonomy' => 7002,
+  $dependencies['system'][7036] = array(
+    'taxonomy' => 7001,
   );
   // It also must run before nodes are upgraded to use the Field API.
   $dependencies['node'][7006] = array(
-    'taxonomy' => 7002,
+    'taxonomy' => 7001,
   );
 
   return $dependencies;
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Taxonomy updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Rename taxonomy tables.
  */
-function taxonomy_update_7001() {
+function taxonomy_update_7000() {
   db_rename_table('term_data', 'taxonomy_term_data');
   db_rename_table('term_hierarchy', 'taxonomy_term_hierarchy');
   db_rename_table('term_node', 'taxonomy_term_node');
@@ -279,7 +284,7 @@ function taxonomy_update_7001() {
 /**
  * Add {vocabulary}.machine_name column.
  */
-function taxonomy_update_7002() {
+function taxonomy_update_7001() {
   $field = array(
     'type' => 'varchar',
     'length' => 255,
@@ -313,14 +318,14 @@ function taxonomy_update_7002() {
  * This setting has not been used since Drupal 6. The {taxonomy_relations} table
  * itself is retained to allow for data to be upgraded.
  */
-function taxonomy_update_7003() {
+function taxonomy_update_7002() {
   db_drop_field('taxonomy_vocabulary', 'relations');
 }
 
 /**
  * Move taxonomy vocabulary associations for nodes to fields and field instances.
  */
-function taxonomy_update_7004() {
+function taxonomy_update_7003() {
   $taxonomy_index = array(
     'description' => 'Maintains denormalized information about node/term relationships.',
     'fields' => array(
@@ -493,7 +498,7 @@ function taxonomy_update_7004() {
  * @todo: This function can possibly be made much faster by wrapping a
  * transaction around all the inserts.
  */
-function taxonomy_update_7005(&$sandbox) {
+function taxonomy_update_7004(&$sandbox) {
   // $sandbox contents:
   // - total: The total number of term_node relationships to migrate.
   // - count: The number of term_node relationships that have been
@@ -702,7 +707,7 @@ function taxonomy_update_7005(&$sandbox)
 /**
  * Add {taxonomy_term_data}.format column.
  */
-function taxonomy_update_7006() {
+function taxonomy_update_7005() {
   db_add_field('taxonomy_term_data', 'format', array(
     'type' => 'int',
     'size' => 'small',
@@ -715,14 +720,14 @@ function taxonomy_update_7006() {
 /**
  * Add index on {taxonomy_term_data}.name column to speed up taxonomy_get_term_by_name().
  */
-function taxonomy_update_7007() {
+function taxonomy_update_7006() {
   db_add_index('taxonomy_term_data', 'name', array('name'));
 }
 
 /**
  * Change the weight columns to normal int.
  */
-function taxonomy_update_7008() {
+function taxonomy_update_7007() {
   db_drop_index('taxonomy_term_data', 'taxonomy_tree');
   db_change_field('taxonomy_term_data', 'weight', 'weight', array(
     'type' => 'int',
@@ -747,3 +752,8 @@ function taxonomy_update_7008() {
     ),
   ));
 }
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/trigger/trigger.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.install,v
retrieving revision 1.17
diff -u -p -r1.17 trigger.install
--- modules/trigger/trigger.install	22 Aug 2010 13:55:53 -0000	1.17
+++ modules/trigger/trigger.install	12 Sep 2010 16:42:56 -0000
@@ -54,6 +54,11 @@ function trigger_install() {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Trigger updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Adds operation names to the hook names and drops the "op" field.
  */
 function trigger_update_7000() {
@@ -69,3 +74,8 @@ function trigger_update_7000() {
   }
   db_drop_field('trigger_assignments', 'op');
 }
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/update/update.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.install,v
retrieving revision 1.19
diff -u -p -r1.19 update.install
--- modules/update/update.install	25 Jun 2010 17:47:22 -0000	1.19
+++ modules/update/update.install	12 Sep 2010 16:42:56 -0000
@@ -160,7 +160,7 @@ function _update_requirement_check($proj
 }
 
 /**
- * @defgroup updates-6.x-to-7.x Filter updates from 6.x to 7.x
+ * @defgroup updates-6.x-to-7.x Update module updates from 6.x to 7.x
  * @{
  */
 
@@ -180,7 +180,7 @@ function update_update_7000() {
  * Removes 'headers' column.
  */
 function update_update_7001() {
-  $schema = system_schema_cache_7054();
+  $schema = system_schema_cache_7040();
 
   db_drop_table('cache_update');
   db_create_table('cache_update', $schema);
Index: modules/user/user.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.install,v
retrieving revision 1.62
diff -u -p -r1.62 user.install
--- modules/user/user.install	5 Sep 2010 01:05:06 -0000	1.62
+++ modules/user/user.install	12 Sep 2010 16:42:56 -0000
@@ -344,16 +344,16 @@ function user_install() {
 function user_update_dependencies() {
   // Run all the critical user upgrades before everything.
   $dependencies['system'][7000] = array(
-    'user' => 7008,
+    'user' => 7007,
   );
-  // user_update_7006 relies on filter_update_7002.
-  // TODO: move user_update_7006 down below in the upgrade process.
-  $dependencies['user'][7006] = array(
-    'filter' => 7003,
+  // user_update_7005 relies on filter_update_7002.
+  // TODO: move user_update_7005 down below in the upgrade process.
+  $dependencies['user'][7005] = array(
+    'filter' => 7002,
   );
-  // user_update_7013 relies on system_update_7060.
-  $dependencies['user'][7013] = array(
-    'system' => 7059,
+  // user_update_7012 relies on system_update_7044.
+  $dependencies['user'][7012] = array(
+    'system' => 7044,
   );
 
   return $dependencies;
@@ -385,7 +385,7 @@ function _update_user_role_grant_permiss
 }
 
 /**
- * @defgroup user-updates-6.x-to-7.x User updates from 6.x to 7.x
+ * @defgroup updates-6.x-to-7.x User updates from 6.x to 7.x
  * @{
  */
 
@@ -545,16 +545,9 @@ function user_update_7003() {
 }
 
 /**
- * Moved to user_update_7012().
- */
-function user_update_7004() {
-  // This doesn't affect any subsequent user updates.
-}
-
-/**
  * Changes the users table to allow longer e-mail addresses.
  */
-function user_update_7005(&$sandbox) {
+function user_update_7004(&$sandbox) {
   $mail_field = array(
     'type' => 'varchar',
     'length' => 254,
@@ -577,7 +570,7 @@ function user_update_7005(&$sandbox) {
 /**
  * Add module data to {role_permission}.
  */
-function user_update_7006(&$sandbox) {
+function user_update_7005(&$sandbox) {
   $module_field = array(
     'type' => 'varchar',
     'length' => 255,
@@ -603,7 +596,7 @@ function user_update_7006(&$sandbox) {
 /**
  * Add a weight column to user roles.
  */
-function user_update_7007() {
+function user_update_7006() {
   db_add_field('role', 'weight', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
   db_add_index('role', 'name_weight', array('name', 'weight'));
 }
@@ -612,7 +605,7 @@ function user_update_7007() {
  * If 'user_register' variable was unset in Drupal 6, set it to be the same as
  * the Drupal 6 default setting.
  */
-function user_update_7008() {
+function user_update_7007() {
   if (!isset($GLOBALS['conf']['user_register'])) {
     // Set to the Drupal 6 default, "visitors can create accounts".
     variable_set('user_register', USER_REGISTER_VISITORS);
@@ -622,7 +615,7 @@ function user_update_7008() {
 /**
  * Converts fields that store serialized variables from text to blob.
  */
-function user_update_7009() {
+function user_update_7008() {
   $spec = array(
     'type' => 'blob',
     'not null' => FALSE,
@@ -636,7 +629,7 @@ function user_update_7009() {
 /**
  * Update the {user}.signature_format column.
  */
-function user_update_7010() {
+function user_update_7009() {
   // It was previously possible for a value of "0" to be stored in database
   // tables to indicate that a particular piece of text should be filtered
   // using the default text format.
@@ -659,7 +652,7 @@ function user_update_7010() {
  * displays a warning to users that they may need to go and modify the wording
  * of their templates.
  */
-function user_update_7011() {
+function user_update_7010() {
   $message = '';
 
   $tokens = array(
@@ -695,7 +688,7 @@ function user_update_7011() {
  * Add the user's pictures to the {file_managed} table and make them managed
  * files.
  */
-function user_update_7012(&$sandbox) {
+function user_update_7011(&$sandbox) {
 
   $picture_field = array(
     'type' => 'int',
@@ -768,7 +761,7 @@ function user_update_7012(&$sandbox) {
 /**
  * Add user module file usage entries.
  */
-function user_update_7013(&$sandbox) {
+function user_update_7012(&$sandbox) {
   if (!isset($sandbox['progress'])) {
     // Initialize batch update information.
     $sandbox['progress'] = 0;
@@ -794,6 +787,6 @@ function user_update_7013(&$sandbox) {
 }
 
 /**
- * @} End of "defgroup user-updates-6.x-to-7.x"
+ * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */