diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-07-26 20:03:12 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-07-26 20:03:12 +0200 |
| commit | 77266bc6a01668b2106b9974da02e2a7ceaf2fe6 (patch) | |
| tree | 955346c3278c03a2ff4174b9d078e9416a298ee9 /user_guide_src/source/general/requirements.rst | |
| parent | a9874a638970ef826f835718e58b197ff3672566 (diff) | |
| parent | 0b9540209499fbd0515e13fdc66e85dea4b6baad (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
.travis.yml
system/core/CodeIgniter.php
system/database/drivers/oci8/oci8_forge.php
system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
system/helpers/path_helper.php
system/libraries/Email.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/contributing/index.rst
user_guide_src/source/general/requirements.rst
user_guide_src/source/general/styleguide.rst
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrade_310.rst
user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'user_guide_src/source/general/requirements.rst')
| -rw-r--r-- | user_guide_src/source/general/requirements.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/general/requirements.rst b/user_guide_src/source/general/requirements.rst index 7eea71745..f2729f3d5 100644 --- a/user_guide_src/source/general/requirements.rst +++ b/user_guide_src/source/general/requirements.rst @@ -2,9 +2,9 @@ Server Requirements ################### -`PHP <http://php.net/>`_ version 5.5 or newer is recommended. +`PHP <http://php.net/>`_ version 5.6 or newer is recommended. -It should work on 5.2.4 as well, but we strongly advise you NOT to run +It should work on 5.3.7 as well, but we strongly advise you NOT to run such old versions of PHP, because of potential security and performance issues, as well as missing features. |