summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-09-01 03:04:16 +0200
committerGreg Aker <greg@gregaker.net>2011-09-01 03:04:16 +0200
commita1e848eeb37574f2bb0f57f968075c493e9a6938 (patch)
tree3a6026999337c7fd77e7d41e36e3185634bf2065
parent221d7ee9e683237c3b344290cfa8b5813d2c0f7c (diff)
parentcb212c6ad80e85b8d41fea6a5bde26e4272dd223 (diff)
Merge pull request #362 from marcoscoelho/feature/typo
fixes some typo
-rw-r--r--application/config/mimes.php2
-rw-r--r--application/config/routes.php2
-rw-r--r--application/config/smileys.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 90a1d18bb..206329fde 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -8,7 +8,7 @@
|
*/
-$mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'),
+$mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'),
'cpt' => 'application/mac-compactpro',
'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'),
diff --git a/application/config/routes.php b/application/config/routes.php
index 5f9a58343..f30a0d1f2 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -23,7 +23,7 @@
| RESERVED ROUTES
| -------------------------------------------------------------------------
|
-| There area two reserved routes:
+| There are two reserved routes:
|
| $route['default_controller'] = 'welcome';
|
diff --git a/application/config/smileys.php b/application/config/smileys.php
index 25d28b2c4..38f02a9e0 100644
--- a/application/config/smileys.php
+++ b/application/config/smileys.php
@@ -60,7 +60,7 @@ $smileys = array(
':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'),
':question:' => array('question.gif', '19', '19', 'question') // no comma after last item
- );
+);
/* End of file smileys.php */
/* Location: ./application/config/smileys.php */ \ No newline at end of file