summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/libraries
diff options
context:
space:
mode:
authorThanasis Polychronakis <thanpolas@gmail.com>2012-05-31 20:54:35 +0200
committerThanasis Polychronakis <thanpolas@gmail.com>2012-05-31 20:54:35 +0200
commit991cfa2e5843df05c6295445133882b9f35e3f7b (patch)
tree7d53e8612dca6e41c330829062a03e3d8520a1f7 /user_guide_src/source/libraries
parent142eef9c0024420fdc1442eafe8e5cdd357451bb (diff)
Changed documentation and added note to changelog as per @philsturgeon request
Diffstat (limited to 'user_guide_src/source/libraries')
-rw-r--r--user_guide_src/source/libraries/config.rst12
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
================