summaryrefslogtreecommitdiffstats
path: root/user_guide/general/reserved_names.html
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide/general/reserved_names.html')
-rw-r--r--user_guide/general/reserved_names.html3
1 files changed, 0 insertions, 3 deletions
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index 8abfbe6ce..573732793 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -67,7 +67,6 @@ is a list of reserved names. Do not name your controller functions any of these
<li>Controller</li>
<li>CI_Base</li>
<li>_ci_initialize</li>
- <li>_ci_scaffolding</li>
<li>Default (PHP 5)</li>
<li>index</li>
</ul>
@@ -85,14 +84,12 @@ is a list of reserved names. Do not name your controller functions any of these
<li>language</li>
<li>library</li>
<li>model</li>
- <li>scaffolding</li>
<li>script</li>
<li>view</li>
<li>vars</li>
<li>_ci_assign_to_models</li>
<li>_ci_autoloader</li>
<li>_ci_init_class</li>
- <li>_ci_init_scaffolding</li>
<li>_ci_is_instance</li>
<li>_ci_load</li>
<li>_ci_load_class</li>