summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/helpers/string_helper.php2
-rw-r--r--system/language/english/ftp_lang.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php
index 12f818fda..4be7f294b 100644
--- a/system/helpers/string_helper.php
+++ b/system/helpers/string_helper.php
@@ -188,7 +188,7 @@ if ( ! function_exists('random_string'))
*
* Useful for generating passwords or hashes.
*
- * @param string type of random string. basic, alpha, alunum, numeric, nozero, unique, md5, encrypt and sha1
+ * @param string type of random string. basic, alpha, alnum, numeric, nozero, unique, md5, encrypt and sha1
* @param int number of characters
* @return string
*/
diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php
index 042ab55df..f0e89ff69 100644
--- a/system/language/english/ftp_lang.php
+++ b/system/language/english/ftp_lang.php
@@ -26,7 +26,7 @@
*/
defined('BASEPATH') OR exit('No direct script access allowed');
-$lang['ftp_no_connection'] = 'Unable to locate a valid connection ID. Please make sure you are connected before peforming any file routines.';
+$lang['ftp_no_connection'] = 'Unable to locate a valid connection ID. Please make sure you are connected before performing any file routines.';
$lang['ftp_unable_to_connect'] = 'Unable to connect to your FTP server using the supplied hostname.';
$lang['ftp_unable_to_login'] = 'Unable to login to your FTP server. Please check your username and password.';
$lang['ftp_unable_to_mkdir'] = 'Unable to create the directory you have specified.';