diff options
author | Mike Funk <mfunk@xulonpress.com> | 2012-03-07 19:33:27 +0100 |
---|---|---|
committer | Mike Funk <mfunk@xulonpress.com> | 2012-03-07 19:33:27 +0100 |
commit | 9fcb2ad0e435fdfeda5b147b3fee112b4cb89861 (patch) | |
tree | bbaa310e66f1b6463a498737658674cf1c0322ae /user_guide_src/source/overview | |
parent | aa20f5b70f6da196d1a66d5dc17b05a037708e1a (diff) | |
parent | 1d571971be8be78a92d31aad27dda4009770043f (diff) |
merged latest develop branch, fixed changelog conflict.
Diffstat (limited to 'user_guide_src/source/overview')
-rw-r--r-- | user_guide_src/source/overview/at_a_glance.rst | 2 |
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 |