diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2011-04-27 08:47:47 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2011-04-27 08:47:47 +0200 |
| commit | a6507905578f1cf209776ae3d53099a005a06823 (patch) | |
| tree | 9f23bb557f920034cf65c86059c84e37efd34d79 /user_guide/general/reserved_names.html | |
| parent | 60ef4ea72e169e174ff8dbb421609a178a3c0c48 (diff) | |
| parent | 25d495b4a2598f771a858108a2cd2e96f0130412 (diff) | |
merging in changes
Diffstat (limited to 'user_guide/general/reserved_names.html')
| -rw-r--r-- | user_guide/general/reserved_names.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 00bebff61..48b6b2a5e 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -61,8 +61,8 @@ Controllers <h3>Controller names</h3> <p>Since your controller classes will extend the main application controller you must be careful not to name your functions identically to the ones used by that class, otherwise your local functions -will override them. The following -is a list of reserved names. Do not name your controller any of these:</p> +will override them. The following +is a list of reserved names. Do not name your controller any of these:</p> <ul> <li>Controller</li> <li>CI_Base</li> |