diff options
| author | Eric Roberts <eric@cryode.com> | 2012-04-15 00:49:21 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-04-15 00:49:21 +0200 |
| commit | 8cefb3ff51de4f023753c0146eb16950f48601a9 (patch) | |
| tree | ed868ec7a795fcf1fe97efc5642d26dc1d1faefe /readme.rst | |
| parent | 0760a48d431fb9ab85f2a0ca9af63aa131e29520 (diff) | |
| parent | 0f2211711deceb74157d6811116acc0376d3157d (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/form_error_msgs
Conflicts:
system/language/english/form_validation_lang.php
Diffstat (limited to 'readme.rst')
| -rw-r--r-- | readme.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/readme.rst b/readme.rst index 26e04ceac..4707847c7 100644 --- a/readme.rst +++ b/readme.rst @@ -23,13 +23,13 @@ Changelog and New Features ************************** You can find a list of all changes for each release in the `user -guide change log <https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide/changelog.html>`_. +guide change log <https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide_src/source/changelog.rst>`_. ******************* Server Requirements ******************* -- PHP version 5.1.6 or newer. +- PHP version 5.2.4 or newer. ************ Installation @@ -90,9 +90,9 @@ must also be updated for every change. Also PHPDoc blocks must be maintained. Compatibility ============= -CodeIgniter is compatible with PHP 5.1.6 so all code supplied must stick to -this requirement. If PHP 5.2 or 5.3 functions or features are used then there -must be a fallback for PHP 5.1.6. +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. Branching ========= @@ -193,4 +193,4 @@ Acknowledgement *************** The EllisLab team and The Reactor Engineers would like to thank all the -contributors to the CodeIgniter project and you, the CodeIgniter user.
\ No newline at end of file +contributors to the CodeIgniter project and you, the CodeIgniter user. |