diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-14 01:00:03 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-14 01:00:03 -0700 |
| commit | 9a4fdff0af0ba05ad77096ce835aeb4bf343a53f (patch) | |
| tree | d4657c9e64fdc050695dd58cf419241ace32e7a6 /railties/guides/source/getting_started.textile | |
| parent | 2ff5f38abb4a44ed5356c34b40d30d446fb63408 (diff) | |
| parent | e090898c5e98e853828208343b3911a229563b62 (diff) | |
| download | rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.tar.gz rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.tar.bz2 rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.zip | |
Merge commit 'docrails/master'
Diffstat (limited to 'railties/guides/source/getting_started.textile')
| -rw-r--r-- | railties/guides/source/getting_started.textile | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile index 2bbb4dc252..cbace177f9 100644 --- a/railties/guides/source/getting_started.textile +++ b/railties/guides/source/getting_started.textile @@ -232,13 +232,13 @@ If you choose to use MySQL instead of the shipped Sqlite3 database, your +config <yaml> development: -adapter: mysql -encoding: utf8 -database: blog_development -pool: 5 -username: root -password: -socket: /tmp/mysql.sock + adapter: mysql + encoding: utf8 + database: blog_development + pool: 5 + username: root + password: + socket: /tmp/mysql.sock </yaml> If your development computer's MySQL installation includes a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the +development+ section as appropriate. @@ -249,12 +249,12 @@ Finally if you choose to use PostgreSQL, your +config/database.yml+ will be cust <yaml> development: -adapter: postgresql -encoding: unicode -database: blog_development -pool: 5 -username: blog -password: + adapter: postgresql + encoding: unicode + database: blog_development + pool: 5 + username: blog + password: </yaml> Change the username and password in the +development+ section as appropriate. |