summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries/uri.html
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-08-20 18:58:58 +0200
committerGreg Aker <greg@gregaker.net>2011-08-20 18:58:58 +0200
commitabbad9ea53e81c6e3211029711ac5b2ab4f1978d (patch)
tree9a4d5a8587da1dd3a365251afa37be2f835a53c2 /user_guide/libraries/uri.html
parent71644d683d0a15a6f7e04fabd0f51a4200d620b4 (diff)
parentd56be70257696d0bbf2dcc880888d8dc17cba21c (diff)
Merge branch 'develop' into feature/unit-tests
Conflicts: .hgignore
Diffstat (limited to 'user_guide/libraries/uri.html')
-rw-r--r--user_guide/libraries/uri.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index 884f4b955..0e1c26f1e 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -28,7 +28,7 @@
<div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
</tr>
</table>
@@ -106,7 +106,7 @@ re-routed URI in the event you are using CodeIgniter's <a href="../general/routi
<h2>$this->uri->slash_segment(<var>n</var>)</h2>
<p>This function is almost identical to <dfn>$this->uri->segment()</dfn>, except it adds a trailing and/or leading slash based on the second
-parameter. If the parameter is not used, a trailing slash added. Examples:</p>
+parameter. If the parameter is not used, a trailing slash added. Examples:</p>
<code>$this->uri->slash_segment(<var>3</var>);<br />
$this->uri->slash_segment(<var>3</var>, 'leading');<br />
@@ -130,7 +130,7 @@ re-routed URI in the event you are using CodeIgniter's <a href="../general/routi
<h2>$this->uri->uri_to_assoc(<var>n</var>)</h2>
-<p>This function lets you turn URI segments into and associative array of key/value pairs. Consider this URI:</p>
+<p>This function lets you turn URI segments into and associative array of key/value pairs. Consider this URI:</p>
<code>index.php/user/search/name/joe/location/UK/gender/male</code>
@@ -143,7 +143,7 @@ re-routed URI in the event you are using CodeIgniter's <a href="../general/routi
&nbsp;&nbsp;&nbsp;&nbsp;'gender' => 'male'<br />
)</code>
-<p>The first parameter of the function lets you set an offset. By default it is set to <kbd>3</kbd> since your
+<p>The first parameter of the function lets you set an offset. By default it is set to <kbd>3</kbd> since your
URI will normally contain a controller/function in the first and second segments. Example:</p>
<code>
@@ -173,19 +173,19 @@ re-routed URI in the event you are using CodeIgniter's <a href="../general/routi
<h2>$this->uri->assoc_to_uri()</h2>
-<p>Takes an associative array as input and generates a URI string from it. The array keys will be included in the string. Example:</p>
+<p>Takes an associative array as input and generates a URI string from it. The array keys will be included in the string. Example:</p>
<code>$array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');<br />
<br />
$str = $this->uri->assoc_to_uri($array);<br />
<br />
-// Produces: product/shoes/size/large/color/red
+// Produces: product/shoes/size/large/color/red
</code>
<h2>$this->uri->uri_string()</h2>
-<p>Returns a string with the complete URI. For example, if this is your full URL:</p>
+<p>Returns a string with the complete URI. For example, if this is your full URL:</p>
<code>http://example.com/index.php/news/local/345</code>
@@ -215,7 +215,7 @@ re-routed URI in the event you are using CodeIgniter's <a href="../general/routi
<h2>$this->uri->segment_array()</h2>
-<p>Returns an array containing the URI segments. For example:</p>
+<p>Returns an array containing the URI segments. For example:</p>
<code>
$segs = $this->uri->segment_array();<br />