diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
commit | 042766bac61958a21ba5d6b3c53b0e4296fdcce7 (patch) | |
tree | df9e26699ddb5d3841a0d1cc1795913c819bf611 /user_guide_src/source/overview/features.rst | |
parent | 0688ac9ad88a03f1c56cfcd9e3c475b83301344d (diff) | |
parent | 61318a2c53c13a314f483fcbbfd64c6e01f5242c (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-cleanup
Diffstat (limited to 'user_guide_src/source/overview/features.rst')
-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 |