Merged recent changes and tweaked multi-env changes.

1 files changed, 2 insertions, 2 deletions

diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index 35043d9ca..11410a31f 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -84,8 +84,8 @@ know what you are doing before attempting it.</p>
 <li>Log</li>
 <li>Output</li>
 <li>Router</li>
-<li>Unicode</li>
 <li>URI</li>
+<li>Utf8</li>
 </ul>
 
 <h2>Replacing Core Classes</h2>
@@ -179,7 +179,7 @@ Previous Topic:&nbsp;&nbsp;<a href="creating_libraries.html">Creating Your Own L
 <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://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>