From 0cd17c337a396ad0677e65392f668b31814f67eb Mon Sep 17 00:00:00 2001 From: vlakoff Date: Sun, 4 Jan 2015 20:27:29 +0100 Subject: Update reserved controller names --- user_guide_src/source/general/reserved_names.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'user_guide_src/source/general') diff --git a/user_guide_src/source/general/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst index 09c4549fd..9da94b398 100644 --- a/user_guide_src/source/general/reserved_names.rst +++ b/user_guide_src/source/general/reserved_names.rst @@ -16,9 +16,7 @@ the ones used by that class, otherwise your local methods will override them. The following is a list of reserved names. Do not name your controller any of these: -- Controller -- CI_Base -- _ci_initialize +- CI_Controller - Default - index -- cgit v1.2.3-24-g4f1b From fe9309d22c1b088f5363954d6dac013c8c955894 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 9 Jan 2015 17:48:58 +0200 Subject: Bulk (mostly documentation) update - Remove PHP version from license notices - Bump year number in copyright notices - Recommend PHP 5.4 or newer to be used - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version Related: #3450 --- user_guide_src/source/general/requirements.rst | 2 +- user_guide_src/source/general/styleguide.rst | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'user_guide_src/source/general') 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 `_ version 5.2.4 or newer. +- `PHP `_ 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 -- cgit v1.2.3-24-g4f1b