? error_log
Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.1
diff -u -F^f -r1.1 install.php
--- install.php	13 Jul 2006 13:11:36 -0000	1.1
+++ install.php	27 Jul 2006 20:46:44 -0000
@@ -131,7 +131,7 @@ function install_change_settings() {
     drupal_maintenance_theme();
     drupal_set_message(st('The Drupal installer requires write permissions to %file during the installation process.', array('%file' => $settings_file)), 'error');
 
-    drupal_set_title('Drupal installation');
+    drupal_set_title('Drupal database setup');
     print theme('install_page', '');
     exit;
   }
@@ -148,8 +148,20 @@ function install_change_settings() {
     '#required' => TRUE,
     '#options' => drupal_detect_database_types(),
     '#default_value' => $db_type,
-    '#description' => st('Select the type of database you would like to use with your %drupal installation. If you do not find your preferred database type listed here, verify that the database type is <a href="http://drupal.org/node/270#database">supported by Drupal</a> then confirm that it is properly installed and accessible from PHP. Only properly installed databases that are accessible from PHP and recognized by %drupal are displayed in this menu.', array('%drupal' => drupal_install_profile_name())),
+    '#description' => st('The type of database used on your web server. If no choices appear, make sure your web server\'s database is <a href="http://drupal.org/node/270#database">supported by Drupal</a>.'),
   );
+
+  // Database name
+  $form['db_path'] = array(
+    '#type' => 'textfield',
+    '#title' => 'Database name',
+    '#default_value' => $db_path,
+    '#size' => 45,
+    '#maxlength' => 45,
+    '#required' => TRUE,
+    '#description' => st('The name of the database your %drupal data will be stored in. It must exist on your server before %drupal can be installed.', array('%drupal' => drupal_install_profile_name()))
+  );
+
   // Database username
   $form['db_user'] = array(
     '#type' => 'textfield',
@@ -158,7 +170,6 @@ function install_change_settings() {
     '#size' => 45,
     '#maxlength' => 45,
     '#required' => TRUE,
-    '#description' => st('The database username that your %drupal installation will use to connect to your database server.', array('%drupal' => drupal_install_profile_name())),
   );
 
   // Database username
@@ -169,40 +180,36 @@ function install_change_settings() {
     '#size' => 45,
     '#maxlength' => 45,
     '#required' => TRUE,
-    '#description' => st('The database password that your %drupal installation will use to connect to your database server.', array('%drupal' => drupal_install_profile_name())),
   );
 
-  // Database name
-  $form['db_path'] = array(
-    '#type' => 'textfield',
-    '#title' => 'Database name',
-    '#default_value' => $db_path,
-    '#size' => 45,
-    '#maxlength' => 45,
-    '#required' => TRUE,
-    '#description' => st('The name of the database where %drupal can install its database tables.', array('%drupal' => drupal_install_profile_name())),
+  $form['advanced_options'] = array(
+    '#type' => 'fieldset',
+    '#title' => 'Advanced options',
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+    '#description' => st('These options are only necessary for some sites. If you\'re not sure what you should enter here, leave the default settings or check with your web hosting company.')
   );
 
   // Database host
-  $form['db_host'] = array(
+  $form['advanced_options']['db_host'] = array(
     '#type' => 'textfield',
     '#title' => 'Database host',
     '#default_value' => $db_host,
     '#size' => 45,
     '#maxlength' => 45,
     '#required' => TRUE,
-    '#description' => st('The hostname or IP address of your database server. If your database server is on the same machine as you are installing %drupal, you should probably enter %localhost.', array('%drupal' => drupal_install_profile_name(), '%localhost' => 'localhost')),
+    '#description' => st('If your database is located on a different server, change this.', array('%drupal' => drupal_install_profile_name())),
   );
 
   // Database prefix
-  $form['db_prefix'] = array(
+  $form['advanced_options']['db_prefix'] = array(
     '#type' => 'textfield',
     '#title' => 'Database prefix',
     '#default_value' => $db_prefix,
     '#size' => 45,
     '#maxlength' => 45,
     '#required' => FALSE,
-    '#description' => 'Optionally set a prefix for all database table names. If a prefix is specified, all table names will be prepended with this value. Only alphanumeric characters and the underscore are allowed. If you do not wish to use a prefix, leave this field empty. If you wish to only prefix specific tables, you will need to manually edit your <em>settings.php</em> configuration file.',
+    '#description' => st('If more than one %drupal web site will be sharing this database, enter a table prefix for your %drupal site here.', array('%drupal' => drupal_install_profile_name())),
   );
 
   $form['save'] = array(
@@ -217,7 +224,7 @@ function install_change_settings() {
   drupal_maintenance_theme();
   $output = drupal_get_form('install_settings', $form);
   drupal_set_title('Database configuration');
-  print theme('install_page', st('<p>Please fill out the following information to configure your %drupal site.</p>', array('%drupal' => drupal_install_profile_name())). $output);
+  print theme('install_page', st('<p>Fill out the following information to set up your %drupal database.</p>', array('%drupal' => drupal_install_profile_name())). $output);
   exit;
 }