summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/overview
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-04-26 23:34:05 +0200
committerTimothy Warren <tim@timshomepage.net>2012-04-26 23:34:05 +0200
commitf59bb1ac944dfaed23150ffd452ce5bca9f5f5c0 (patch)
treed48f5d570c9f1696997aabb863507d5854e8af50 /user_guide_src/source/overview
parent96ddee29ef2d2deac9bfb91f7d508efca09ee70f (diff)
parent8ebd1b7a21dec212be7ba0be51ce671f45b389ca (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch
Diffstat (limited to 'user_guide_src/source/overview')
-rw-r--r--user_guide_src/source/overview/features.rst2
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