summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/overview
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-09 13:12:22 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-09 13:12:22 +0100
commit996c9fee5a53443de34240c41c3936c3527aa3ce (patch)
tree4b6d68c75286ac06b9f871c3dd7b6d8bb50d3145 /user_guide_src/source/overview
parentc28e7025f93114afa8c9ab7fb9d65b9c329e2ae6 (diff)
parentc016a1102e2a77e0c27b9656c19a0460df24dfb6 (diff)
Merge upstream branch
Diffstat (limited to 'user_guide_src/source/overview')
-rw-r--r--user_guide_src/source/overview/at_a_glance.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/overview/at_a_glance.rst b/user_guide_src/source/overview/at_a_glance.rst
index 31f0b4dd9..6dcfdbb14 100644
--- a/user_guide_src/source/overview/at_a_glance.rst
+++ b/user_guide_src/source/overview/at_a_glance.rst
@@ -41,7 +41,7 @@ CodeIgniter Uses M-V-C
CodeIgniter uses the Model-View-Controller approach, which allows great
separation between logic and presentation. This is particularly good for
projects in which designers are working with your template files, as the
-code these file contain will be minimized. We describe MVC in more
+code these files contain will be minimized. We describe MVC in more
detail on its own page.
CodeIgniter Generates Clean URLs