[ci skip] More doc changes related to PHP 5.4.8 requirement

6 files changed, 30 insertions, 20 deletions

diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst
index be776ec1f..e102b8848 100644
--- a/user_guide_src/source/contributing/index.rst
+++ b/user_guide_src/source/contributing/index.rst
@@ -104,9 +104,9 @@ Compatibility
 =============
 
 CodeIgniter recommends PHP 5.6 or newer to be used, but it should be
-compatible with PHP 5.3.7 so all code supplied must stick to this
-requirement. If PHP 5.4 (and above) functions or features are used then
-there must be a fallback for PHP 5.3.7.
+compatible with PHP 5.4.8 so all code supplied must stick to this
+requirement. If PHP 5.5 (and above) functions or features are used then
+there must be a fallback for PHP 5.4.8.
 
 Branching
 =========
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 6d6744cf7..602a6c763 100644
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -24,9 +24,9 @@ loading any libraries or helpers.
 
 	Example::
 
-		if (is_php('5.3'))
+		if (is_php('5.5'))
 		{
-			$str = quoted_printable_encode($str);
+			echo json_last_error_msg();
 		}
 
 	Returns boolean TRUE if the installed version of PHP is equal to or
@@ -185,4 +185,4 @@ loading any libraries or helpers.
 	.. note:: This function was introduced because Suhosin terminated
 		script execution, but this turned out to be a bug. A fix
 		has been available for some time (version 0.9.34), but is
-		unfortunately not released yet.
\ No newline at end of file
+		unfortunately not released yet.
diff --git a/user_guide_src/source/general/compatibility_functions.rst b/user_guide_src/source/general/compatibility_functions.rst
index 584968663..71559d0be 100644
--- a/user_guide_src/source/general/compatibility_functions.rst
+++ b/user_guide_src/source/general/compatibility_functions.rst
@@ -32,7 +32,6 @@ that is otherwise available only since PHP 5.5.
 Dependencies
 ============
 
-- PHP 5.3.7
 - ``CRYPT_BLOWFISH`` support for ``crypt()``
 
 Constants
diff --git a/user_guide_src/source/general/requirements.rst b/user_guide_src/source/general/requirements.rst
index f2729f3d5..2e24d6d03 100644
--- a/user_guide_src/source/general/requirements.rst
+++ b/user_guide_src/source/general/requirements.rst
@@ -4,7 +4,7 @@ Server Requirements
 
 `PHP <http://php.net/>`_ version 5.6 or newer is recommended.
 
-It should work on 5.3.7 as well, but we strongly advise you NOT to run
+It should work on 5.4.8 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.
 
@@ -18,4 +18,4 @@ Currently supported databases are:
   - SQLite via the *sqlite* (version 2), *sqlite3* (version 3) and *pdo* drivers
   - CUBRID via the *cubrid* and *pdo* drivers
   - Interbase/Firebird via the *ibase* and *pdo* drivers
-  - ODBC via the *odbc* and *pdo* drivers (you should know that ODBC is actually an abstraction layer)
\ No newline at end of file
+  - ODBC via the *odbc* and *pdo* drivers (you should know that ODBC is actually an abstraction layer)
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst
index 9b4a84e14..5f25a5ae4 100644
--- a/user_guide_src/source/general/styleguide.rst
+++ b/user_guide_src/source/general/styleguide.rst
@@ -346,7 +346,7 @@ Compatibility
 =============
 
 CodeIgniter recommends PHP 5.6 or newer to be used, but it should be
-compatible with PHP 5.3.7. Your code must either be compatible with this
+compatible with PHP 5.4.8. Your code must either be compatible with this
 requirement, provide a suitable fallback, or be an optional feature that
 dies quietly without affecting a user's application.
 
@@ -633,4 +633,4 @@ Whenever appropriate, provide function argument defaults, which helps
 prevent PHP errors with mistaken calls and provides common fallback
 values which can save a few lines of code. Example::
 
-	function foo($bar = '', $baz = FALSE)
\ No newline at end of file
+	function foo($bar = '', $baz = FALSE)
diff --git a/user_guide_src/source/installation/upgrade_320.rst b/user_guide_src/source/installation/upgrade_320.rst
index 0cf311028..a2772e10c 100644
--- a/user_guide_src/source/installation/upgrade_320.rst
+++ b/user_guide_src/source/installation/upgrade_320.rst
@@ -13,7 +13,18 @@ Replace all files and directories in your *system/* directory.
 .. note:: If you have any custom developed files in these directories,
 	please make copies of them first.
 
-Step 2: Change database connection handling
+Step 2: Check your PHP version
+==============================
+
+We recommend always running versions that are `currently supported
+<https://secure.php.net/supported-versions.php>`_, which right now is at least PHP 5.6.
+
+PHP 5.3.x versions are now officially not supported by CodeIgniter, and while 5.4.8+
+may be at least runnable, we strongly discourage you from using any PHP versions below
+the ones listed on the `PHP.net Supported Versions <https://secure.php.net/supported-versions.php>`_
+page.
+
+Step 3: Change database connection handling
 ===========================================
 
 "Loading" a database, whether by using the *config/autoload.php* settings
@@ -58,7 +69,7 @@ That doesn't make sense and that's the reason why most database drivers
 don't support it at all.
 Thus, ``db_set_charset()`` is no longer necessary and is removed.
 
-Step 3: Check logic related to URI parsing of CLI requests
+Step 4: Check logic related to URI parsing of CLI requests
 ==========================================================
 
 When running a CodeIgniter application from the CLI, the
@@ -71,7 +82,7 @@ this change was made) and therefore you shouldn't be affected by this, but
 if you've relied on them for some reason, you'd probably have to make some
 changes to your code.
 
-Step 4: Check Cache Library configurations for Redis, Memcache(d)
+Step 5: Check Cache Library configurations for Redis, Memcache(d)
 =================================================================
 
 The new improvements for the 'redis' and 'memcached' drivers of the
@@ -98,7 +109,7 @@ value (previously, it just set the host to the default '127.0.0.1').
 Therefore, if you've added a configuration that only sets e.g. a ``port``,
 you will now have to explicitly set the ``host`` to '127.0.0.1' as well.
 
-Step 5: Check usage of the Email library
+Step 6: Check usage of the Email library
 ========================================
 
 The :doc:`Email Library <../libraries/email>` will now by default check the
@@ -112,7 +123,7 @@ everything works fine.
 If something indeed goes wrong with that, please report it as a bug to us,
 and you can disable the **validate** option to revert to the old behavior.
 
-Step 6: Check usage of doctype() HTML helper
+Step 7: Check usage of doctype() HTML helper
 ============================================
 
 The :doc:`HTML Helper <../helpers/html_helper>` function
@@ -125,7 +136,7 @@ relies on the default value, you should double-check it and either
 explicitly set the desired format, or adapt your front-end to use proper
 HTML 5 formatting.
 
-Step 6: Check usage of form_upload() Form helper
+Step 8: Check usage of form_upload() Form helper
 ================================================
 
 The :doc:`Form Helper <../helpers/form_helper>` function
@@ -142,7 +153,7 @@ You should change it to::
 
 	form_upload('name', $extra);
 
-Step 7: Remove usage of previously deprecated functionalities
+Step 9: Remove usage of previously deprecated functionalities
 =============================================================
 
 The following is a list of functionalities deprecated in previous
@@ -177,8 +188,8 @@ CodeIgniter versions that have been removed in 3.2.0:
 
 - The entire *Smiley Helper* (an archived version is available on GitHub: `bcit-ci/ci3-smiley-helper <https://github.com/bcit-ci/ci3-smiley-helper>`_)
 
-Step 8: Make sure you're validating all user inputs
-===================================================
+Step 10: Make sure you're validating all user inputs
+====================================================
 
 The :doc:`Input Library <../libraries/input>` used to (often
 unconditionally) filter and/or sanitize user input in the ``$_GET``,