diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:40:48 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:40:48 +0200 |
| commit | 4b9c62980599228f070b401c7673dce8085b0c61 (patch) | |
| tree | 314bd87831a09913cbbfd1ffe1447b3c38b394c5 /application/config/database.php | |
| parent | 114ab0988e20ac6be39ad363ff897a1a3b85e565 (diff) | |
backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke the Typography class's string replacements, for instance
Diffstat (limited to 'application/config/database.php')
| -rw-r--r-- | application/config/database.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/application/config/database.php b/application/config/database.php index e77bf97df..fa541a734 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /* | ------------------------------------------------------------------- | DATABASE CONNECTIVITY SETTINGS @@ -16,10 +16,10 @@ | ['username'] The username used to connect to the database | ['password'] The password used to connect to the database | ['database'] The name of the database you want to connect to -| ['dbdriver'] The database type. ie: mysql. Currently supported: -| mysql, mysqli, postgre, odbc, mssql, sqlite, oci8 +| ['dbdriver'] The database type. ie: mysql. Currently supported: + mysql, mysqli, postgre, odbc, mssql, sqlite, oci8 | ['dbprefix'] You can add an optional prefix, which will be added -| to the table name when using the Active Record class +| to the table name when using the Active Record class | ['pconnect'] TRUE/FALSE - Whether to use a persistent connection | ['db_debug'] TRUE/FALSE - Whether database errors should be displayed. | ['cache_on'] TRUE/FALSE - Enables/disables query caching @@ -38,7 +38,7 @@ | - good for ensuring strict SQL while developing | | The $active_group variable lets you choose which connection group to -| make active. By default there is only one group (the 'default' group). +| make active. By default there is only one group (the 'default' group). | | The $active_record variables lets you determine whether or not to load | the active record class |