summaryrefslogtreecommitdiffstats
path: root/user_guide/general
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2010-07-05 13:31:17 +0200
committerDerek Allard <derek.allard@ellislab.com>2010-07-05 13:31:17 +0200
commit13fbacda9f846c997f4745d341a7b75098d79bcf (patch)
tree5ee5e0500e22ad924ea0df3562e2a9bb03310b63 /user_guide/general
parent7c708ca4da0e0848c15ed78f9a14aa637a5ba14c (diff)
guide clarification
Diffstat (limited to 'user_guide/general')
-rw-r--r--user_guide/general/reserved_names.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index 0984845f1..7ab518d20 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -62,7 +62,7 @@ Controllers
<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 functions any of these:</p>
+is a list of reserved names. Do not name your controller any of these:</p>
<ul>
<li>Controller</li>
<li>CI_Base</li>