Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.77
diff -u -p -r1.77 install.php
--- install.php	9 Sep 2007 19:46:54 -0000	1.77
+++ install.php	26 Sep 2007 02:09:17 -0000
@@ -895,18 +895,18 @@ function install_configure_form() {
     '#weight' => 0,
   );
 
-  $zones = _system_zonelist();
 
   $form['server_settings'] = array(
     '#type' => 'fieldset',
     '#title' => st('Server settings'),
     '#collapsible' => FALSE,
   );
+
   $form['server_settings']['date_default_timezone'] = array(
     '#type' => 'select',
     '#title' => st('Default time zone'),
     '#default_value' => variable_get('date_default_timezone', 0),
-    '#options' => $zones,
+    '#options' => _system_zonelist(),
     '#description' => st('By default, dates in this site will be displayed in the chosen time zone.'),
     '#weight' => 5,
   );
@@ -936,6 +936,15 @@ if (Drupal.jsEnabled) {
     '#weight' => 10,
   );
 
+  $form['server_settings']['update_status_module'] = array(
+    '#type' => 'radios',
+    '#title' => st('Update status module'),
+    '#options' => array(st('Disabled'), st('Enabled')),
+    '#default_value' => 1,
+    '#description' => st("The Update status module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts you to available updates. To do this, anonymous usage statistics are sent to drupal.org which contain a list of what versions of this software your site is running. While it is highly recommended you enable this module to inform you of updates (especially security fixes), you may disable it should you have privacy concerns."),
+    '#weight' => 15,
+  );
+
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => st('Save'),
@@ -945,6 +954,7 @@ if (Drupal.jsEnabled) {
   if (function_exists($hook_form_alter)) {
     $hook_form_alter($form, 'install_configure');
   }
+
   return $form;
 }
 
@@ -967,6 +977,11 @@ function install_configure_form_submit($
   variable_set('site_mail', $form_state['values']['site_mail']);
   variable_set('date_default_timezone', $form_state['values']['date_default_timezone']);
 
+  // Enable Update status module if this option was selected.
+  if ($form_state['values']['update_status_module']) {
+    drupal_install_modules(array('update'));
+  }
+
   // Turn this off temporarily so that we can pass a password through.
   variable_set('user_email_verification', FALSE);
   $form_state['old_values'] = $form_state['values'];
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.154
diff -u -p -r1.154 system.install
--- modules/system/system.install	20 Sep 2007 08:37:22 -0000	1.154
+++ modules/system/system.install	26 Sep 2007 02:09:19 -0000
@@ -187,6 +187,23 @@ function system_requirements($phase) {
   include_once './includes/unicode.inc';
   $requirements = array_merge($requirements, unicode_requirements());
 
+  // Check for Update status module.
+  if ($phase == 'runtime') {
+    if (!module_exists('update')) {
+      $requirements['update status'] = array(
+        'value' => $t('Not enabled'),
+        'severity' => REQUIREMENT_ERROR,
+        'description' => $t('The Update status module is not enabled. It is highly recommended that you enable this module in order to stay up-to-date on new releases. Enable it from the <a href="@module">module administration page</a>.', array('@module' => url('admin/build/modules'))),
+      );
+    }
+    else {
+      $requirements['update status'] = array(
+        'value' => $t('Enabled'),
+      );
+    }
+    $requirements['update status']['title'] = $t('Update status module');
+  }
+
   return $requirements;
 }
 
@@ -3634,6 +3651,8 @@ function system_update_6026() {
   drupal_set_installed_schema_version('update', 0);
   module_enable(array('update'));
   menu_rebuild();
+  drupal_set_message(t('The Update module was automatically enabled. This module automatically checks for new versions of modules and themes. For more information, please read the <a href="@update-help">Update module help page</a>.', array('@update-help' => url('admin/help/update'))), 'warning');
+
   return $ret;
 }
 
Index: modules/update/update.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.module,v
retrieving revision 1.1
diff -u -p -r1.1 update.module
--- modules/update/update.module	11 Jul 2007 15:15:40 -0000	1.1
+++ modules/update/update.module	26 Sep 2007 02:09:20 -0000
@@ -71,6 +71,13 @@ function update_help($path, $arg) {
       // These two pages don't need additional nagging.
       break;
 
+    case 'admin/help#update':
+      $output = '<p>'. t("The Update status module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts you to available updates.") .'</p>';
+      $output .= '<p>'. t('The <a href="@update-log">log of available updates</a> will indicate when new releases are ready for download, and you may configure various options, including frequency of update checking and notification options, at the <a href="@update-settings">Update status module settings page</a>.', array('@update-log' => url('admin/logs/updates'), '@update-settings' => url('admin/logs/updates/settings'))) .'</p>';
+      $output .= '<p>'. t('Please note that in order to provide this information, anonymous usage statistics (consisting of a unique key and a list of versions of the software your site is runnning) are sent to drupal.org. It is highly recommended that you enable this module to inform you of updates (especially security fixes). However, while the information sent to drupal.org may not be used to determine what site sent each request, you may disable the Update module should you have privacy concerns from the <a href="@modules">module administration page</a>.', array('@modules' => url('admin/build/modules'))) .'</p>';
+      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@update">Update status page</a>.', array('@update' => 'http://drupal.org/handbook/modules/update')) .'</p>';
+      return $output;
+
     default:
       // Otherwise, if we're on *any* admin page and there's a security
       // update missing, print an error message about it.
Index: profiles/default/default.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v
retrieving revision 1.16
diff -u -p -r1.16 default.profile
--- profiles/default/default.profile	11 Jul 2007 15:15:40 -0000	1.16
+++ profiles/default/default.profile	26 Sep 2007 02:09:20 -0000
@@ -8,7 +8,7 @@
  *  An array of modules to be enabled.
  */
 function default_profile_modules() {
-  return array('color', 'comment', 'help', 'menu', 'taxonomy', 'dblog', 'update');
+  return array('color', 'comment', 'help', 'menu', 'taxonomy', 'dblog');
 }
 
 /**
