From 3567246091195e035ea4c8d3b2915eb6b45ad5e2 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Fri, 15 Feb 2013 01:36:04 +0100
Subject: Various cosmetic fixes

---
 system/core/Loader.php                             | 2 +-
 system/core/URI.php                                | 2 +-
 system/libraries/Cart.php                          | 2 +-
 system/libraries/Form_validation.php               | 2 +-
 system/libraries/Profiler.php                      | 2 +-
 system/libraries/Upload.php                        | 4 ++--
 tests/codeigniter/core/URI_test.php                | 2 +-
 user_guide_src/source/database/call_function.rst   | 2 +-
 user_guide_src/source/general/controllers.rst      | 4 ++--
 user_guide_src/source/general/routing.rst          | 2 +-
 user_guide_src/source/installation/upgrade_300.rst | 4 ++--
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 00ca35199..9306a09ef 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -988,7 +988,7 @@ class CI_Loader {
 			return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name);
 		}
 
-		// Lets search for the requested library file and load it.
+		// Let's search for the requested library file and load it.
 		foreach ($this->_ci_library_paths as $path)
 		{
 			$filepath = $path.'libraries/'.$subdir.$class.'.php';
diff --git a/system/core/URI.php b/system/core/URI.php
index 9b31a646b..b2286f032 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -126,7 +126,7 @@ class CI_URI {
 				return;
 			}
 
-			// As a last ditch effort lets try using the $_GET array
+			// As a last ditch effort let's try using the $_GET array
 			if (is_array($_GET) && count($_GET) === 1 && trim(key($_GET), '/') !== '')
 			{
 				$this->_set_uri_string(key($_GET));
diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php
index d64f6f042..b7b0697fb 100644
--- a/system/libraries/Cart.php
+++ b/system/libraries/Cart.php
@@ -365,7 +365,7 @@ class CI_Cart {
 	 */
 	protected function _save_cart()
 	{
-		// Lets add up the individual prices and set the cart sub-total
+		// Let's add up the individual prices and set the cart sub-total
 		$this->_cart_contents['total_items'] = $this->_cart_contents['cart_total'] = 0;
 		foreach ($this->_cart_contents as $key => $val)
 		{
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 4cf4ecae0..172e799f6 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -356,7 +356,7 @@ class CI_Form_validation {
 	 */
 	public function error_string($prefix = '', $suffix = '')
 	{
-		// No errrors, validation passes!
+		// No errors, validation passes!
 		if (count($this->_error_array) === 0)
 		{
 			return '';
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index ac8f6ba71..36e0431b2 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -238,7 +238,7 @@ class CI_Profiler {
 		foreach ($dbs as $name => $db)
 		{
 			$hide_queries = (count($db->queries) > $this->_query_toggle_count) ? ' display:none' : '';
-			
+
 			$total_time = number_format(array_sum($db->query_times), 4).' '.$this->CI->lang->line('profiler_seconds');
 
 			$show_hide_js = '(<span style="cursor: pointer;" onclick="var s=document.getElementById(\'ci_profiler_queries_db_'.$count.'\').style;s.display=s.display==\'none\'?\'\':\'none\';this.innerHTML=this.innerHTML==\''.$this->CI->lang->line('profiler_section_hide').'\'?\''.$this->CI->lang->line('profiler_section_show').'\':\''.$this->CI->lang->line('profiler_section_hide').'\';">'.$this->CI->lang->line('profiler_section_hide').'</span>)';
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 814ea68a4..acd76b03b 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -430,7 +430,7 @@ class CI_Upload {
 			}
 			else
 			{
-				// An extension was provided, lets have it!
+				// An extension was provided, let's have it!
 				$this->file_ext	= $this->get_extension($this->_file_name_override);
 			}
 
@@ -1050,7 +1050,7 @@ class CI_Upload {
 			// <a, <body, <head, <html, <img, <plaintext, <pre, <script, <table, <title
 			// title is basically just in SVG, but we filter it anyhow
 
-			// if its an image or no "triggers" detected in the first 256 bytes - we're good
+			// if it's an image or no "triggers" detected in the first 256 bytes - we're good
 			return ! preg_match('/<(a|body|head|html|img|plaintext|pre|script|table|title)[\s>]/i', $opening_bytes);
 		}
 
diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php
index e2deabe51..7fa0e6265 100644
--- a/tests/codeigniter/core/URI_test.php
+++ b/tests/codeigniter/core/URI_test.php
@@ -91,7 +91,7 @@ class URI_test extends CI_TestCase {
 
 	public function test_explode_segments()
 	{
-		// Lets test the function's ability to clean up this mess
+		// Let's test the function's ability to clean up this mess
 		$uris = array(
 			'test/uri' => array('test', 'uri'),
 			'/test2/uri2' => array('test2', 'uri2'),
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.
-- 
cgit v1.2.3-24-g4f1b