update pMachine to EllisLab
update copyright year
update Code Igniter to CodeIgniter
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index 6d2f9ae..e4e3003 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.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> ›
Output Class
</td>
@@ -70,7 +70,7 @@
<p>Under normal circumstances you won't even notice the Output class since it works transparently without your intervention.
For example, when you use the <a href="../libraries/loader.html">Loader</a> class to load a view file, it's automatically
-passed to the Output class, which will be called automatically by Code Igniter at the end of system execution.
+passed to the Output class, which will be called automatically by CodeIgniter at the end of system execution.
It is possible, however, for you to manually intervene with the output if you need to, using either of the two following functions:</p>
<h2>$this->output->set_output();</h2>
@@ -89,7 +89,7 @@
<code>$string = $this->output->get_output();</code>
<p>Note that data will only be retrievable from this function if it has been previously sent to the output class by one of the
-Code Igniter functions like <var>$this->load->view()</var>.</p>
+CodeIgniter functions like <var>$this->load->view()</var>.</p>
<h2>$this->output->set_header();</h2>
@@ -132,7 +132,7 @@
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="pagination.html">Pagination Class</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>