update pMachine to EllisLab
update copyright year
update Code Igniter to CodeIgniter
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
index f603f1f..ef846f3 100644
--- a/user_guide/general/alternative_php.html
+++ b/user_guide/general/alternative_php.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Alternate PHP Syntax

 </td>

@@ -62,7 +62,7 @@
 

 <h1>Alternate PHP Syntax for View Files</h1>

 

-<p>If you do not utilize Code Igniter's <a href="../libraries/parser.html">template engine</a>, you'll be using pure PHP

+<p>If you do not utilize CodeIgniter's <a href="../libraries/parser.html">template engine</a>, you'll be using pure PHP

 in your View files.  To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use 

 PHPs alternative syntax for control structures and short tag echo statements.  If you are not familiar with this syntax, it allows you to eliminate the braces from your code,

 and eliminate "echo" statements.</p>

@@ -70,7 +70,7 @@
 <h2>Automatic Short Tag Support</h2>

 

 <p><strong>Note:</strong> If you find that the syntax described in this page does not work on your server it might

-be that "short tags" are disabled in your PHP ini file. Code Igniter will optionally rewrite short tags on-the-fly, 

+be that "short tags" are disabled in your PHP ini file. CodeIgniter will optionally rewrite short tags on-the-fly, 

 allowing you to use that syntax even if your server doesn't support it.  This feature can be enabled in your

 <dfn>config/config.php</dfn> file.</p>

 

@@ -145,7 +145,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="security.html">Security</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html
index 7bf285f..f496161 100644
--- a/user_guide/general/ancillary_classes.html
+++ b/user_guide/general/ancillary_classes.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Creating Ancillary Classes

 </td>

@@ -63,15 +63,15 @@
 <h1>Creating Ancillary Classes</h1>

 

 <p>In some cases you may want to develop classes that exist apart from your controllers but have the ability to

-utilize all of Code Igniter's resources. This is easily possible as you'll see.</p>

+utilize all of CodeIgniter's resources. This is easily possible as you'll see.</p>

 

 <h2>get_instance()</h2>

 

 

-<p><strong>Any class that you instantiate within your controller functions can access Code Igniter's native resources</strong> simply by using the <kbd>get_instance()</kbd> function.

-This function returns the main Code Igniter object.</p>

+<p><strong>Any class that you instantiate within your controller functions can access CodeIgniter's native resources</strong> simply by using the <kbd>get_instance()</kbd> function.

+This function returns the main CodeIgniter object.</p>

 

-<p>Normally, to call any of the available Code Igniter functions requires you to use the <kbd>$this</kbd> construct:</p>

+<p>Normally, to call any of the available CodeIgniter functions requires you to use the <kbd>$this</kbd> construct:</p>

 

 <code>

 <strong>$this</strong>->load->helper('url');<br />

@@ -81,10 +81,10 @@
 </code>

 

 <p><kbd>$this</kbd>, however, only works within your controllers, your models, or your views.

-If you would like to use Code Igniter's classes from within your own custom classes you can do so as follows:</p>

+If you would like to use CodeIgniter's classes from within your own custom classes you can do so as follows:</p>

 

 

-<p>First, assign the Code Igniter object to a variable:</p>

+<p>First, assign the CodeIgniter object to a variable:</p>

 

 <code>$CI =& get_instance();</code>

 

@@ -102,7 +102,7 @@
 <br /><br />

 <var>$CI =& get_instance();</var>

 <br /><br />

-This is very important. Assigning by reference allows you to use the original Code Igniter object rather than creating a copy of it.</p>

+This is very important. Assigning by reference allows you to use the original CodeIgniter object rather than creating a copy of it.</p>

 </div>

 <!-- END CONTENT -->

 

@@ -115,7 +115,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="autoloader.html">Auto-loading Resources</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index f3127cc..7ac2253 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Auto-loading Resources

 </td>

@@ -62,7 +62,7 @@
 

 <h1>Auto-loading Resources</h1>

 

-<p>Code Igniter comes with an "Auto-load" feature that permits libraries, helpers, and plugins to be initialized

+<p>CodeIgniter comes with an "Auto-load" feature that permits libraries, helpers, and plugins to be initialized

 automatically every time the system runs. If you need certain resources globally throughout your application you should

 consider auto-loading them for convenience.</p>

 

@@ -98,7 +98,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="scaffolding.html">Scaffolding</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html
index 9371ed3..0cec441 100644
--- a/user_guide/general/caching.html
+++ b/user_guide/general/caching.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Page Caching

 </td>

@@ -63,9 +63,9 @@
 

 <h1>Web Page Caching</h1>

 

-<p>Code Igniter lets you cache your pages in order to achieve maximum performance.

+<p>CodeIgniter lets you cache your pages in order to achieve maximum performance.

 

-Although Code Igniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the

+Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the

 server resources, memory, and processing cycles utilized, which affect your page load speeds.

 By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

 

@@ -112,7 +112,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="profiling.html">Profiling Your Application</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 0bb4ac4..f80325e 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Controllers

 </td>

@@ -89,7 +89,7 @@
 

 <code>www.your-site.com/index.php/<var>blog</var>/</code>

 

-<p>In the above example, Code Igniter would attempt to find a controller named <dfn>blog.php</dfn> and load it.</p>

+<p>In the above example, CodeIgniter would attempt to find a controller named <dfn>blog.php</dfn> and load it.</p>

 

 <p><strong>When a controller's name matches the first segment of a URI, it will be loaded.</strong></p>

 

@@ -208,7 +208,7 @@
 <a name="default"></a>

 <h2>Defining a Default Controller</h2>

 

-<p>Code Igniter can be told to load a default controller when a URI is not present,

+<p>CodeIgniter can be told to load a default controller when a URI is not present,

 as will be the case when only your site root URL is requested.  To specify a default controller, open

 your <dfn>application/config/routes.php</dfn> file and set this variable:</p>

 

@@ -223,7 +223,7 @@
 <h2>Remapping Function Calls</h2>

 

 <p>As noted above, the second segment of the URI typically determines which function in the controller gets called.

-Code Igniter permits you to override this behavior through the use of the <kbd>_remap()</kbd> function:</p>

+CodeIgniter permits you to override this behavior through the use of the <kbd>_remap()</kbd> function:</p>

 

 <code>function _remap()<br />

 {<br />

@@ -255,9 +255,9 @@
 <a name="output"></a>

 <h2>Processing Output</h2>

 

-<p>Code Igniter has an output class that takes care of sending your final rendered data to the web browser automatically.  More information on this can be found in the

+<p>CodeIgniter has an output class that takes care of sending your final rendered data to the web browser automatically.  More information on this can be found in the

 <a href="views.html">Views</a> and <a href="../libraries/output.html">Output class</a> pages.  In some cases, however, you might want to

-post-process the finalized data in some way and send it to the browser yourself.  Code Igniter permits you to

+post-process the finalized data in some way and send it to the browser yourself.  CodeIgniter permits you to

 add a function named <dfn>_output()</dfn> to your controller that will receive the finalized output data.

 

 <p><strong>Important:</strong>&nbsp; If your controller contains a function named <kbd>_output()</kbd>, it will <strong>always</strong>

@@ -299,7 +299,7 @@
 <a name="subfolders"></a>

 <h2>Organizing Your Controllers into Sub-folders</h2>

 

-<p>If you are building a large application you might find it convenient to organize your controllers into sub-folders.  Code Igniter permits you to do this.</p>

+<p>If you are building a large application you might find it convenient to organize your controllers into sub-folders.  CodeIgniter permits you to do this.</p>

 

 <p>Simply create folders within your <dfn>application/controllers</dfn> directory and place your controller classes within them.</p>

 

@@ -317,7 +317,7 @@
 <dfn>application/config/routes.php</dfn> file</p>

 

 

-<p>Code Igniter also permits you to remap your URIs using its <a href="routing.html">URI Routing</a> feature.

+<p>CodeIgniter also permits you to remap your URIs using its <a href="routing.html">URI Routing</a> feature.

 

 

 

@@ -421,14 +421,14 @@
 

 <div id="footer">

 <p>

-Previous Topic:&nbsp;&nbsp;<a href="urls.html">Code Igniter URLs</a>

+Previous Topic:&nbsp;&nbsp;<a href="urls.html">CodeIgniter URLs</a>

 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="views.html">Views</a>

 <p>

 

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index 0e13ce7..58fa5d9 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Creating Core System Classes

 </td>

@@ -62,11 +62,11 @@
 

 <h1>Creating Core System Classes</h1>

 

-<p>Every time Code Igniter runs there are several base classes that are initialized automatically as part of the core framework.

+<p>Every time CodeIgniter runs there are several base classes that are initialized automatically as part of the core framework.

 It is possible, however, to swap any of the core system classes with your own versions or even extend the core versions.</p>

 

 <p><strong>Most users will never have any need to do this,

-but the option to replace or extend them does exist for those who would like to significantly alter the Code Igniter core.</strong>

+but the option to replace or extend them does exist for those who would like to significantly alter the CodeIgniter core.</strong>

 </p>

 

 <p class="important"><strong>Note:</strong>&nbsp; Messing with a core system class has a lot of implications, so make sure you

@@ -75,7 +75,7 @@
 

 <h2>System Class List</h2>

 

-<p>The following is a list of the core system files that are invoked every time Code Igniter runs:</p>

+<p>The following is a list of the core system files that are invoked every time CodeIgniter runs:</p>

 

 <ul>

 <li>Benchmark</li>

@@ -141,7 +141,7 @@
 

 <p class="important"><strong>Tip:</strong>&nbsp; Any functions in your class that are named identically to the functions in the parent class will be used instead of the native ones

 (this is known as "method overloading").

-This allows you to substantially alter the Code Igniter core.</p>

+This allows you to substantially alter the CodeIgniter core.</p>

 

 

 <h3>Setting Your Own Prefix</h3>

@@ -150,7 +150,7 @@
 

 <code>$config['subclass_prefix'] = 'MY_';</code>

 

-<p>Please note that all native Code Igniter libraries are prefixed with <kbd>CI_</kbd> so DO NOT use that as your prefix.</p>

+<p>Please note that all native CodeIgniter libraries are prefixed with <kbd>CI_</kbd> so DO NOT use that as your prefix.</p>

 

 

 

@@ -167,7 +167,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="hooks.html">Hooks - Extending the Core</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index d8fdb38..f17c3cf 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Creating Libraries

 </td>

@@ -67,7 +67,7 @@
 your own libraries within your <dfn>application/libraries</dfn> directory in order to maintain separation between your local resources

 and the global framework resources.</p>

 

-<p>As an added bonus, Code Igniter permits your libraries to <kbd>extend</kbd> native classes if you simply need to add some functionality

+<p>As an added bonus, CodeIgniter permits your libraries to <kbd>extend</kbd> native classes if you simply need to add some functionality

 to an existing library. Or you can even replace native libraries just by placing identically named versions in your <dfn>application/libraries</dfn> folder.

 

 <p>In summary:</p>

@@ -86,7 +86,7 @@
 

 <h2>Storage</h2>

 

-<p>Your library classes should be placed within your <dfn>application/libraries</dfn> folder, as this is where Code Igniter will look for them when

+<p>Your library classes should be placed within your <dfn>application/libraries</dfn> folder, as this is where CodeIgniter will look for them when

 they are initialized.</p>

 

 

@@ -121,7 +121,7 @@
 <code>$this->load->library('<kbd>someclass</kbd>');</code>

 

 <p>Where <em>someclass</em> is the file name, without the ".php" file extension. You can submit the file name capitalized or lower case.

-Code Igniter doesn't care.</p>

+CodeIgniter doesn't care.</p>

 

 <p>Once loaded you can access your class using the <kbd>lower case</kbd> version:</p>

 

@@ -163,13 +163,13 @@
 

 

 

-<h2>Utilizing Code Igniter Resources within Your Library</h2>

+<h2>Utilizing CodeIgniter Resources within Your Library</h2>

 

 

-<p>To access Code Igniter's native resources within your library use the <kbd>get_instance()</kbd> function.

-This function returns the Code Igniter super object.</p>

+<p>To access CodeIgniter's native resources within your library use the <kbd>get_instance()</kbd> function.

+This function returns the CodeIgniter super object.</p>

 

-<p>Normally from within your controller functions you will call any of the available Code Igniter functions using the <kbd>$this</kbd> construct:</p>

+<p>Normally from within your controller functions you will call any of the available CodeIgniter functions using the <kbd>$this</kbd> construct:</p>

 

 <code>

 <strong>$this</strong>->load->helper('url');<br />

@@ -179,10 +179,10 @@
 </code>

 

 <p><kbd>$this</kbd>, however, only works directly within your controllers, your models, or your views.

-If you would like to use Code Igniter's classes from within your own custom classes you can do so as follows:</p>

+If you would like to use CodeIgniter's classes from within your own custom classes you can do so as follows:</p>

 

 

-<p>First, assign the Code Igniter object to a variable:</p>

+<p>First, assign the CodeIgniter object to a variable:</p>

 

 <code>$CI =& get_instance();</code>

 

@@ -200,12 +200,12 @@
 <br /><br />

 <var>$CI =& get_instance();</var>

 <br /><br />

-<kbd>This is very important.</kbd> Assigning by reference allows you to use the original Code Igniter object rather than creating a copy of it.</p>

+<kbd>This is very important.</kbd> Assigning by reference allows you to use the original CodeIgniter object rather than creating a copy of it.</p>

 

 

 <h2>Replacing Native Libraries with Your Versions</h2>

 

-<p>Simply by naming your class files identically to a native library will cause Code Igniter to use it instead of the native one. To use this

+<p>Simply by naming your class files identically to a native library will cause CodeIgniter to use it instead of the native one. To use this

 feature you must name the file and the class declaration exactly the same as the native library.  For example, to replace the native <kbd>Email</kbd> library

 you'll create a file named <dfn>application/libraries/Email.php</dfn>, and declare your class with:</p>

 

@@ -274,7 +274,7 @@
 

 <code>$config['subclass_prefix'] = 'MY_';</code>

 

-<p>Please note that all native Code Igniter libraries are prefixed with <kbd>CI_</kbd> so DO NOT use that as your prefix.</p>

+<p>Please note that all native CodeIgniter libraries are prefixed with <kbd>CI_</kbd> so DO NOT use that as your prefix.</p>

 

 

 

@@ -284,13 +284,13 @@
 

 <div id="footer">

 <p>

-Previous Topic:&nbsp;&nbsp;<a href="libraries.html">Using Code Igniter Libraries</a>

+Previous Topic:&nbsp;&nbsp;<a href="libraries.html">Using CodeIgniter Libraries</a>

 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="core_classes.html">Creating Core System Classes</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index c87c24b..e1bd8c3 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Credits

 </td>

@@ -62,16 +62,16 @@
 

 <h1>Credits</h1>

 

-<p>Code Igniter was developed by <a href="http://www.ellislab.com">Rick Ellis</a>, who in his other life is CEO of

+<p>CodeIgniter was developed by <a href="http://www.ellislab.com">Rick Ellis</a>, who in his other life is CEO of

 <a href="http://ellislab.com/">Ellislab, Inc.</a>  The core framework was written

 specifically for this application, while many of the class libraries, helpers, and sub-systems borrow from the code-base of

-<a href="http://www.pmachine.com/ee/">ExpressionEngine</a>, a Content Management System written by Rick Ellis and

+<a href="http://www.EllisLab.com/ee/">ExpressionEngine</a>, a Content Management System written by Rick Ellis and

 <a href="http://www.reedmaniac.com">Paul Burdick</a>.</p>

 

 <p>A hat tip goes to Ruby on Rails for inspiring us to create a PHP framework, and for

 bringing frameworks into the general consciousness of the web community.</p>

 

-<p>The Code Igniter logo and icons were created by Rick Ellis.</p>

+<p>The CodeIgniter logo and icons were created by Rick Ellis.</p>

 

 <p>The pull-down table of contents was created with the use of the <a href="http://moofx.mad4milk.net/">moo.fx library</a>.</p>

 

@@ -86,10 +86,10 @@
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

-Next Topic:&nbsp;&nbsp;<a href="../installation/downloads.html">Downloading Code Igniter</a>

+Next Topic:&nbsp;&nbsp;<a href="../installation/downloads.html">Downloading CodeIgniter</a>

 <p>

 

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html
index 86e1888..e19af05 100644
--- a/user_guide/general/errors.html
+++ b/user_guide/general/errors.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Error Handling

 </td>

@@ -62,15 +62,15 @@
 

 <h1>Error Handling</h1>

 

-<p>Code Igniter lets you build error reporting into your applications using the functions described below.

+<p>CodeIgniter lets you build error reporting into your applications using the functions described below.

 In addition, it has an error logging class that permits error and debugging messages to be saved as text files.</p>

 

-<p class="important"><strong>Note:</strong> By default, Code Igniter displays all PHP errors.  You might

+<p class="important"><strong>Note:</strong> By default, CodeIgniter displays all PHP errors.  You might

 wish to change this behavior once your development is complete.  You'll find the <dfn>error_reporting()</dfn>

 function located at the top of your main index.php file. Disabling error reporting will NOT prevent log files

 from being written if there are errors.</p>

 

-<p>Unlike most systems in Code Igniter, the error functions are simple procedural interfaces that are available

+<p>Unlike most systems in CodeIgniter, the error functions are simple procedural interfaces that are available

 globally throughout the application.  This approach permits error messages to get triggered without having to worry

 about class/function scoping.</p>

 

@@ -85,7 +85,7 @@
 <p><dfn>application/errors/</dfn><kbd>error_404.php</kbd></p>

 

 <p>The function expects the string passed to it to be the file path to the page that isn't found.

-Note that Code Igniter automatically shows 404 messages if controllers are not found.</p>

+Note that CodeIgniter automatically shows 404 messages if controllers are not found.</p>

 

 

 <h2>log_message('<var>level</var>', '<samp>message</samp>')</h2>

@@ -112,7 +112,7 @@
 <ol>

 <li>Error Messages.  These are actual errors, such as PHP errors or user errors.</li>

 <li>Debug Messages.  These are messages that assist in debugging. For example, if a class has been initialized, you could log this as debugging info.</li>

-<li>Informational Messages.  These are the lowest priority messages, simply giving information regarding some process.  Code Igniter doesn't natively generate any info messages but you may want to in your application.</li>

+<li>Informational Messages.  These are the lowest priority messages, simply giving information regarding some process.  CodeIgniter doesn't natively generate any info messages but you may want to in your application.</li>

 </ol>

 

 

@@ -135,7 +135,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="caching.html">Page Caching</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html
index df522e9..7f51e30 100644
--- a/user_guide/general/helpers.html
+++ b/user_guide/general/helpers.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Helper Functions

 </td>

@@ -68,14 +68,14 @@
 <dfn>Cookie Helpers</dfn> set and read cookies, <dfn>File Helpers</dfn> help you deal with files, etc.

 </p>

 

-<p>Unlike most other systems in Code Igniter, Helpers are not written in an Object Oriented format.  They are simple, procedural functions.

+<p>Unlike most other systems in CodeIgniter, Helpers are not written in an Object Oriented format.  They are simple, procedural functions.

 Each helper function performs one specific task, with no dependence on other functions.</p>

 

-<p>Code Igniter does not load Helper Files by default, so the first step in using

+<p>CodeIgniter does not load Helper Files by default, so the first step in using

 a Helper is to load it.  Once loaded, it becomes globally available in your <a href="../general/controllers.html">controller</a> and <a href="../general/views.html">views</a>.</p>

 

 <p>Helpers are typically stored in your <dfn>system/helpers</dfn> directory.  Alternately you can create a folder called <kbd>helpers</kbd> inside

-your <kbd>application</kbd> folder and store them there.  Code Igniter will look first in your <dfn>system/application/helpers</dfn>

+your <kbd>application</kbd> folder and store them there.  CodeIgniter will look first in your <dfn>system/application/helpers</dfn>

 directory.  If the directory does not exist or the specified helper is not located there CI will instead look in your global

 <dfn>system/helpers</dfn> folder.</p>

 

@@ -107,7 +107,7 @@
 

 <h2>Auto-loading Helpers</h2>

 

-<p>If you find that you need a particular helper globally throughout your application, you can tell Code Igniter to auto-load it during system initialization.

+<p>If you find that you need a particular helper globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization.

 This is done by opening the <var>application/config/autoload.php</var> file and adding the helper to the autoload array.</p>

 

 

@@ -139,7 +139,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="plugins.html">Plugins</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index 14a2404..b0e15f1 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Hooks - Extending the Framework Core

 </td>

@@ -62,8 +62,8 @@
 

 <h1>Hooks - Extending the Framework Core</h1>

 

-<p>Code Igniter's Hooks feature provides a means to tap into and modify the inner workings of the framework without hacking the core files.

-When Code Igniter runs it follows a specific execution process, diagramed in the <a href="../overview/appflow.html">Application Flow</a> page.

+<p>CodeIgniter's Hooks feature provides a means to tap into and modify the inner workings of the framework without hacking the core files.

+When CodeIgniter runs it follows a specific execution process, diagramed in the <a href="../overview/appflow.html">Application Flow</a> page.

 There may be instances, however, where you'd like to cause some action to take place at a particular stage in the execution process.

 For example, you might want to run a script right before your controllers get loaded, or right after, or you might want to trigger one of

 your own scripts in some other location.

@@ -186,7 +186,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="autoloader.html">Auto-loading Resources</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/index.html b/user_guide/general/index.html
index 1354f87..a533468 100644
--- a/user_guide/general/index.html
+++ b/user_guide/general/index.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Getting Started

 </td>

@@ -60,13 +60,13 @@
 <!-- START CONTENT -->

 <div id="content">

 

-<h1>Getting Started With Code Igniter</h1>

+<h1>Getting Started With CodeIgniter</h1>

 

 <p>Any software application requires some effort to learn.  We've done our best to minimize the learning

 curve while making the process as enjoyable as possible.

 </p>

 

-<p>The first step is to <a href="../installation/index.html">install</a> Code Igniter, then read

+<p>The first step is to <a href="../installation/index.html">install</a> CodeIgniter, then read

 all the topics in the <strong>Introduction</strong> section of the Table of Contents.</p>

 

 <p>Next, read each of the <strong>General Topics</strong> pages in order.

@@ -90,9 +90,9 @@
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

-Next Topic:&nbsp;&nbsp;<a href="urls.html">Code Igniter URLs</a>

+Next Topic:&nbsp;&nbsp;<a href="urls.html">CodeIgniter URLs</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
index b5b63ce..aaa4d69 100644
--- a/user_guide/general/libraries.html
+++ b/user_guide/general/libraries.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,9 +45,9 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

-Using Code Igniter Libraries

+Using CodeIgniter Libraries

 </td>

 <td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="www.codeigniter.com/user_guide/" />Search User Guide&nbsp; <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" />&nbsp;<input type="submit" class="submit" name="sa" value="Go" /></form></td>

 </tr>

@@ -60,7 +60,7 @@
 <!-- START CONTENT -->

 <div id="content">

 

-<h1>Using Code Igniter Libraries</h1>

+<h1>Using CodeIgniter Libraries</h1>

 

 

 <p>All of the available libraries are located in your <dfn>system/libraries</dfn> folder.

@@ -92,7 +92,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="creating_libraries.html">Creating Libraries</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html
index 5d20efa..28e00f0 100644
--- a/user_guide/general/managing_apps.html
+++ b/user_guide/general/managing_apps.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Managing your Applications

 </td>

@@ -62,9 +62,9 @@
 

 <h1>Managing your Applications</h1>

 

-<p>By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your

+<p>By default it is assumed that you only intend to use CodeIgniter to manage one application, which you will build in your

 <dfn>system/application/</dfn> directory.  It is possible, however, to have multiple sets of applications that share a single

-Code Igniter installation, or even to rename or relocate your <dfn>application</dfn> folder.</p>

+CodeIgniter installation, or even to rename or relocate your <dfn>application</dfn> folder.</p>

 

 <h2>Renaming the Application Folder</h2>

 

@@ -82,9 +82,9 @@
 <code>$application_folder = "/Path/to/your/application";</code>

 

 

-<h2>Running Multiple Applications with one Code Igniter Installation</h2>

+<h2>Running Multiple Applications with one CodeIgniter Installation</h2>

 

-<p>If you would like to share a common Code Igniter installation to manage several different applications simply 

+<p>If you would like to share a common CodeIgniter installation to manage several different applications simply 

 put all of the directories located inside your <kbd>application</kbd> folder into their

 own sub-folder.</p>

 

@@ -132,7 +132,7 @@
 Next Topic:&nbsp;&nbsp;<a href="alternative_php.html">Alternative PHP Syntax</a>

 <p>

 

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index cd93a42..cf66342 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Models

 </td>

@@ -79,7 +79,7 @@
 <h2>What is a Model?</h2>

 

 <p>Models are PHP classes that are designed to work with information in your database.  For example, let's say

-you use Code Igniter to manage a blog.  You might have a model class that contains functions to insert, update, and

+you use CodeIgniter to manage a blog.  You might have a model class that contains functions to insert, update, and

 retrieve your blog data. Here is an example of what such a model class might look like:</p>

 

 <code>

@@ -252,7 +252,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="helpers.html">Helpers</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html
index 9358530..b811abd 100644
--- a/user_guide/general/plugins.html
+++ b/user_guide/general/plugins.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Plugins

 </td>

@@ -68,7 +68,7 @@
 the core system; plugins are intended to be created and shared by our community.</p>

 

 <p>Plugins should be saved to your <dfn>system/plugins</dfn> directory or you can create a folder called <kbd>plugins</kbd> inside

-your <kbd>application</kbd> folder and store them there.  Code Igniter will look first in your <dfn>system/application/plugins</dfn>

+your <kbd>application</kbd> folder and store them there.  CodeIgniter will look first in your <dfn>system/application/plugins</dfn>

 directory.  If the directory does not exist or the specified plugin is not located there CI will instead look in your global

 <dfn>system/plugins</dfn> folder.</p>

 

@@ -102,7 +102,7 @@
 

 <h2>Auto-loading Plugins</h2>

 

-<p>If you find that you need a particular plugin globally throughout your application, you can tell Code Igniter to auto-load it

+<p>If you find that you need a particular plugin globally throughout your application, you can tell CodeIgniter to auto-load it

 during system initialization. This is done by opening the <var>application/config/autoload.php</var> file and adding the plugin to the autoload array.</p>

 

 

@@ -125,7 +125,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="libraries.html">Using Libraries</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html
index f02440b..4e30664 100644
--- a/user_guide/general/profiling.html
+++ b/user_guide/general/profiling.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Profiling Your Application

 </td>

@@ -112,7 +112,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="managing_apps.html">Managing Applications</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html
index e4bdb6c..2a01dd0 100644
--- a/user_guide/general/quick_reference.html
+++ b/user_guide/general/quick_reference.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Quick Reference Chart

 </td>

@@ -76,7 +76,7 @@
 <a href="../index.html">User Guide Home</a>

 <p>

 

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
index 0d7b33e..689aad5 100644
--- a/user_guide/general/requirements.html
+++ b/user_guide/general/requirements.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Server Requirements

 </td>

@@ -81,7 +81,7 @@
 Next Topic:&nbsp;&nbsp;<a href="../license.html">License Agreement</a>

 <p>

 

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index 5789b72..6f94b4b 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 URI Routing

 </td>

@@ -80,7 +80,7 @@
 </p>

 

 <p>Normally the second segment of the URL is reserved for the function name, but in the example above it instead has a product ID.

-To overcome this, Code Igniter allows you to remap the URI handler.</p>

+To overcome this, CodeIgniter allows you to remap the URI handler.</p>

 

 

 <h2>Setting your own routing rules</h2>

@@ -179,7 +179,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="errors.html">Error Handling</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html
index 3d3ecac..aee72f7 100644
--- a/user_guide/general/scaffolding.html
+++ b/user_guide/general/scaffolding.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Scaffolding

 </td>

@@ -62,11 +62,11 @@
 

 <h1>Scaffolding</h1>

 

-<p>Code Igniter's Scaffolding feature provides a fast and very convenient way to add, edit, or delete information in your database

+<p>CodeIgniter's Scaffolding feature provides a fast and very convenient way to add, edit, or delete information in your database

 during development.</p>

 

 <p class="important"><strong>Very Important:</strong>  Scaffolding is intended for development use only.  It provides very little

-security other than a "secret" word, so anyone who has access to your Code Igniter site can potentially edit or delete your information.

+security other than a "secret" word, so anyone who has access to your CodeIgniter site can potentially edit or delete your information.

 If you use scaffolding make sure you disable it immediately after you are through using it.  DO NOT leave it enabled on a live site.

 And please, set a secret word before you use it.</p>

 

@@ -75,7 +75,7 @@
 

 <p>Here's a typical scenario:  You create a new database table during development and you'd like a quick way to insert some data

 into it to work with.  Without scaffolding your choices are either to write some inserts using the command line or to use a

-database management tool like phpMyAdmin.  With Code Igniter's scaffolding feature you can quickly add some data using its browser

+database management tool like phpMyAdmin.  With CodeIgniter's scaffolding feature you can quickly add some data using its browser

 interface.  And when you are through using the data you can easily delete it.</p>

 

 <h2>Setting a Secret Word</h2>

@@ -95,7 +95,7 @@
 <h2>Enabling Scaffolding</h2>

 

 <p>Note: The information on this page assumes you already know how <a href="controllers.html">controllers</a> work, and that you have

-a working one available.  It also assumes you have configured Code Igniter to auto-connect to your <a href="../database/index.html">database</a>.

+a working one available.  It also assumes you have configured CodeIgniter to auto-connect to your <a href="../database/index.html">database</a>.

 If not, the information here won't be very relevant, so you are encouraged to go through those sections first.

 Lastly, it assumes you understand what a class constructor is.  If not, read the last section of the <a href="controllers.html">controllers</a>

 page.</p>

@@ -146,7 +146,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="routing.html">URI Routing</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/security.html b/user_guide/general/security.html
index e5602d3..5dd00ec 100644
--- a/user_guide/general/security.html
+++ b/user_guide/general/security.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Security

 </td>

@@ -63,12 +63,12 @@
 <h1>Security</h1>

 

 <p>This page describes some "best practices" regarding web security, and details

-Code Igniter's internal security features.</p>

+CodeIgniter's internal security features.</p>

 

 

 <h2>URI Security</h2>

 

-<p>Code Igniter is fairly restrictive regarding which characters it allows in your URI strings in order to help

+<p>CodeIgniter is fairly restrictive regarding which characters it allows in your URI strings in order to help

 minimize the possibility that malicious data can be passed to your application.  URIs may only contain the following:

 </p>

 

@@ -83,7 +83,7 @@
 

 <h2>GET, POST, and COOKIE Data</h2>

 

-<p>GET data is simply disallowed by Code Igniter since the system utilizes URI segments rather than traditional URL query strings (unless

+<p>GET data is simply disallowed by CodeIgniter since the system utilizes URI segments rather than traditional URL query strings (unless

 you have the query string option enabled in your config file).  The global GET

 array is <strong>unset</strong> by the Input class during system initialization.</p>

 

@@ -110,13 +110,13 @@
 <li>Escape the data before submitting it into your database.</li>

 </ol>

 

-Code Igniter provides the following functions to assist in this process:</p>

+CodeIgniter provides the following functions to assist in this process:</p>

 

 <ul>

 

 <li><h2>XSS Filtering</h2>

 

-<p>Code Igniter comes with a Cross Site Scripting filter.  This filter looks for commonly

+<p>CodeIgniter comes with a Cross Site Scripting filter.  This filter looks for commonly

 used techniques to embed malicious Javascript into your data, or other types of code that attempt to hijack cookies

 or do other malicious things. The XSS Filter is described <a href="../libraries/input.html">here</a>.

 </p>

@@ -124,7 +124,7 @@
 

 <li><h2>Validate the data</h2>

 

-<p>Code Igniter has a <a href="../libraries/validation.html">Validation Class</a> that assists you in validating, filtering, and prepping

+<p>CodeIgniter has a <a href="../libraries/validation.html">Validation Class</a> that assists you in validating, filtering, and prepping

 your data.</p>

 </li>

 

@@ -152,7 +152,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="../libraries/benchmark.html">Benchmarking Class</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html
index 1d24312..4d29b73 100644
--- a/user_guide/general/urls.html
+++ b/user_guide/general/urls.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 URLS

 </td>

@@ -61,10 +61,10 @@
 <div id="content">

 

 

-<h1>Code Igniter URLs</h1>

+<h1>CodeIgniter URLs</h1>

 

-<p>By default, URLs in Code Igniter are designed to be search-engine and human friendly.  Rather than using the standard "query string"

-approach to URLs that is synonymous with dynamic systems, Code Igniter uses a <strong>segment-based</strong> approach:</p>

+<p>By default, URLs in CodeIgniter are designed to be search-engine and human friendly.  Rather than using the standard "query string"

+approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a <strong>segment-based</strong> approach:</p>

 

 <code>www.your-site.com/<var>news</var>/<dfn>article</dfn>/<samp>my_article</samp></code>

 

@@ -108,7 +108,7 @@
 <h2>Adding a URL Suffix</h2>

 

 <p>In your <dfn>config/config.php</dfn> file you can specify a suffix that will be added to all URLs generated

-by Code Igniter.  For example, if a URL is this:

+by CodeIgniter.  For example, if a URL is this:

 

 <code>www.your-site.com/index.php/products/view/shoes</code>

 

@@ -123,7 +123,7 @@
 

 <code>index.php?c=products&m=view&id=345</code>

 

-<p>Code Igniter optionally supports this capability, which can be enabled in your <dfn>application/config.php</dfn> file. If you

+<p>CodeIgniter optionally supports this capability, which can be enabled in your <dfn>application/config.php</dfn> file. If you

 open your config file you'll see these items:</p>

 

 <code>$config['enable_query_strings'] = FALSE;<br />

@@ -152,7 +152,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="controllers.html">Controllers</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>

diff --git a/user_guide/general/views.html b/user_guide/general/views.html
index 4e749a6..f97a003 100644
--- a/user_guide/general/views.html
+++ b/user_guide/general/views.html
@@ -2,7 +2,7 @@
 <html>

 <head>

 

-<title>Code Igniter User Guide</title>

+<title>CodeIgniter User Guide</title>

 

 <style type='text/css' media='all'>@import url('../userguide.css');</style>

 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />

@@ -22,7 +22,7 @@
 <meta http-equiv= 'pragma' content='no-cache' />

 <meta name='robots' content='all' />

 <meta name='author' content='Rick Ellis' />

-<meta name='description' content='Code Igniter User Guide' />

+<meta name='description' content='CodeIgniter User Guide' />

 

 </head>

 <body>

@@ -33,7 +33,7 @@
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.2</h1></td>

+<td><h1>CodeIgniter User Guide Version 1.5.3</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>

 </tr>

 </table>

@@ -45,7 +45,7 @@
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

 <td id="breadcrumb">

-<a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

 Views

 </td>

@@ -250,7 +250,7 @@
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 Next Topic:&nbsp;&nbsp;<a href="models.html">Models</a>

 <p>

-<p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

+<p><a href="http://www.codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2007 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>

 </div>

 

 </body>