diff -urp --strip-trailing-cr ../drupal-6.x-dev/includes/database.mysqli.inc ./includes/database.mysqli.inc
--- ../drupal-6.x-dev/includes/database.mysqli.inc	2007-10-20 23:57:49.000000000 +0200
+++ ./includes/database.mysqli.inc	2007-11-04 15:24:15.000000000 +0100
@@ -87,31 +87,17 @@ function db_connect($url) {
     drupal_maintenance_theme();
     drupal_set_header('HTTP/1.1 503 Service Unavailable');
     drupal_set_title('Unable to connect to database server');
-    print theme('maintenance_page', '<p>If you still have to install Drupal, proceed to the <a href="'. base_path() .'install.php">installation page</a>.</p>
-<p>If you have already finished installing Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the MySQL database server. This could mean your hosting provider\'s database server is down.</p>
-<p>The MySQL error was: '. theme('placeholder', mysqli_connect_error()) .'.</p>
-<p>Currently, the username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
-<ul>
-  <li>Are you sure you have the correct username and password?</li>
-  <li>Are you sure that you have typed the correct hostname?</li>
-  <li>Are you sure that the database server is running?</li>
-  <li>Are you sure that the mysqli libraries are compiled in your PHP installation? Try using the mysql library instead by editing your <code>settings.php</code> configuration file in Drupal.</li>
-</ul>
-<p>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.</p>');
+    print theme('maintenance_page', "<p>The requested page is currently not available due to technical problems. Please try again later. Thank you for your understanding.</p>
+<hr />
+<p><small>(If you are the maintainer of this site, please check your database settings in the <code>settings.php</code> file, and whether your hosting provider's database server is running. The MySQLi error was: ". theme('placeholder', mysqli_connect_error()) .'. For more help, see <a href="http://drupal.org/node/258">handbook</a>, or contact your hosting provider.)</small></p>');
     exit;
   }
   else if (mysqli_connect_errno() > 0) {
     drupal_maintenance_theme();
     drupal_set_title('Unable to select database');
-    print theme('maintenance_page', '<p>We were able to connect to the MySQL database server (which means your username and password are okay) but not able to select the database.</p>
-<p>The MySQL error was: '. theme('placeholder', mysqli_connect_error()) .'.</p>
-<p>Currently, the database is '. theme('placeholder', substr($url['path'], 1)) .'. The username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
-<ul>
-  <li>Are you sure you have the correct database name?</li>
-  <li>Are you sure the database exists?</li>
-  <li>Are you sure the username has permission to access the database?</li>
-</ul>
-<p>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.</p>');
+    print theme('maintenance_page', "<p>The requested page is currently not available due to technical problems. Please try again later. Thank you for your understanding.</p>
+<hr />
+<p><small>(If you are the maintainer of this site, please check your database settings in the <code>settings.php</code> file. The MySQLi error was: ". theme('placeholder', mysqli_connect_error()) .'. For more help, see <a href="http://drupal.org/node/258">handbook</a>, or contact your hosting provider.)</small></p>');
     exit;
   }
 
diff -urp --strip-trailing-cr ../drupal-6.x-dev/includes/database.mysql.inc ./includes/database.mysql.inc
--- ../drupal-6.x-dev/includes/database.mysql.inc	2007-10-20 23:57:49.000000000 +0200
+++ ./includes/database.mysql.inc	2007-11-04 15:15:52.000000000 +0100
@@ -89,31 +89,18 @@ function db_connect($url) {
     drupal_maintenance_theme();
     drupal_set_header('HTTP/1.1 503 Service Unavailable');
     drupal_set_title('Unable to connect to database server');
-    print theme('maintenance_page', '<p>If you still have to install Drupal, proceed to the <a href="'. base_path() .'install.php">installation page</a>.</p>
-<p>If you have already finished installing Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the MySQL database server. This could mean your hosting provider\'s database server is down.</p>
-<p>The MySQL error was: '. theme('placeholder', mysql_error()) .'.</p>
-<p>Currently, the username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
-<ul>
-  <li>Are you sure you have the correct username and password?</li>
-  <li>Are you sure that you have typed the correct hostname?</li>
-  <li>Are you sure that the database server is running?</li>
-</ul>
-<p>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.</p>');
+    print theme('maintenance_page', "<p>The requested page is currently not available due to technical problems. Please try again later. Thank you for your understanding.</p>
+<hr />
+<p><small>(If you are the maintainer of this site, please check your database settings in the <code>settings.php</code> file, and whether your hosting provider's database server is running. The MySQL error was: ". theme('placeholder', mysql_error()) .'. For more help, see <a href="http://drupal.org/node/258">handbook</a>, or contact your hosting provider.)</small></p>');
     exit;
   }
 
   if (!mysql_select_db(substr($url['path'], 1))) {
     drupal_maintenance_theme();
     drupal_set_title('Unable to select database');
-    print theme('maintenance_page', '<p>We were able to connect to the MySQL database server (which means your username and password are okay) but not able to select the database.</p>
-<p>The MySQL error was: '. theme('placeholder', mysql_error($connection)) .'.</p>
-<p>Currently, the database is '. theme('placeholder', substr($url['path'], 1)) .'. The username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
-<ul>
-  <li>Are you sure you have the correct database name?</li>
-  <li>Are you sure the database exists?</li>
-  <li>Are you sure the username has permission to access the database?</li>
-</ul>
-<p>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.</p>');
+    print theme('maintenance_page', "<p>The requested page is currently not available due to technical problems. Please try again later. Thank you for your understanding.</p>
+<hr />
+<p><small>(If you are the maintainer of this site, please check your database settings in the <code>settings.php</code> file. The MySQL error was: ". theme('placeholder', mysql_error()) .'. For more help, see <a href="http://drupal.org/node/258">handbook</a>, or contact your hosting provider.)</small></p>');
     exit;
   }
 
diff -urp --strip-trailing-cr ../drupal-6.x-dev/includes/database.pgsql.inc ./includes/database.pgsql.inc
--- ../drupal-6.x-dev/includes/database.pgsql.inc	2007-10-17 14:47:28.000000000 +0200
+++ ./includes/database.pgsql.inc	2007-11-04 15:27:28.000000000 +0100
@@ -85,17 +85,9 @@ function db_connect($url) {
     drupal_maintenance_theme();
     drupal_set_header('HTTP/1.1 503 Service Unavailable');
     drupal_set_title('Unable to connect to database');
-    print theme('maintenance_page', '<p>If you still have to install Drupal, proceed to the <a href="'. base_path() .'install.php">installation page</a>.</p>
-<p>If you have already finished installing Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the PostgreSQL database server. This could mean your hosting provider\'s database server is down.</p>
-<p>The PostgreSQL error was: '. theme('placeholder', decode_entities($php_errormsg)) .'</p>
-<p>Currently, the database is '. theme('placeholder', substr($url['path'], 1)) .', the username is '. theme('placeholder', $url['user']) .', and the database server is '. theme('placeholder', $url['host']) .'.</p>
-<ul>
-  <li>Are you sure you have the correct username and password?</li>
-  <li>Are you sure that you have typed the correct hostname?</li>
-  <li>Are you sure you have the correct database name?</li>
-  <li>Are you sure that the database server is running?</li>
-</ul>
-<p>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.</p>');
+    print theme('maintenance_page', "<p>The requested page is currently not available due to technical problems. Please try again later. Thank you for your understanding.</p>
+<hr />
+<p><small>(If you are the maintainer of this site, please check your database settings in the <code>settings.php</code> file, and whether your hosting provider's database server is running. The PostgreSQL error was: ". theme('placeholder', decode_entities($php_errormsg)) .'. For more help, see <a href="http://drupal.org/node/258">handbook</a>, or contact your hosting provider.)</small></p>');
     exit;
   }