From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Apr 2012 06:53:10 +0000 (+0000)
Subject: Merged r9409 from trunk.
X-Git-Tag: 1.4.0~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2c0ba78f7092d0af263b19daac9ac3c0becbb4eb;p=redmine.git

Merged r9409 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9410 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

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