From e588dea672ceffcce3fbda40efb04087f5e13ac0 Mon Sep 17 00:00:00 2001
From: Quinn Chrzan <quinnchrzan@gmail.com>
Date: Fri, 30 May 2014 14:23:40 -0400
Subject: Bumping version numbers and adding upgrade instructions

---
 user_guide/changelog.html | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'user_guide/changelog.html')

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index aebf52580..96fc8e310 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -28,7 +28,7 @@
 <div id="masthead">
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
 <tr>
-<td><h1>CodeIgniter User Guide Version 2.1.4</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.2.0</h1></td>
 <td id="breadcrumb_right"><a href="./toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -57,10 +57,20 @@ Change Log
 
 <h1>Change Log</h1>
 
+<h2>Version 2.2.0</h2>
+<p>Release Date: June 2, 2014</p>
+
+<ul>
+	<li>General Changes
+		<ul>
+			<li>The xor_encode method in the Encyption Class has been deprecated. The Encryption Class now requires the Mcrypt extension to be installed.</li>
+		</ul>
+	</li>
+</ul>
+
 <h2>Version 2.1.4</h2>
 <p>Release Date: July 8, 2013</p>
 
-
 <ul>
 	<li>General Changes
 		<ul>
-- 
cgit v1.2.3-24-g4f1b