From c1a66512eacc76968cbf01e2ee37c3c65584b1f0 Mon Sep 17 00:00:00 2001
From: Repox
Date: Mon, 23 Apr 2012 13:14:27 +0200
Subject: Corrected the migration_missing_down_method language string
---
system/language/english/migration_lang.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/language/english/migration_lang.php b/system/language/english/migration_lang.php
index 4763ca243..f17530f00 100644
--- a/system/language/english/migration_lang.php
+++ b/system/language/english/migration_lang.php
@@ -5,7 +5,7 @@ $lang['migration_not_found'] = "This migration could not be found.";
$lang['migration_multiple_version'] = "This are multiple migrations with the same version number: %d.";
$lang['migration_class_doesnt_exist'] = "The migration class \"%s\" could not be found.";
$lang['migration_missing_up_method'] = "The migration class \"%s\" is missing an 'up' method.";
-$lang['migration_missing_down_method'] = "The migration class \"%s\" is missing an 'up' method.";
+$lang['migration_missing_down_method'] = "The migration class \"%s\" is missing an 'down' method.";
$lang['migration_invalid_filename'] = "Migration \"%s\" has an invalid filename.";
--
cgit v1.2.3-24-g4f1b
From e463c4d71c2fdcc224e70f7576582220ae64e3d7 Mon Sep 17 00:00:00 2001
From: Wes Baker
Date: Fri, 4 May 2012 18:44:24 -0400
Subject: Added a return false if an image doesn't pass XSS cleaning to prevent
file_get_contents from returning a NULL and passing through unscathed.
---
system/libraries/Upload.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index b0490de30..0e5d73b19 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -868,6 +868,10 @@ class CI_Upload {
{
return TRUE; // its an image, no "triggers" detected in the first 256 bytes, we're good
}
+ else
+ {
+ return FALSE;
+ }
}
if (($data = @file_get_contents($file)) === FALSE)
--
cgit v1.2.3-24-g4f1b
From e2c374fc474f91cc1c04aaae68e15cef6984f494 Mon Sep 17 00:00:00 2001
From: Alexander Hofstede
Date: Thu, 17 May 2012 00:28:08 +0200
Subject: Check cookie against md5 regex.
Otherwise, cookie can contain arbitrary injected code that gets sent
back directly to the browser.
---
system/core/Security.php | 2 +-
user_guide/changelog.html | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/system/core/Security.php b/system/core/Security.php
index a3e227437..6f5ac1ed8 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -848,7 +848,7 @@ class CI_Security {
// each page load since a page could contain embedded
// sub-pages causing this feature to fail
if (isset($_COOKIE[$this->_csrf_cookie_name]) &&
- $_COOKIE[$this->_csrf_cookie_name] != '')
+ preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->_csrf_cookie_name]) === 1)
{
return $this->_csrf_hash = $_COOKIE[$this->_csrf_cookie_name];
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 613c4e65d..38275955b 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -85,6 +85,7 @@ Change Log
Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
Fixed a bug (#538) - Windows paths were ignored when using the Image Manipulation Class to create a new file.
Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.
+ Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
--
cgit v1.2.3-24-g4f1b
From c3eb672ed01c57a543dd8cdf1b90eb4001498c19 Mon Sep 17 00:00:00 2001
From: Alexander Hofstede
Date: Thu, 17 May 2012 10:48:11 +0200
Subject: Use tab for indent
---
.project | 13 +++++++++++++
.settings/com.aptana.formatter.epl.prefs | 2 ++
user_guide/changelog.html | 2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 .project
create mode 100644 .settings/com.aptana.formatter.epl.prefs
diff --git a/.project b/.project
new file mode 100644
index 000000000..6f00520a1
--- /dev/null
+++ b/.project
@@ -0,0 +1,13 @@
+
+
+ CodeIgniter
+
+
+
+
+
+ com.aptana.projects.webnature
+ com.aptana.editor.php.phpNature
+
+
diff --git a/.settings/com.aptana.formatter.epl.prefs b/.settings/com.aptana.formatter.epl.prefs
new file mode 100644
index 000000000..ebd4b7aeb
--- /dev/null
+++ b/.settings/com.aptana.formatter.epl.prefs
@@ -0,0 +1,2 @@
+com.aptana.formatter.profiles.active=com.aptana.formatter.profiles.default
+eclipse.preferences.version=1
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 38275955b..55fbceeaf 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -85,7 +85,7 @@ Change Log
Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
Fixed a bug (#538) - Windows paths were ignored when using the Image Manipulation Class to create a new file.
Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.
- Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
+ Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
--
cgit v1.2.3-24-g4f1b
From be32f2b25c72517c003010eeaae8b46dae19fe3e Mon Sep 17 00:00:00 2001
From: Alexander Hofstede
Date: Thu, 17 May 2012 10:51:05 +0200
Subject: Revert "Use tab for indent"
This reverts commit c3eb672ed01c57a543dd8cdf1b90eb4001498c19.
---
.project | 13 -------------
.settings/com.aptana.formatter.epl.prefs | 2 --
user_guide/changelog.html | 2 +-
3 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100644 .project
delete mode 100644 .settings/com.aptana.formatter.epl.prefs
diff --git a/.project b/.project
deleted file mode 100644
index 6f00520a1..000000000
--- a/.project
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- CodeIgniter
-
-
-
-
-
- com.aptana.projects.webnature
- com.aptana.editor.php.phpNature
-
-
diff --git a/.settings/com.aptana.formatter.epl.prefs b/.settings/com.aptana.formatter.epl.prefs
deleted file mode 100644
index ebd4b7aeb..000000000
--- a/.settings/com.aptana.formatter.epl.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-com.aptana.formatter.profiles.active=com.aptana.formatter.profiles.default
-eclipse.preferences.version=1
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 55fbceeaf..38275955b 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -85,7 +85,7 @@ Change Log
Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
Fixed a bug (#538) - Windows paths were ignored when using the Image Manipulation Class to create a new file.
Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.
- Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
+ Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
--
cgit v1.2.3-24-g4f1b
From 8f04c69fe65ddc2604425eaee811b50a909d905f Mon Sep 17 00:00:00 2001
From: Alexander Hofstede
Date: Thu, 17 May 2012 10:52:44 +0200
Subject: Use tabs for indenting
---
user_guide/changelog.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 38275955b..55fbceeaf 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -85,7 +85,7 @@ Change Log
Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
Fixed a bug (#538) - Windows paths were ignored when using the Image Manipulation Class to create a new file.
Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.
- Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
+ Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
--
cgit v1.2.3-24-g4f1b
From 324ef078dda5a3596444152ba49dd591a61adba6 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Thu, 17 May 2012 14:45:25 +0100
Subject: Added upgrade for 2.1.1 and updated version.
---
system/core/CodeIgniter.php | 2 +-
system/database/drivers/pdo/pdo_driver.php | 2 +-
system/database/drivers/pdo/pdo_forge.php | 2 +-
system/database/drivers/pdo/pdo_result.php | 2 +-
system/database/drivers/pdo/pdo_utility.php | 2 +-
system/libraries/Cache/Cache.php | 2 +-
system/libraries/Cache/drivers/Cache_apc.php | 2 +-
system/libraries/Cache/drivers/Cache_dummy.php | 2 +-
system/libraries/Cache/drivers/Cache_file.php | 2 +-
system/libraries/Cache/drivers/Cache_memcached.php | 2 +-
system/libraries/Cart.php | 2 +-
system/libraries/Driver.php | 2 +-
system/libraries/Migration.php | 2 +-
user_guide/changelog.html | 4 +-
user_guide/database/active_record.html | 4 +-
user_guide/database/caching.html | 4 +-
user_guide/database/call_function.html | 4 +-
user_guide/database/configuration.html | 4 +-
user_guide/database/connecting.html | 4 +-
user_guide/database/examples.html | 4 +-
user_guide/database/fields.html | 4 +-
user_guide/database/forge.html | 4 +-
user_guide/database/helpers.html | 4 +-
user_guide/database/index.html | 4 +-
user_guide/database/queries.html | 4 +-
user_guide/database/results.html | 4 +-
user_guide/database/table_data.html | 4 +-
user_guide/database/transactions.html | 4 +-
user_guide/database/utilities.html | 4 +-
user_guide/doc_style/index.html | 4 +-
user_guide/doc_style/template.html | 2 +-
user_guide/general/alternative_php.html | 4 +-
user_guide/general/ancillary_classes.html | 4 +-
user_guide/general/autoloader.html | 4 +-
user_guide/general/caching.html | 4 +-
user_guide/general/cli.html | 4 +-
user_guide/general/common_functions.html | 4 +-
user_guide/general/controllers.html | 4 +-
user_guide/general/core_classes.html | 4 +-
user_guide/general/creating_drivers.html | 4 +-
user_guide/general/creating_libraries.html | 4 +-
user_guide/general/credits.html | 4 +-
user_guide/general/drivers.html | 4 +-
user_guide/general/environments.html | 4 +-
user_guide/general/errors.html | 4 +-
user_guide/general/helpers.html | 4 +-
user_guide/general/hooks.html | 4 +-
user_guide/general/libraries.html | 4 +-
user_guide/general/managing_apps.html | 4 +-
user_guide/general/models.html | 4 +-
user_guide/general/profiling.html | 4 +-
user_guide/general/quick_reference.html | 4 +-
user_guide/general/requirements.html | 4 +-
user_guide/general/reserved_names.html | 4 +-
user_guide/general/routing.html | 4 +-
user_guide/general/security.html | 4 +-
user_guide/general/styleguide.html | 4 +-
user_guide/general/urls.html | 4 +-
user_guide/general/views.html | 4 +-
user_guide/helpers/array_helper.html | 4 +-
user_guide/helpers/captcha_helper.html | 4 +-
user_guide/helpers/cookie_helper.html | 4 +-
user_guide/helpers/date_helper.html | 4 +-
user_guide/helpers/directory_helper.html | 4 +-
user_guide/helpers/download_helper.html | 4 +-
user_guide/helpers/email_helper.html | 4 +-
user_guide/helpers/file_helper.html | 4 +-
user_guide/helpers/form_helper.html | 4 +-
user_guide/helpers/html_helper.html | 4 +-
user_guide/helpers/inflector_helper.html | 4 +-
user_guide/helpers/language_helper.html | 4 +-
user_guide/helpers/number_helper.html | 4 +-
user_guide/helpers/path_helper.html | 4 +-
user_guide/helpers/security_helper.html | 4 +-
user_guide/helpers/smiley_helper.html | 4 +-
user_guide/helpers/string_helper.html | 4 +-
user_guide/helpers/text_helper.html | 4 +-
user_guide/helpers/typography_helper.html | 4 +-
user_guide/helpers/url_helper.html | 4 +-
user_guide/helpers/xml_helper.html | 4 +-
user_guide/index.html | 4 +-
user_guide/installation/downloads.html | 16 ++--
user_guide/installation/index.html | 4 +-
user_guide/installation/troubleshooting.html | 4 +-
user_guide/installation/upgrade_120.html | 4 +-
user_guide/installation/upgrade_130.html | 4 +-
user_guide/installation/upgrade_131.html | 4 +-
user_guide/installation/upgrade_132.html | 4 +-
user_guide/installation/upgrade_133.html | 4 +-
user_guide/installation/upgrade_140.html | 4 +-
user_guide/installation/upgrade_141.html | 4 +-
user_guide/installation/upgrade_150.html | 4 +-
user_guide/installation/upgrade_152.html | 4 +-
user_guide/installation/upgrade_153.html | 4 +-
user_guide/installation/upgrade_154.html | 4 +-
user_guide/installation/upgrade_160.html | 4 +-
user_guide/installation/upgrade_161.html | 4 +-
user_guide/installation/upgrade_162.html | 4 +-
user_guide/installation/upgrade_163.html | 4 +-
user_guide/installation/upgrade_170.html | 4 +-
user_guide/installation/upgrade_171.html | 4 +-
user_guide/installation/upgrade_172.html | 4 +-
user_guide/installation/upgrade_200.html | 4 +-
user_guide/installation/upgrade_201.html | 4 +-
user_guide/installation/upgrade_202.html | 4 +-
user_guide/installation/upgrade_203.html | 4 +-
user_guide/installation/upgrade_210.html | 4 +-
user_guide/installation/upgrade_211.html | 89 ++++++++++++++++++++++
user_guide/installation/upgrade_b11.html | 4 +-
user_guide/installation/upgrading.html | 5 +-
user_guide/libraries/benchmark.html | 4 +-
user_guide/libraries/caching.html | 4 +-
user_guide/libraries/calendar.html | 4 +-
user_guide/libraries/cart.html | 4 +-
user_guide/libraries/config.html | 4 +-
user_guide/libraries/email.html | 4 +-
user_guide/libraries/encryption.html | 4 +-
user_guide/libraries/file_uploading.html | 4 +-
user_guide/libraries/form_validation.html | 4 +-
user_guide/libraries/ftp.html | 4 +-
user_guide/libraries/image_lib.html | 4 +-
user_guide/libraries/input.html | 4 +-
user_guide/libraries/javascript.html | 4 +-
user_guide/libraries/language.html | 4 +-
user_guide/libraries/loader.html | 4 +-
user_guide/libraries/migration.html | 4 +-
user_guide/libraries/output.html | 4 +-
user_guide/libraries/pagination.html | 4 +-
user_guide/libraries/parser.html | 4 +-
user_guide/libraries/security.html | 4 +-
user_guide/libraries/sessions.html | 4 +-
user_guide/libraries/table.html | 4 +-
user_guide/libraries/trackback.html | 4 +-
user_guide/libraries/typography.html | 4 +-
user_guide/libraries/unit_testing.html | 4 +-
user_guide/libraries/uri.html | 4 +-
user_guide/libraries/user_agent.html | 4 +-
user_guide/libraries/xmlrpc.html | 4 +-
user_guide/libraries/zip.html | 4 +-
user_guide/license.html | 4 +-
user_guide/overview/appflow.html | 4 +-
user_guide/overview/at_a_glance.html | 4 +-
user_guide/overview/cheatsheets.html | 4 +-
user_guide/overview/features.html | 4 +-
user_guide/overview/getting_started.html | 4 +-
user_guide/overview/goals.html | 4 +-
user_guide/overview/index.html | 4 +-
user_guide/overview/mvc.html | 4 +-
user_guide/toc.html | 4 +-
user_guide/tutorial/conclusion.html | 4 +-
user_guide/tutorial/create_news_items.html | 4 +-
user_guide/tutorial/hard_coded_pages.html | 4 +-
user_guide/tutorial/index.html | 4 +-
user_guide/tutorial/news_section.html | 4 +-
user_guide/tutorial/static_pages.html | 4 +-
155 files changed, 391 insertions(+), 299 deletions(-)
create mode 100644 user_guide/installation/upgrade_211.html
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index db1aee574..ec7294102 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -33,7 +33,7 @@
* @var string
*
*/
- define('CI_VERSION', '2.1.0');
+ define('CI_VERSION', '2.1.1');
/**
* CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index 5de2079bb..4fc65aeb4 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -9,7 +9,7 @@
* @license http://codeigniter.com/user_guide/license.html
* @author EllisLab Dev Team
* @link http://codeigniter.com
- * @since Version 2.1.0
+ * @since Version 2.1.1
* @filesource
*/
diff --git a/system/database/drivers/pdo/pdo_forge.php b/system/database/drivers/pdo/pdo_forge.php
index 1462e8c21..1a076d4a2 100644
--- a/system/database/drivers/pdo/pdo_forge.php
+++ b/system/database/drivers/pdo/pdo_forge.php
@@ -9,7 +9,7 @@
* @license http://codeigniter.com/user_guide/license.html
* @author EllisLab Dev Team
* @link http://codeigniter.com
- * @since Version 2.1.0
+ * @since Version 2.1.1
* @filesource
*/
diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php
index 7f3058ff0..7c4a2f977 100644
--- a/system/database/drivers/pdo/pdo_result.php
+++ b/system/database/drivers/pdo/pdo_result.php
@@ -9,7 +9,7 @@
* @license http://codeigniter.com/user_guide/license.html
* @author EllisLab Dev Team
* @link http://codeigniter.com
- * @since Version 2.1.0
+ * @since Version 2.1.1
* @filesource
*/
diff --git a/system/database/drivers/pdo/pdo_utility.php b/system/database/drivers/pdo/pdo_utility.php
index 29aefca80..fec276458 100644
--- a/system/database/drivers/pdo/pdo_utility.php
+++ b/system/database/drivers/pdo/pdo_utility.php
@@ -9,7 +9,7 @@
* @license http://codeigniter.com/user_guide/license.html
* @author EllisLab Dev Team
* @link http://codeigniter.com
- * @since Version 2.1.0
+ * @since Version 2.1.1
* @filesource
*/
diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php
index 61e7aa761..261fc367b 100644
--- a/system/libraries/Cache/Cache.php
+++ b/system/libraries/Cache/Cache.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0
diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php
index 79d91b320..f750e6cb7 100644
--- a/system/libraries/Cache/drivers/Cache_apc.php
+++ b/system/libraries/Cache/drivers/Cache_apc.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0
diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php
index f96a68e27..b11b5b8fc 100644
--- a/system/libraries/Cache/drivers/Cache_dummy.php
+++ b/system/libraries/Cache/drivers/Cache_dummy.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0
diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
index 13e2d1af6..c50043660 100644
--- a/system/libraries/Cache/drivers/Cache_file.php
+++ b/system/libraries/Cache/drivers/Cache_file.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0
diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php
index fc586e025..747842091 100644
--- a/system/libraries/Cache/drivers/Cache_memcached.php
+++ b/system/libraries/Cache/drivers/Cache_memcached.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0
diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php
index ab5a70c98..da47b5a19 100644
--- a/system/libraries/Cart.php
+++ b/system/libraries/Cart.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2006 - 2011, EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php
index 9881c1eec..f9959ff81 100644
--- a/system/libraries/Driver.php
+++ b/system/libraries/Driver.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2006 - 2011, EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index 3943ec130..5a41377ea 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2006 - 2011, EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 55fbceeaf..d8fa374cb 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -58,7 +58,7 @@ Change Log
Change Log
Version 2.1.1
-Release Date: not yet released
+Release Date: May 18, 2012
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 17c58c9f1..734b28411 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -27,7 +27,7 @@
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html
index e6e72f269..6cf6ebd98 100644
--- a/user_guide/database/caching.html
+++ b/user_guide/database/caching.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html
index 4fc894743..b28a05050 100644
--- a/user_guide/database/call_function.html
+++ b/user_guide/database/call_function.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html
index 17a291ac2..01a28c0b5 100644
--- a/user_guide/database/configuration.html
+++ b/user_guide/database/configuration.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html
index f86602269..531f6a104 100644
--- a/user_guide/database/connecting.html
+++ b/user_guide/database/connecting.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html
index 58035557d..1a1d71be6 100644
--- a/user_guide/database/examples.html
+++ b/user_guide/database/examples.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html
index 56c9d9fdf..546a4ca1f 100644
--- a/user_guide/database/fields.html
+++ b/user_guide/database/fields.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html
index 2289e148e..e6153721d 100644
--- a/user_guide/database/forge.html
+++ b/user_guide/database/forge.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html
index 82f5c1d21..db03de1e9 100644
--- a/user_guide/database/helpers.html
+++ b/user_guide/database/helpers.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/index.html b/user_guide/database/index.html
index 8a957ecef..2a08f0a69 100644
--- a/user_guide/database/index.html
+++ b/user_guide/database/index.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index 3152997ca..263752f52 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/results.html b/user_guide/database/results.html
index 0baf992fb..395714073 100644
--- a/user_guide/database/results.html
+++ b/user_guide/database/results.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html
index dc5b54198..5ebe368d8 100644
--- a/user_guide/database/table_data.html
+++ b/user_guide/database/table_data.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html
index dd5f73ed1..53e667046 100644
--- a/user_guide/database/transactions.html
+++ b/user_guide/database/transactions.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index 7c30070f6..4a3005f9f 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html
index aa7fff43d..ad5c65a5b 100644
--- a/user_guide/doc_style/index.html
+++ b/user_guide/doc_style/index.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html
index d59d5e4ed..3fde59c9e 100644
--- a/user_guide/doc_style/template.html
+++ b/user_guide/doc_style/template.html
@@ -121,7 +121,7 @@ Previous Topic: Previous Class
User Guide Home ·
Next Topic: Next Class
-CodeIgniter · Copyright © 2006 - 2011 · EllisLab, Inc.
+CodeIgniter · Copyright © 2006 - 2012 · EllisLab, Inc.
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
index 6e601af44..6d2165fda 100644
--- a/user_guide/general/alternative_php.html
+++ b/user_guide/general/alternative_php.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html
index 0e3d54deb..9c209c0b7 100644
--- a/user_guide/general/ancillary_classes.html
+++ b/user_guide/general/ancillary_classes.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index 699751202..fdc02e906 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html
index a0d7596ed..5ccc79190 100644
--- a/user_guide/general/caching.html
+++ b/user_guide/general/caching.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html
index 5dda24b56..e21d1de51 100644
--- a/user_guide/general/cli.html
+++ b/user_guide/general/cli.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html
index f290521a9..ac2ff529b 100644
--- a/user_guide/general/common_functions.html
+++ b/user_guide/general/common_functions.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 91dd95a00..ee482e512 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index be711903c..ae43eef27 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html
index 77cccd03c..eaa626566 100644
--- a/user_guide/general/creating_drivers.html
+++ b/user_guide/general/creating_drivers.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index f905bb7c3..977cfae4d 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index 00c577871..90e7d0306 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html
index f463adb10..9ea7df6b6 100644
--- a/user_guide/general/drivers.html
+++ b/user_guide/general/drivers.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html
index 0245b085d..38285a662 100644
--- a/user_guide/general/environments.html
+++ b/user_guide/general/environments.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html
index d6bed9ea1..3f0830419 100644
--- a/user_guide/general/errors.html
+++ b/user_guide/general/errors.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html
index 619e9ff78..099430bea 100644
--- a/user_guide/general/helpers.html
+++ b/user_guide/general/helpers.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index 07d302a7d..70fb9648e 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
index 73b642bef..648b6cba9 100644
--- a/user_guide/general/libraries.html
+++ b/user_guide/general/libraries.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html
index 388519796..97312a01e 100644
--- a/user_guide/general/managing_apps.html
+++ b/user_guide/general/managing_apps.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index 7bda4d9a9..a416a80d9 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -27,7 +27,7 @@
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html
index 451b6f9e6..b6d5721fd 100644
--- a/user_guide/general/profiling.html
+++ b/user_guide/general/profiling.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html
index 6c07b335c..1eb78992b 100644
--- a/user_guide/general/quick_reference.html
+++ b/user_guide/general/quick_reference.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
index 1393b40e0..230ab7809 100644
--- a/user_guide/general/requirements.html
+++ b/user_guide/general/requirements.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index 450c0f667..80df6fd11 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index d5c90a1b8..e2252e028 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/security.html b/user_guide/general/security.html
index 9e78d4c68..b91266f92 100644
--- a/user_guide/general/security.html
+++ b/user_guide/general/security.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html
index c94313365..3ca16496b 100644
--- a/user_guide/general/styleguide.html
+++ b/user_guide/general/styleguide.html
@@ -34,7 +34,7 @@
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html
index edf03309b..d5d85df8a 100644
--- a/user_guide/general/urls.html
+++ b/user_guide/general/urls.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/general/views.html b/user_guide/general/views.html
index 5dc1d3250..68686e1e6 100644
--- a/user_guide/general/views.html
+++ b/user_guide/general/views.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html
index 92a11ed69..9b7a90b85 100644
--- a/user_guide/helpers/array_helper.html
+++ b/user_guide/helpers/array_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html
index 6c2671ad0..d6b46fdc0 100644
--- a/user_guide/helpers/captcha_helper.html
+++ b/user_guide/helpers/captcha_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html
index 2fde7f841..beba67a96 100644
--- a/user_guide/helpers/cookie_helper.html
+++ b/user_guide/helpers/cookie_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html
index e705593b0..f39971a0c 100644
--- a/user_guide/helpers/date_helper.html
+++ b/user_guide/helpers/date_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html
index 7fd7797af..c5ac082cd 100644
--- a/user_guide/helpers/directory_helper.html
+++ b/user_guide/helpers/directory_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html
index ccfe9ac72..b669202ad 100644
--- a/user_guide/helpers/download_helper.html
+++ b/user_guide/helpers/download_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html
index 13ae220fe..ae8d2da0e 100644
--- a/user_guide/helpers/email_helper.html
+++ b/user_guide/helpers/email_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html
index 0296191ff..3302cd048 100644
--- a/user_guide/helpers/file_helper.html
+++ b/user_guide/helpers/file_helper.html
@@ -27,7 +27,7 @@
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html
index ce809e946..02952b679 100644
--- a/user_guide/helpers/form_helper.html
+++ b/user_guide/helpers/form_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html
index a8277febe..6ade2d137 100644
--- a/user_guide/helpers/html_helper.html
+++ b/user_guide/helpers/html_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html
index 66982e8b3..d441ca1eb 100644
--- a/user_guide/helpers/inflector_helper.html
+++ b/user_guide/helpers/inflector_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html
index 073c368d8..9761b96b7 100644
--- a/user_guide/helpers/language_helper.html
+++ b/user_guide/helpers/language_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html
index c48987e6c..8dd9287a8 100644
--- a/user_guide/helpers/number_helper.html
+++ b/user_guide/helpers/number_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html
index 00f4aa2ec..04826bb19 100644
--- a/user_guide/helpers/path_helper.html
+++ b/user_guide/helpers/path_helper.html
@@ -27,7 +27,7 @@
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
index 16d5c51f2..b05d8e076 100644
--- a/user_guide/helpers/security_helper.html
+++ b/user_guide/helpers/security_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html
index 8bdd1df2c..3441cd8a3 100644
--- a/user_guide/helpers/smiley_helper.html
+++ b/user_guide/helpers/smiley_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html
index 3d7ba1c51..d4023841d 100644
--- a/user_guide/helpers/string_helper.html
+++ b/user_guide/helpers/string_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html
index 9f0d22ffc..775ded677 100644
--- a/user_guide/helpers/text_helper.html
+++ b/user_guide/helpers/text_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html
index a6bd809a5..16e3ca989 100644
--- a/user_guide/helpers/typography_helper.html
+++ b/user_guide/helpers/typography_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html
index c23c5ac92..488078c39 100644
--- a/user_guide/helpers/url_helper.html
+++ b/user_guide/helpers/url_helper.html
@@ -27,7 +27,7 @@
diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html
index f410b2114..ce037c251 100644
--- a/user_guide/helpers/xml_helper.html
+++ b/user_guide/helpers/xml_helper.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/index.html b/user_guide/index.html
index fa90983e1..b7ae61887 100644
--- a/user_guide/index.html
+++ b/user_guide/index.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html
index f01c8b8d5..aca760ca4 100644
--- a/user_guide/installation/index.html
+++ b/user_guide/installation/index.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html
index e79eb6a9f..bb7cadeba 100644
--- a/user_guide/installation/troubleshooting.html
+++ b/user_guide/installation/troubleshooting.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html
index 2b3d066cd..b80c02ad9 100644
--- a/user_guide/installation/upgrade_120.html
+++ b/user_guide/installation/upgrade_120.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html
index dd1465617..3a335738e 100644
--- a/user_guide/installation/upgrade_130.html
+++ b/user_guide/installation/upgrade_130.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html
index 202468dac..4a91c6ceb 100644
--- a/user_guide/installation/upgrade_131.html
+++ b/user_guide/installation/upgrade_131.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html
index 99f8fd3ab..1763f2b9c 100644
--- a/user_guide/installation/upgrade_132.html
+++ b/user_guide/installation/upgrade_132.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html
index b9b7a7fd3..fd1887d0e 100644
--- a/user_guide/installation/upgrade_133.html
+++ b/user_guide/installation/upgrade_133.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
index 50891b912..d82472551 100644
--- a/user_guide/installation/upgrade_140.html
+++ b/user_guide/installation/upgrade_140.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html
index afa8018b8..3ed11e7b5 100644
--- a/user_guide/installation/upgrade_141.html
+++ b/user_guide/installation/upgrade_141.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html
index f910aa039..5909a463a 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html
index 55e43f728..f46aee967 100644
--- a/user_guide/installation/upgrade_152.html
+++ b/user_guide/installation/upgrade_152.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html
index 3e6af7a38..3d28c6c77 100644
--- a/user_guide/installation/upgrade_153.html
+++ b/user_guide/installation/upgrade_153.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html
index 627fa0896..d8dffc99d 100644
--- a/user_guide/installation/upgrade_154.html
+++ b/user_guide/installation/upgrade_154.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html
index 70e589ccf..b90a2e370 100644
--- a/user_guide/installation/upgrade_160.html
+++ b/user_guide/installation/upgrade_160.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html
index 40877369d..69bf84893 100644
--- a/user_guide/installation/upgrade_161.html
+++ b/user_guide/installation/upgrade_161.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html
index d67190842..270507c59 100644
--- a/user_guide/installation/upgrade_162.html
+++ b/user_guide/installation/upgrade_162.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html
index cdf6bdf6f..35e7f5c52 100644
--- a/user_guide/installation/upgrade_163.html
+++ b/user_guide/installation/upgrade_163.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html
index 7c67f9125..3a7943905 100644
--- a/user_guide/installation/upgrade_170.html
+++ b/user_guide/installation/upgrade_170.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html
index 014b2c589..43710d444 100644
--- a/user_guide/installation/upgrade_171.html
+++ b/user_guide/installation/upgrade_171.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html
index 961f3cae1..1882da712 100644
--- a/user_guide/installation/upgrade_172.html
+++ b/user_guide/installation/upgrade_172.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html
index b5d6e75ec..fb4fdaf71 100644
--- a/user_guide/installation/upgrade_200.html
+++ b/user_guide/installation/upgrade_200.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html
index 7edd0ba6a..16177e940 100644
--- a/user_guide/installation/upgrade_201.html
+++ b/user_guide/installation/upgrade_201.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html
index 9aaa561eb..a0d787115 100644
--- a/user_guide/installation/upgrade_202.html
+++ b/user_guide/installation/upgrade_202.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html
index d4b703af0..0969164df 100644
--- a/user_guide/installation/upgrade_203.html
+++ b/user_guide/installation/upgrade_203.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_210.html b/user_guide/installation/upgrade_210.html
index d9a7213a9..7c34806e7 100644
--- a/user_guide/installation/upgrade_210.html
+++ b/user_guide/installation/upgrade_210.html
@@ -28,7 +28,7 @@
diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html
new file mode 100644
index 000000000..a2afdee2b
--- /dev/null
+++ b/user_guide/installation/upgrade_211.html
@@ -0,0 +1,89 @@
+
+
+
+
+Upgrading from 2.0.3 to 2.1.0 : CodeIgniter User Guide
+
+
+
+
+
Upgrading from 2.1.0 to 2.1.1
+
+
Before performing an update you should take your site offline by replacing the index.php file with a static one.
+
+
Step 1: Update your CodeIgniter files
+
+
Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.
+
+
Note: If you have any custom developed files in these folders please make copies of them first.
+
+
Step 2: Replace config/mimes.php
+
+
This config file has been updated to contain more user mime-types, please copy it to application/config/mimes.php .
+
+
+
