summaryrefslogtreecommitdiffstats
path: root/system/application
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-01-16 22:22:03 +0100
committerDerek Jones <derek.jones@ellislab.com>2008-01-16 22:22:03 +0100
commit35683d6584628220510d964da0015f9f98af34dc (patch)
tree64338194dce842d87df9504ce7c6fa2ac34f18e0 /system/application
parent39b622db9bda38282a32bb45623da63efe685729 (diff)
added char_set and dbcollat to the code comments
Diffstat (limited to 'system/application')
-rw-r--r--system/application/config/database.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/system/application/config/database.php b/system/application/config/database.php
index 1ee0c4bb4..59b973981 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -25,6 +25,8 @@
| ['active_r'] TRUE/FALSE - Whether to load the active record class
| ['cache_on'] TRUE/FALSE - Enables/disables query caching
| ['cachedir'] The path to the folder where cache files should be stored
+| ['char_set'] The character set used in communicating with the database
+| ['dbcollat'] The character collation used in communicating with the database
|
| The $active_group variable lets you choose which connection group to
| make active. By default there is only one group (the "default" group).