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/database/utilities.html  | 10 ++++------
 user_guide/general/controllers.html | 13 ++++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'user_guide')

diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index fcfc24945..f815039cb 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -85,14 +85,12 @@ Database Utility Class
 <a name="init"></a>
 <h2>Initializing the Utility Class</h2>
 
-<p class="important"><strong>Important:</strong>&nbsp; This class must be initialized independently since it is a separate class from the main Database class. 
-More info below...</p>
+<p class="important"><strong>Important:</strong>&nbsp; In order to initialize the Utility class, your database driver must
+already be running, since the utilities class is loaded from within the main DB class.</p>
 
-<p>To initialize this class please use the following code:</p>
+<p>Load the Utility Class as follows:</p>
 
-<code>$this->load->dbutil()</code>
-
-<p>You can also autoload this class from within your <dfn>config/autoload.php</dfn> file by specifying <kbd>dbutil</kbd> in the <samp>$autoload['libraries']</samp> array.</p>
+<code>$this->db->load_utilities()</code>
 
 <p>Once initialized you will access the functions using the <dfn>$this->dbutil</dfn> object:</p>
 
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