diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:18:26 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:18:26 +0200 |
commit | 1fcce9667fe8d1925a36549e22124411f5828230 (patch) | |
tree | 56e5cb2c50831a50b7c79ea216645846ea59e8ab /user_guide_src/source/overview | |
parent | b8949fab60082e17f219fc89c6c8a85d3ff73f19 (diff) | |
parent | ced2c9ab41450cb632c042730604111ec2a24e1f (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-mssql
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 |