summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-08-31 15:17:57 +0200
committerAndrey Andreev <narf@devilix.net>2015-08-31 15:17:57 +0200
commit64f3d3de0296846ed18f46a85be43962eaab79a8 (patch)
treea8008818f630329092e008cd74afdfacf5f48d30
parent8e138eced12fa88da721cc9b840fe4aa02c9e031 (diff)
[ci skip] Fix incorrect routing description
Close #4079
-rw-r--r--user_guide_src/source/installation/upgrade_300.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/user_guide_src/source/installation/upgrade_300.rst b/user_guide_src/source/installation/upgrade_300.rst
index 971f9e484..4b3b408a7 100644
--- a/user_guide_src/source/installation/upgrade_300.rst
+++ b/user_guide_src/source/installation/upgrade_300.rst
@@ -266,8 +266,7 @@ cause your 'Main' controller to be loaded.
However, what happens if you have an *application/controllers/admin/*
directory and the user visits ``http://example.com/admin/``?
In CodeIgniter 3, the router will look for a 'Main' controller under the
-admin/ directory as well. If not found, it will fallback to the parent
-(*application/controllers/*) directory, like in version 2.x.
+admin/ directory as well. If not found, a Not Found (404) will be triggered.
The same rule applies to the '404_override' setting.