update pMachine to EllisLab
update copyright year
update Code Igniter to CodeIgniter
diff --git a/user_guide/index.html b/user_guide/index.html
index 1e0f6cf..e8f2b52 100644
--- a/user_guide/index.html
+++ b/user_guide/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>
@@ -44,7 +44,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> › Code Igniter User Guide
+<a href="http://www.codeigniter.com/">CodeIgniter Home</a> › CodeIgniter User Guide
</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 <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td>
</tr>
@@ -62,21 +62,21 @@
-<h2>Welcome to Code Igniter</h2>
+<h2>Welcome to CodeIgniter</h2>
-<p>Code Igniter is an Application Development Framework - a toolkit - for people who build web sites using PHP.
+<p>CodeIgniter is an Application Development Framework - a toolkit - for people who build web sites using PHP.
Its goal is to enable you to develop projects much faster than you could if you were writing code
from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and
-logical structure to access these libraries. Code Igniter lets you creatively focus on your project by
+logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by
minimizing the amount of code needed for a given task.</p>
-<p>Please read the Introduction section of the User Guide to learn the broad concepts behind Code Igniter,
+<p>Please read the Introduction section of the User Guide to learn the broad concepts behind CodeIgniter,
then read the <a href="general/index.html">Getting Started</a> page.</p>
-<h2>Who is Code Igniter For?</h2>
+<h2>Who is CodeIgniter For?</h2>
-<p>Code Igniter is right for you if:</p>
+<p>CodeIgniter is right for you if:</p>
<ul>
<li>You want a framework with a small footprint.</li>
@@ -98,7 +98,7 @@
<div id="footer">
<p><a href="#top">Top of Page</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>