summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-14 06:53:10 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-14 06:53:10 +0000
commit2c0ba78f7092d0af263b19daac9ac3c0becbb4eb (patch)
tree2738f598dcaffa97fe907f2928e10f6a83f8f6f4 /config
parentf0f01d370e7ce517558aeb6422e7a2358f8dc964 (diff)
downloadredmine-2c0ba78f7092d0af263b19daac9ac3c0becbb4eb.tar.gz
redmine-2c0ba78f7092d0af263b19daac9ac3c0becbb4eb.zip
Merged r9409 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9410 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/database.yml.example4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/database.yml.example b/config/database.yml.example
index b558ec2c6..21337802d 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,4 +1,6 @@
-# MySQL (default setup).
+# 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`.
+# Examples for PostgreSQL and SQLite3 can be found at the end.
production:
adapter: mysql