12 files changed, 9 insertions, 14 deletions
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 2a871acf5..732e1c77e 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -82,9 +82,9 @@ Change Log
 <li>Added <a href="../database/results.html">$query->free_result()</a> to database class.</li>
 <li>Added <a href="../database/fields.html">$query->field_names()</a> function to database class</li>
 <li>Added <a href="../database/helpers.html">$this->db->platform()</a> function</li>
-<li>Added two more protocols to the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.</li>
 <li>Added "is_numeric" to validation, which uses the native PHP is_numeric function.</li>
-<li>Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers.</li>
+<li>Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.</li>
+<li>Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.</li>
 <li>Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.</li>
 <li>Updated the <dfn>input->cookie()</dfn> and <dfn>input->post()</dfn> functions in <a href="../libraries/input.html">Input Class</a> to permit arrays contained cookies that are arrays to be run through the XSS filter.</li>
 <li>Fixed a bug in the Email class related to SMTP Helo data.</li>
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index 73bc4d60f..fb3f41789 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -250,8 +250,11 @@ class MY_Email extends CI_Email {<br />
 
 <code>$this->load->library('<kbd>my_</kbd>email');</code>
 
+<p>Once loaded you will use the class variable as you normally would for the class you are extending.  In the case of 
+the email class all calls will use:
 
 
+<code>$this-><kbd>email</kbd>->some_function();</code>
 
 </div>
 <!-- END CONTENT -->
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
index 9d2a01e1b..cd3e66441 100644
--- a/user_guide/libraries/calendar.html
+++ b/user_guide/libraries/calendar.html
@@ -75,8 +75,6 @@ template, allowing 100% control over every aspect of its design. In addition, yo
 <code>$this->load->library('calendar');</code>
 <p>Once loaded, the Calendar object will be available using: <dfn>$this->calendar</dfn></p>
 
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
-
 
 <h2>Displaying a Calendar</h2>
 
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
index 92d128cd8..9be32cf4f 100644
--- a/user_guide/libraries/encryption.html
+++ b/user_guide/libraries/encryption.html
@@ -110,8 +110,6 @@ for example, can only hold 4K of information.</p>
 <code>$this->load->library('encrypt');</code>
 <p>Once loaded, the Encrypt library object will be available using: <dfn>$this->encrypt</dfn></p>
 
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
-
 
 <h2>$this->encrypt->encode()</h2>
 
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index b93d5fa79..347421d68 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -85,6 +85,10 @@ Note: We use the terms "class" and "library" interchangeably.</p>
 
 Each library is described in detail in its own page, so please read theinformation regarding each one you would like to use.</p>
 
+<p>Parameters can be passed to the library via an array in the second parameter. 
+
+
+
 <p>If you would like your libraries assigned to a different variable name then the default you can specify the name in the second paramter:</p>
 
 <code>
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
index 2f93baf0b..ace408e09 100644
--- a/user_guide/libraries/parser.html
+++ b/user_guide/libraries/parser.html
@@ -103,7 +103,6 @@ full-blown template parsing solution. We've kept it very lean on purpose in orde
 
 <code>$this->load->library('parser');</code>
 <p>Once loaded, the Parser library object will be available using: <dfn>$this->parser</dfn></p>
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
 
 
 <p>The following functions are available in this library:</p>
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index 7a894faed..5a1216f6e 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -87,7 +87,6 @@ will cause it to read, create, and update sessions.</p>
 
 <code>$this->load->library('session');</code>
 <p>Once loaded, the Sessions library object will be available using: <dfn>$this->session</dfn></p>
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
 
 
 <h2>How do Sessions work?</h2>
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index c2e323993..61b5ce82f 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -72,8 +72,6 @@ HTML Table Class
 <code>$this->load->library('table');</code>
 <p>Once loaded, the Table library object will be available using: <dfn>$this->table</dfn></p>
 
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
-
 
 <h2>Examples</h2>
 
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index 87f6f3a0b..0621d4e75 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -74,7 +74,6 @@ Trackback Class
 
 <code>$this->load->library('trackback');</code>
 <p>Once loaded, the Trackback library object will be available using: <dfn>$this->trackback</dfn></p>
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
 
 
 <h2>Sending Trackbacks</h2>
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index 9951c824d..45b92abb8 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -78,7 +78,6 @@ to determine if it is producing the correct data type and result.
 
 <code>$this->load->library('unit_test');</code>
 <p>Once loaded, the Unit Test object will be available using: <dfn>$this->unit</dfn></p>
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
 
 
 <h2>Running Tests</h2>
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html
index 50f4b77f4..8f3eb07de 100644
--- a/user_guide/libraries/user_agent.html
+++ b/user_guide/libraries/user_agent.html
@@ -72,7 +72,6 @@ In addition you can get referrer information as well as language and supported c
 
 <code>$this->load->library('user_agent');</code>
 <p>Once loaded, the object will be available using: <dfn>$this->agent</dfn></p>
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
 
 <h2>User Agent Definitions</h2>
 
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html
index 32ef3bedd..d072a5705 100644
--- a/user_guide/libraries/zip.html
+++ b/user_guide/libraries/zip.html
@@ -71,7 +71,6 @@ desktop or saved to a directory.</p>
 
 <code>$this->load->library('zip');</code>
 <p>Once loaded, the Zip library object will be available using: <dfn>$this->zip</dfn></p>
-<p>You can also set your own class variable name.  Please see the <a href="loader.html">Loader Class</a> for more info.</p>
 
 
 <h2>Usage Example</h2>