summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorEric Roberts <eric@cryode.com>2013-01-12 04:21:25 +0100
committerEric Roberts <eric@cryode.com>2013-01-12 04:21:25 +0100
commit7a4fb63a43392fc1cf5a5ead32ad81451c53dc67 (patch)
tree9fb1452b99805eaf655b8760f18ece663c160783 /application/config
parentc90e67ea553f1ff0fc22f280583fca22f95f9f42 (diff)
parent5a519db2c4884a3972dd33e09d0b3a314aa222e2 (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/output-cache-improvements
Diffstat (limited to 'application/config')
-rw-r--r--application/config/autoload.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/application/config/autoload.php b/application/config/autoload.php
index 40f0a6520..5a20c943a 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -148,12 +148,16 @@ $autoload['language'] = array();
| -------------------------------------------------------------------
| Prototype:
|
-| $autoload['model'] = array('model1', 'model2');
+| $autoload['model'] = array('first_model', 'second_model');
|
+| You can also supply an alternative model name to be assigned
+| in the controller:
+|
+| $autoload['model'] = array('first_model' => 'first');
*/
$autoload['model'] = array();
/* End of file autoload.php */
-/* Location: ./application/config/autoload.php */
+/* Location: ./application/config/autoload.php */ \ No newline at end of file