diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-13 18:38:24 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-13 18:38:24 +0200 |
| commit | 0eebc808cb298cdc6cd81be93de306a44c523e75 (patch) | |
| tree | 837a7f92cead194db5892c61a45eca164e5af60e | |
| parent | b55050962bb731d1a99430cd37953e55434236a9 (diff) | |
| parent | 686ff126762c0923556036a3cf73abb9390a7e67 (diff) | |
Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1
155 files changed, 165 insertions, 160 deletions
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 952016848..654074cd1 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 c05fbc908..650b5f98d 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 a199d45f0..4912c4aa7 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 ccec890e0..56fdba68a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1470,7 +1470,7 @@ Previous Topic: <a href="license.html">License Agreement</a> <a href="index.html">User Guide Home</a> · Next Topic: <a href="./general/credits.html">Credits</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 1152ca587..734b28411 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -817,7 +817,7 @@ Previous Topic: <a href="helpers.html">Query Helper Functions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="transactions.html">Transactions</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 4ea410af4..6cf6ebd98 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -213,7 +213,7 @@ Previous Topic: <a href="call_function.html">Custom Function Calls</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="forge.html">Database manipulation with Database Forge</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 139530a95..b28a05050 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -111,7 +111,7 @@ Previous Topic: <a href="fields.html">Field MetaData</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="caching.html">Query Caching</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b21fc1031..01a28c0b5 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -157,7 +157,7 @@ Previous Topic: <a href="examples.html">Quick Start: Usage Examples</ <a href="../index.html">User Guide Home</a> · Next Topic: <a href="connecting.html">Connecting to your Database</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 47d11e72c..531f6a104 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -181,7 +181,7 @@ Previous Topic: <a href="configuration.html">Database Configuration</ <a href="../index.html">User Guide Home</a> · Next Topic: <a href="queries.html">Queries</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index e19021987..1a1d71be6 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -210,7 +210,7 @@ Previous Topic: <a href="index.html">Database Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="configuration.html">Database Configuration</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index e462584f8..546a4ca1f 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -156,7 +156,7 @@ Previous Topic: <a href="table_data.html"> Table Data</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="call_function.html">Custom Function Calls</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index b331774f3..e6153721d 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -227,7 +227,7 @@ Previous Topic: <a href="caching.html">DB Caching Class</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="utilities.html">Database Utilities Class</a><a href="../libraries/email.html"></a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 16a298c6d..db03de1e9 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -144,7 +144,7 @@ Previous Topic: <a href="results.html">Query Results</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="active_record.html">Active Record Pattern</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 52f3a6870..2a08f0a69 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -92,7 +92,7 @@ Previous Topic: <a href="../libraries/caching.html">Caching Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="examples.html">Quick Start: Usage Examples</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 84b18d5b3..263752f52 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -151,7 +151,7 @@ Previous Topic: <a href="connecting.html">Connecting to your Database <a href="../index.html">User Guide Home</a> · Next Topic: <a href="results.html">Query Results</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 8b66f658d..395714073 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -252,7 +252,7 @@ Previous Topic: <a href="queries.html">Queries</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="helpers.html">Query Helper Functions</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 6c686feac..5ebe368d8 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -106,7 +106,7 @@ Previous Topic: <a href="transactions.html"> Transactions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="fields.html"> Field Metadata</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 16cdcdb50..53e667046 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -193,7 +193,7 @@ Previous Topic: <a href="fields.html">Field MetaData</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="table_data.html">Table Metadata</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index cb14cfd6b..4a3005f9f 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -307,7 +307,7 @@ Previous Topic: <a href="forge.html">DB Forge Class</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../libraries/javascript.html">Javascript Class</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 824a0cbcf..ad5c65a5b 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -80,7 +80,7 @@ Previous Topic: <a href="../general/styleguide.html">PHP Style Guide< <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../libraries/benchmark.html">Benchmarking Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> 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: <a href="#">Previous Class</a> <a href="#">User Guide Home</a> · Next Topic: <a href="#">Next Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index c8d19af30..6d2165fda 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -140,7 +140,7 @@ Previous Topic: <a href="managing_apps.html">Managing Applications</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="security.html">Security</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index c3e88d5c1..9c209c0b7 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -110,7 +110,7 @@ Previous Topic: <a href="creating_libraries.html">Creating Core Libra <a href="../index.html">User Guide Home</a> · Next Topic: <a href="autoloader.html">Auto-loading Resources</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index e1ccfc4bd..fdc02e906 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -93,7 +93,7 @@ Previous Topic: <a href="hooks.html">Hooks - Extending the Core</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="common_functions.html">Common Functions</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 8f58386eb..5ccc79190 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -108,7 +108,7 @@ Previous Topic: <a href="errors.html">Error Handling</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="profiling.html">Profiling Your Application</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index 28760cc30..e21d1de51 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -143,7 +143,7 @@ Previous Topic: <a href="urls.html">CodeIgniter URLs</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="reserved_names.html">Reserved Names</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index f8b3e9677..ac2ff529b 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -120,7 +120,7 @@ Previous Topic: <a href="autoloader.html">Auto-loading Resources</a>< <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="routing.html">URI Routing</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 6c9adb224..ee482e512 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -381,7 +381,7 @@ Previous Topic: <a href="urls.html">CodeIgniter URLs</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="reserved_names.html">Reserved Names</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 96901a860..ae43eef27 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -179,7 +179,7 @@ Previous Topic: <a href="creating_libraries.html">Creating Your Own L <a href="../index.html">User Guide Home</a> · Next Topic: <a href="hooks.html">Hooks - Extending the Core</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index ba705ff51..eaa626566 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -93,7 +93,7 @@ Previous Topic: <a href="drivers.html">Using CodeIgniter Drivers</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="core_classes.html">Creating Core System Classes</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 1a9cf4ef5..977cfae4d 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -286,7 +286,7 @@ Previous Topic: <a href="libraries.html">Using CodeIgniter Libraries< <a href="../index.html">User Guide Home</a> · Next Topic: <a href="drivers.html">Using CodeIgniter Drivers</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index d27e41549..90e7d0306 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -80,7 +80,7 @@ Previous Topic: <a href="../changelog.html">Change Log</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../installation/downloads.html">Downloading CodeIgniter</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index 3af773da8..9ea7df6b6 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -97,7 +97,7 @@ Previous Topic: <a href="creating_libraries.html">Creating Libraries< <a href="../index.html">User Guide Home</a> · Next Topic: <a href="creating_drivers.html">Creating Drivers</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index 9cbdc6bf3..38285a662 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -119,7 +119,7 @@ Previous Topic: <a href="managing_apps.html">Managing Applications</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="alternative_php.html">Alternative PHP Syntax</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 4ed2e04e5..3f0830419 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -133,7 +133,7 @@ Previous Topic: <a href="routing.html">URI Routing</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="caching.html">Page Caching</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 90b622139..099430bea 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -178,7 +178,7 @@ Previous Topic: <a href="models.html">Models</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="libraries.html">Using Libraries</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 8dc6e5406..70fb9648e 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -158,7 +158,7 @@ Previous Topic: <a href="core_classes.html">Creating Core Classes</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="autoloader.html">Auto-loading Resources</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 645b70912..648b6cba9 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -91,7 +91,7 @@ Previous Topic: <a href="helpers.html">Helpers</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="creating_libraries.html">Creating Libraries</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index ce1cfa852..97312a01e 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -126,7 +126,7 @@ Previous Topic: <a href="profiling.html">Profiling Your Application</ <a href="../index.html">User Guide Home</a> · Next Topic: <a href="alternative_php.html">Alternative PHP Syntax</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/models.html b/user_guide/general/models.html index d49e7be40..a416a80d9 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -244,7 +244,7 @@ Previous Topic: <a href="views.html">Views</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="helpers.html">Helpers</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index a87431d9d..b6d5721fd 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -174,7 +174,7 @@ Previous Topic: <a href="caching.html">Caching</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="managing_apps.html">Managing Applications</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 26ee96e63..1eb78992b 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -70,7 +70,7 @@ Quick Reference Chart <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 9ce1697bb..230ab7809 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -75,7 +75,7 @@ Server Requirements <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../license.html">License Agreement</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index bbc30713d..80df6fd11 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -121,7 +121,7 @@ Previous Topic: <a href="controllers.html">Controllers</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="views.html">Views</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index a8fff0148..e2252e028 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -164,7 +164,7 @@ Previous Topic: <a href="common_functions.html">Common Functions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="errors.html">Error Handling</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/security.html b/user_guide/general/security.html index d00933e56..b91266f92 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -157,7 +157,7 @@ Previous Topic: <a href="alternative_php.html">Alternative PHP</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="styleguide.html">PHP Style Guide</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index bff29e71d..3ca16496b 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -672,7 +672,7 @@ Previous Topic: <a href="security.html">Security</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../doc_style/index.html">Writing Documentation</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 829308f0b..d5d85df8a 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -144,7 +144,7 @@ segment based URLs.</p> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="controllers.html">Controllers</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 426ed88bb..68686e1e6 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -267,7 +267,7 @@ Previous Topic: <a href="reserved_names.html">Reserved Names</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="models.html">Models</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index cf355cd8f..9b7a90b85 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -163,7 +163,7 @@ Previous Topic: <a href="../libraries/javascript.html">Javascript Cl <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="captcha_helper.html">CAPTCHA Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index ec383af51..d6b46fdc0 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -188,7 +188,7 @@ Previous Topic: <a href="array_helper.html">Array Helper</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="cookie_helper.html">Cookie Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 75ddec3db..beba67a96 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -100,7 +100,7 @@ Previous Topic: <a href="captcha_helper.html">CAPTCHA Helper</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="date_helper.html">Date Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 7d1e1e226..f39971a0c 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -401,7 +401,7 @@ Previous Topic: <a href="cookie_helper.html">Cookie Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="directory_helper.html">Directory Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index f0b3c2e70..c5ac082cd 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -136,7 +136,7 @@ Previous Topic: <a href="date_helper.html">Date Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="download_helper.html">Download Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 3abd69c1a..b669202ad 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -105,7 +105,7 @@ Previous Topic: <a href="directory_helper.html">Directory Helper</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="email_helper.html">Email Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 80713e9d2..ae8d2da0e 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -95,7 +95,7 @@ Previous Topic: <a href="download_helper.html">Download Helper</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="file_helper.html">File Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 4aee5a706..3302cd048 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -172,7 +172,7 @@ Previous Topic: <a href="email_helper.html">Email Helper</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="form_helper.html">Form Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index e4f5aa111..02952b679 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -477,7 +477,7 @@ Previous Topic: <a href="file_helper.html">File Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="html_helper.html">HTML Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 882e11e58..6ade2d137 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -383,7 +383,7 @@ Previous Topic: <a href="form_helper.html">Form Helper</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="path_helper.html"> Path Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 8966383dc..d441ca1eb 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -144,7 +144,7 @@ Previous Topic: <a href="html_helper.html"> HTML Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="number_helper.html">Number Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 6fab2a907..9761b96b7 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -91,7 +91,7 @@ Previous Topic: <a href="date_helper.html">Date Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="download_helper.html">Download Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index 146fc0f2e..8dd9287a8 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -106,7 +106,7 @@ Previous Topic: <a href="inflector_helper.html">Inflector Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="path_helper.html">Path Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 7e69bd446..04826bb19 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -99,7 +99,7 @@ Previous Topic: <a href="number_helper.html">Number Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="security_helper.html">Security Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 7b769216f..b05d8e076 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -125,7 +125,7 @@ Previous Topic: <a href="path_helper.html"> Path Helper</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="smiley_helper.html">Smiley Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 543796054..3441cd8a3 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -208,7 +208,7 @@ Previous Topic: <a href="security_helper.html">Security Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="string_helper.html">String Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 0a1d25dc8..d4023841d 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -182,7 +182,7 @@ Previous Topic: <a href="smiley_helper.html">Smiley Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="text_helper.html">Text Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index b2bfe088b..775ded677 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -204,7 +204,7 @@ Previous Topic: <a href="string_helper.html">String Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="typography_helper.html">Typography Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 7609a8352..16e3ca989 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -105,7 +105,7 @@ Previous Topic: <a href="text_helper.html">Text Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="url_helper.html">URL Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index cf2e432ab..488078c39 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -295,7 +295,7 @@ Previous Topic: <a href="typography_helper.html">Typography Helper</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="xml_helper.html">XML Helper</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 62f0bb1bf..ce037c251 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -98,7 +98,7 @@ Previous Topic: <a href="url_helper.html">URL Helper</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/index.html b/user_guide/index.html index 64815d6a3..b7ae61887 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -89,7 +89,7 @@ minimizing the amount of code needed for a given task.</p> <div id="footer"> <p><a href="#top">Top of Page</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index af0079692..12252ad47 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -92,11 +92,12 @@ Downloading CodeIgniter <h1 id="git">Git Server</h1> <p><a href="http://git-scm.com/about">Git</a> is a distributed version control system.</p> - <p>Public Git access is available at <a href="https://github.com/EllisLab/CodeIgniter">GitHub</a>. - Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken - from the tip.</p> +<p>Public Git access is available at <a href="https://github.com/EllisLab/CodeIgniter">GitHub</a>. + Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken + from the tip.</p> + +<p>Beginning with version 2.0.3, stable tags are also available via GitHub, simply select the version from the Tags dropdown.</p> - <p>Beginning with version 2.0.3, stable tags are also available via GitHub, simply select the version from the Tags dropdown.</p> </div> <!-- END CONTENT --> @@ -109,7 +110,7 @@ Previous Topic: <a href="../general/credits.html">Credits</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../installation/index.html">Installation Instructions</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com/">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 69398a522..aca760ca4 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -101,7 +101,7 @@ Previous Topic: <a href="../general/credits.html">Credits</a> Next Topic: <a href="upgrading.html">Upgrading from a Previous Version</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index bebda9632..bb7cadeba 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -83,7 +83,7 @@ Previous Topic: <a href="upgrading.html">Upgrading from a Previous Ve <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index ded86b135..b80c02ad9 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -85,7 +85,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 606e1df3e..3a335738e 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -196,7 +196,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index b0c91f6bf..4a91c6ceb 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -95,7 +95,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 75720349a..1763f2b9c 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -93,7 +93,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index b6e36ea14..fd1887d0e 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -105,7 +105,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 68aa00be6..d82472551 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -138,7 +138,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 07ee906d4..3ed11e7b5 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -141,7 +141,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 17193704d..5909a463a 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -171,7 +171,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index f03485f3b..f46aee967 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -104,7 +104,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 8cbf9823c..3d28c6c77 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -93,7 +93,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 7c69571b6..d8dffc99d 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -109,7 +109,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index 21270f613..b90a2e370 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -118,7 +118,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 9f9bcd423..69bf84893 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -91,7 +91,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index dd729eb10..270507c59 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -99,7 +99,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 29e416cee..35e7f5c52 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -92,7 +92,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index f87ab2ad0..3a7943905 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -114,7 +114,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index c93423ad9..43710d444 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -91,7 +91,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index 86e9ab692..1882da712 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -102,7 +102,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index fe48fdf43..fb4fdaf71 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -124,7 +124,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 3e673c187..16177e940 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -98,7 +98,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index 19e3528dd..a0d787115 100644 --- a/user_guide/installation/upgrade_202.html +++ b/user_guide/installation/upgrade_202.html @@ -90,7 +90,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index df7e91c9e..0969164df 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -114,7 +114,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_210.html b/user_guide/installation/upgrade_210.html index 78bbcbac3..7c34806e7 100644 --- a/user_guide/installation/upgrade_210.html +++ b/user_guide/installation/upgrade_210.html @@ -82,7 +82,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html index a581fd6c9..92b5faab1 100644 --- a/user_guide/installation/upgrade_211.html +++ b/user_guide/installation/upgrade_211.html @@ -65,7 +65,11 @@ Upgrading from 2.1.0 to 2.1.1 <p class="important"><strong>Note:</strong> If you have any custom developed files in these folders please make copies of them first.</p> -<h2>Step 2: Update your IP address tables:</h2> +<h2>Step 2: Replace config/mimes.php</h2> + +<p>This config file has been updated to contain more user mime-types, please copy it to <kbd>application/config/mimes.php</kbd>.</p> + +<h2>Step 3: Update your IP address tables:</h2> <p>This upgrade adds support for IPv6 IP addresses. In order to store them, you need to enlarge your <var>ip_address</var> columns to 45 characters. For example, CodeIgniter's session table will need to change:</p> @@ -83,7 +87,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 34fab1901..0e52aa601 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -137,7 +137,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 232f3d1a2..1c8be9025 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -100,7 +100,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="troubleshooting.html">Troubleshooting</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 7b5e60f1f..55592857a 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -191,7 +191,7 @@ Previous Topic: <a href="../doc_style/index.html">Writing Documentaio <a href="../index.html">User Guide Home</a> · Next Topic: <a href="calendar.html">Calendar Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index e14f6dd28..a818fe807 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -186,7 +186,7 @@ Previous Topic: <a href="zip.html">Zip Encoding Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../database/index.html">Database Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index f8c9fb3ab..ac0c8252a 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -242,7 +242,7 @@ Previous Topic: <a href="benchmark.html">Benchmark Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="cart.html">Cart Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index e7ac6719b..c10ab4488 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -339,7 +339,7 @@ Previous Topic: <a href="calendar.html">Calendar Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="config.html">Config Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index d0849521d..a689bd5cf 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -215,7 +215,7 @@ Previous Topic: <a href="calendar.html">Calendaring Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../database/index.html">Database Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index b6205fb71..e418d528d 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -300,7 +300,7 @@ Previous Topic: <a href="../database/index.html">Database Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="encryption.html">Encryption Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 59ea33bc6..935e0bfa0 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -217,7 +217,7 @@ Previous Topic: <a href="email.html">Email Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="file_uploading.html">File Uploading Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 61d45e9df..2ada111ab 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -444,7 +444,7 @@ Previous Topic: <a href="encryption.html">Encryption Helper</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="form_validation.html">Form Validation Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index b935186ef..8d6f3b6d2 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -1243,7 +1243,7 @@ Previous Topic: <a href="file_uploading.html">File Uploading Class</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="ftp.html">FTP Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index ea0a32810..8cf60893e 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -308,7 +308,7 @@ Previous Topic: <a href="form_validation.html">Form Validation Class< <a href="../index.html">User Guide Home</a> · Next Topic: <a href="table.html">HTML Table Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index bd2d84e20..8df6976e1 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -660,7 +660,7 @@ Previous Topic: <a href="table.html">HTML Table Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="input.html">Input Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index e86b5d850..e199c58dd 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -288,7 +288,7 @@ Previous Topic: <a href="image_lib.html">Image Manipulation Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="loader.html">Loader Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index a7d2c4cee..6b72ed6c2 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -240,7 +240,7 @@ Previous Topic: <a href="../database/index.html">Database Class</a> <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../helpers/array_helper.html">Array Helper</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 091861893..44a4cb654 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -130,7 +130,7 @@ Previous Topic: <a href="loader.html">Loader Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="output.html">Output Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 15e0e0de5..862430b9f 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -266,7 +266,7 @@ Previous Topic: <a href="input.html">Input Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="language.html">Language Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/migration.html b/user_guide/libraries/migration.html index cc90422bc..646772198 100644 --- a/user_guide/libraries/migration.html +++ b/user_guide/libraries/migration.html @@ -169,7 +169,7 @@ Previous Topic: <a href="form_validation.html">Form Validation Class< <a href="../index.html">User Guide Home</a> · Next Topic: <a href="table.html">HTML Table Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 543308575..cf2324bd8 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -170,7 +170,7 @@ Previous Topic: <a href="language.html">Language Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="pagination.html">Pagination Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index ffc446461..54c7efcc2 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -226,7 +226,7 @@ Previous Topic: <a href="output.html">Output Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="sessions.html">Session Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 5a95e2354..4d909223c 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -205,7 +205,7 @@ Previous Topic: <a href="trackback.html">Trackback Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="typography.html">Typography</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 1be4326fc..25f1fe879 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -128,7 +128,7 @@ Previous Topic: <a href="pagination.html">Pagination Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="sessions.html">Session Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 5c66f2a0a..bfffa0b2f 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -334,7 +334,7 @@ Previous Topic: <a href="security.html">Security Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="trackback.html">Trackback Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index e81fbb49d..1c46b5fac 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -308,7 +308,7 @@ Previous Topic: <a href="ftp.html"> FTP Class</a> &mi <a href="../index.html">User Guide Home</a> · Next Topic: <a href="image_lib.html">Image Manipulation Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index a1dd1beef..f77937a9b 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -239,7 +239,7 @@ Previous Topic: <a href="sessions.html">Session Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="parser.html">Template Parser Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 01f3ec10f..81c244790 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -153,7 +153,7 @@ Previous Topic: <a href="parser.html">Template Parser</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="unit_testing.html">Unit Testing Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 871007a57..df1748e5c 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -219,7 +219,7 @@ Previous Topic: <a href="typography.html">Typography Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="uri.html">URI Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 0223bd5d7..f333199ac 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -245,7 +245,7 @@ Previous Topic: <a href="unit_testing.html">Unit Testing Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="user_agent.html">User Agent Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index ef47892e2..829fdba03 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -219,7 +219,7 @@ Previous Topic: <a href="uri.html">URI Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="xmlrpc.html">XML-RPC Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index c6891ea7a..ad714efbf 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -512,7 +512,7 @@ Previous Topic: <a href="user_agent.html">User Agent Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="zip.html">Zip Encoding Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index bd90a2706..3324bd16c 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -281,7 +281,7 @@ Previous Topic: <a href="xmlrpc.html"> XML-RPC Class</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="caching.html">Caching Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/license.html b/user_guide/license.html index 1b98a6949..bc25c30b4 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -100,7 +100,7 @@ Previous Topic: <a href="general/requirements.html">Server Requiremen <a href="index.html">User Guide Home</a> · Next Topic: <a href="changelog.html">Change Log</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index bbcd27552..a59758f0b 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -88,7 +88,7 @@ Previous Topic: <a href="features.html">CodeIgniter Features</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="mvc.html">Model-View-Controller</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 13430f36c..18688d34f 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -155,7 +155,7 @@ Previous Topic: <a href="getting_started.html">Getting Started</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="cheatsheets.html">CodeIgniter Cheatsheets</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 2f0d8e113..005890a55 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -76,7 +76,7 @@ Previous Topic: <a href="at_a_glance.html">CodeIgniter at a Glance</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="features.html">CodeIgniter Features</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 4dafa7104..c97044414 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -111,7 +111,7 @@ Previous Topic: <a href="cheatsheets.html">CodeIgniter Cheatsheets</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="appflow.html">Application Flow Chart</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 54c0d745a..8d8a8af35 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -85,7 +85,7 @@ our <a href="http://codeigniter.com/wiki/">Wiki</a> to see code examples posted <a href="../index.html">User Guide Home</a> · Next Topic: <a href="at_a_glance.html">CodeIgniter At a Glance</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index a9da0e43f..0d2eeb5c9 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -91,7 +91,7 @@ Previous Topic: <a href="mvc.html">Model-View-Controller</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="./getting_started.html">Getting Started</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 178ff3688..732a245ff 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -77,7 +77,7 @@ Introduction <div id="footer"> <p><a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 47eba792b..989ad7afb 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -93,7 +93,7 @@ Previous Topic: <a href="appflow.html">Application Flow Chart</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="goals.html">Architectural Goals</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/toc.html b/user_guide/toc.html index ea4f97c64..07bfbd234 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -221,7 +221,7 @@ Table of Contents <div id="footer"> <p><a href="#top">Top of Page</a></p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> diff --git a/user_guide/tutorial/conclusion.html b/user_guide/tutorial/conclusion.html index bd7bb7d97..b4a1e0005 100644 --- a/user_guide/tutorial/conclusion.html +++ b/user_guide/tutorial/conclusion.html @@ -84,7 +84,7 @@ Previous Topic: <a href="create_news_items.html">Create news items</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../general/urls.html">CodeIgniter URLs</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/tutorial/create_news_items.html b/user_guide/tutorial/create_news_items.html index 830cd63ec..9afeed9ec 100644 --- a/user_guide/tutorial/create_news_items.html +++ b/user_guide/tutorial/create_news_items.html @@ -172,7 +172,7 @@ Previous Topic: <a href="news_section.html">News section</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="conclusion.html">Conclusion</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/tutorial/hard_coded_pages.html b/user_guide/tutorial/hard_coded_pages.html index 4d349282c..354dcb0e6 100644 --- a/user_guide/tutorial/hard_coded_pages.html +++ b/user_guide/tutorial/hard_coded_pages.html @@ -151,7 +151,7 @@ Previous Topic: <a href="cheatsheets.html">CodeIgniter Cheatsheets</a <a href="../index.html">User Guide Home</a> · Next Topic: <a href="appflow.html">Application Flow Chart</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/tutorial/index.html b/user_guide/tutorial/index.html index a0de706a9..d3392669e 100644 --- a/user_guide/tutorial/index.html +++ b/user_guide/tutorial/index.html @@ -94,7 +94,7 @@ Previous Topic: <a href="../overview/goals.html">Goals</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="static_pages.html">Static pages</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html index 117f8632e..1cb67c66e 100644 --- a/user_guide/tutorial/news_section.html +++ b/user_guide/tutorial/news_section.html @@ -223,7 +223,7 @@ Previous Topic: <a href="static_pages.html">Static pages</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="create_news_items.html">Create news items</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html index c4068fa42..a7112f362 100644 --- a/user_guide/tutorial/static_pages.html +++ b/user_guide/tutorial/static_pages.html @@ -199,7 +199,7 @@ Previous Topic: <a href="index.html">Introduction</a> <a href="../index.html">User Guide Home</a> · Next Topic: <a href="news_section.html">News section</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> |