From fd2750b8f85b4f204e536d255742e18018c3f1f2 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Fri, 6 Oct 2006 17:29:12 +0000
Subject:

---
 user_guide/general/controllers.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'user_guide/general')

diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 0bfe973e5..20f207f5f 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -372,18 +372,16 @@ is a list of reserved names.  Do not name your controller functions any of these
 <ul>
 <li>Controller</li>
 <li>CI_Base</li>
-<li>_ci_autoload</li>
-<li>_ci_autoloader</li>
 <li>_ci_assign_core</li>
-<li>_ci_init_class</li>
+<li>_ci_assign_to_models</li>
+<li>_ci_autoload</li>
 <li>_ci_init_database</li>
+<li>_ci_init_class</li>
 <li>_ci_init_model</li>
 <li>_ci_init_scaffolding</li>
 <li>_ci_is_loaded</li>
-<li>_ci_load</li>
 <li>_ci_load_class</li>
 <li>_ci_scaffolding</li>
-<li>_ci_set_view_path</li>
 </ul>
 
 <p><br />If you are running PHP 4 there are some additional reserved names. These ONLY apply if you are running PHP 4.</p>
@@ -397,12 +395,17 @@ is a list of reserved names.  Do not name your controller functions any of these
 <li>helpers</li>
 <li>language</li>
 <li>library</li>
+<li>model</li>
 <li>plugin</li>
 <li>plugins</li>
 <li>scaffolding</li>
 <li>script</li>
 <li>view</li>
 <li>vars</li>
+<li>_ci_autoloader</li>
+<li>_ci_load</li>
+<li>_ci_object_to_array</li>
+<li>_ci_set_view_path</li>
 </ul>
 
 
-- 
cgit v1.2.3-24-g4f1b