summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/general
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r--user_guide_src/source/general/controllers.rst4
-rw-r--r--user_guide_src/source/general/routing.rst6
2 files changed, 5 insertions, 5 deletions
diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst
index 729b08417..8cfb012a0 100644
--- a/user_guide_src/source/general/controllers.rst
+++ b/user_guide_src/source/general/controllers.rst
@@ -108,7 +108,7 @@ Passing URI Segments to your methods
If your URI contains more then two segments they will be passed to your
method as parameters.
-For example, lets say you have a URI like this::
+For example, let's say you have a URI like this::
example.com/index.php/products/shoes/sandals/123
@@ -267,7 +267,7 @@ Simply create folders within your *application/controllers/* directory
and place your controller classes within them.
.. note:: When using this feature the first segment of your URI must
- specify the folder. For example, lets say you have a controller located
+ specify the folder. For example, let's say you have a controller located
here::
application/controllers/products/shoes.php
diff --git a/user_guide_src/source/general/routing.rst b/user_guide_src/source/general/routing.rst
index 2a0332088..0c6dfe888 100644
--- a/user_guide_src/source/general/routing.rst
+++ b/user_guide_src/source/general/routing.rst
@@ -12,7 +12,7 @@ In some instances, however, you may want to remap this relationship so
that a different class/method can be called instead of the one
corresponding to the URL.
-For example, lets say you want your URLs to have this prototype::
+For example, let's say you want your URLs to have this prototype::
example.com/product/1/
example.com/product/2/
@@ -129,7 +129,7 @@ For those of you who don't know regular expressions and want to learn
more about them, `regular-expressions.info <http://www.regular-expressions.info/>`
might be a good starting point.
-..note:: You can also mix and match wildcards with regular expressions.
+.. note:: You can also mix and match wildcards with regular expressions.
Callbacks
=========
@@ -137,7 +137,7 @@ Callbacks
If you are using PHP >= 5.3 you can use callbacks in place of the normal
routing rules to process the back-references. Example::
- $route['products/([a-z]+)/edit/(\d+)'] = function ($product_type, $id)
+ $route['products/([a-zA-Z]+)/edit/(\d+)'] = function ($product_type, $id)
{
return 'catalog/product_edit/' . strtolower($product_type) . '/' . $id;
};