diff options
| -rw-r--r-- | INSTALL.txt | 8 | ||||
| -rw-r--r-- | sites/default/settings.php | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/INSTALL.txt b/INSTALL.txt index 35f6f7d1d..9a95bc5b4 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -84,7 +84,7 @@ INSTALLATION where 'drupal' is the name of your database - 'nobody@localhost' is the userid of your webserver MySQL account + 'nobody@localhost' is the username of your webserver MySQL account 'password' is the password required to log in as the MySQL user If successful, MySQL will reply with: @@ -106,7 +106,7 @@ INSTALLATION directory and run it directly as SQL commands. From the command line, use (again, replacing 'nobody' and - 'drupal' with your MySQL userid and name of your database): + 'drupal' with your MySQL username and name of your database): mysql -u nobody -p drupal < database/database.mysql @@ -118,9 +118,9 @@ INSTALLATION base URL to the web site. Open the configuration file and edit the $db_url line to match the database defined in the previous steps: - $db_url = "mysql://userid:password@localhost/database"; + $db_url = "mysql://username:password@localhost/database"; - where 'userid', 'password', 'localhost' and 'database' are the + where 'username', 'password', 'localhost' and 'database' are the username, password, host and database name for your set up. Set $base_url to match the address to your Drupal site: diff --git a/sites/default/settings.php b/sites/default/settings.php index 50499134e..92b1f2042 100644 --- a/sites/default/settings.php +++ b/sites/default/settings.php @@ -37,8 +37,8 @@ * * Note that the $db_url variable gets parsed using PHP's built-in * URL parser (i.e. using the "parse_url()" function) so make sure - * not to confuse the parser. If your db_user, db_password, - * db_hostname, or db_name contain characters used to delineate + * not to confuse the parser. If your username, password + * or database name contain characters used to delineate * $db_url parts, you can escape them via URI hex encodings: * * : = %3a / = %2f @ = %40 @@ -75,10 +75,10 @@ * ); * * Database URL format: - * $db_url = 'mysql://db_user:db_password@db_hostname/db_name'; - * $db_url = 'pgsql://db_user:db_password@db_hostname/db_name'; + * $db_url = 'mysql://username:password@localhost/database'; + * $db_url = 'pgsql://username:password@localhost/database'; */ -$db_url = 'mysql://drupal:drupal@localhost/drupal'; +$db_url = 'mysql://username:password@localhost/database'; $db_prefix = ''; /** |