diff -u INSTALL.sqlite.txt INSTALL.sqlite.txt --- INSTALL.sqlite.txt +++ INSTALL.sqlite.txt 27 Nov 2010 04:42:58 -0000 @@ -22,7 +22,7 @@ ensure that the directory is writeable by the web server. If you must place your database file in your webroot, you could try using the -following in your "Database name" field: +following in your "Database file" field: sites/default/files/.ht.sqlite diff -u includes/database/sqlite/install.inc includes/database/sqlite/install.inc --- includes/database/sqlite/install.inc +++ includes/database/sqlite/install.inc 27 Nov 2010 04:43:11 -0000 @@ -30,7 +30,7 @@ // Make the text more accurate for SQLite. $form['database']['#title'] = st('Database file'); - $form['database']['#description'] = st('Absolute path to file where @drupal data will be stored. Must be writable by the web server, and should exist outside of web root.', array('@drupal' => drupal_install_profile_distribution_name())); + $form['database']['#description'] = st('The absolute path to the file where @drupal data will be stored. This must be writable by the web server and should exist outside of the web root.', array('@drupal' => drupal_install_profile_distribution_name())); $default_database = conf_path(FALSE, TRUE) . '/files/.ht.sqlite'; $form['database']['#default_value'] = empty($database['database']) ? $default_database : $database['database']; return $form; @@ -39,10 +39,10 @@ public function validateDatabaseSettings($database) { $errors = array(); - // Verify the database is writeable. + // Verify the database is writable. $db_directory = new SplFileInfo(dirname($database['database'])); if (!$db_directory->isWritable()) { - $errors[$database['driver'] . '][database'] = st('The directory you specified is not writable. Please verify that the web server has write-access to that directory.'); + $errors[$database['driver'] . '][database'] = st('The directory you specified is not writable by the web server.'); } // Verify the table prefix.