summaryrefslogtreecommitdiffstats
path: root/user_guide/general/controllers.html
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-11-09 21:29:19 +0100
committerGreg Aker <greg.aker@ellislab.com>2010-11-09 21:29:19 +0100
commitbdef2dcc47ef6aa8d0b82266d9038c8e7bc2bb72 (patch)
treec3e2159983b3c0951dc2e87e0f92f9ee5b394f65 /user_guide/general/controllers.html
parent6c5b0cf0c2f2bea2887111c05fb17051cabd879a (diff)
parent7d8e8201a7c7ac160f0f07e806cd6284762defab (diff)
Merging in changes
Diffstat (limited to 'user_guide/general/controllers.html')
-rw-r--r--user_guide/general/controllers.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 9da1da248..56a1145ad 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -229,7 +229,7 @@ CodeIgniter permits you to override this behavior through the use of the <kbd>_r
get called regardless of what your URI contains. It overrides the normal behavior in which the URI determines which function is called,
allowing you to define your own function routing rules.</p>
-<p>The overridden function call (typically the second segment of the URI) will be passed as a parameter the <kbd>_remap()</kbd> function:</p>
+<p>The overridden function call (typically the second segment of the URI) will be passed as a parameter to the <kbd>_remap()</kbd> function:</p>
<code>function _remap(<var>$method</var>)<br />
{<br />
@@ -243,6 +243,7 @@ allowing you to define your own function routing rules.</p>
&nbsp;&nbsp;&nbsp;&nbsp;}<br />
}</code>
+<p>An array of leftover segments are passed into <kbd>_remap()</kbd> as an optional second parameter.</p>