? .DS_Store ? autocomplete_coding_style_01.patch ? handbook_page_update_01.patch Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.320 diff -u -p -r1.320 update.php --- update.php 24 Apr 2010 14:49:13 -0000 1.320 +++ update.php 29 Apr 2010 23:29:33 -0000 @@ -226,7 +226,7 @@ function update_info_page() { update_task_list('info'); drupal_set_title('Drupal database update'); $token = drupal_get_token('update'); - $output = '

Use this utility to update your database whenever a new release of Drupal or a module is installed.

For more detailed information, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.

'; + $output = '

Use this utility to update your database whenever a new release of Drupal or a module is installed.

For more detailed information, see the upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.

'; $output .= "
    \n"; $output .= "
  1. Back up your database. This process will change your database values and in case of emergency you may need to revert to a backup.
  2. \n"; $output .= "
  3. Back up your code. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.
  4. \n"; Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.133 diff -u -p -r1.133 install.inc --- includes/install.inc 28 Apr 2010 05:12:43 -0000 1.133 +++ includes/install.inc 29 Apr 2010 23:29:33 -0000 @@ -367,7 +367,7 @@ abstract class DatabaseTasks { } } if (!empty($message)) { - $message = '

    In order for Drupal to work, and to continue with the installation process, you must resolve all issues reported below. For more help with configuring your database server, see the Installation and upgrading handbook. If you are unsure what any of this means you should probably contact your hosting provider.

    ' . $message; + $message = '

    In order for Drupal to work, and to continue with the installation process, you must resolve all issues reported below. For more help with configuring your database server, see the installation handbook. If you are unsure what any of this means you should probably contact your hosting provider.

    ' . $message; throw new DatabaseTaskException($message); } } @@ -384,7 +384,7 @@ abstract class DatabaseTasks { $this->pass('Drupal can CONNECT to the database ok.'); } catch (Exception $e) { - $this->fail(st('Failed to connect to your %name database server. %name reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => $e->getMessage(), '%name' => $this->name()))); + $this->fail(st('Failed to connect to your %name database server. %name reports the following message: %error.For more help, see the installation handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => $e->getMessage(), '%name' => $this->name()))); return FALSE; } return TRUE;