summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-15 12:35:43 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-15 12:35:43 +0100
commit3ba26413f3fabe64f77f936a357845d118f950f5 (patch)
tree5abb111b5b6a1ecbe79720b37057df085bebad38 /user_guide_src
parent3a533ac93a62f15c2abd186878238b0a99e10f88 (diff)
parent3567246091195e035ea4c8d3b2915eb6b45ad5e2 (diff)
Merge pull request #2248 from vlakoff/develop
Various cosmetic fixes
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/database/call_function.rst2
-rw-r--r--user_guide_src/source/general/controllers.rst4
-rw-r--r--user_guide_src/source/general/routing.rst2
-rw-r--r--user_guide_src/source/installation/upgrade_300.rst4
4 files changed, 6 insertions, 6 deletions
diff --git a/user_guide_src/source/database/call_function.rst b/user_guide_src/source/database/call_function.rst
index 9890fc453..83fc870d0 100644
--- a/user_guide_src/source/database/call_function.rst
+++ b/user_guide_src/source/database/call_function.rst
@@ -7,7 +7,7 @@ $this->db->call_function();
This function enables you to call PHP database functions that are not
natively included in CodeIgniter, in a platform independent manner. For
-example, lets say you want to call the mysql_get_client_info()
+example, let's say you want to call the mysql_get_client_info()
function, which is **not** natively supported by CodeIgniter. You could
do so like this::
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 ed21a6109..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/
diff --git a/user_guide_src/source/installation/upgrade_300.rst b/user_guide_src/source/installation/upgrade_300.rst
index 2d125a71a..a3ea01d02 100644
--- a/user_guide_src/source/installation/upgrade_300.rst
+++ b/user_guide_src/source/installation/upgrade_300.rst
@@ -129,9 +129,9 @@ The above files should respectively be renamed to the following:
application/libraries/MY_Email.php
application/core/MY_Log.php
-****************************************************************************
+*****************************************************************************
Step 10: Check the calls to Array Helper's element() and elements() functions
-****************************************************************************
+*****************************************************************************
The default return value of these functions, when the required elements
don't exist, has been changed from FALSE to NULL.