diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
| commit | 8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch) | |
| tree | 912d83e6e2adbe136d892f0a41ea1730dc11206a /application/config/autoload.php | |
| parent | 806b82448ddccece1311228519dc1410dacd0971 (diff) | |
| parent | 4b9c62980599228f070b401c7673dce8085b0c61 (diff) | |
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'application/config/autoload.php')
| -rw-r--r-- | application/config/autoload.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/application/config/autoload.php b/application/config/autoload.php index 1c492a20d..53129c9c6 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.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'); /* | ------------------------------------------------------------------- | AUTO-LOADER @@ -8,7 +8,7 @@ | In order to keep the framework as light-weight as possible only the | absolute minimal resources are loaded by default. For example, | the database is not connected to automatically since no assumption -| is made regarding whether you intend to use it. This file lets +| is made regarding whether you intend to use it. This file lets | you globally define which systems you would like loaded with every | request. | @@ -29,11 +29,11 @@ /* | ------------------------------------------------------------------- -| Auto-load Packges +| Auto-load Packges | ------------------------------------------------------------------- | Prototype: | -| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared'); +| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared'); | */ @@ -42,7 +42,7 @@ $autoload['packages'] = array(); /* | ------------------------------------------------------------------- -| Auto-load Libraries +| Auto-load Libraries | ------------------------------------------------------------------- | These are the classes located in the system/libraries folder | or in your application/libraries folder. @@ -57,7 +57,7 @@ $autoload['libraries'] = array(); /* | ------------------------------------------------------------------- -| Auto-load Helper Files +| Auto-load Helper Files | ------------------------------------------------------------------- | Prototype: | @@ -69,14 +69,14 @@ $autoload['helper'] = array(); /* | ------------------------------------------------------------------- -| Auto-load Config files +| Auto-load Config files | ------------------------------------------------------------------- | Prototype: | | $autoload['config'] = array('config1', 'config2'); | | NOTE: This item is intended for use ONLY if you have created custom -| config files. Otherwise, leave it blank. +| config files. Otherwise, leave it blank. | */ @@ -85,13 +85,13 @@ $autoload['config'] = array(); /* | ------------------------------------------------------------------- -| Auto-load Language files +| Auto-load Language files | ------------------------------------------------------------------- | Prototype: | | $autoload['language'] = array('lang1', 'lang2'); | -| NOTE: Do not include the "_lang" part of your file. For example +| NOTE: Do not include the "_lang" part of your file. For example | "codeigniter_lang.php" would be referenced as array('codeigniter'); | */ @@ -101,7 +101,7 @@ $autoload['language'] = array(); /* | ------------------------------------------------------------------- -| Auto-load Models +| Auto-load Models | ------------------------------------------------------------------- | Prototype: | |