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 /user_guide/general | |
parent | b55050962bb731d1a99430cd37953e55434236a9 (diff) | |
parent | 686ff126762c0923556036a3cf73abb9390a7e67 (diff) |
Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1
Diffstat (limited to 'user_guide/general')
28 files changed, 28 insertions, 28 deletions
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> |