diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-19 14:47:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-19 14:47:19 +0000 |
| commit | 1188789e15531e591b11fc53fd5b3f75a68d4476 (patch) | |
| tree | 0d38d13cefa4a52f13d37c0014cffcf7208b3c1e | |
| parent | 513419debbbdfc754ae1efeb63691969910d3e4e (diff) | |
| download | redmine-1188789e15531e591b11fc53fd5b3f75a68d4476.tar.gz redmine-1188789e15531e591b11fc53fd5b3f75a68d4476.zip | |
Set ruby1.9 as default for the database configuration example.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11204 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | config/database.yml.example | 10 | ||||
| -rw-r--r-- | doc/INSTALL | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config/database.yml.example b/config/database.yml.example index 8992a5aa8..5cbb42338 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -1,9 +1,9 @@ -# Default setup is given for MySQL with ruby1.8. If you're running Redmine -# with MySQL and ruby1.9, replace the adapter name with `mysql2`. +# Default setup is given for MySQL with ruby1.9. If you're running Redmine +# with MySQL and ruby1.8, replace the adapter name with `mysql`. # Examples for PostgreSQL and SQLite3 can be found at the end. production: - adapter: mysql + adapter: mysql2 database: redmine host: localhost username: root @@ -11,7 +11,7 @@ production: encoding: utf8 development: - adapter: mysql + adapter: mysql2 database: redmine_development host: localhost username: root @@ -22,7 +22,7 @@ development: # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: - adapter: mysql + adapter: mysql2 database: redmine_test host: localhost username: root diff --git a/doc/INSTALL b/doc/INSTALL index 06be1c73e..122d14fb1 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -27,10 +27,10 @@ Optional: 2. Create an empty utf8 encoded database: "redmine" for example 3. Configure the database parameters in config/database.yml - for the "production" environment (default database is MySQL and ruby1.8) + for the "production" environment (default database is MySQL and ruby1.9) - If you're running Redmine with MySQL and ruby1.9, replace the adapter name - with `mysql2` + If you're running Redmine with MySQL and ruby1.8, replace the adapter name + with `mysql` 4. Install the required gems by running: bundle install --without development test |