diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-06-04 16:28:23 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-06-04 16:28:23 +0200 |
commit | 3902e383b41c6c0ef77b65e95d451cb2ea3d85db (patch) | |
tree | eb2adb1cf4f1dea1e4d14c69a3f1a275b14cff08 /user_guide_src/source/libraries/config.rst | |
parent | fd2ceab417bbb696134910ce0eaeca34bea3e1e5 (diff) | |
parent | fc11dcc82cefa7299e6f8c74d0e005ebb6fa568c (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'user_guide_src/source/libraries/config.rst')
-rw-r--r-- | user_guide_src/source/libraries/config.rst | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/user_guide_src/source/libraries/config.rst b/user_guide_src/source/libraries/config.rst index c81cad7b3..08d9c2905 100644 --- a/user_guide_src/source/libraries/config.rst +++ b/user_guide_src/source/libraries/config.rst @@ -149,11 +149,13 @@ folders: - Your own custom configuration files .. note:: - CodeIgniter always tries to load the configuration files for - the current environment first. If the file does not exist, the global - config file (i.e., the one in application/config/) is loaded. This means - you are not obligated to place **all** of your configuration files in an - environment folder − only the files that change per environment. + CodeIgniter always loads the global config file first (i.e., the one in application/config/), + then tries to load the configuration files for the current environment. + This means you are not obligated to place **all** of your configuration files in an + environment folder. Only the files that change per environment. Additionally you don't + have to copy **all** the config items in the environment config file. Only the config items + that you wish to change for your environment. The config items declared in your environment + folders always overwrite those in your global config files. Helper Functions ================ |