diff options
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/cilexer/cilexer/cilexer.py | 6 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/conf.py | 4 | ||||
| -rw-r--r-- | user_guide_src/source/contributing/index.rst | 7 | ||||
| -rw-r--r-- | user_guide_src/source/general/requirements.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/styleguide.rst | 8 | ||||
| -rw-r--r-- | user_guide_src/source/installation/upgrade_200.rst | 3 | ||||
| -rw-r--r-- | user_guide_src/source/license.rst | 2 |
8 files changed, 18 insertions, 16 deletions
diff --git a/user_guide_src/cilexer/cilexer/cilexer.py b/user_guide_src/cilexer/cilexer/cilexer.py index e4d25d772..2580b0b30 100644 --- a/user_guide_src/cilexer/cilexer/cilexer.py +++ b/user_guide_src/cilexer/cilexer/cilexer.py @@ -1,10 +1,12 @@ # CodeIgniter # http://codeigniter.com # -# An open source application development framework for PHP 5.2.4 or newer +# An open source application development framework for PHP # # This content is released under the MIT License (MIT) # +# Copyright (c) 2014 - 2015, British Columbia Institute of Technology +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights @@ -24,7 +26,7 @@ # THE SOFTWARE. # # Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) -# Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) +# Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) # # http://opensource.org/licenses/MIT MIT License diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 05442d803..42ef52c52 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -13,7 +13,7 @@ Release Date: Not Released - General Changes - - PHP 5.1.6 is no longer supported. CodeIgniter now requires PHP 5.2.4. + - PHP 5.1.6 is no longer supported. CodeIgniter now requires PHP 5.2.4 and recommends PHP 5.4+ or newer to be used. - Changed filenaming convention (class file names now must be Ucfirst and everything else in lowercase). - Changed the default database driver to 'mysqli' (the old 'mysql' driver is DEPRECATED). - ``$_SERVER['CI_ENV']`` can now be set to control the ``ENVIRONMENT`` constant. diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index d1e86f6fc..482d4936f 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -41,7 +41,7 @@ master_doc = 'index' # General information about the project. project = u'CodeIgniter' -copyright = u'2014, British Columbia Institute of Technology' +copyright = u'2014 - 2015, British Columbia Institute of Technology' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -229,7 +229,7 @@ man_pages = [ epub_title = u'CodeIgniter' epub_author = u'British Columbia Institute of Technology' epub_publisher = u'British Columbia Institute of Technology' -epub_copyright = u'2014, British Columbia Institute of Technology' +epub_copyright = u'2014 - 2015, British Columbia Institute of Technology' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst index 427a0673f..89bceaa61 100644 --- a/user_guide_src/source/contributing/index.rst +++ b/user_guide_src/source/contributing/index.rst @@ -92,9 +92,10 @@ must also be updated for every change. Also PHPDoc blocks must be maintained. Compatibility ============= -CodeIgniter is compatible with PHP 5.2.4 so all code supplied must stick to -this requirement. If PHP 5.3 or 5.4 functions or features are used then there -must be a fallback for PHP 5.2.4. +CodeIgniter recommends PHP 5.4 or newer to be used, but is compatible with +PHP 5.2.4 so all code supplied must stick to this requirement. If PHP 5.3 +(and above) functions or features are used then there must be a fallback +for PHP 5.2.4. Branching ========= diff --git a/user_guide_src/source/general/requirements.rst b/user_guide_src/source/general/requirements.rst index 0b67e8e3a..1cb5938aa 100644 --- a/user_guide_src/source/general/requirements.rst +++ b/user_guide_src/source/general/requirements.rst @@ -2,7 +2,7 @@ Server Requirements ################### -- `PHP <http://www.php.net/>`_ version 5.2.4 or newer. +- `PHP <http://www.php.net/>`_ version 5.4 or newer is recommended and 5.2.4 as the absolute minimum required. - A Database is required for most web application programming. Currently supported databases are: diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst index 6718bc342..3d8f0a78a 100644 --- a/user_guide_src/source/general/styleguide.rst +++ b/user_guide_src/source/general/styleguide.rst @@ -368,10 +368,10 @@ inability for CodeIgniter to send proper headers. Compatibility ============= -CodeIgniter requires a minimum PHP version of 5.2.4. Your code must either -be compatible with this minimum requirement, provide a suitable fallback, -or be an optional feature that dies quietly without affecting a user's -application. +CodeIgniter recommends PHP 5.4 or newer to be used, but the absolute +minimum version required is 5.2.4. Your code must either be compatible +with this minimum requirement, provide a suitable fallback, or be an +optional feature that dies quietly without affecting a user's application. Additionally, do not use PHP functions that require non-default libraries to be installed unless your code contains an alternative method when the diff --git a/user_guide_src/source/installation/upgrade_200.rst b/user_guide_src/source/installation/upgrade_200.rst index 948b1bc58..ca2c6c1e0 100644 --- a/user_guide_src/source/installation/upgrade_200.rst +++ b/user_guide_src/source/installation/upgrade_200.rst @@ -109,7 +109,6 @@ Please refer to the :ref:`2.0.0 Change Log <2.0.0-changelog>` for full details, but here are some of the larger changes that are more likely to impact your code: -- CodeIgniter now requires PHP 5.2.4. - Scaffolding has been removed. - The CAPTCHA plugin in now a :doc:`helper </helpers/captcha_helper>`. - The JavaScript calendar plugin was removed. @@ -146,4 +145,4 @@ The following files have been changed: The following files have been added: - foreign_chars.php -- profiler.php +- profiler.php
\ No newline at end of file diff --git a/user_guide_src/source/license.rst b/user_guide_src/source/license.rst index c57bf0945..c1a32772f 100644 --- a/user_guide_src/source/license.rst +++ b/user_guide_src/source/license.rst @@ -2,7 +2,7 @@ The MIT License (MIT) ##################### -Copyright (c) 2014, British Columbia Institute of Technology +Copyright (c) 2014 - 2015, British Columbia Institute of Technology Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal |