diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-03-09 11:08:36 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-03-09 11:08:36 +0100 |
| commit | 93ca71552d9a3e28eeaa00dd10755d20b2cbf32e (patch) | |
| tree | 660233f2ec631e5730731491d2fd244fe15f7df8 /user_guide/database/configuration.html | |
| parent | a9924b8352aa18869677bea0182c45e2a7e2ce37 (diff) | |
| parent | 2f8b27efeb0a39c24eddf89cf31ea0fd113a6b71 (diff) | |
Merged recent Core changes and fixed conflict.
Diffstat (limited to 'user_guide/database/configuration.html')
| -rw-r--r-- | user_guide/database/configuration.html | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 8e6fe1f42..d71cd34db 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -61,9 +61,7 @@ Configuration <h1>Database Configuration</h1> <p>CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). -The config file is located at:</p> - -<p><kbd>application/config/database.php</kbd></p> +The config file is located at <samp>application/config/database.php</samp>. You can also set database connection values for specific <a href="../libraries/config.html">environments</a> by placing <strong>database.php</strong> it the respective environment config folder.</p> <p>The config settings are stored in a multi-dimensional array with this prototype:</p> @@ -136,7 +134,7 @@ for the primary connection, but it too can be renamed to something more relevant <li><strong>char_set</strong> - The character set used in communicating with the database.</li> <li><strong>dbcollat</strong> - The character collation used in communicating with the database.</li> <li><strong>swap_pre</strong> - A default table prefix that should be swapped with <var>dbprefix</var>. This is useful for distributed applications where you might run manually written queries, and need the prefix to still be customizable by the end user.</li> -<li><strong>autoinit</strong> - Whether or not to automatically initialize the database.</li> +<li><strong>autoinit</strong> - Whether or not to automatically connect to the database when the library loads. If set to false, the connection will take place prior to executing the first query.</li> <li><strong>stricton</strong> - TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application.</li> <li><strong>port</strong> - The database port number. To use this value you have to add a line to the database config array.<code>$db['default']['port'] = 5432;</code> </ul> |