summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-09 21:20:04 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-09 21:20:04 +0100
commit7d8e8201a7c7ac160f0f07e806cd6284762defab (patch)
tree0d0073c3b51800ef3339b6efe09364f08ab7be5b /user_guide
parent64b44a22605f6aca5ae43c78b7e220625846216e (diff)
parent3431ae375f7e9283ccfe7e165f39bfc84d79f694 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/general/controllers.html3
-rw-r--r--user_guide/general/core_classes.html1
2 files changed, 3 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>
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index a75034593..ac965aee3 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -84,6 +84,7 @@ know what you are doing before attempting it.</p>
<li>Log</li>
<li>Output</li>
<li>Router</li>
+<li>Unicode</li>
<li>URI</li>
</ul>