summaryrefslogtreecommitdiffstats
path: root/user_guide/general/reserved_names.html
diff options
context:
space:
mode:
authorphilsturgeon <devnull@localhost>2011-06-15 17:00:03 +0200
committerphilsturgeon <devnull@localhost>2011-06-15 17:00:03 +0200
commit0fe54dbaf89a8337d27b9203f74891cf1a799715 (patch)
treece168b3c24788e5a4a31e0cc65b64f54e25ee8a2 /user_guide/general/reserved_names.html
parent3a43c7adae7737d68a0eeca663cc2dd3fc5b0cf3 (diff)
parent3ef65bd7491f847fecdab1acc9687f0e90eee09b (diff)
Merged Alex Bilbies MSSQL changes.
Diffstat (limited to 'user_guide/general/reserved_names.html')
-rw-r--r--user_guide/general/reserved_names.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index c12ee6e15..48b6b2a5e 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -28,7 +28,7 @@
<div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
</tr>
</table>
@@ -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>
@@ -90,6 +90,7 @@ is a list of reserved names. Do not name your controller any of these:</p>
</ul>
<h3>Constants</h3>
<ul>
+ <li>ENVIRONMENT</li>
<li>EXT</li>
<li>FCPATH</li>
<li>SELF</li>