diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:17:56 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:17:56 +0200 |
commit | 721c77fcf347751895623514fb2e4c89390afa67 (patch) | |
tree | cb1f7b5f7688d9090e9a90960a17d188ceef8083 /user_guide_src/source/overview | |
parent | 871a6f979e4291365c40247158ccde8fccca3ae5 (diff) | |
parent | ced2c9ab41450cb632c042730604111ec2a24e1f (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 |