diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 10:54:40 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 10:54:40 +0200 |
commit | ce747c8a1e72a30f5369de7d56ba91b72f0e2eb3 (patch) | |
tree | 32433143610df1683131dba5cf4437ddadc306c6 /user_guide_src/source/overview | |
parent | 870ad190f068ec16aad45622528ba6747c61c120 (diff) | |
parent | 61318a2c53c13a314f483fcbbfd64c6e01f5242c (diff) |
Merge upstream branch
Diffstat (limited to 'user_guide_src/source/overview')
-rw-r--r-- | user_guide_src/source/overview/features.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/overview/features.rst b/user_guide_src/source/overview/features.rst index 44db08a94..8c27b1436 100644 --- a/user_guide_src/source/overview/features.rst +++ b/user_guide_src/source/overview/features.rst @@ -15,7 +15,7 @@ CodeIgniter's main features. - Model-View-Controller Based System - Extremely Light Weight - Full Featured database classes with support for several platforms. -- Active Record Database Support +- Query Builder Database Support - Form and Data Validation - Security and XSS Filtering - Session Management |