typo fixes

83 files changed, 140 insertions, 140 deletions

diff --git a/ext/date/tests/bug55397.phpt b/ext/date/tests/bug55397.phpt
index 13778a00b2..7c9bbb01c1 100644
--- a/ext/date/tests/bug55397.phpt
+++ b/ext/date/tests/bug55397.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #55397 (comparsion of incomplete DateTime causes SIGSEGV)
+Bug #55397 (comparison of incomplete DateTime causes SIGSEGV)
 --INI--
 --FILE--
 <?php
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 303d65c33b..5295ab3673 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -889,7 +889,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			RETURN_FALSE;
 		}
 		if (hptr->flags & (DBA_NO_APPEND|DBA_CAST_AS_FD)) {
-			/* Needed becasue some systems do not allow to write to the original 
+			/* Needed because some systems do not allow to write to the original 
 			 * file contents with O_APPEND being set.
 			 */
 			if (SUCCESS != php_stream_cast(info->fp, PHP_STREAM_AS_FD, (void*)&info->fd, 1)) {
diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt
index 33d7d20615..8ac3f6474d 100644
--- a/ext/dba/tests/dba_gdbm.phpt
+++ b/ext/dba/tests/dba_gdbm.phpt
@@ -12,7 +12,7 @@ DBA GDBM handler test
 	$lock_flag = ''; // lock in library
 	require_once dirname(__FILE__) .'/dba_handler.inc';
 	
-	// Read during write is system dependant. Important is that there is no deadlock
+	// Read during write is system dependent. Important is that there is no deadlock
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt b/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt
index d3f0658c1f..d5743bc6cf 100644
--- a/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt
+++ b/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DomDocument::schemaValidate() - non-existant schema file
+DomDocument::schemaValidate() - non-existent schema file
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 # TestFest 2009 NYPHP
@@ -12,14 +12,14 @@ $doc = new DOMDocument;
 
 $doc->load(dirname(__FILE__)."/book.xml");
 
-$result = $doc->schemaValidate(dirname(__FILE__)."/non-existant-file");
+$result = $doc->schemaValidate(dirname(__FILE__)."/non-existent-file");
 var_dump($result);
 
 ?>
 --EXPECTF--
-Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existant-file" in %s.php on line %d
+Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existent-file" in %s.php on line %d
 
-Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existant-file'. in %s.php on line %d
+Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existent-file'. in %s.php on line %d
 
 Warning: DOMDocument::schemaValidate(): Invalid Schema in %s.php on line %d
 bool(false)
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 141192c67f..98b5c9fd87 100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -674,7 +674,7 @@ PHP_FUNCTION(enchant_broker_dict_exists)
 	described/referred to by 'tag'. The ordering is a comma delimited
 	list of provider names. As a special exception, the "*" tag can
 	be used as a language tag to declare a default ordering for any
-	language that does not explictly declare an ordering. */
+	language that does not explicitly declare an ordering. */
 
 PHP_FUNCTION(enchant_broker_set_ordering)
 {
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index c691075898..bd646d9adf 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2595,7 +2595,7 @@ static int exif_process_string_raw(char **result, char *value, size_t byte_count
 
 /* {{{ exif_process_string
  * Copy a string in Exif header to a character string and return length of allocated buffer if any.
- * In contrast to exif_process_string this function does allways return a string buffer */
+ * In contrast to exif_process_string this function does always return a string buffer */
 static int exif_process_string(char **result, char *value, size_t byte_count TSRMLS_DC) {
 	/* we cannot use strlcpy - here the problem is that we cannot use strlen to
 	 * determin length of string and we cannot use strlcpy with len=byte_count+1
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index 1e7dbf7449..0671fa99f9 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -1630,7 +1630,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
 	/* Verify we have enough data to match magic type */
 	switch (m->type) {
 	case FILE_BYTE:
-		if (nbytes < (offset + 1)) /* should alway be true */
+		if (nbytes < (offset + 1)) /* should always be true */
 			return 0;
 		break;
 
diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic
index 27bde927e6..374734d57a 100644
--- a/ext/fileinfo/tests/magic
+++ b/ext/fileinfo/tests/magic
@@ -3303,7 +3303,7 @@
 >>>0x44		string	=GLOB		\b.
 >>>>0x60	beshort	x		\b%.4d
 
-# Scripts that run in the embeded Python interpreter
+# Scripts that run in the embedded Python interpreter
 0		string	#!BPY		Blender3D BPython script
 
 #------------------------------------------------------------------------------
diff --git a/ext/ftp/tests/ftp_fget_basic.phpt b/ext/ftp/tests/ftp_fget_basic.phpt
index d736f8c45e..355b8b8469 100644
--- a/ext/ftp/tests/ftp_fget_basic.phpt
+++ b/ext/ftp/tests/ftp_fget_basic.phpt
@@ -27,7 +27,7 @@ var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY));
 fseek($fp, $postition);
 var_dump(urlencode(fgets($fp)));
 
-//test non-existant file request 
+//test non-existent file request 
 ftp_fget($ftp, $fp ,'a warning.txt', FTP_ASCII);
 
 //remove file
diff --git a/ext/ftp/tests/ftp_get_basic.phpt b/ext/ftp/tests/ftp_get_basic.phpt
index 23fd8d07f3..2fd8c79149 100644
--- a/ext/ftp/tests/ftp_get_basic.phpt
+++ b/ext/ftp/tests/ftp_get_basic.phpt
@@ -27,7 +27,7 @@ var_dump(ftp_get($ftp, $tmpfname, 'binary data.bin', FTP_BINARY));
 var_dump(urlencode(file_get_contents($tmpfname)));
 unlink($tmpfname);
 
-//test non-existant file request 
+//test non-existent file request 
 ftp_get($ftp, $tmpfname ,'a warning.txt', FTP_ASCII);
 ?>
 --EXPECTF--
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 87e889345c..3279463b7e 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -129,7 +129,7 @@ int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b);
 /* IMPORTANT NOTE FOR NEW FILTER
  * Do not forget to update:
  * IMAGE_FILTER_MAX: define the last filter index
- * IMAGE_FILTER_MAX_ARGS: define the biggest amout of arguments
+ * IMAGE_FILTER_MAX_ARGS: define the biggest amount of arguments
  * image_filter array in PHP_FUNCTION(imagefilter)
  * */
 #define IMAGE_FILTER_NEGATE         0
diff --git a/ext/gd/libgd/webpimg.h b/ext/gd/libgd/webpimg.h
index 8a05429a73..db23de5bb2 100644
--- a/ext/gd/libgd/webpimg.h
+++ b/ext/gd/libgd/webpimg.h
@@ -84,7 +84,7 @@ WebPResult WebPDecode(const uint8* data,
  *                               height.
  *      6. y_stride: The width (in bytes) of one row of Y data. This may not
  *                   match width if there is end of row padding (e.g., for 32
- *                   bit row aligment).
+ *                   bit row alignment).
  *      7. QP: the quantization parameter. This parameter controls the
  *             compression vs quality tradeoff. Use smaller numbers for better
  *             quality (compression will be lesser) and vice versa. 20 is a
diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt
index 326fbd51a5..de7ce55b10 100644
--- a/ext/hash/tests/hash_file_error.phpt
+++ b/ext/hash/tests/hash_file_error.phpt
@@ -23,8 +23,8 @@ file_put_contents( $filename, 'The quick brown fox jumped over the lazy dog.' );
 echo "\n-- Testing hash_file() function with an unknown algorithm --\n";
 var_dump( hash_file( 'foobar', $filename ) );
 
-echo "\n-- Testing hash_file() function with a non-existant file --\n";
-var_dump( hash_file( 'md5', 'nonexistant.txt' ) );
+echo "\n-- Testing hash_file() function with a non-existent file --\n";
+var_dump( hash_file( 'md5', 'nonexistent.txt' ) );
 
 echo "\n-- Testing hash_file() function with less than expected no. of arguments --\n";
 var_dump( hash_file( 'md5' ) );
@@ -50,7 +50,7 @@ unlink( $filename );
 Warning: hash_file(): Unknown hashing algorithm: %s in %s on line %d
 bool(false)
 
--- Testing hash_file() function with a non-existant file --
+-- Testing hash_file() function with a non-existent file --
 
 Warning: hash_file(%s): failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/intl/tests/transliterator_create_error.phpt b/ext/intl/tests/transliterator_create_error.phpt
index 31aef68feb..4f2d04ae78 100644
--- a/ext/intl/tests/transliterator_create_error.phpt
+++ b/ext/intl/tests/transliterator_create_error.phpt
@@ -6,15 +6,15 @@ Transliterator::create (error)
 <?php
 
 ini_set("intl.error_level", E_WARNING);
-Transliterator::create("inexistant id");
+Transliterator::create("inexistent id");
 echo intl_get_error_message(), "\n";
 Transliterator::create("bad UTF-8 \x8F");
 echo intl_get_error_message(), "\n";
 
 echo "Done.\n";
 --EXPECTF--
-Warning: Transliterator::create(): transliterator_create: unable to open ICU transliterator with id "inexistant id" in %s on line %d
-transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
+Warning: Transliterator::create(): transliterator_create: unable to open ICU transliterator with id "inexistent id" in %s on line %d
+transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 
 Warning: Transliterator::create(): String conversion of id to UTF-16 failed in %s on line %d
 String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
diff --git a/ext/intl/tests/transliterator_transliterate_variant1.phpt b/ext/intl/tests/transliterator_transliterate_variant1.phpt
index fc77a4e3ac..dcd01efd40 100644
--- a/ext/intl/tests/transliterator_transliterate_variant1.phpt
+++ b/ext/intl/tests/transliterator_transliterate_variant1.phpt
@@ -13,7 +13,7 @@ echo transliterator_transliterate("\x8F", $str), "\n";
 echo intl_get_error_message(), "\n";
 
 class A {
-function __toString() { return "inexistant id"; }
+function __toString() { return "inexistent id"; }
 }
 
 echo transliterator_transliterate(new A(), $str), "\n";
@@ -29,9 +29,9 @@ Warning: transliterator_transliterate(): Could not create transliterator with ID
 
 String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
 
-Warning: transliterator_transliterate(): transliterator_create: unable to open ICU transliterator with id "inexistant id" in %s on line %d
+Warning: transliterator_transliterate(): transliterator_create: unable to open ICU transliterator with id "inexistent id" in %s on line %d
 
-Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistant id" (transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID) in %s on line %d
+Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistent id" (transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID) in %s on line %d
 
-transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
+transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 Done.
diff --git a/ext/ldap/tests/ldap_get_values_len_error.phpt b/ext/ldap/tests/ldap_get_values_len_error.phpt
index 8caea1479a..45f9031df4 100644
--- a/ext/ldap/tests/ldap_get_values_len_error.phpt
+++ b/ext/ldap/tests/ldap_get_values_len_error.phpt
@@ -20,7 +20,7 @@ var_dump(ldap_get_values_len($link));
 var_dump(ldap_get_values_len($link, $entry));
 var_dump(ldap_get_values_len($link, $entry, "weirdAttribute", "Additional data"));
 
-var_dump(ldap_get_values_len($link, $entry, "inexistantAttribute"));
+var_dump(ldap_get_values_len($link, $entry, "inexistentAttribute"));
 ?>
 ===DONE===
 --CLEAN--
diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
index 966612f652..c8c7985826 100644
--- a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
+++ b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
@@ -35,7 +35,7 @@ function rebind_proc ($ds, $ldap_url) {
 $link = ldap_connect($host, $port);
 var_dump(ldap_set_rebind_proc($link));
 var_dump(ldap_set_rebind_proc($link, "rebind_proc", "Additional data"));
-var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistant"));
+var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistent"));
 ?>
 ===DONE===
 --EXPECTF--
@@ -45,6 +45,6 @@ bool(false)
 Warning: ldap_set_rebind_proc() expects exactly 2 parameters, 3 given in %s on line %d
 bool(false)
 
-Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistant' to be a valid callback in %s on line %d
+Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistent' to be a valid callback in %s on line %d
 bool(false)
 ===DONE===
diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt
index 4e266a0533..023e4d2299 100644
--- a/ext/mysqli/tests/mysqli_driver.phpt
+++ b/ext/mysqli/tests/mysqli_driver.phpt
@@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc');
 	} catch (mysqli_sql_exception $e) {
 		$ok = true;
 		if ('' == $e->getMessage())
-			printf("[008] getMessage() has returned an emptry string.\n");
+			printf("[008] getMessage() has returned an empty string.\n");
 		if ('' == $e->getCode())
 			printf("[009] getCode() has returned an empty string.\n");
 		if ('' == $e->getFile())
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index fa00ecda15..ac2e7c0001 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -17,7 +17,7 @@ mysqli_fetch_assoc() - utf8
 		die("skip Looks like UTF8 is not available on the server");
 
 	if (strtolower($tmp['Charset']) !== 'utf8')
-		die("skip Not sure if UTF8 is available, cancelling the test");
+		die("skip Not sure if UTF8 is available, canceling the test");
 
 	mysqli_free_result($res);
 
@@ -28,7 +28,7 @@ mysqli_fetch_assoc() - utf8
 		die("skip Looks like UCS2 is not available on the server");
 
 	if (strtolower($tmp['Charset']) !== 'ucs2')
-		die("skip Not sure if UCS2 is available, cancelling the test");
+		die("skip Not sure if UCS2 is available, canceling the test");
 
 	mysqli_free_result($res);
 	mysqli_close($link);
diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt
index 2f7986d3fe..5daaa597fa 100644
--- a/ext/mysqli/tests/mysqli_options.phpt
+++ b/ext/mysqli/tests/mysqli_options.phpt
@@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
 
 	$valid_options = array(
 		MYSQLI_READ_DEFAULT_GROUP 			=> "MYSQLI_READ_DEFAULT_GROUP",
-		MYSQLI_READ_DEFAULT_FILE 			=> "MYSQLI_READ_DEFAUTL_FILE",
+		MYSQLI_READ_DEFAULT_FILE 			=> "MYSQLI_READ_DEFAULT_FILE",
 		MYSQLI_OPT_CONNECT_TIMEOUT			=> "MYSQLI_OPT_CONNECT_TIMEOUT",
 		MYSQLI_OPT_LOCAL_INFILE				=> "MYSQLI_OPT_LOCAL_INFILE",
 		MYSQLI_INIT_COMMAND					=> "MYSQLI_INIT_COMMAND",
diff --git a/ext/oci8/tests/bug43492_2.phpt b/ext/oci8/tests/bug43492_2.phpt
index 61511cf6d2..d735f64299 100644
--- a/ext/oci8/tests/bug43492_2.phpt
+++ b/ext/oci8/tests/bug43492_2.phpt
@@ -8,7 +8,7 @@ require(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 
-// This test is similar to bug43492.phpt without the explict free.
+// This test is similar to bug43492.phpt without the explicit free.
 // Now that bug 44206 is fixed an automatic clean up will occur -
 // though it is still recommended in practice.
 
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 1e7166a5ec..c84a4ecc60 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2704,7 +2704,7 @@ PHP_FUNCTION(odbc_num_rows)
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 /* {{{ proto bool odbc_next_result(resource result_id)
-   Checks if multiple results are avaiable */
+   Checks if multiple results are available */
 PHP_FUNCTION(odbc_next_result)
 {
 	odbc_result *result;
diff --git a/ext/pcntl/php_signal.c b/ext/pcntl/php_signal.c
index 7e123a1ac6..b3cccac44f 100644
--- a/ext/pcntl/php_signal.c
+++ b/ext/pcntl/php_signal.c
@@ -23,7 +23,7 @@
 #include "Zend/zend.h"
 #include "Zend/zend_signal.h"
 
-/* php_signal using sigaction is derrived from Advanced Programing
+/* php_signal using sigaction is derived from Advanced Programing
  * in the Unix Environment by W. Richard Stevens p 298. */
 Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
 {
diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt
index 29dfc5af1e..ae2eb128ba 100644
--- a/ext/pcre/tests/preg_grep_error1.phpt
+++ b/ext/pcre/tests/preg_grep_error1.phpt
@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_grep reacts to being passed bad regexes
 */
 echo "*** Testing preg_grep() : error conditions ***\n";
-$values = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$values = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt
index a3cb684044..95ab905d7d 100644
--- a/ext/pcre/tests/preg_match_all_error1.phpt
+++ b/ext/pcre/tests/preg_match_all_error1.phpt
@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_match_all reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_match_all() : error conditions ***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt
index 7630481517..ec9cf8cec8 100644
--- a/ext/pcre/tests/preg_match_error1.phpt
+++ b/ext/pcre/tests/preg_match_error1.phpt
@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_match reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_match() : error conditions ***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt
index 7ddfcfdef8..ec573c77bf 100644
--- a/ext/pcre/tests/preg_replace_error1.phpt
+++ b/ext/pcre/tests/preg_replace_error1.phpt
@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_replace reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_replace() : error conditions***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 25db6842f6..ee763571c0 100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -899,7 +899,7 @@ static PHP_METHOD(PDO, getAttribute)
 	PDO_DBH_CLEAR_ERR();
 	PDO_CONSTRUCT_CHECK;
 
-	/* handle generic PDO-level atributes */
+	/* handle generic PDO-level attributes */
 	switch (attr) {
 		case PDO_ATTR_PERSISTENT:
 			RETURN_BOOL(dbh->is_persistent);
diff --git a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt
index 81e9b74ff9..ab9b99fc6c 100644
--- a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PDO_OCI: Atrribute: closing a connection in non-autocommit mode commits data
+PDO_OCI: Attribute: closing a connection in non-autocommit mode commits data
 --SKIPIF--
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded');
diff --git a/ext/pgsql/mysql_users.php b/ext/pgsql/mysql_users.php
index 65a2c33967..edfaa1cddc 100644
--- a/ext/pgsql/mysql_users.php
+++ b/ext/pgsql/mysql_users.php
@@ -56,7 +56,7 @@ ORDER BY 1;
 /*
  * mysql_list_fields()
  *
- * See also pg_meta_data(). It returns field defintion as array.
+ * See also pg_meta_data(). It returns field definition as array.
  */
 function pg_list_fields($db, $table) 
 {
diff --git a/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
index 465e868cfa..dfec951f79 100644
--- a/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ReflectionExtension::getClassNames() method on an extension which acually returns some information
+ReflectionExtension::getClassNames() method on an extension which actually returns some information
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--
diff --git a/ext/session/tests/session_status_disabled.phpt b/ext/session/tests/session_status_disabled.phpt
index 24e0ecd7bf..c4d1f2192d 100644
--- a/ext/session/tests/session_status_disabled.phpt
+++ b/ext/session/tests/session_status_disabled.phpt
@@ -3,7 +3,7 @@ Test session_status() function : disabled
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
-session.save_handler=non-existant
+session.save_handler=non-existent
 --FILE--
 <?php
 
diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php
index 5b978734e8..b8ee893d8d 100644
--- a/ext/soap/interop/client_round2_interop.php
+++ b/ext/soap/interop/client_round2_interop.php
@@ -300,7 +300,7 @@ class Interop_Client
 
     /**
     *  decodeSoapval
-    * decodes a soap value to php type, used for test result comparisions
+    * decodes a soap value to php type, used for test result comparisons
     *
     * @param SOAP_Value soapval
     * @return mixed result
@@ -398,7 +398,7 @@ class Interop_Client
             $namespace = $soapaction = 'http://soapinterop.org/';
             // hack to make tests work with MS SoapToolkit
             // it's the only one that uses this soapaction, and breaks if
-            // it isn't right.  Can't wait for soapaction to be fully depricated
+            // it isn't right.  Can't wait for soapaction to be fully deprecated
             if ($this->currentTest == 'base' &&
                 strstr($endpoint_info['endpointName'],'MS SOAP ToolKit 2.0')) {
                 $soapaction = 'urn:soapinterop';
diff --git a/ext/soap/interop/index.php b/ext/soap/interop/index.php
index 1ae25d92f0..fc12bc8cb7 100644
--- a/ext/soap/interop/index.php
+++ b/ext/soap/interop/index.php
@@ -35,7 +35,7 @@ classes to define what the type of the value is.</p>
 
 <h3>Client Test Interface</h3>
 <p>The <a href="client_round2.php">client interface</a> allows you to run the PHP SOAP
-Client against a choosen interop server.  Each run updates the results database below.</p>
+Client against a chosen interop server.  Each run updates the results database below.</p>
 
 <h3>Interop Client Test Results</h3>
 <p>This is a database of the current test results using PHP SOAP Clients against interop servers.</p>
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 2a7299eced..e08f8b60b0 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1284,7 +1284,7 @@ PHP_METHOD(SoapServer, setClass)
 			}
 		}
 	} else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to set a non existant class (%s)", classname);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to set a non existent class (%s)", classname);
 		return;
 	}
 
@@ -1415,7 +1415,7 @@ PHP_METHOD(SoapServer, addFunction)
 				zend_str_tolower_copy(key, Z_STRVAL_PP(tmp_function), key_len);
 
 				if (zend_hash_find(EG(function_table), key, key_len+1, (void**)&f) == FAILURE) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existant function '%s'", Z_STRVAL_PP(tmp_function));
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existent function '%s'", Z_STRVAL_PP(tmp_function));
 					return;
 				}
 
@@ -1437,7 +1437,7 @@ PHP_METHOD(SoapServer, addFunction)
 		zend_str_tolower_copy(key, Z_STRVAL_P(function_name), key_len);
 
 		if (zend_hash_find(EG(function_table), key, key_len+1, (void**)&f) == FAILURE) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existant function '%s'", Z_STRVAL_P(function_name));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existent function '%s'", Z_STRVAL_P(function_name));
 			return;
 		}
 		if (service->soap_functions.ft == NULL) {
diff --git a/ext/soap/tests/bugs/bug28985.phpt b/ext/soap/tests/bugs/bug28985.phpt
index 59d96e2c77..5134cbf099 100644
--- a/ext/soap/tests/bugs/bug28985.phpt
+++ b/ext/soap/tests/bugs/bug28985.phpt
@@ -47,7 +47,7 @@ array(42) {
   string(86) "struct MGCodeLibelle {
  string Code;
  string Libelle;
- boolean Defaut;
+ boolean Default;
  anyType Tag;
 }"
   [9]=>
diff --git a/ext/soap/tests/bugs/bug28985.wsdl b/ext/soap/tests/bugs/bug28985.wsdl
index ee528818bb..50c2fcda84 100644
--- a/ext/soap/tests/bugs/bug28985.wsdl
+++ b/ext/soap/tests/bugs/bug28985.wsdl
@@ -67,7 +67,7 @@ type="s:string" />
 type="s:string" />

           <s:element minOccurs="0" maxOccurs="1" name="Libelle"

 type="s:string" />

-          <s:element minOccurs="1" maxOccurs="1" name="Defaut"

+          <s:element minOccurs="1" maxOccurs="1" name="Default"

 type="s:boolean" />

           <s:element minOccurs="0" maxOccurs="1" name="Tag" />

         </s:sequence>

diff --git a/ext/spl/internal/iteratoriterator.inc b/ext/spl/internal/iteratoriterator.inc
index 37676e0537..451d05da32 100644
--- a/ext/spl/internal/iteratoriterator.inc
+++ b/ext/spl/internal/iteratoriterator.inc
@@ -17,7 +17,7 @@
  * an Iterator. It is very important to understand that most classes that do 
  * not implement Iterator have their reasone to. Most likely they do not allow
  * the full Iterator feature set. If so you need to provide techniques to
- * prevent missuse. If you do not you must expect exceptions or fatal erros.
+ * prevent missuse. If you do not you must expect exceptions or fatal errors.
  *
  * It is also possible to derive the class and implement IteratorAggregate by
  * downcasting the instances returned in getIterator. See the following
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
index 32705f0919..4402d6ca4c 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
index 942c7619d9..64d6514a29 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
index ee2497252d..efbb5fb685 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
index 5430e53758..7487b8353c 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
index 96c0290953..1a94532b2b 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
index a570318999..fd90103bfa 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c
index c3d3408e19..bf06ae4831 100644
--- a/ext/sqlite3/libsqlite/sqlite3.c
+++ b/ext/sqlite3/libsqlite/sqlite3.c
@@ -11864,7 +11864,7 @@ SQLITE_PRIVATE   int sqlite3MemdebugNoType(void*,u8);
 **
 *************************************************************************
 **
-** This file contains definitions of global variables and contants.
+** This file contains definitions of global variables and constants.
 */
 
 /* An array to map all upper-case characters into their corresponding
@@ -16130,7 +16130,7 @@ SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetMemsys3(void){
 **   1.  All memory allocations sizes are rounded up to a power of 2.
 **
 **   2.  If two adjacent free blocks are the halves of a larger block,
-**       then the two blocks are coalesed into the single larger block.
+**       then the two blocks are coalesced into the single larger block.
 **
 **   3.  New memory is allocated from the first available free block.
 **
@@ -20926,7 +20926,7 @@ do_atof_calc:
   /* store the result */
   *pResult = result;
 
-  /* return true if number and no extra non-whitespace chracters after */
+  /* return true if number and no extra non-whitespace characters after */
   return z>=zEnd && nDigits>0 && eValid;
 #else
   return !sqlite3Atoi64(z, pResult, length, enc);
@@ -30074,7 +30074,7 @@ static int unixGetLastError(sqlite3_vfs *NotUsed, int NotUsed2, char *NotUsed3){
 ** setting the environment variable SQLITE_FORCE_PROXY_LOCKING to 1 will
 ** force proxy locking to be used for every database file opened, and 0
 ** will force automatic proxy locking to be disabled for all database
-** files (explicity calling the SQLITE_SET_LOCKPROXYFILE pragma or
+** files (explicitly calling the SQLITE_SET_LOCKPROXYFILE pragma or
 ** sqlite_file_control API is not affected by SQLITE_FORCE_PROXY_LOCKING).
 */
 
@@ -69899,7 +69899,7 @@ SQLITE_PRIVATE int sqlite3MemJournalSize(void){
 
 /*
 ** Walk an expression tree.  Invoke the callback once for each node
-** of the expression, while decending.  (In other words, the callback
+** of the expression, while descending.  (In other words, the callback
 ** is invoked before visiting children.)
 **
 ** The return value from the callback should be one of the WRC_*
@@ -70936,7 +70936,7 @@ static int resolveOrderGroupBy(
 }
 
 /*
-** Resolve names in the SELECT statement p and all of its descendents.
+** Resolve names in the SELECT statement p and all of its descendants.
 */
 static int resolveSelectStep(Walker *pWalker, Select *p){
   NameContext *pOuterNC;  /* Context that contains this SELECT */
@@ -71244,7 +71244,7 @@ SQLITE_PRIVATE void sqlite3ResolveSelectNames(
 ** affinity of that column is returned. Otherwise, 0x00 is returned,
 ** indicating no affinity for the expression.
 **
-** i.e. the WHERE clause expresssions in the following statements all
+** i.e. the WHERE clause expressions in the following statements all
 ** have an affinity:
 **
 ** CREATE TABLE t1(a);
@@ -74260,13 +74260,13 @@ static int evalConstExpr(Walker *pWalker, Expr *pExpr){
 
 /*
 ** Preevaluate constant subexpressions within pExpr and store the
-** results in registers.  Modify pExpr so that the constant subexpresions
+** results in registers.  Modify pExpr so that the constant subexpressions
 ** are TK_REGISTER opcodes that refer to the precomputed values.
 **
 ** This routine is a no-op if the jump to the cookie-check code has
 ** already occur.  Since the cookie-check jump is generated prior to
 ** any other serious processing, this check ensures that there is no
-** way to accidently bypass the constant initializations.
+** way to accidentally bypass the constant initializations.
 **
 ** This routine is also a no-op if the SQLITE_FactorOutConst optimization
 ** is disabled via the sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS)
@@ -75132,7 +75132,7 @@ static void renameParentFunc(
 ** ALTER TABLE command. The first argument is the text of a CREATE TRIGGER 
 ** statement. The second is a table name. The table name in the CREATE 
 ** TRIGGER statement is replaced with the third argument and the result 
-** returned. This is analagous to renameTableFunc() above, except for CREATE
+** returned. This is analogous to renameTableFunc() above, except for CREATE
 ** TRIGGER, not CREATE INDEX and CREATE TABLE.
 */
 static void renameTriggerFunc(
@@ -86752,7 +86752,7 @@ static int xferOptimization(
   }
 #endif
 #ifndef SQLITE_OMIT_FOREIGN_KEY
-  /* Disallow the transfer optimization if the destination table constains
+  /* Disallow the transfer optimization if the destination table constrains
   ** any foreign key constraints.  This is more restrictive than necessary.
   ** But the main beneficiary of the transfer optimization is the VACUUM 
   ** command, and the VACUUM command disables foreign key constraints.  So
@@ -93175,7 +93175,7 @@ static int flattenSubquery(
   pSubSrc = pSub->pSrc;
   assert( pSubSrc );
   /* Prior to version 3.1.2, when LIMIT and OFFSET had to be simple constants,
-  ** not arbitrary expresssions, we allowed some combining of LIMIT and OFFSET
+  ** not arbitrary expressions, we allowed some combining of LIMIT and OFFSET
   ** because they could be computed at compile-time.  But when LIMIT and OFFSET
   ** became arbitrary expressions, we were forced to add restrictions (13)
   ** and (14). */
@@ -94472,7 +94472,7 @@ SQLITE_PRIVATE int sqlite3Select(
     */
     if( pGroupBy ){
       KeyInfo *pKeyInfo;  /* Keying information for the group by clause */
-      int j1;             /* A-vs-B comparision jump */
+      int j1;             /* A-vs-B comparison jump */
       int addrOutputRow;  /* Start of subroutine that outputs a result row */
       int regOutputRow;   /* Return address register for output subroutine */
       int addrSetAbort;   /* Set the abort flag and return */
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 9b02575276..e218dc0e49 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -352,7 +352,7 @@ PHP_FUNCTION(count)
 
 /* Numbers are always smaller than strings int this function as it
  * anyway doesn't make much sense to compare two different data types.
- * This keeps it consistant and simple.
+ * This keeps it consistent and simple.
  *
  * This is not correct any more, depends on what compare_func is set to.
  */
diff --git a/ext/standard/image.c b/ext/standard/image.c
index b3dade4a75..bd80f11dec 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -112,7 +112,7 @@ static struct gfxinfo *php_handle_gif (php_stream * stream TSRMLS_DC)
 	result->width    = (unsigned int)dim[0] | (((unsigned int)dim[1])<<8);
 	result->height   = (unsigned int)dim[2] | (((unsigned int)dim[3])<<8);
 	result->bits     = dim[4]&0x80 ? ((((unsigned int)dim[4])&0x07) + 1) : 0;
-	result->channels = 3; /* allways */
+	result->channels = 3; /* always */
 
 	return result;
 }
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 25766818f6..b4f6a926c1 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -318,7 +318,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
 	sendmail = popen_ex(sendmail_cmd, "wb", NULL, NULL TSRMLS_CC);
 #else
 	/* Since popen() doesn't indicate if the internal fork() doesn't work
-	 * (e.g. the shell can't be executed) we explicitely set it to 0 to be
+	 * (e.g. the shell can't be executed) we explicitly set it to 0 to be
 	 * sure we don't catch any older errno value. */
 	errno = 0;
 	sendmail = popen(sendmail_cmd, "w");
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 29419d211f..a09793e484 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -69,7 +69,7 @@ char machine_little_endian;
 /* Mapping of byte from char (8bit) to long for machine endian */
 static int byte_map[1];
 
-/* Mappings of bytes from int (machine dependant) to int for machine endian */
+/* Mappings of bytes from int (machine dependent) to int for machine endian */
 static int int_map[sizeof(int)];
 
 /* Mappings of bytes from shorts (16bit) for all endian environments */
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 77e0dff4c3..b32cc7cd94 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1581,7 +1581,7 @@ PHP_FUNCTION(pathinfo)
 		const char *p;
 		int idx;
 
-		/* Have we alrady looked up the basename? */
+		/* Have we already looked up the basename? */
 		if (!have_basename && !ret) {
 			php_basename(path, path_len, NULL, 0, &ret, &ret_len TSRMLS_CC);
 		}
diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt
index a6e9cd2bbf..69a1f0a6d1 100644
--- a/ext/standard/tests/array/array_key_exists_variation2.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_key_exists() function : usage variations - Pass differnt data types to $search arg
+Test array_key_exists() function : usage variations - Pass different data types to $search arg
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt
index 04f3b91388..c247879ccc 100644
--- a/ext/standard/tests/array/array_search_variation4.phpt
+++ b/ext/standard/tests/array/array_search_variation4.phpt
@@ -16,7 +16,7 @@ $file_handle = fopen(__FILE__, "r");
 //directory type resource
 $dir_handle = opendir( dirname(__FILE__) );
 
-//store resources in array for comparision.
+//store resources in array for comparison.
 $resources = array($file_handle, $dir_handle);
 
 // search for resouce type in the resource array
diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt
index b713064569..660809357d 100644
--- a/ext/standard/tests/array/array_values_variation7.phpt
+++ b/ext/standard/tests/array/array_values_variation7.phpt
@@ -9,7 +9,7 @@ Test array_values() function : usage variations - Internal order check
 
 /*
  * Check that array_values is re-assigning keys according to the internal order of the array,
- * and is not dependant on the \$input argument's keys
+ * and is not dependent on the \$input argument's keys
  */
 
 echo "*** Testing array_values() : usage variations ***\n";
diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt
index 31f6b4c1db..023f4176fc 100644
--- a/ext/standard/tests/array/bug34066.phpt
+++ b/ext/standard/tests/array/bug34066.phpt
@@ -123,7 +123,7 @@ Bug #34066 (recursive array_walk causes segfault)
                 "ProceedKeyArticle"	=>	"01",
                 "ActionKey"		=>	"00",
                 "ContactCommissionArticle"=>	"0,00",
-                "QuantDependantPriceKey"=>	"",
+                "QuantdependentPriceKey"=>	"",
                 "Quant"			=>	"1",
                 "QuantUnit"		=>	"",
                 "Meas" => array(
@@ -584,7 +584,7 @@ gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
 /Docs/Doc/DocItems/DocItem/ContactCommissionArticle=0,00
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/) end
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
-/Docs/Doc/DocItems/DocItem/QuantDependantPriceKey
+/Docs/Doc/DocItems/DocItem/QuantdependentPriceKey
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/) end
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
 /Docs/Doc/DocItems/DocItem/Quant=1
diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt
index edc16efd05..6d0f7f84e9 100644
--- a/ext/standard/tests/array/bug34066_1.phpt
+++ b/ext/standard/tests/array/bug34066_1.phpt
@@ -123,7 +123,7 @@ Bug #34066 (recursive array_walk causes segfault)
                 "ProceedKeyArticle"	=>	"01",
                 "ActionKey"		=>	"00",
                 "ContactCommissionArticle"=>	"0,00",
-                "QuantDependantPriceKey"=>	"",
+                "QuantdependentPriceKey"=>	"",
                 "Quant"			=>	"1",
                 "QuantUnit"		=>	"",
                 "Meas" => array(
@@ -543,7 +543,7 @@ gen_xml(prefix=/Docs/)
 /Docs/ContactCommissionArticle=0,00
 gen_xml(prefix=/Docs/) end
 gen_xml(prefix=/Docs/)
-/Docs/QuantDependantPriceKey
+/Docs/QuantdependentPriceKey
 gen_xml(prefix=/Docs/) end
 gen_xml(prefix=/Docs/)
 /Docs/Quant=1
diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt
index b88a5a2d62..a27bb196b4 100644
--- a/ext/standard/tests/array/in_array_variation4.phpt
+++ b/ext/standard/tests/array/in_array_variation4.phpt
@@ -19,7 +19,7 @@ $file_handle = fopen(__FILE__, "r");
 //directory type resource
 $dir_handle = opendir( dirname(__FILE__) );
 
-//store resources in array for comparision.
+//store resources in array for comparison.
 $resources = array($file_handle, $dir_handle);
 
 // search for resouce type in the resource array
diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt
index cd32d8d947..889db9886a 100644
--- a/ext/standard/tests/array/uasort_object2.phpt
+++ b/ext/standard/tests/array/uasort_object2.phpt
@@ -8,7 +8,7 @@ Test uasort() function : object functionality - sort diff. objects
 *
 
 /*
- * This testcase tests uasort() functionality with differnt objects
+ * This testcase tests uasort() functionality with different objects
  * Objects of different classes: 
  *  simple class,
  *  child class,
diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt
index 809cb78f56..e0c5e72f7e 100644
--- a/ext/standard/tests/array/uasort_variation10.phpt
+++ b/ext/standard/tests/array/uasort_variation10.phpt
@@ -11,7 +11,7 @@ Test uasort() function : usage variations - sort array with reference variables
 * Testing uasort() with 'array_arg' containing different reference variables
 */
 
-// comparision function
+// comparison function
 /* Prototype : int cmp_function(mixed $value1, mixed $value2)
  * Parameters : $value1 and $value2 - values to be compared
  * Return value : 0 - if both values are same
diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt
index c2844bfd24..0ed797fb87 100644
--- a/ext/standard/tests/array/uasort_variation4.phpt
+++ b/ext/standard/tests/array/uasort_variation4.phpt
@@ -12,7 +12,7 @@ Test uasort() function : usage variations - sort different numeric values
 *  integer, octal, hexadecimal & float
 */
 
-// comparision function
+// comparison function
 /* Prototype : int cmp_function(mixed $value1, mixed $value2)
  * Parameters : $value1 and $value2 - values to be compared
  * Return value : 0 - if both values are same
diff --git a/ext/standard/tests/file/bug41874.phpt b/ext/standard/tests/file/bug41874.phpt
index 827f486d4d..8cc1ce2e6e 100644
--- a/ext/standard/tests/file/bug41874.phpt
+++ b/ext/standard/tests/file/bug41874.phpt
@@ -6,9 +6,9 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) die('skip windows only test');
 ?>
 --FILE--
 <?php
-$result = exec('cd 1:\non_existant; dir nonexistant');
+$result = exec('cd 1:\non_existent; dir nonexistent');
 echo "$result";
-system('cd 1:\non_existant; dir nonexistant');
+system('cd 1:\non_existent; dir nonexistent');
 ?>
 --EXPECT--
 The system cannot find the drive specified.
diff --git a/ext/standard/tests/file/bug41874_2.phpt b/ext/standard/tests/file/bug41874_2.phpt
index 5d7b7cad8d..bf76a749fd 100644
--- a/ext/standard/tests/file/bug41874_2.phpt
+++ b/ext/standard/tests/file/bug41874_2.phpt
@@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
 ?>
 --FILE--
 <?php
-$result = exec('cd 1:\\non_existant; dir nonexistant');
+$result = exec('cd 1:\\non_existent; dir nonexistent');
 echo "$result";
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/file/bug41874_3.phpt b/ext/standard/tests/file/bug41874_3.phpt
index 4d7b139ad7..05095c6f10 100644
--- a/ext/standard/tests/file/bug41874_3.phpt
+++ b/ext/standard/tests/file/bug41874_3.phpt
@@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
 ?>
 --FILE--
 <?php
-system('cd 1:\\non_existant; dir nonexistant');
+system('cd 1:\\non_existent; dir nonexistent');
 ?>
 --EXPECT--
 The system cannot find the drive specified.
\ No newline at end of file
diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc
index c0f86e7c3f..b3cd99e1c1 100644
--- a/ext/standard/tests/file/file.inc
+++ b/ext/standard/tests/file/file.inc
@@ -575,13 +575,13 @@ Description:
   Compares two stat values, stat value should be obtained by stat/lstat
   $stat1 = first stat array
   $stat2 = second stat array
-  $op = type of the comparision to be perform between elements of stat1 and stat2
+  $op = type of the comparison to be perform between elements of stat1 and stat2
     "!=" compare for not equal
     "==" compare for equality
     ">"  if each element of stat1 is > than stat2
     "<"  if each element of stat1 is < than stat2
   $fields = contains the key of the elements that needs to be compared. 
-            type of the comparision is based on $op argument value
+            type of the comparison is based on $op argument value
   $flag = specify true to dump the stat1 and stat2 
 */
 
diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt
index 979959e280..bacbd93c82 100644
--- a/ext/standard/tests/file/lchown_error.phpt
+++ b/ext/standard/tests/file/lchown_error.phpt
@@ -36,7 +36,7 @@ var_dump( lchown( $filename ) );
 // More than expected arguments
 var_dump( lchown( $filename, $uid, 'foobar' ) );
 
-// Non-existant filename
+// Non-existent filename
 var_dump( lchown( 'foobar_lchown.txt', $uid ) );
 
 // Wrong argument types
diff --git a/ext/standard/tests/file/symlink_to_symlink.phpt b/ext/standard/tests/file/symlink_to_symlink.phpt
index b7554f9bd0..8b7ff65cf0 100644
--- a/ext/standard/tests/file/symlink_to_symlink.phpt
+++ b/ext/standard/tests/file/symlink_to_symlink.phpt
@@ -19,8 +19,8 @@ symlink(basename($prefix . "_file"), $prefix . "_link1");
 symlink(basename($prefix . "_link1"), $prefix . "_link2");
 
 // symlink to a non-existent path
-@unlink($prefix . "_nonexistant");
-symlink(basename($prefix . "_nonexistant"), $prefix . "_link3");
+@unlink($prefix . "_nonexistent");
+symlink(basename($prefix . "_nonexistent"), $prefix . "_link3");
 
 // symlink to a regular file using an absolute path
 symlink($prefix . "_file", $prefix . "_link4");
@@ -45,6 +45,6 @@ unlink($prefix . "_file");
 --EXPECTF--
 %unicode|string%(%d) "symlink_to_symlink.php_file"
 %unicode|string%(%d) "symlink_to_symlink.php_link1"
-%unicode|string%(%d) "symlink_to_symlink.php_nonexistant"
+%unicode|string%(%d) "symlink_to_symlink.php_nonexistent"
 %unicode|string%(%d) "%s/symlink_to_symlink.php_file"
 %unicode|string%(%d) "%s/symlink_to_symlink.php_link4"
diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt
index b5a9707e95..d39898bbe2 100644
--- a/ext/standard/tests/file/userstreams.phpt
+++ b/ext/standard/tests/file/userstreams.phpt
@@ -158,7 +158,7 @@ class mystream
 }
 
 if (@stream_wrapper_register("bogus", "class_not_exist")) {
-	die("Registered a non-existant class!!!???");
+	die("Registered a non-existent class!!!???");
 }
 echo "Not Registered\n";
 
diff --git a/ext/standard/tests/general_functions/003.phpt b/ext/standard/tests/general_functions/003.phpt
index 7ad90c8b5a..08e53b2344 100644
--- a/ext/standard/tests/general_functions/003.phpt
+++ b/ext/standard/tests/general_functions/003.phpt
@@ -43,7 +43,7 @@ $n += test_me("bug #7368", 2,      "1345",     "1234");
 $n += test_me("bug #6562", 1,    "debugg",    "debug");
 $n += test_me("bug #6562", 1,    "ddebug",    "debug");
 $n += test_me("bug #6562", 2,   "debbbug",    "debug");
-$n += test_me("bug #6562", 1, "debugging", "debuging");
+$n += test_me("bug #6562", 1, "debugging", "debugging");
 
 $n += test_me("bug #16473", 2, "a", "bc");
 $n += test_me("bug #16473", 2, "xa", "xbc");
diff --git a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
index aa1e521e92..58957c84a9 100644
--- a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
@@ -24,8 +24,8 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
-$delimeters =  array (
+// array with different values for $delimiter
+$delimiters =  array (
 
   // integer values
   0,
@@ -68,13 +68,13 @@ $delimeters =  array (
   @$unset_var
 );
 
-// loop through with each element of the $delimeters array to test explode() function
+// loop through with each element of the $delimiters array to test explode() function
 $count = 1;
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
-foreach($delimeters as $delimeter) {
+foreach($delimiters as $delimiter) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt
index 37f5a93f66..79f66f1fa0 100644
--- a/ext/standard/tests/strings/bug38322.phpt
+++ b/ext/standard/tests/strings/bug38322.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #38322 (reading past array in sscanf() leads to segfault/arbitary code execution)
+Bug #38322 (reading past array in sscanf() leads to segfault/arbitrary code execution)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/bug47322.phpt b/ext/standard/tests/strings/bug47322.phpt
index e04b230bab..1fedc2937f 100644
--- a/ext/standard/tests/strings/bug47322.phpt
+++ b/ext/standard/tests/strings/bug47322.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #47322 (sscanf %d does't work)
+Bug #47322 (sscanf %d doesn't work)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/explode_error.phpt b/ext/standard/tests/strings/explode_error.phpt
index f7342e7ad3..e88b1b0c6b 100644
--- a/ext/standard/tests/strings/explode_error.phpt
+++ b/ext/standard/tests/strings/explode_error.phpt
@@ -14,11 +14,11 @@ echo "\n-- Testing explode() function with no arguments --\n";
 var_dump( explode() );
 
 echo "\n-- Testing explode() function with more than expected no. of arguments --\n";
-$delimeter = " ";
+$delimiter = " ";
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
 $extra_arg = 10;
-var_dump( explode($delimeter, $string, $limit, $extra_arg) );
+var_dump( explode($delimiter, $string, $limit, $extra_arg) );
 
 ?>
 ===Done===
diff --git a/ext/standard/tests/strings/explode_variation1.phpt b/ext/standard/tests/strings/explode_variation1.phpt
index 9c9ce11695..f16f69bece 100644
--- a/ext/standard/tests/strings/explode_variation1.phpt
+++ b/ext/standard/tests/strings/explode_variation1.phpt
@@ -24,8 +24,8 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
-$delimeters =  array (
+// array with different values for $delimiter
+$delimiters =  array (
 
 		  // integer values
 /*1*/	  0,
@@ -68,13 +68,13 @@ $delimeters =  array (
 /*22*/	  @$unset_var
 );
 
-// loop through with each element of the $delimeters array to test explode() function
+// loop through with each element of the $delimiters array to test explode() function
 $count = 1;
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
-foreach($delimeters as $delimeter) {
+foreach($delimiters as $delimiter) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/ext/standard/tests/strings/explode_variation2.phpt b/ext/standard/tests/strings/explode_variation2.phpt
index 9e1f72c5ac..4de4637ac1 100644
--- a/ext/standard/tests/strings/explode_variation2.phpt
+++ b/ext/standard/tests/strings/explode_variation2.phpt
@@ -70,11 +70,11 @@ $strings =  array (
 
 // loop through with each element of the $strings array to test explode() function
 $count = 1;
-$delimeter = " ";
+$delimiter = " ";
 $limit = 5;
 foreach($strings as $string) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt
index 54d5222caa..2e87893107 100644
--- a/ext/standard/tests/strings/explode_variation3.phpt
+++ b/ext/standard/tests/strings/explode_variation3.phpt
@@ -24,7 +24,7 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
+// array with different values for $delimiter
 $limits =  array (
 
 		  // integer values
@@ -70,11 +70,11 @@ $limits =  array (
 
 // loop through with each element of the $limits array to test explode() function
 $count = 1;
-$delimeter = " ";
+$delimiter = " ";
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 foreach($limits as $limit) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 4d3502f18a..3997c54b59 100644
--- a/ext/standard/tests/strings/implode1.phpt
+++ b/ext/standard/tests/strings/implode1.phpt
diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt
index 1d4e50efdf..b5bfe2d9c2 100644
--- a/ext/standard/tests/strings/strrchr_basic.phpt
+++ b/ext/standard/tests/strings/strrchr_basic.phpt
@@ -34,7 +34,7 @@ var_dump( strrchr("Hello, World", "Hi") );
 var_dump( strrchr("Hello, World", "o") );
 var_dump( strrchr("Hello, World", "ooo") );
 
-var_dump( strrchr("Hello, World", "Zzzz") ); //non-existant needle in haystack
+var_dump( strrchr("Hello, World", "Zzzz") ); //non-existent needle in haystack
 echo "*** Done ***";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/substr_replace_error.phpt b/ext/standard/tests/strings/substr_replace_error.phpt
index 7d3a695d4e..fd314cbd9d 100644
--- a/ext/standard/tests/strings/substr_replace_error.phpt
+++ b/ext/standard/tests/strings/substr_replace_error.phpt
@@ -26,7 +26,7 @@ echo "\n-- Testing substr_replace() function with start and length different typ
 var_dump(substr_replace($s1, "evening", array(5))); 
 var_dump(substr_replace($s1, "evening", 5, array(8))); 
   
-echo "\n-- Testing substr_replace() function with start and length with a different number of elments --\n";
+echo "\n-- Testing substr_replace() function with start and length with a different number of elements --\n";
 var_dump(substr_replace($s1, "evening", array(5, 1), array(8))); 
 
 echo "\n-- Testing substr_replace() function with start and length as arrays but string not--\n";
@@ -58,7 +58,7 @@ string(12) "Good morning"
 Warning: substr_replace(): 'from' and 'len' should be of same type - numerical or array  in %s on line %d
 string(12) "Good morning"
 
--- Testing substr_replace() function with start and length with a different number of elments --
+-- Testing substr_replace() function with start and length with a different number of elements --
 
 Warning: substr_replace(): 'from' and 'len' should have the same number of elements in %s on line %d
 string(12) "Good morning"
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index bd4cf1429c..ee53d484cf 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1121,7 +1121,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
 				break;
 
 			case CS_CMD_FAIL:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Command failed, cancelling rest");
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Command failed, canceling rest");
 				ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
 				fail = 1;
 				break;
@@ -1131,7 +1131,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
 			case CS_PARAM_RESULT:
 			case CS_ROW_RESULT:
 				/* Unexpected results, cancel them. */
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Unexpected results, cancelling current");
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Unexpected results, canceling current");
 				ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_CURRENT);
 				break;
 
@@ -1141,7 +1141,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
 				break;
 
 			default:
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Unexpected results, cancelling all");
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Unexpected results, canceling all");
 				ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
 				break;
 		}
@@ -1696,7 +1696,7 @@ PHP_FUNCTION(sybase_free_result)
 	
 	/* Did we fetch up until the end? */
 	if (result->last_retcode != CS_END_DATA && result->last_retcode != CS_END_RESULTS) {
-		/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Cancelling the rest of the results"); */
+		/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  canceling the rest of the results"); */
 		ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
 		php_sybase_finish_results(result TSRMLS_CC);
 	}
diff --git a/ext/sybase_ct/tests/bug26407.phpt b/ext/sybase_ct/tests/bug26407.phpt
index 35bf6df7ad..27f5f99b9d 100644
--- a/ext/sybase_ct/tests/bug26407.phpt
+++ b/ext/sybase_ct/tests/bug26407.phpt
@@ -80,7 +80,7 @@ bool(true)
     select "bar"   
   
 
-Notice: sybase_query(): Sybase:  Unexpected results, cancelling current in %stest.inc on line %d
+Notice: sybase_query(): Sybase:  Unexpected results, canceling current in %stest.inc on line %d
 <<< Return: resource
 array(1) {
   [0]=>
diff --git a/ext/sybase_ct/tests/bug43578.phpt b/ext/sybase_ct/tests/bug43578.phpt
index e840402edc..9f75b9c0ea 100644
--- a/ext/sybase_ct/tests/bug43578.phpt
+++ b/ext/sybase_ct/tests/bug43578.phpt
@@ -23,7 +23,7 @@ Sybase-CT bug #43578 (Incurred fault #6 - if returned textfield ist empty)
   var_dump(sybase_query('insert into #Resource values (123, NULL)', $db));
   var_dump(sybase_query('insert into #Resource values (124, "")', $db));
 
-  // Select non-existant
+  // Select non-existent
   var_dump(sybase_select_ex($db, 'select DC_Rights from #Resource where Resource_ID = 122'));
 
   // Select null
diff --git a/ext/sybase_ct/tests/test_fetch_object.phpt b/ext/sybase_ct/tests/test_fetch_object.phpt
index c23658fa35..2d225cd9cf 100644
--- a/ext/sybase_ct/tests/test_fetch_object.phpt
+++ b/ext/sybase_ct/tests/test_fetch_object.phpt
@@ -40,7 +40,7 @@ Sybase-CT sybase_fetch_object
   // Test with object
   var_export(fetch_object($db, new article())); echo "\n";
 
-  // Test with non-existant class
+  // Test with non-existent class
   var_export(fetch_object($db, '***')); echo "\n";
     
   sybase_close($db);
diff --git a/ext/sybase_ct/tests/test_msghandler.phpt b/ext/sybase_ct/tests/test_msghandler.phpt
index afe97cbef3..3189aaac21 100644
--- a/ext/sybase_ct/tests/test_msghandler.phpt
+++ b/ext/sybase_ct/tests/test_msghandler.phpt
@@ -13,7 +13,7 @@ Sybase-CT server message handler
   
   $db= sybase_connect_ex();
 
-  echo 'Nonexistant:     '; sybase_set_messagehandler_ex('function_does_not_exist');
+  echo 'Nonexistent:     '; sybase_set_messagehandler_ex('function_does_not_exist');
   echo 'Static method:   '; sybase_set_messagehandler_ex(array('sybase', 'static_handler'));
   echo 'Instance method: '; sybase_set_messagehandler_ex(array(new sybase(), 'handler'));
   echo 'Lambda function: '; sybase_set_messagehandler_ex(create_function('', 'return FALSE;'));
@@ -25,7 +25,7 @@ Sybase-CT server message handler
   sybase_close($db);
 ?>
 --EXPECTF--
-Nonexistant:     
+Nonexistent:     
 Warning: sybase_set_message_handler() expects parameter 1 to be a valid callback, function 'function_does_not_exist' not found or invalid function name in %stest.inc on line %d
 NULL
 Static method:   bool(true)
diff --git a/ext/xmlwriter/tests/bug41287.phpt b/ext/xmlwriter/tests/bug41287.phpt
index 0612b21f15..72b6720f1d 100644
--- a/ext/xmlwriter/tests/bug41287.phpt
+++ b/ext/xmlwriter/tests/bug41287.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #41287 (Namespace functions don't allow xmlns defintion to be optional)
+Bug #41287 (Namespace functions don't allow xmlns definition to be optional)
 --SKIPIF--
 <?php 
 if (!extension_loaded("xmlwriter")) die("skip");