summaryrefslogtreecommitdiffstats
path: root/user_guide/general/urls.html
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-04-27 08:47:47 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-04-27 08:47:47 +0200
commita6507905578f1cf209776ae3d53099a005a06823 (patch)
tree9f23bb557f920034cf65c86059c84e37efd34d79 /user_guide/general/urls.html
parent60ef4ea72e169e174ff8dbb421609a178a3c0c48 (diff)
parent25d495b4a2598f771a858108a2cd2e96f0130412 (diff)
merging in changes
Diffstat (limited to 'user_guide/general/urls.html')
-rw-r--r--user_guide/general/urls.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html
index 421f51301..b975b701f 100644
--- a/user_guide/general/urls.html
+++ b/user_guide/general/urls.html
@@ -58,7 +58,7 @@ URLS
<h1>CodeIgniter URLs</h1>
-<p>By default, URLs in CodeIgniter are designed to be search-engine and human friendly. Rather than using the standard "query string"
+<p>By default, URLs in CodeIgniter are designed to be search-engine and human friendly. Rather than using the standard "query string"
approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a <strong>segment-based</strong> approach:</p>
<code>example.com/<var>news</var>/<dfn>article</dfn>/<samp>my_article</samp></code>
@@ -78,7 +78,7 @@ approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a <st
</ol>
<p>The <a href="../libraries/uri.html">URI Class</a> and the <a href="../helpers/url_helper.html">URL Helper</a>
-contain functions that make it easy to work with your URI data. In addition, your URLs can be remapped using the
+contain functions that make it easy to work with your URI data. In addition, your URLs can be remapped using the
<a href="routing.html">URI Routing</a> feature for more flexibility.</p>
@@ -103,7 +103,7 @@ a request for your index.php file.</p>
<h2>Adding a URL Suffix</h2>
<p>In your <dfn>config/config.php</dfn> file you can specify a suffix that will be added to all URLs generated
-by CodeIgniter. For example, if a URL is this:</p>
+by CodeIgniter. For example, if a URL is this:</p>
<code>example.com/index.php/products/view/shoes</code>
@@ -125,7 +125,7 @@ open your config file you'll see these items:</p>
$config['controller_trigger'] = 'c';<br />
$config['function_trigger'] = 'm';</code>
-<p>If you change "enable_query_strings" to TRUE this feature will become active. Your controllers and functions will then
+<p>If you change "enable_query_strings" to TRUE this feature will become active. Your controllers and functions will then
be accessible using the "trigger" words you've set to invoke your controllers and methods:</p>
<code>index.php?c=controller&amp;m=method</code>