update pMachine to EllisLab
update copyright year
update Code Igniter to CodeIgniter
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> ›
+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> ›
<a href="../index.html">User Guide Home</a> ›
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> 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: <a href="urls.html">Code Igniter URLs</a>
+Previous Topic: <a href="urls.html">CodeIgniter URLs</a>
·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="views.html">Views</a>
<p>
-<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
</body>