diff options
| -rw-r--r-- | system/libraries/URI.php | 2 | ||||
| -rw-r--r-- | system/libraries/Unit_test.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 6 | ||||
| -rw-r--r-- | user_guide/database/queries.html | 2 | ||||
| -rw-r--r-- | user_guide/database/transactions.html | 2 | ||||
| -rw-r--r-- | user_guide/general/routing.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/input.html | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/system/libraries/URI.php b/system/libraries/URI.php index c3dfef1d8..668b1ee01 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -237,7 +237,7 @@ class CI_URI { * Re-index Segments
*
* This function re-indexes the $this->segment array so that it
- * starts at 1 rather then 0. Doing so makes it simpler to
+ * starts at 1 rather than 0. Doing so makes it simpler to
* use functions like $this->uri->segment(n) since there is
* a 1:1 relationship between the segment array and the actual segments.
*
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index e53e04c15..de2ab7306 100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php @@ -150,7 +150,7 @@ class CI_Unit_test { /**
* Use strict comparison
*
- * Causes the evaluation to use === rather then ==
+ * Causes the evaluation to use === rather than ==
*
* @access public
* @param bool
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5e9fc88c3..50a3bc78e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,7 +69,7 @@ SVN Revision: XXXX</p> <li>Updated the <a href="libraries/sessions.html">Sessions class</a> so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.</li>
<li>Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the <a href="libraries/loader.html">Loader class</a> for more info. </li>
<li>Added the ability to assign library objects to your own variable names when you use <kbd>this->load->library()</kbd>. Please see the <a href="libraries/loader.html">Loader class</a> for more info. </li>
- <li>Changed the output of the profiler to use style attribute rather then clear, and added the id "codeigniter_profiler" to the container div</li>
+ <li>Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div</li>
</ul>
</li>
<li>Helpers
@@ -96,7 +96,7 @@ SVN Revision: XXXX</p> <h3>Bug fixes for 1.7.0</h3>
<ul>
<li>Fixed bug in xss_clean() that could remove some desirable tag attributes.</li>
- <li>Fixed assorted user guide typos or examples (#4840, #4862, #4864, #4899, #4930, #5006, #5071).</li>
+ <li>Fixed assorted user guide typos or examples (#4807, #4840, #4862, #4864, #4899, #4930, #5006, #5071).</li>
<li>Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.</li>
<li>Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.</li>
<li>Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.</li>
@@ -545,7 +545,7 @@ SVN Revision: 1155</p> <ul>
<li>Added <a href="./installation/downloads.html#svn">subversion information</a> to the <a href="./installation/downloads.html">downloads</a> page. </li>
<li>Added support for captions in the <a href="./libraries/table.html">Table Library</a> </li>
- <li>Fixed a bug in the <a href="./helpers/download_helper.html">download_helper</a> that was causing Internet Explorer to load rather then download </li>
+ <li>Fixed a bug in the <a href="./helpers/download_helper.html">download_helper</a> that was causing Internet Explorer to load rather than download </li>
<li>Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.</li>
<li>Removed unescaped variables in error messages of Input and Router classes</li>
<li>Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log. </li>
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index eb4d13e9d..1411e65db 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -98,7 +98,7 @@ can escape only string data. It also automatically adds single quotes around th <code>$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";</code></li>
<li><strong>$this->db->escape_str()</strong> This function escapes the data passed to it, regardless of type.
-Most of the time you'll use the above function rather then this one. Use the function like this:
+Most of the time you'll use the above function rather than this one. Use the function like this:
<code>$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";</code></li>
</ol>
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 7ff23ee66..8652aad18 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -62,7 +62,7 @@ Transactions <h1>Transactions</h1>
<p>CodeIgniter's database abstraction allows you to use <dfn>transactions</dfn> with databases that support transaction-safe table types. In MySQL, you'll need
-to be running InnoDB or BDB table types rather then the more common MyISAM. Most other database platforms support transactions natively.</p>
+to be running InnoDB or BDB table types rather than the more common MyISAM. Most other database platforms support transactions natively.</p>
<p>If you are not familiar with
transactions we recommend you find a good online resource to learn about them for your particular database. The information below assumes you
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 331161a49..80c8ab0d5 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -130,7 +130,7 @@ Higher routes will always take precedence over lower ones.</p> <p>If you prefer you can use regular expressions to define your routing rules. Any valid regular expression is allowed, as are back-references.</p>
-<p class="important"><strong>Note:</strong> If you use back-references you must use the dollar syntax rather then the double backslash syntax.</p>
+<p class="important"><strong>Note:</strong> If you use back-references you must use the dollar syntax rather than the double backslash syntax.</p>
<p>A typical RegEx route might look something like this:</p>
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index eae3a4d1a..ad73dffb7 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -120,7 +120,7 @@ Note: This function should only be used to deal with data upon submission. It's <h2>Using POST, COOKIE, or SERVER Data</h2>
<p>CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided
-functions rather then fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and
+functions rather than fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and
return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first.
In other words, normally you might do something like this:</p>
|