summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2010-01-17 08:56:56 +0100
committerDerek Allard <derek.allard@ellislab.com>2010-01-17 08:56:56 +0100
commitc47eb1e3009cb4d0760748c9c1fe029fb988dd55 (patch)
tree0171fd6d1c0c8279a0f325c717483f08bc376868 /user_guide
parent9502311beeda23042370bb891f850eab3aadad96 (diff)
Added "default" to the list Reserved Names
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/changelog.html5
-rw-r--r--user_guide/general/reserved_names.html1
2 files changed, 6 insertions, 0 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 55718c6bb..bb175c21a 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -90,6 +90,11 @@ SVN Revision: </p>
<li>Modified <kbd>delete_files()</kbd> in the <a href="helpers/file_helper.html">File Helper</a> to return FALSE on failure.</li>
</ul>
</li>
+ <li>Other Changes
+ <ul>
+ <li>Added "default" to the list <a href="general/reserved_names.html">Reserved Names</a>.</li>
+ </ul>
+ </li>
</ul>
<h3>Bug fixes for 1.7.3</h3>
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index 2d637e8e4..0d697b38b 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -68,6 +68,7 @@ is a list of reserved names. Do not name your controller functions any of these
<li>CI_Base</li>
<li>_ci_initialize</li>
<li>_ci_scaffolding</li>
+ <li>Default (PHP 5)</li>
<li>index</li>
</ul>
<p><br />