Merge branch 'PHP-5.5'

* PHP-5.5: Merge branch 'pull-request/341' Merge branch 'pull-request/341'
author: Stanislav Malyshev <stas@php.net> 2013-06-10 14:31:57 -0700
committer: Stanislav Malyshev <stas@php.net> 2013-06-10 14:31:57 -0700
commit: 8ac131503ddeee5b1de8225510f9d2927e903620 (patch)
tree: f02250a3e6cb8712adc02d23eb2e1b0f5dd3b3fd
parent: d7c943e2a1f54c445276fc77369918f33c4f6cce (diff)
parent: 4427d1dcfdca5e5e4b7e1b1226cf4771cc82389f (diff)
download: php-git-8ac131503ddeee5b1de8225510f9d2927e903620.tar.gz
231 files changed, 327 insertions, 327 deletions
diff --git a/README.TESTING b/README.TESTING
index 75141d50e5..5e0ee11be0 100644
--- a/README.TESTING
+++ b/README.TESTING
@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usualy indicate a problem with your local system setup
+ Failed tests usually indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
 You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.
diff --git a/Zend/ZEND_CHANGES b/Zend/ZEND_CHANGES
index 5208ce1623..4a6dc6cdcf 100644
--- a/Zend/ZEND_CHANGES
+++ b/Zend/ZEND_CHANGES
@@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0
       that of other object-oriented languages, such as Java: When the
       last reference to an object is destroyed the object's
       destructor, which is a class method name __destruct() that
-      recieves no parameters, is called before the object is freed
+      receives no parameters, is called before the object is freed
       from memory.
 
       Example:
diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt
index 70093cd28b..654f86bb11 100644
--- a/Zend/tests/019.phpt
+++ b/Zend/tests/019.phpt
@@ -357,7 +357,7 @@ var_dump($global_var);
 test_unset3();
 var_dump($global_var);
 
-//Note: No error conditions relating to passing arugments can be tested
+//Note: No error conditions relating to passing arguments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
 ===DONE===
diff --git a/Zend/tests/bug32428.phpt b/Zend/tests/bug32428.phpt
index 0b5ca6aebc..e75148fec1 100644
--- a/Zend/tests/bug32428.phpt
+++ b/Zend/tests/bug32428.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #32428 (The @ warning error supression operator is broken)
+Bug #32428 (The @ warning error suppression operator is broken)
 --FILE--
 <?php 
   $data = @$not_exists; 
diff --git a/Zend/tests/gc_007.phpt b/Zend/tests/gc_007.phpt
index 8601ea43b1..a018e4846d 100644
--- a/Zend/tests/gc_007.phpt
+++ b/Zend/tests/gc_007.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GC 007: Unreferensed array cycle
+GC 007: Unreferenced array cycle
 --INI--
 zend.enable_gc=1
 --FILE--
diff --git a/Zend/tests/gc_008.phpt b/Zend/tests/gc_008.phpt
index 289d581d60..4e27e5b70a 100644
--- a/Zend/tests/gc_008.phpt
+++ b/Zend/tests/gc_008.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GC 008: Unreferensed object cycle
+GC 008: Unreferenced object cycle
 --INI--
 zend.enable_gc=1
 --FILE--
diff --git a/Zend/tests/gc_009.phpt b/Zend/tests/gc_009.phpt
index 263d31f45b..3f4657d2e3 100644
--- a/Zend/tests/gc_009.phpt
+++ b/Zend/tests/gc_009.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GC 009: Unreferensed array-object cycle
+GC 009: Unreferenced array-object cycle
 --INI--
 zend.enable_gc=1
 --FILE--
diff --git a/Zend/tests/generators/yield_without_value.phpt b/Zend/tests/generators/yield_without_value.phpt
index 510c755bd3..52292b737c 100644
--- a/Zend/tests/generators/yield_without_value.phpt
+++ b/Zend/tests/generators/yield_without_value.phpt
@@ -9,13 +9,13 @@ function recv() {
     }
 }
 
-$reciever = recv();
-var_dump($reciever->current());
-$reciever->send(1);
-var_dump($reciever->current());
-$reciever->send(2);
-var_dump($reciever->current());
-$reciever->send(3);
+$receiver = recv();
+var_dump($receiver->current());
+$receiver->send(1);
+var_dump($receiver->current());
+$receiver->send(2);
+var_dump($receiver->current());
+$receiver->send(3);
 
 ?>
 --EXPECT--
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index e867ca5dac..56c7c245b5 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1172,7 +1172,7 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas
 
 /* This function requires 'properties' to contain all props declared in the
  * class and all props being public. If only a subset is given or the class
- * has protected members then you need to merge the properties seperately by
+ * has protected members then you need to merge the properties separately by
  * calling zend_merge_properties(). */
 ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC) /* {{{ */
 {
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index a2aa909f15..faef3a9197 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3941,7 +3941,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 #endif
 		} else {
 			/* inherited members are overridden by members inserted by traits */
-			/* check whether the trait method fullfills the inheritance requirements */
+			/* check whether the trait method fulfills the inheritance requirements */
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
 		}
 	}
@@ -7176,7 +7176,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len)
 	}
 #elif defined(NETWARE)
 	/*
-	 * Find the first occurence of : from the left
+	 * Find the first occurrence of : from the left
 	 * move the path pointer to the position just after :
 	 * increment the len_adjust to the length of path till colon character(inclusive)
 	 * If there is no character beyond : simple return len
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index c8b868d16a..88995c46b6 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1530,7 +1530,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {
 				/* If both are objects sharing the same comparision handler then use is */
 				if (Z_OBJ_HANDLER_P(op1,compare_objects) == Z_OBJ_HANDLER_P(op2,compare_objects)) {
 					if (Z_OBJ_HANDLE_P(op1) == Z_OBJ_HANDLE_P(op2)) {
-						/* object handles are identical, apprently this is the same object */
+						/* object handles are identical, apparently this is the same object */
 						ZVAL_LONG(result, 0);
 						return SUCCESS;
 					}
diff --git a/acinclude.m4 b/acinclude.m4
index 11ff779ff1..b545f06944 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1832,7 +1832,7 @@ AC_TRY_COMPILE([
 ])
 
 dnl -------------------------------------------------------------------------
-dnl Library/function existance and build sanity checks
+dnl Library/function existence and build sanity checks
 dnl -------------------------------------------------------------------------
 
 dnl
diff --git a/build/shtool b/build/shtool
index d50aa1dbb8..684a01f5df 100755
--- a/build/shtool
+++ b/build/shtool
@@ -376,11 +376,11 @@ while [ $# -gt 0 ]; do
             eval "opt_${opt_OPT}=yes"
             ;;
         ':' )
-            #   option with argument (multiple occurances override)
+            #   option with argument (multiple occurrences override)
             eval "opt_${opt_OPT}=\"\$opt_ARG\""
             ;;
         '+' )
-            #   option with argument (multiple occurances append)
+            #   option with argument (multiple occurrences append)
             eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
             ;;
         * )
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index 65b06d79f5..abe84fc316 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -518,7 +518,7 @@ static PHP_FUNCTION(bzcompress)
 		efree(dest);
 		RETURN_LONG(error);
 	} else {
-		/* Copy the buffer, we have perhaps allocate alot more than we need,
+		/* Copy the buffer, we have perhaps allocate a lot more than we need,
 		   so we erealloc() the buffer to the proper size */
 		dest = erealloc(dest, dest_len + 1);
 		dest[dest_len] = 0;
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 853b7df4ca..8289322d6d 100644
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -429,7 +429,7 @@ PHP_FUNCTION(com_variant_create_instance)
 		/* If already an array and VT_ARRAY is passed then:
 			- if only VT_ARRAY passed then do not perform a conversion
 			- if VT_ARRAY plus other type passed then perform conversion 
-			  but will probably fail (origional behavior)
+			  but will probably fail (original behavior)
 		*/
 		if ((vt & VT_ARRAY) && (V_VT(&obj->v) & VT_ARRAY)) {
 			long orig_vt = vt;
diff --git a/ext/date/tests/date_sunrise_and_sunset_basic.phpt b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
index a96fa83034..f89b63fd93 100644
--- a/ext/date/tests/date_sunrise_and_sunset_basic.phpt
+++ b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
@@ -14,7 +14,7 @@ offset: +1 GMT
 
 echo "Basic test for date_sunrise() and date_sunset()\n";
 
-// supress date() function strict msgs 
+// suppress date() function strict msgs 
 error_reporting(E_ALL & ~E_STRICT);
 
 echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";
diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index 71575f5d85..a782a572e9 100644
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -20,7 +20,7 @@ DBA CDB handler test (read only)
 			$keys .= $a;
 			$count++;
 		}
-		// display number of entries and key existance
+		// display number of entries and key existence
 		echo $count;
 		for ($i=1; $i<8; $i++) {
 			echo dba_exists($i, $db_file) ? "Y" : "N";
diff --git a/ext/dom/element.c b/ext/dom/element.c
index f217ca2450..606a23f9cb 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -177,7 +177,7 @@ PHP_METHOD(domelement, __construct)
 		RETURN_FALSE;
 	}
 
-	/* Namespace logic is seperate and only when uri passed in to insure no BC breakage */
+	/* Namespace logic is separate and only when uri passed in to insure no BC breakage */
 	if (uri_len > 0) {
 		errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len);
 		if (errorcode == 0) {
diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt
index 384eb47b5e..fb0977488e 100644
--- a/ext/dom/tests/DOMNode_removeChild_basic.phpt
+++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt
@@ -39,7 +39,7 @@ $root = $dom->documentElement;
 
 $children = $root->childNodes;
 $len = $children->length;
-echo "orignal has $len nodes\n";
+echo "original has $len nodes\n";
 for ($index = $children->length - 1; $index >=0; $index--) {
 	echo "node $index\n";
 	$current = $children->item($index);
@@ -58,7 +58,7 @@ for ($index = 0; $index < $children->length; $index++) {
 }
 
 --EXPECTF--
-orignal has 5 nodes
+original has 5 nodes
 node 4
 Course: no title:DOMText
 ~string(1) "
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index e4b4263766..141192c67f 100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -651,7 +651,7 @@ PHP_FUNCTION(enchant_broker_free_dict)
 /* }}} */
 
 /* {{{ proto bool enchant_broker_dict_exists(resource broker, string tag)
-   Wether a dictionary exists or not. Using non-empty tag */
+   Whether a dictionary exists or not. Using non-empty tag */
 PHP_FUNCTION(enchant_broker_dict_exists)
 {
 	zval *broker;
diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index da899194c7..0f9c135420 100644
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -78,7 +78,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of exif_tagname()
-// when $index arugment is supplied with different values
+// when $index argument is supplied with different values
 
 echo "\n--- Testing exif_tagname() by supplying different values for 'index' argument ---\n";
 $counter = 1;
diff --git a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
index c43ba4e298..7d1b008d5a 100644
--- a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
+++ b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test finfo extention : loading into phpinfo()
+Test finfo extension : loading into phpinfo()
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic
index 5266dd0dc5..27bde927e6 100644
--- a/ext/fileinfo/tests/magic
+++ b/ext/fileinfo/tests/magic
@@ -4957,7 +4957,7 @@
 >>>>0	ubelong			=0		\b, next free block index %lu
 >>>>0	ubelong			!0		\b, next free block index %lu
 >>>512	default			x		dBase IV DBT
-# DBF file name without extention 
+# DBF file name without extension 
 >>>>8	string			>\0		\b of %-.8s.DBF
 # size of blocks  ; not reliable 0x2020204C
 #>>>>4	ulelong			=0		\b, blocks size %lu
@@ -13205,7 +13205,7 @@
 # they have their real name at offset 22
 >>>>>22		string			>\0			\b%-.5s
 >4	uleshort&0x8000			0x0000			
-# 32 bit sector adressing ( > 32 MB) for block devices
+# 32 bit sector addressing ( > 32 MB) for block devices
 >>4	uleshort&0x0002			0x0002			\b,32-bit sector-
 # support by driver functions 13h, 17h, 18h
 >4	uleshort&0x0040			0x0040			\b,IOCTL-
@@ -17951,7 +17951,7 @@
 #   00030  00 00 00 00 01 00 00 00  00 00 00 00 00 00 00 00  ................
 #   00040  00 00 00 00 ff ff ff ff  ff ff ff ff 02 00 00 00  ................
 #
-# GRR this test is still too general as it catches example adressen.dbt
+# GRR this test is still too general as it catches example addressen.dbt
 0	belong	0x03000000	
 >8	ubelong	0xec020000	VMS Alpha executable
 >>75264	string	PK\003\004	\b, Info-ZIP SFX archive v5.12 w/decryption
diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt
index a0454faf86..fd96ab6928 100644
--- a/ext/gd/tests/imagecopyresampled_basic.phpt
+++ b/ext/gd/tests/imagecopyresampled_basic.phpt
@@ -35,9 +35,9 @@ imagefilledellipse($image_lge, 200, 150, 300, 200, $col_ellipse);
 imagepng($image_lge, $dest_lge);
 
 // Get new dimensions
-$percent = 0.5; // new image 50% of orginal
+$percent = 0.5; // new image 50% of original
 list($width, $height) = getimagesize($dest_lge);
-echo "Size of orginal: width=". $width . " height=" . $height . "\n";
+echo "Size of original: width=". $width . " height=" . $height . "\n";
 
 $new_width = $width * $percent;
 $new_height = $height * $percent;
@@ -66,6 +66,6 @@ echo "Done\n";
 ?>
 --EXPECT--
 Simple test of imagecopyresampled() function
-Size of orginal: width=400 height=300
+Size of original: width=400 height=300
 Size of copy: width=200 height=150
 Done
diff --git a/ext/hash/tests/mhash_002.phpt b/ext/hash/tests/mhash_002.phpt
index 7bcafd3896..45cf09fb77 100644
--- a/ext/hash/tests/mhash_002.phpt
+++ b/ext/hash/tests/mhash_002.phpt
@@ -24,7 +24,7 @@ $supported_hash_al = array(
 "CRC32"     => 4,
 "CRC32B"    => 4,
 "ADLER32"   => 4,
-"NA_XYZ"    => 0   /* verify that the algorythm works */
+"NA_XYZ"    => 0   /* verify that the algorithm works */
 );
 
 $hc = mhash_count() + 1;
diff --git a/ext/imap/tests/imap_include.inc b/ext/imap/tests/imap_include.inc
index ed36239572..b33a10e5e8 100644
--- a/ext/imap/tests/imap_include.inc
+++ b/ext/imap/tests/imap_include.inc
@@ -61,7 +61,7 @@ function displayOverviewFields($resp, $fields=null) {
  * @param string mailbox_suffix Suffix used to uniquely identify mailboxes
  * @param int message_count number of test msgs to be written to new mailbox 
  * 
- * @return IMAP stream to new mailbox on sucesss; FALSE on failure
+ * @return IMAP stream to new mailbox on success; FALSE on failure
  */
 function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){
 	global $server, $default_mailbox, $username, $password;
diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt
index 5b16ac2917..c5167c132e 100644
--- a/ext/interbase/tests/005.phpt
+++ b/ext/interbase/tests/005.phpt
@@ -18,7 +18,7 @@ InterBase: transactions
     
 /*
 Difference between default and other transactions:
-default commited when you call  ibase_close().
+default committed when you call  ibase_close().
 Other transaction doing rollback.
 
 If you not open default transaction with
@@ -158,7 +158,7 @@ three transaction on default link
 
     ibase_free_result($res);
 
- 	/* tr_4 IBASE_COMMITED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */
+ 	/* tr_4 IBASE_COMMITTED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */
  	$res = ibase_query($tr_4, "select * from test5");
    
  	 echo "three rows in fourth transaction with deadlock\n";
diff --git a/ext/intl/ERROR.CONVENTIONS b/ext/intl/ERROR.CONVENTIONS
index 6f9079c56d..41cd14ec06 100644
--- a/ext/intl/ERROR.CONVENTIONS
+++ b/ext/intl/ERROR.CONVENTIONS
@@ -18,7 +18,7 @@ message set by the PHP wrapping code, not by ICU. The message should include the
 name of the function that failed in order to make debugging easier (though if
 you activate warnings with intl.error_level or exceptions with
 intl.use_exceptions you get more fine-grained information about where the
-error ocurred).
+error occurred).
 
 The internal PHP code can set the global last error with:
 void intl_error_set_code(intl_error* err, UErrorCode err_code TSRMLS_DC);
diff --git a/ext/intl/doc/Tutorial.txt b/ext/intl/doc/Tutorial.txt
index 4a66dc1844..3bb31b00ec 100644
--- a/ext/intl/doc/Tutorial.txt
+++ b/ext/intl/doc/Tutorial.txt
@@ -7,7 +7,7 @@ Examle of locales format: 'en_US', 'ru_UA', 'ua_UA' (see http://demo.icu-project
 
 
 2. Collator::getDisplayName( $obj_locale, $disp_locale ).
-Get name of the object for the desired Locale, in the desired langauge. Both arguments 
+Get name of the object for the desired Locale, in the desired language. Both arguments 
 must be from getAvailableLocales method.
 
      @param  string  $obj_locale   Locale to get display name for.
diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php
index 465453fd32..e22d165cbb 100644
--- a/ext/intl/doc/grapheme_api.php
+++ b/ext/intl/doc/grapheme_api.php
@@ -98,7 +98,7 @@
 	 * @param string	$haystack	The input string.
 	 * @param string	$needle		The string to look for.
 	 * @param [boolean]	$before_needle	If TRUE (the default is FALSE), grapheme_strstr() returns the part of the
-						haystack before the first occurence of the needle.
+						haystack before the first occurrence of the needle.
 	 * @return string	Returns the portion of string, or FALSE if needle is not found.
 	*/
 	function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {}
@@ -109,7 +109,7 @@
          * @param string        $haystack       The input string.
          * @param string        $needle         The string to look for.
          * @param [boolean]     $before_needle  If TRUE (the default is FALSE), grapheme_strstr() returns the part of the
-                                                haystack before the first occurence of the needle.
+                                                haystack before the first occurrence of the needle.
          * @return string       Returns the portion of string, or FALSE if needle is not found.
         */
         function grapheme_stristr($haystack, $needle, $before_needle = FALSE) {}
diff --git a/ext/intl/doc/msgfmt_api.php b/ext/intl/doc/msgfmt_api.php
index e4d047b979..3df6f0de11 100644
--- a/ext/intl/doc/msgfmt_api.php
+++ b/ext/intl/doc/msgfmt_api.php
@@ -31,7 +31,7 @@ class MessageFormatter {
 	/**
 	 * Format the message
 	 * @param   array   $args   arguments to insert into the pattern string
-	 * @return  string  the formatted string, or false if an error ocurred
+	 * @return  string  the formatted string, or false if an error occurred
 	 */
 	public function format($args) {}
 
@@ -124,7 +124,7 @@ class MessageFormatter {
 	 * Format the message
 	 * @param MessageFormatter $fmt The message formatter 
 	 * @param   array   $args   arguments to insert into the pattern string
-	 * @return  string  the formatted string, or false if an error ocurred
+	 * @return  string  the formatted string, or false if an error occurred
 	 */
 	function msgfmt_format($fmt, $args) {}
 
diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt
index 94da3d8481..75d0006a3f 100644
--- a/ext/libxml/tests/bug61367-read.phpt
+++ b/ext/libxml/tests/bug61367-read.phpt
@@ -8,7 +8,7 @@ error_reporting=E_ALL & ~E_NOTICE
 --FILE--
 <?php
 /*
- * Note: Using error_reporting=E_ALL & ~E_NOTICE to supress "Trying to get property of non-object" notices.
+ * Note: Using error_reporting=E_ALL & ~E_NOTICE to suppress "Trying to get property of non-object" notices.
  */
 class StreamExploiter {
 	public function stream_close (  ) {
diff --git a/ext/mbstring/README_PHP3-i18n-ja b/ext/mbstring/README_PHP3-i18n-ja
index cac00b82a1..869fe3e495 100644
--- a/ext/mbstring/README_PHP3-i18n-ja
+++ b/ext/mbstring/README_PHP3-i18n-ja
@@ -408,7 +408,7 @@ o i18n.script_encoding - script encoding
     entering the script parser.
 
     Be aware that auto detection may fail under some conditions.
-    For best auto detection, add multibyte charactor at begining of
+    For best auto detection, add multibyte charactor at beginning of
     script.
 
 
diff --git a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h
index 5ae282e91b..cb6c445e75 100644
--- a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h
+++ b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h
@@ -4643,7 +4643,7 @@ static const int ucs_r2_jisx0213_min = 0xFA0F;
 static const int ucs_r2_jisx0213_max = 0xFA6A;
 
 /* 
-   CJK Compatibility Ideographs: U+F900 - U+FAFF (seperate mapping for U+F9XX)
+   CJK Compatibility Ideographs: U+F900 - U+FAFF (separate mapping for U+F9XX)
 */
 static const unsigned short ucs_r2b_jisx0213_cmap_key[] = {
 	0xf91d,0xf928,0xf929,0xf936,0xf970,0xf9d0,0xf9dc};
diff --git a/ext/mbstring/oniguruma/HISTORY b/ext/mbstring/oniguruma/HISTORY
index 06f38c246a..244cd3d150 100644
--- a/ext/mbstring/oniguruma/HISTORY
+++ b/ext/mbstring/oniguruma/HISTORY
@@ -1812,7 +1812,7 @@ History
 2003/01/31: [impl] rename TTRANS() to TOLOWER().
 2003/01/30: [bug]  .c.o --> .c.obj in win32\Makefile.
 2003/01/30: [impl] add -DNOT_RUBY to Makefile.in.
-                   NOT_RUBY is refered in regint.h for escape double
+                   NOT_RUBY is referred in regint.h for escape double
                    including config.h.
 2003/01/30: [impl] when string hasn't case ambiguity, don't compile
                    to ignore case opcode.
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 145ee0c13f..607921ebb6 100644
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -648,7 +648,7 @@ _php_mb_regex_init_options(const char *parg, int narg, OnigOptionType *option, O
 /* }}} */
 
 /*
- * php funcions
+ * php functions
  */
 
 /* {{{ proto string mb_regex_encoding([string encoding])
diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index 1ea89d9bee..4fe87f4c00 100644
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -16,7 +16,7 @@ class DbConnection {
 		var_dump($link);
 
 		$link = mysqli_init();
-		/* @ is to supress 'Property access is not allowed yet' */
+		/* @ is to suppress 'Property access is not allowed yet' */
 		@var_dump($link);
 
 		$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 724876e899..1d4e387d23 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -1455,7 +1455,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, list_fields)(MYSQLND_CONN_DATA * conn, const c
 			}
 
 			if (FAIL == result->m.read_result_metadata(result, conn TSRMLS_CC)) {
-				DBG_ERR("Error ocurred while reading metadata");
+				DBG_ERR("Error occurred while reading metadata");
 				result->m.free_result(result, TRUE TSRMLS_CC);
 				result = NULL;
 				break;
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index b4725feb2b..20d941e05b 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -486,7 +486,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s
 						mnd_efree(conn->current_result);
 						conn->current_result = NULL;
 					}
-					DBG_ERR("Error ocurred while reading metadata");
+					DBG_ERR("Error occurred while reading metadata");
 					break;
 				}
 
@@ -498,7 +498,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s
 					break;
 				}
 				if (FAIL == (ret = PACKET_READ(fields_eof, conn))) {
-					DBG_ERR("Error ocurred while reading the EOF packet");
+					DBG_ERR("Error occurred while reading the EOF packet");
 					result->m.free_result_contents(result TSRMLS_CC);
 					mnd_efree(result);
 					if (!stmt) {
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 00566b1b60..c51d216f32 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -831,7 +831,7 @@ Fixed bug #36820 (Privileged connection with an Oracle password file fails)
    <date>2006-03-16</date>
    <license uri="http://www.php.net/license">PHP</license>
    <notes>Changed OCI8 code to use OCIServerVersion() instead of OCIPing(), which may crash Oracle server of version &lt; 10.2
-Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch)
+Fixed bug #36235 (ocicolumnname returns false before a successfull fetch)
 Fixed bug #36096 (oci_result() returns garbage after oci_fetch() failed)
 Fixed bug #36055 (possible OCI8 crash in multithreaded environment)
 Fixed bug #36010 (Segfault when re-creating and re-executing statements with bound parameters)
diff --git a/ext/oci8/tests/conn_attr.inc b/ext/oci8/tests/conn_attr.inc
index 2c086b1892..220e688210 100644
--- a/ext/oci8/tests/conn_attr.inc
+++ b/ext/oci8/tests/conn_attr.inc
@@ -98,7 +98,7 @@ function set_attr($conn,$attr,$sufix)
 	else if (!strcmp($attr,'CLIENT_IDENTIFIER')) 
         $r = oci_set_client_identifier($conn,'ID00'.$sufix);
 	else
-		echo "Pass one of the above four attibutes!!!\n";
+		echo "Pass one of the above four attributes!!!\n";
 	if ($r) {
 		echo "Value of $attr has been set successfully\n";
     }
diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt
index d15b7a38de..4885f80b71 100644
--- a/ext/oci8/tests/conn_attr_4.phpt
+++ b/ext/oci8/tests/conn_attr_4.phpt
@@ -62,7 +62,7 @@ foreach($values_array as $val ) {
 	oci_set_client_info($c1,$val);
 	$r = oci_set_action($c1,$val);	
 	if ($r) {
-		echo "Values set succesfully to $val\n";
+		echo "Values set successfully to $val\n";
 		foreach($attr_array as $attr) {
             get_attr($c1,$attr);
         }
@@ -98,12 +98,12 @@ bool(true)
 The value of ACTION is ACTION1
 
 Setting to different values 
-Values set succesfully to 1000
+Values set successfully to 1000
 The value of MODULE is 1000
 The value of ACTION is 1000
 The value of CLIENT_INFO is 1000
 The value of CLIENT_IDENTIFIER is 1000
-Values set succesfully to 
+Values set successfully to 
 The value of MODULE is 
 The value of ACTION is 
 The value of CLIENT_INFO is 
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index 8251528e19..ca237c0537 100644
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -161,7 +161,7 @@ PHP_FUNCTION(solid_fetch_prev);
 #define UNIX
 /*
  * Extended Fetch in the Birdstep ODBC API is incapable of returning long varchar (memo) fields.
- * So the following line has been commented-out to accomadate. - KNS
+ * So the following line has been commented-out to accommodate. - KNS
  *
  * #define HAVE_SQL_EXTENDED_FETCH 1
  */
diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h
index 063c951027..06a2cf7f4a 100644
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -168,7 +168,7 @@ typedef time_t accel_time_t;
 typedef enum _zend_accel_restart_reason {
 	ACCEL_RESTART_OOM,    /* restart because of out of memory */
 	ACCEL_RESTART_HASH,   /* restart because of hash overflow */
-	ACCEL_RESTART_USER    /* restart sheduled by opcache_reset() */
+	ACCEL_RESTART_USER    /* restart scheduled by opcache_reset() */
 } zend_accel_restart_reason;
 
 typedef struct _zend_persistent_script {
@@ -268,7 +268,7 @@ typedef struct _zend_accel_shared_globals {
 	unsigned long   blacklist_misses;
 	unsigned long   oom_restarts;     /* number of restarts because of out of memory */
 	unsigned long   hash_restarts;    /* number of restarts because of hash overflow */
-	unsigned long   manual_restarts;  /* number of restarts sheduled by opcache_reset() */
+	unsigned long   manual_restarts;  /* number of restarts scheduled by opcache_reset() */
 	zend_accel_hash hash;             /* hash table for cached scripts */
 	zend_accel_hash include_paths;    /* used "include_path" values    */
 
diff --git a/ext/openssl/tests/openssl.cnf b/ext/openssl/tests/openssl.cnf
index 10e69076cf..4ed40fdc8a 100644
--- a/ext/openssl/tests/openssl.cnf
+++ b/ext/openssl/tests/openssl.cnf
@@ -3,7 +3,7 @@ default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+x509_extensions	= v3_ca	# The extensions to add to the self signed cert
 string_mask = MASK:4294967295
 
 
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index ff8a22e14f..e9a72e3f3e 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -274,7 +274,7 @@ static int php_openssl_sockop_close(php_stream *stream, int close_handle TSRMLS_
 			 * Essentially, we are waiting for the socket to become writeable, which means
 			 * that all pending data has been sent.
 			 * We use a small timeout which should encourage the OS to send the data,
-			 * but at the same time avoid hanging indefintely.
+			 * but at the same time avoid hanging indefinitely.
 			 * */
 			do {
 				n = php_pollfd_for_ms(sslsock->s.socket, POLLOUT, 500);
diff --git a/ext/pcre/pcrelib/ChangeLog b/ext/pcre/pcrelib/ChangeLog
index 1b016ecee5..ed164fed0f 100644
--- a/ext/pcre/pcrelib/ChangeLog
+++ b/ext/pcre/pcrelib/ChangeLog
@@ -1751,7 +1751,7 @@ Version 7.7 07-May-08
     containing () gave an internal compiling error instead of "reference to
     non-existent subpattern". Fortunately, when the pattern did exist, the
     compiled code was correct. (When scanning forwards to check for the
-    existencd of the subpattern, it was treating the data ']' as terminating
+    existence of the subpattern, it was treating the data ']' as terminating
     the class, so got the count wrong. When actually compiling, the reference
     was subsequently set up correctly.)
 
diff --git a/ext/pcre/pcrelib/pcre_compile.c b/ext/pcre/pcrelib/pcre_compile.c
index 5f0c8ed087..4997b3b1ec 100644
--- a/ext/pcre/pcrelib/pcre_compile.c
+++ b/ext/pcre/pcrelib/pcre_compile.c
@@ -8139,7 +8139,7 @@ if (code - codestart > length) errorcode = ERR23;
 
 #ifdef SUPPORT_VALGRIND
 /* If the estimated length exceeds the really used length, mark the extra
-allocated memory as unadressable, so that any out-of-bound reads can be
+allocated memory as unaddressable, so that any out-of-bound reads can be
 detected. */
 VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar));
 #endif
diff --git a/ext/pcre/tests/preg_replace_basic.phpt b/ext/pcre/tests/preg_replace_basic.phpt
index 33fb2d4a8a..6962bce255 100644
--- a/ext/pcre/tests/preg_replace_basic.phpt
+++ b/ext/pcre/tests/preg_replace_basic.phpt
@@ -11,7 +11,7 @@ var_dump($string);
 var_dump(preg_replace('<- This is a string$>', 'This shouldn\'t work', $string)); //tries to find '- This is a string' at the end of a string but can't so replaces nothing and prints the unchanged $string.
 var_dump(preg_replace('<[0-35-9]>', '4', $string)); //finds any number that's not 4 and replaces it with a 4 ('444444444')
 var_dump(preg_replace('<\b[hH]\w{2,4}>', 'Bonjour', $string)); //finds h or H at the beginning of a word followed by 2-4 characters and replaces it with Bonjour (i.e. Hello -> Bonjour) (was finding the 'his' in This and replacing it)
-var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinate amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
+var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
 var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com')); //finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com')
 
 ?>
diff --git a/ext/pcre/tests/preg_replace_edit_basic.phpt b/ext/pcre/tests/preg_replace_edit_basic.phpt
index 97350e756e..556b48b8c1 100644
--- a/ext/pcre/tests/preg_replace_edit_basic.phpt
+++ b/ext/pcre/tests/preg_replace_edit_basic.phpt
@@ -24,7 +24,7 @@ var_dump(preg_replace('<\b[hH]\w{2,4}>',
                       'Bonjour', $string));						//finds h or H at the beginning of a word followed by 2-4 characters and replaces it with Bonjour (i.e. Hello -> Bonjour) (was finding the 'his' in This and replacing it)
 
 var_dump(preg_replace('<(\w)\s*-\s*(\w)>',
-                      '\\1. \\2', $string));						//finds dashes with an indefinate amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
+                      '\\1. \\2', $string));						//finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
 
 var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', 
                       '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com'));	//finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com')
diff --git a/ext/pcre/tests/preg_split_basic.phpt b/ext/pcre/tests/preg_split_basic.phpt
index e94a94f62e..5d23ce6df1 100644
--- a/ext/pcre/tests/preg_split_basic.phpt
+++ b/ext/pcre/tests/preg_split_basic.phpt
@@ -7,7 +7,7 @@ Test preg_split() function : basic functionality
 * Function is implemented in ext/pcre/php_pcre.c
 */
 $string = 'this is a_list: value1, Test__, string; Hello, world!_(parentheses)';
-var_dump(preg_split('/[:,;\(\)]/', $string, -1, PREG_SPLIT_NO_EMPTY)); //parts of $string seperated by : , ; ( or ) are put into an array.
+var_dump(preg_split('/[:,;\(\)]/', $string, -1, PREG_SPLIT_NO_EMPTY)); //parts of $string separated by : , ; ( or ) are put into an array.
 var_dump(preg_split('/:\s*(\w*,*\s*)+;/', $string)); //all text between : and ; is removed
 var_dump(preg_split('/(\(|\))/', $string, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY)); //all text before (parentheses) is put into first element, ( into second, "parentheses" into third and ) into fourth.
 var_dump(preg_split('/NAME/i', $string)); //tries to find NAME regardless of case in $string (can't split it so just returns how string as first element)
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index f38e7b5ec9..c757dbf1e5 100644
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
@@ -469,7 +469,7 @@ struct _pdo_dbh_t {
 	/* when set, convert int/floats to strings */
 	unsigned stringify:1;
 
-	/* the sum of the number of bits here and the bit fields preceeding should
+	/* the sum of the number of bits here and the bit fields preceding should
 	 * equal 32 */
 	unsigned _reserved_flags:21;
 
diff --git a/ext/pgsql/README b/ext/pgsql/README
index 2b4c412338..785b4f034b 100644
--- a/ext/pgsql/README
+++ b/ext/pgsql/README
@@ -35,7 +35,7 @@ names.
 Older names will become aliases of new functions for backward
 compatibility.
 
-Manual will be updated when this change is commited to CVS source.
+Manual will be updated when this change is committed to CVS source.
 
 ==== Configure Option Notes ====
 You cannot specify PostgreSQL source directly to build PostgreSQL
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index 65193726de..00cb92ff13 100644
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -733,7 +733,7 @@ notfound:
 				PHAR_G(cwd_len) = save_len;
 				efree(entry);
 				efree(arch);
-				/* Error Occured */
+				/* Error Occurred */
 				if (!IS_EXISTS_CHECK(type)) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "%sstat failed for %s", IS_LINK_OPERATION(type) ? "L" : "", filename);
 				}
diff --git a/ext/phar/tests/files/openssl.cnf b/ext/phar/tests/files/openssl.cnf
index 10e69076cf..4ed40fdc8a 100644
--- a/ext/phar/tests/files/openssl.cnf
+++ b/ext/phar/tests/files/openssl.cnf
@@ -3,7 +3,7 @@ default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+x509_extensions	= v3_ca	# The extensions to add to the self signed cert
 string_mask = MASK:4294967295
 
 
diff --git a/ext/posix/config.m4 b/ext/posix/config.m4
index 83ead2e46a..82b80ce972 100644
--- a/ext/posix/config.m4
+++ b/ext/posix/config.m4
@@ -45,6 +45,6 @@ int main(int argc, char *argv[])
     ])
   ])
   if test "$ac_cv_have_utsname_domainname" = yes; then
-    AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Wether struct utsname has domainname])
+    AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Whether struct utsname has domainname])
   fi
 fi
diff --git a/ext/shmop/README b/ext/shmop/README
index 5ec15861b8..a8ea03af91 100644
--- a/ext/shmop/README
+++ b/ext/shmop/README
@@ -4,12 +4,12 @@ Shared Memory Operations Extension to PHP
 
 	While developing a search deamon we needed a php based front end
 	to communicate the deamon via SHM. PHP already had a shared memory
-	extention (sysvshm) written by Christian Cartus <cartus@atrior.de>,
-	unfortunatly this extention was designed with PHP only in mind and
+	extension (sysvshm) written by Christian Cartus <cartus@atrior.de>,
+	unfortunately this extension was designed with PHP only in mind and
 	offers high level features which are extremly bothersome for basic SHM
 	we had in mind.  After spending a day trying to reverse engineer and figure
 	out the format of sysvshm we decided that it would be much easier to
-	add our own extention to php for simple SHM operations, we were right :)). 
+	add our own extension to php for simple SHM operations, we were right :)). 
 
 the functions are:
 	
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 47e2d43f5a..186aeb5cdd 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -719,7 +719,7 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
 	zval *snmpval = NULL;
 	int snmp_errno;
 
-	/* we start with retval=FALSE. If any actual data is aquired, retval will be set to appropriate type */
+	/* we start with retval=FALSE. If any actual data is acquired, retval will be set to appropriate type */
 	RETVAL_FALSE;
 	
 	/* reset errno and errstr */
@@ -1871,7 +1871,7 @@ PHP_METHOD(snmp, close)
 /* }}} */
 
 /* {{{ proto mixed SNMP::get(mixed object_id [, bool preserve_keys])
-   Fetch a SNMP object returing scalar for single OID and array of oid->value pairs for multi OID request */
+   Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */
 PHP_METHOD(snmp, get)
 {
 	php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, (-1));
@@ -1879,7 +1879,7 @@ PHP_METHOD(snmp, get)
 /* }}} */
 
 /* {{{ proto mixed SNMP::getnext(mixed object_id)
-   Fetch a SNMP object returing scalar for single OID and array of oid->value pairs for multi OID request */
+   Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */
 PHP_METHOD(snmp, getnext)
 {
 	php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, (-1));
diff --git a/ext/soap/TODO b/ext/soap/TODO
index ad0b11c948..9e6784f6f4 100644
--- a/ext/soap/TODO
+++ b/ext/soap/TODO
@@ -41,7 +41,7 @@ Encoding
 ? support for "nillable" and "nil"
 ? default values of <element>
 ? provide schema 1999/2001 support???
-? make internal refrences for soap encoding (use seralization logic)???
+? make internal references for soap encoding (use serialization logic)???
 ? provide user space overriding of serialization certin objects and types???
 
 WSDL
diff --git a/ext/soap/TODO.old b/ext/soap/TODO.old
index 59deb4b9dc..b219c61f8a 100644
--- a/ext/soap/TODO.old
+++ b/ext/soap/TODO.old
@@ -2,13 +2,13 @@ TODO:
 make sure soap 1.1 and 1.2 is supported fully
 Better WSDL support Client and server (how much validation is needed here?)
 UDDI??
-make internal refrences for soap encoding (use seralization logic)
+make internal references for soap encoding (use serialization logic)
 add ini option for always soap_error_handler
 provide user space overriding of serialization certin objects and types
 serialization in general needs to be polished/finished... all xsd types
 look to see if php-soap will work with out always_populate_raw_post_data on
 see if client will work with ssl.. should be eaiser with php_streams
-work on soap seralizer (php serialization)
+work on soap serializer (php serialization)
 -work on a soap-service 'regiestry' and 'proxy' (apache soap style)
 -convert all string mainpulation to use smart_str
 make the 'soap' packet abstract.. maybe incorperate xml-rpc
diff --git a/ext/soap/interop/client_round2_params.php b/ext/soap/interop/client_round2_params.php
index f0987a1702..e0b2c0e82d 100644
--- a/ext/soap/interop/client_round2_params.php
+++ b/ext/soap/interop/client_round2_params.php
@@ -486,7 +486,7 @@ $test->headers_expect = array();
 $soap_tests['GroupC'][] = $test;
 
 // echoMeStringRequest with endpoint header destination, must understand,
-// invalid namespace, should recieve a fault
+// invalid namespace, should receive a fault
 $test = new SOAP_Test('echoVoid(echoMeStringRequest invalid namespace)', NULL);
 $test->headers[] = new SoapHeader('http://unknown.org/echoheader/','echoMeStringRequest', 'hello world', 1, SOAP_ACTOR_NEXT);
 $test->headers_expect = array();
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index 7a109c1966..5af308c180 100644
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -1222,7 +1222,7 @@ try_again:
 				zval *err;
 				MAKE_STD_ZVAL(err);
 				ZVAL_STRINGL(err, http_body, http_body_size, 1);
-				add_soap_fault(this_ptr, "HTTP", "Didn't recieve an xml document", NULL, err TSRMLS_CC);
+				add_soap_fault(this_ptr, "HTTP", "Didn't receive an xml document", NULL, err TSRMLS_CC);
 				efree(content_type);
 				efree(http_headers);
 				efree(http_body);
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index ba9455e134..8a41ff4e4f 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1675,7 +1675,7 @@ PHP_METHOD(SoapServer, handle)
 			}
 		}
 #endif
-		/* If new session or something wierd happned */
+		/* If new session or something weird happned */
 		if (soap_obj == NULL) {
 			zval *tmp_soap;
 
diff --git a/ext/soap/tests/bugs/bug27742.wsdl b/ext/soap/tests/bugs/bug27742.wsdl
index f38d911852..7f1514acbf 100644
--- a/ext/soap/tests/bugs/bug27742.wsdl
+++ b/ext/soap/tests/bugs/bug27742.wsdl
@@ -5,7 +5,7 @@
 		<xsd:schema targetNamespace="urn:TMSWebServices" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tms="urn:TMSWebServices" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 	<simpleType name="duration">
 		<annotation>
-			<documentation xml:lang="en">ISO 8601 pattern used to denote program durations.  Year, month and day are not relevent in our context and are omitted.</documentation>
+			<documentation xml:lang="en">ISO 8601 pattern used to denote program durations.  Year, month and day are not relevant in our context and are omitted.</documentation>
 		</annotation>
 		<restriction base="xsd:duration">
 			<pattern value="PT[0-9][0-9]H[0-5][0-9]M"/>
@@ -484,7 +484,7 @@
 									</attribute>
 									<attribute name="to" type="tms:date" use="optional">
 										<annotation>
-											<documentation xml:lang="en">Date untill which the mapping is valid, within the validity period of the whole XTVD document. @IMPORTANT : The change will occur at midnight.</documentation>
+											<documentation xml:lang="en">Date until which the mapping is valid, within the validity period of the whole XTVD document. @IMPORTANT : The change will occur at midnight.</documentation>
 										</annotation>
 									</attribute>
 								</complexType>
diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc
index 33258ab954..4d4bf8dbff 100644
--- a/ext/spl/internal/cachingiterator.inc
+++ b/ext/spl/internal/cachingiterator.inc
@@ -23,7 +23,7 @@
  *       flag CALL_TOSTRING to do the conversion when the actual element
  *       is being fetched. Otherwise the conversion would happen with the
  *       already changed iterator. If you do not need this then it you should
- *       omit this flag because it costs unneccessary work and time.
+ *       omit this flag because it costs unnecessary work and time.
  */
 class CachingIterator implements OuterIterator
 {
diff --git a/ext/spl/tests/iterator_031.phpt b/ext/spl/tests/iterator_031.phpt
index 40342f4bb4..8bd3ca7c54 100644
--- a/ext/spl/tests/iterator_031.phpt
+++ b/ext/spl/tests/iterator_031.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: AppendIterator::append() rewinds when neccessary
+SPL: AppendIterator::append() rewinds when necessary
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt
index 97896f8154..d56f48f896 100644
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
@@ -43,8 +43,8 @@ var_dump(iterator_apply($it, 'test'));
 
 echo "===ERRORS===\n";
 var_dump(iterator_apply($it, 'test', 1));
-var_dump(iterator_apply($it, 'non_existing_functon'));
-var_dump(iterator_apply($it, 'non_existing_functon', NULL, 2));
+var_dump(iterator_apply($it, 'non_existing_function'));
+var_dump(iterator_apply($it, 'non_existing_function', NULL, 2));
 
 ?>
 ===DONE===
@@ -77,7 +77,7 @@ int(4)
 Error: Argument 3 passed to iterator_apply() must be of the type array, integer given
 Error: iterator_apply() expects parameter 3 to be array, integer given
 NULL
-Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_functon' not found or invalid function name
+Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_function' not found or invalid function name
 NULL
 Error: iterator_apply() expects at most 3 parameters, 4 given
 NULL
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c
index 2bcd2409a9..784be51344 100644
--- a/ext/sqlite3/libsqlite/sqlite3.c
+++ b/ext/sqlite3/libsqlite/sqlite3.c
@@ -361,7 +361,7 @@
 ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
 ** 0 means mutexes are permanently disable and the library is never
 ** threadsafe.  1 means the library is serialized which is the highest
-** level of threadsafety.  2 means the libary is multithreaded - multiple
+** level of threadsafety.  2 means the library is multithreaded - multiple
 ** threads can use SQLite as long as no two threads try to use the same
 ** database connection at the same time.
 **
@@ -19267,7 +19267,7 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
         }
         if( xtype==etGENERIC && precision>0 ) precision--;
 #if 0
-        /* Rounding works like BSD when the constant 0.4999 is used.  Wierd! */
+        /* Rounding works like BSD when the constant 0.4999 is used.  Weird! */
         for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1);
 #else
         /* It makes more sense to use 0.5 */
@@ -23962,7 +23962,7 @@ static int os2Delete(
 }
 
 /*
-** Check the existance and status of a file.
+** Check the existence and status of a file.
 */
 static int os2Access(
   sqlite3_vfs *pVfs,        /* Not used on os2 */
@@ -26315,7 +26315,7 @@ static int nolockClose(sqlite3_file *id) {
 /******************************************************************************
 ************************* Begin dot-file Locking ******************************
 **
-** The dotfile locking implementation uses the existance of separate lock
+** The dotfile locking implementation uses the existence of separate lock
 ** files in order to control access to the database.  This works on just
 ** about every filesystem imaginable.  But there are serious downsides:
 **
@@ -26330,7 +26330,7 @@ static int nolockClose(sqlite3_file *id) {
 **
 ** Dotfile locking works by creating a file in the same directory as the
 ** database and with the same name but with a ".lock" extension added.
-** The existance of a lock file implies an EXCLUSIVE lock.  All other lock
+** The existence of a lock file implies an EXCLUSIVE lock.  All other lock
 ** types (SHARED, RESERVED, PENDING) are mapped into EXCLUSIVE.
 */
 
@@ -29637,7 +29637,7 @@ static int unixDelete(
 }
 
 /*
-** Test the existance of or access permissions of file zPath. The
+** Test the existence of or access permissions of file zPath. The
 ** test performed depends on the value of flags:
 **
 **     SQLITE_ACCESS_EXISTS: Return 1 if the file exists
@@ -33788,7 +33788,7 @@ static int winDelete(
 }
 
 /*
-** Check the existance and status of a file.
+** Check the existence and status of a file.
 */
 static int winAccess(
   sqlite3_vfs *pVfs,         /* Not used on win32 */
@@ -34345,7 +34345,7 @@ SQLITE_API int sqlite3_os_end(void){
 /*
 ** A bitmap is an instance of the following structure.
 **
-** This bitmap records the existance of zero or more bits
+** This bitmap records the existence of zero or more bits
 ** with values between 1 and iSize, inclusive.
 **
 ** There are three possible representations of the bitmap.
@@ -35828,7 +35828,7 @@ static sqlite3_pcache *pcache1Create(int szPage, int bPurgeable){
   int sz;               /* Bytes of memory required to allocate the new cache */
 
   /*
-  ** The seperateCache variable is true if each PCache has its own private
+  ** The separateCache variable is true if each PCache has its own private
   ** PGroup.  In other words, separateCache is true for mode (1) where no
   ** mutexing is required.
   **
@@ -41734,7 +41734,7 @@ static void pagerUnlockIfUnused(Pager *pPager){
 ** page is initialized to all zeros. 
 **
 ** If noContent is true, it means that we do not care about the contents
-** of the page. This occurs in two seperate scenarios:
+** of the page. This occurs in two separate scenarios:
 **
 **   a) When reading a free-list leaf page from the database, and
 **
@@ -48700,7 +48700,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
   }else if( gap+2<=top ){
     /* Search the freelist looking for a free slot big enough to satisfy 
     ** the request. The allocation is made from the first free slot in 
-    ** the list that is large enough to accomadate it.
+    ** the list that is large enough to accommodate it.
     */
     int pc, addr;
     for(addr=hdr+1; (pc = get2byte(&data[addr]))>0; addr=pc){
@@ -50520,7 +50520,7 @@ SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){
 
 /*
 ** This routine is called prior to sqlite3PagerCommit when a transaction
-** is commited for an auto-vacuum database.
+** is committed for an auto-vacuum database.
 **
 ** If SQLITE_OK is returned, then *pnTrunc is set to the number of pages
 ** the database file should be truncated to during the commit process. 
@@ -52264,7 +52264,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){
 ** which in turn can make database access faster.
 **
 ** If the "exact" parameter is not 0, and the page-number nearby exists 
-** anywhere on the free-list, then it is guarenteed to be returned. This
+** anywhere on the free-list, then it is guaranteed to be returned. This
 ** is only used by auto-vacuum databases when allocating a new table.
 */
 static int allocateBtreePage(
@@ -58372,7 +58372,7 @@ SQLITE_PRIVATE void sqlite3VdbeNoopComment(Vdbe *p, const char *zFormat, ...){
 ** by running with Valgrind.
 **
 ** About the #ifdef SQLITE_OMIT_TRACE:  Normally, this routine is never called
-** unless p->nOp>0.  This is because in the absense of SQLITE_OMIT_TRACE,
+** unless p->nOp>0.  This is because in the absence of SQLITE_OMIT_TRACE,
 ** an OP_Trace instruction is always inserted by sqlite3VdbeGet() as soon as
 ** a new VDBE is created.  So we are free to set addr to p->nOp-1 without
 ** having to double-check to make sure that the result is non-negative. But
@@ -59551,7 +59551,7 @@ static void invalidateCursorsOnModifiedBtrees(sqlite3 *db){
 ** close it now. Argument eOp must be either SAVEPOINT_ROLLBACK or
 ** SAVEPOINT_RELEASE. If it is SAVEPOINT_ROLLBACK, then the statement
 ** transaction is rolled back. If eOp is SAVEPOINT_RELEASE, then the 
-** statement transaction is commtted.
+** statement transaction is committed.
 **
 ** If an IO error occurs, an SQLITE_IOERR_XXX error code is returned. 
 ** Otherwise SQLITE_OK.
@@ -60076,7 +60076,7 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor *p){
 ** the blob of data that it corresponds to. In a table record, all serial
 ** types are stored at the start of the record, and the blobs of data at
 ** the end. Hence these functions allow the caller to handle the
-** serial-type and data blob seperately.
+** serial-type and data blob separately.
 **
 ** The following table describes the various storage classes for data:
 **
@@ -65590,7 +65590,7 @@ case OP_AutoCommit: {
 ** other process can start another write transaction while this transaction is
 ** underway.  Starting a write transaction also creates a rollback journal. A
 ** write transaction must be started before any changes can be made to the
-** database.  If P2 is 2 or greater then an EXCLUSIVE lock is also obtained
+** database.  If P2 is 2 or greater than an EXCLUSIVE lock is also obtained
 ** on the file.
 **
 ** If a write-transaction is started and the Vdbe.usesStmtJournal flag is
@@ -72784,7 +72784,7 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
 **
 ** If rMayHaveNull is zero, that means that the subquery is being used
 ** for membership testing only.  There is no need to initialize any
-** registers to indicate the presense or absence of NULLs on the RHS.
+** registers to indicate the presence or absence of NULLs on the RHS.
 **
 ** For a SELECT or EXISTS operator, return the register that holds the
 ** result.  For IN operators or if an error occurs, the return value is 0.
@@ -74392,7 +74392,7 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int
   int r1, r2;
 
   assert( jumpIfNull==SQLITE_JUMPIFNULL || jumpIfNull==0 );
-  if( NEVER(v==0) )     return;  /* Existance of VDBE checked by caller */
+  if( NEVER(v==0) )     return;  /* Existence of VDBE checked by caller */
   if( NEVER(pExpr==0) ) return;  /* No way this can happen */
   op = pExpr->op;
   switch( op ){
@@ -74512,7 +74512,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
   int r1, r2;
 
   assert( jumpIfNull==SQLITE_JUMPIFNULL || jumpIfNull==0 );
-  if( NEVER(v==0) ) return; /* Existance of VDBE checked by caller */
+  if( NEVER(v==0) ) return; /* Existence of VDBE checked by caller */
   if( pExpr==0 )    return;
 
   /* The value of pExpr->op and op are related as follows:
@@ -79452,7 +79452,7 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView,
     /* Drop all SQLITE_MASTER table and index entries that refer to the
     ** table. The program name loops through the master table and deletes
     ** every row that refers to a table of the same name as the one being
-    ** dropped. Triggers are handled seperately because a trigger can be
+    ** dropped. Triggers are handled separately because a trigger can be
     ** created in the temp database that refers to a table in another
     ** database.
     */
@@ -82374,7 +82374,7 @@ static void absFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
 **
 ** If p1 is negative, then we begin abs(p1) from the end of x[].
 **
-** If p2 is negative, return the p2 characters preceeding p1.
+** If p2 is negative, return the p2 characters preceding p1.
 */
 static void substrFunc(
   sqlite3_context *context,
@@ -83172,7 +83172,7 @@ static void zeroblobFunc(
 /*
 ** The replace() function.  Three arguments are all strings: call
 ** them A, B, and C. The result is also a string which is derived
-** from A by replacing every occurance of B with C.  The match
+** from A by replacing every occurrence of B with C.  The match
 ** must be exact.  Collating sequences are not used.
 */
 static void replaceFunc(
@@ -90574,7 +90574,7 @@ SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3 *db, Select *p){
 }
 
 /*
-** Given 1 to 3 identifiers preceeding the JOIN keyword, determine the
+** Given 1 to 3 identifiers preceding the JOIN keyword, determine the
 ** type of join.  Return an integer constant that expresses that type
 ** in terms of the following bit values:
 **
@@ -91892,7 +91892,7 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
 
   /* 
   ** "LIMIT -1" always shows all rows.  There is some
-  ** contraversy about what the correct behavior should be.
+  ** controversy about what the correct behavior should be.
   ** The current implementation interprets "LIMIT 0" to mean
   ** no rows.
   */
@@ -94252,7 +94252,7 @@ SQLITE_PRIVATE int sqlite3Select(
     if( pSub==0 || pItem->isPopulated ) continue;
 
     /* Increment Parse.nHeight by the height of the largest expression
-    ** tree refered to by this, the parent select. The child select
+    ** tree referred to by this, the parent select. The child select
     ** may contain expression trees of at most
     ** (SQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit
     ** more conservative than necessary, but much easier than enforcing
@@ -99313,7 +99313,7 @@ static void exprAnalyzeOrTerm(
         }
         if( (chngToIN & getMask(pMaskSet, pOrTerm->leftCursor))==0 ){
           /* This term must be of the form t1.a==t2.b where t2 is in the
-          ** chngToIN set but t1 is not.  This term will be either preceeded
+          ** chngToIN set but t1 is not.  This term will be either preceded
           ** or follwed by an inverted copy (t2.b==t1.a).  Skip this term 
           ** and use its inversion. */
           testcase( pOrTerm->wtFlags & TERM_COPIED );
@@ -102953,7 +102953,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
         **   (1) The table must not depend on other tables that have not
         **       yet run.
         **
-        **   (2) A full-table-scan plan cannot supercede indexed plan unless
+        **   (2) A full-table-scan plan cannot supersede indexed plan unless
         **       the full-table-scan is an "optimal" plan as defined above.
         **
         **   (3) All tables have an INDEXED BY clause or this table lacks an
@@ -107619,7 +107619,7 @@ SQLITE_PRIVATE const char sqlite3IsEbcdicIdChar[];
 **                 a statement.
 **
 **   (4) CREATE    The keyword CREATE has been seen at the beginning of a
-**                 statement, possibly preceeded by EXPLAIN and/or followed by
+**                 statement, possibly preceded by EXPLAIN and/or followed by
 **                 TEMP or TEMPORARY
 **
 **   (5) TRIGGER   We are in the middle of a trigger definition that must be
@@ -108525,7 +108525,7 @@ static int binCollFunc(
 /*
 ** Another built-in collating sequence: NOCASE. 
 **
-** This collating sequence is intended to be used for "case independant
+** This collating sequence is intended to be used for "case independent
 ** comparison". SQLite's knowledge of upper and lower case equivalents
 ** extends only to the 26 characters used in the English language.
 **
@@ -116368,7 +116368,7 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhraseStats(
 ** of the current row. 
 **
 ** More specifically, the returned buffer contains 1 varint for each 
-** occurence of the phrase in the column, stored using the normal (delta+2) 
+** occurrence of the phrase in the column, stored using the normal (delta+2) 
 ** compression and is terminated by either an 0x01 or 0x00 byte. For example,
 ** if the requested column contains "a b X c d X X" and the position-list
 ** for 'X' is requested, the buffer returned may contain:
@@ -118508,7 +118508,7 @@ static int star_oh(const char *z){
 
 /*
 ** If the word ends with zFrom and xCond() is true for the stem
-** of the word that preceeds the zFrom ending, then change the 
+** of the word that preceds the zFrom ending, then change the 
 ** ending to zTo.
 **
 ** The input word *pz and zFrom are both in reverse order.  zTo
@@ -123270,9 +123270,9 @@ static int fts3SnippetFindPositions(Fts3Expr *pExpr, int iPhrase, void *ctx){
 ** is the snippet with the highest score, where scores are calculated
 ** by adding:
 **
-**   (a) +1 point for each occurence of a matchable phrase in the snippet.
+**   (a) +1 point for each occurrence of a matchable phrase in the snippet.
 **
-**   (b) +1000 points for the first occurence of each matchable phrase in 
+**   (b) +1000 points for the first occurrence of each matchable phrase in 
 **       the snippet for which the corresponding mCovered bit is not set.
 **
 ** The selected snippet parameters are stored in structure *pFragment before
@@ -123373,7 +123373,7 @@ static int fts3StringAppend(
   }
 
   /* If there is insufficient space allocated at StrBuffer.z, use realloc()
-  ** to grow the buffer until so that it is big enough to accomadate the
+  ** to grow the buffer until so that it is big enough to accommodate the
   ** appended data.
   */
   if( pStr->n+nAppend+1>=pStr->nAlloc ){
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 8e88a85080..2713d23f1d 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -904,7 +904,7 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ
 	}
 
 	if (php_stream_stat_path_ex((char *)filename, flags, &ssb, NULL)) {
-		/* Error Occured */
+		/* Error Occurred */
 		if (!IS_EXISTS_CHECK(type)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%sstat failed for %s", IS_LINK_OPERATION(type) ? "L" : "", filename);
 		}
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 3732939358..86975d7f5b 100644
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -440,7 +440,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
 		if (strchr(mode, 'a')) {
 			read_write = 3; /* Open for Appending */
 		} else {
-			read_write = 2; /* Open for writting */
+			read_write = 2; /* Open for writing */
 		}
 	}
 	if (!read_write) {
@@ -500,7 +500,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
 		}
 		if (result <= 299 && result >= 200) {
 			if (allow_overwrite) {
-				/* Context permits overwritting file, 
+				/* Context permits overwriting file, 
 				   so we just delete whatever's there in preparation */
 				php_stream_printf(stream TSRMLS_CC, "DELE %s\r\n", resource->path);
 				result = GET_FTP_RESULT(stream);
diff --git a/ext/standard/image.c b/ext/standard/image.c
index 4984e4064a..b3dade4a75 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -606,7 +606,7 @@ static struct gfxinfo *php_handle_jpc(php_stream * stream TSRMLS_DC)
 
 	/* JPEG 2000 components can be vastly different from one another.
 	   Each component can be sampled at a different resolution, use
-	   a different colour space, have a seperate colour depth, and
+	   a different colour space, have a separate colour depth, and
 	   be compressed totally differently! This makes giving a single
 	   "bit depth" answer somewhat problematic. For this implementation
 	   we'll use the highest depth encountered. */
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 209cb7f9b2..f487763b9e 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -1591,7 +1591,7 @@ PHP_FUNCTION(stream_is_local)
 /* }}} */
 
 /* {{{ proto bool stream_supports_lock(resource stream)
-   Tells wether the stream supports locking through flock(). */
+   Tells whether the stream supports locking through flock(). */
 PHP_FUNCTION(stream_supports_lock)
 {
 	php_stream *stream;
diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt
index 03de632905..1381fe0f4c 100644
--- a/ext/standard/tests/array/array_combine_variation3.phpt
+++ b/ext/standard/tests/array/array_combine_variation3.phpt
@@ -29,7 +29,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt
index 8623f8e6c2..309c9ca073 100644
--- a/ext/standard/tests/array/array_fill_basic.phpt
+++ b/ext/standard/tests/array/array_fill_basic.phpt
@@ -16,7 +16,7 @@ $heredoc = <<<HERE_DOC
 Hello
 HERE_DOC;
 
-// array of possible valid values for 'val' arugment
+// array of possible valid values for 'val' argument
 $values = array (
   
   /* 1  */  NULL,
diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt
index 9e1f50c683..13b566a7db 100644
--- a/ext/standard/tests/array/array_fill_variation4.phpt
+++ b/ext/standard/tests/array/array_fill_variation4.phpt
@@ -17,7 +17,7 @@ $heredoc = <<<HERE_DOC
 Hello
 HERE_DOC;
 
-// array of possible valid values for 'val' arugment 
+// array of possible valid values for 'val' argument 
 $values = array (
 
   /* 1  */  NULL,
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
index 50be080590..e3f0ae08ec 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
@@ -31,7 +31,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
index ed2e3d9514..9eb342f8e7 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
@@ -31,7 +31,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt
index b2b7d8ac01..c404e58bab 100644
--- a/ext/standard/tests/array/array_intersect_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_variation3.phpt
@@ -30,7 +30,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt
index 4f1d6f3dd5..66624a66cd 100644
--- a/ext/standard/tests/array/array_intersect_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_variation4.phpt
@@ -30,7 +30,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt
index f433e12562..37ac0f8ecc 100644
--- a/ext/standard/tests/array/array_key_exists.phpt
+++ b/ext/standard/tests/array/array_key_exists.phpt
@@ -114,7 +114,7 @@ var_dump(array_key_exists("print_member", $key_check_obj)); // not found, its a
 var_dump(array_key_exists("arr", $key_check_obj)); //found, public member
 var_dump(array_key_exists("var", $key_check_obj->arr)); //found,  key is in member array
 
-/* error condition, first arguemnt as object */
+/* error condition, first argument as object */
 var_dump( array_key_exists($key_check_obj, $key_check_obj) );
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
index 722388a015..76bf913918 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
@@ -30,7 +30,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt
index 2f97e3ee5f..a491573909 100644
--- a/ext/standard/tests/array/array_pad_variation6.phpt
+++ b/ext/standard/tests/array/array_pad_variation6.phpt
@@ -31,7 +31,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt
index 3cfcfba2b2..757dd6e057 100644
--- a/ext/standard/tests/array/array_unique_variation2.phpt
+++ b/ext/standard/tests/array/array_unique_variation2.phpt
@@ -29,7 +29,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt
index a667e6da03..b6440f899e 100644
--- a/ext/standard/tests/array/array_unshift_variation9.phpt
+++ b/ext/standard/tests/array/array_unshift_variation9.phpt
@@ -33,7 +33,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt
index 654637ab5a..63c5f51ee0 100644
--- a/ext/standard/tests/array/array_walk_error2.phpt
+++ b/ext/standard/tests/array/array_walk_error2.phpt
@@ -25,7 +25,7 @@ echo "*** Testing array_walk() : error conditions - callback parameters ***\n";
 var_dump( array_walk($input, "callback1") );
 var_dump( array_walk($input, "callback2", 4) );
 
-// expected: Warning is supressed
+// expected: Warning is suppressed
 var_dump( @array_walk($input, "callback1") );  
 var_dump( @array_walk($input, "callback2", 4) );  
 
diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt
index d628e9327a..8e0c8829e6 100644
--- a/ext/standard/tests/array/array_walk_recursive_error2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt
@@ -25,7 +25,7 @@ echo "*** Testing array_walk_recursive() : error conditions - callback parameter
 var_dump( array_walk_recursive($input, "callback1") );
 var_dump( array_walk_recursive($input, "callback2", 4) );
 
-// expected: Warning is supressed
+// expected: Warning is suppressed
 var_dump( @array_walk_recursive($input, "callback1") );  
 var_dump( @array_walk_recursive($input, "callback2", 4) );  
 
diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt
index 1545abe34e..bff8d41303 100644
--- a/ext/standard/tests/array/arsort_variation1.phpt
+++ b/ext/standard/tests/array/arsort_variation1.phpt
@@ -74,7 +74,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of arsort()
-// when $array arugment is supplied with different values from $unexpected_values
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing arsort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt
index b85653052f..ddfe319a46 100644
--- a/ext/standard/tests/array/arsort_variation2.phpt
+++ b/ext/standard/tests/array/arsort_variation2.phpt
@@ -70,7 +70,7 @@ $unexpected_values = array(
 );
 
 // loop though each element of the array and check the working of arsort()
-// when $flag arugment is supplied with different values from $unexpected_values
+// when $flag argument is supplied with different values from $unexpected_values
 echo "\n-- Testing arsort() by supplying different unexpected values for 'sort_flags' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt
index 5420f0524c..67eb5bf21c 100644
--- a/ext/standard/tests/array/asort_variation1.phpt
+++ b/ext/standard/tests/array/asort_variation1.phpt
@@ -74,7 +74,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of asort()
-// when $array arugment is supplied with different values from $unexpected_values
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing asort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt
index 6cce644331..138e124537 100644
--- a/ext/standard/tests/array/asort_variation2.phpt
+++ b/ext/standard/tests/array/asort_variation2.phpt
@@ -70,7 +70,7 @@ $unexpected_values = array(
 );
 
 // loop though each element of the array and check the working of asort()
-// when $flag arugment is supplied with different values from $unexpected_values
+// when $flag argument is supplied with different values from $unexpected_values
 echo "\n-- Testing asort() by supplying different unexpected values for 'sort_flags' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt
index eb0c712000..7e132ba3d4 100644
--- a/ext/standard/tests/array/bug40709.phpt
+++ b/ext/standard/tests/array/bug40709.phpt
@@ -2,7 +2,7 @@
 Bug #40709 (array_reduce() behaves strange with one item stored arrays)
 --FILE--
 <?php
-function CommaSeperatedList($a, $b) {
+function CommaSeparatedList($a, $b) {
     if($a == null)
         return $b;
     else
@@ -12,10 +12,10 @@ function CommaSeperatedList($a, $b) {
 $arr1 = array(1,2,3);
 $arr2 = array(1);
 
-echo "result for arr1: ".array_reduce($arr1,'CommaSeperatedList')."\n";
-echo "result for arr2: ".array_reduce($arr2,'CommaSeperatedList')."\n";
-echo "result for arr1: ".array_reduce($arr1,'CommaSeperatedList')."\n";
-echo "result for arr2: ".array_reduce($arr2,'CommaSeperatedList')."\n";
+echo "result for arr1: ".array_reduce($arr1,'CommaSeparatedList')."\n";
+echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n";
+echo "result for arr1: ".array_reduce($arr1,'CommaSeparatedList')."\n";
+echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n";
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt
index e4cbaf8d2c..fa13242a08 100644
--- a/ext/standard/tests/array/krsort_variation1.phpt
+++ b/ext/standard/tests/array/krsort_variation1.phpt
@@ -72,7 +72,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of krsort()
-// when $array arugment is supplied with different values from $unexpected_values
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt
index 1376202470..d193589de4 100644
--- a/ext/standard/tests/array/krsort_variation2.phpt
+++ b/ext/standard/tests/array/krsort_variation2.phpt
@@ -69,7 +69,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of krsort()
-// when 'sort_flags' arugment is supplied with different values
+// when 'sort_flags' argument is supplied with different values
 echo "\n-- Testing krsort() by supplying different unexpected values for 'sort_flags' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt
index d8c037fa95..37a35d1c01 100644
--- a/ext/standard/tests/array/ksort_variation1.phpt
+++ b/ext/standard/tests/array/ksort_variation1.phpt
@@ -72,7 +72,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of ksort()
-// when $array arugment is supplied with different values from $unexpected_values
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt
index 4969844e75..102c1c1eb6 100644
--- a/ext/standard/tests/array/ksort_variation2.phpt
+++ b/ext/standard/tests/array/ksort_variation2.phpt
@@ -69,7 +69,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of ksort()
-// when 'sort_flags' arugment is supplied with different values
+// when 'sort_flags' argument is supplied with different values
 echo "\n-- Testing ksort() by supplying different unexpected values for 'sort_flags' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt
index a2ab2eedfd..b56682c31a 100644
--- a/ext/standard/tests/array/sizeof_basic2.phpt
+++ b/ext/standard/tests/array/sizeof_basic2.phpt
@@ -19,7 +19,7 @@ echo "*** Testing sizeof() : basic functionality ***\n";
 
 $int_array = array(1, 2, 3, 4);
 $string_array = array("Saffron", "White", "Green");
-$indexed_array = array("Agression" => "Saffron", "Peace" => "White", "Growth" => "Green");
+$indexed_array = array("Aggression" => "Saffron", "Peace" => "White", "Growth" => "Green");
 $mixed_array = array(1, 2, "Aggression" => "Saffron", 10 => "Ten", "Ten" => 10);
 
 echo "-- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --\n";
diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt
index a2462757d6..cb8fecc822 100644
--- a/ext/standard/tests/array/sizeof_variation4.phpt
+++ b/ext/standard/tests/array/sizeof_variation4.phpt
@@ -54,7 +54,7 @@ $values = array (
   /* 20 */  $fp
 );
 
-// loop through the each element of the $values array for 'var' arugment 
+// loop through the each element of the $values array for 'var' argument 
 // and check the functionality of sizeof()
 $counter = 1;
 foreach($values as $value)
diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt
index f6991bdf67..9243de08e4 100644
--- a/ext/standard/tests/array/sort_variation1.phpt
+++ b/ext/standard/tests/array/sort_variation1.phpt
@@ -73,7 +73,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of sort()
-// when $array arugment is supplied with different values from $unexpected_values 
+// when $array argument is supplied with different values from $unexpected_values 
 echo "\n-- Testing sort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt
index 7cb8ed642a..af3deba4b9 100644
--- a/ext/standard/tests/array/sort_variation2.phpt
+++ b/ext/standard/tests/array/sort_variation2.phpt
@@ -69,7 +69,7 @@ $unexpected_values = array(
 );
 
 // loop though each element of the array and check the working of sort()
-// when $flag arugment is supplied with different values
+// when $flag argument is supplied with different values
 echo "\n-- Testing sort() by supplying different unexpected values for 'flag' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt
index 820ab58478..cc2dd3a217 100644
--- a/ext/standard/tests/array/uasort_error.phpt
+++ b/ext/standard/tests/array/uasort_error.phpt
@@ -50,7 +50,7 @@ var_dump( uasort($array_arg) );
 echo "-- Testing uasort() function with non-existent compare function --\n";
 var_dump( uasort($array_arg, 'non_existent') );
 
-// With non existent comparison function and extra arguemnt
+// With non existent comparison function and extra argument
 echo "-- Testing uasort() function with non-existent compare function and extra argument --\n";
 var_dump( uasort($array_arg, 'non_existent', $extra_arg) );
 
diff --git a/ext/standard/tests/array/usort_error2.phpt b/ext/standard/tests/array/usort_error2.phpt
index 308199fc1f..7bf0f659e0 100644
--- a/ext/standard/tests/array/usort_error2.phpt
+++ b/ext/standard/tests/array/usort_error2.phpt
@@ -36,7 +36,7 @@ $extra_arg = 10;
 echo "\n-- Testing usort() function with non-existent compare function --\n";
 var_dump( usort($array_arg, 'non_existent') );
 
-// With non existent comparison function and extra arguemnt
+// With non existent comparison function and extra argument
 echo "\n-- Testing usort() function with non-existent compare function and extra argument --\n";
 var_dump( usort($array_arg, 'non_existent', $extra_arg) );
 ?>
diff --git a/ext/standard/tests/file/007_variation10.phpt b/ext/standard/tests/file/007_variation10.phpt
index c9f3e01cff..2981ef7d4c 100644
--- a/ext/standard/tests/file/007_variation10.phpt
+++ b/ext/standard/tests/file/007_variation10.phpt
@@ -30,7 +30,7 @@ echo "*** Test fopen() & fclose() functions:  with 'r+t' mode ***\n";
 $file_handle = fopen($file, "r+t");  //opening the file in "r+t" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt
index d9c6e83d48..a567b72b03 100644
--- a/ext/standard/tests/file/007_variation11-win32.phpt
+++ b/ext/standard/tests/file/007_variation11-win32.phpt
@@ -36,12 +36,12 @@ echo "*** Test fopen() & fclose() functions:  with 'wt' mode ***\n";
 $file_handle = fopen($file, "wt");  //opening the file "wt" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 
@@ -53,7 +53,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wt") );  //Opening the non-existing file in "wt" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt
index 0656c64609..c884f47f42 100644
--- a/ext/standard/tests/file/007_variation11.phpt
+++ b/ext/standard/tests/file/007_variation11.phpt
@@ -36,12 +36,12 @@ echo "*** Test fopen() & fclose() functions:  with 'wt' mode ***\n";
 $file_handle = fopen($file, "wt");  //opening the file "wt" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 
@@ -53,7 +53,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wt") );  //Opening the non-existing file in "wt" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation12-win32.phpt b/ext/standard/tests/file/007_variation12-win32.phpt
index 0fb9ad8dfa..d3d26e2996 100644
--- a/ext/standard/tests/file/007_variation12-win32.phpt
+++ b/ext/standard/tests/file/007_variation12-win32.phpt
@@ -36,7 +36,7 @@ echo "*** Test fopen() & fclose() functions:  with 'w+t' mode ***\n";
 $file_handle = fopen($file, "w+t");  //opening the file "w+t" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
@@ -53,7 +53,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+t") );  //Opening the non-existing file in "w+t" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation12.phpt b/ext/standard/tests/file/007_variation12.phpt
index 44488fa21d..c56605ac62 100644
--- a/ext/standard/tests/file/007_variation12.phpt
+++ b/ext/standard/tests/file/007_variation12.phpt
@@ -36,7 +36,7 @@ echo "*** Test fopen() & fclose() functions:  with 'w+t' mode ***\n";
 $file_handle = fopen($file, "w+t");  //opening the file "w+t" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
@@ -53,7 +53,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+t") );  //Opening the non-existing file in "w+t" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt
index 736b101042..fabcde90cc 100644
--- a/ext/standard/tests/file/007_variation13-win32.phpt
+++ b/ext/standard/tests/file/007_variation13-win32.phpt
@@ -45,7 +45,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "at") );  //Opening the non-existing file in "at" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt
index 0cb48d3661..9d3e6265b5 100644
--- a/ext/standard/tests/file/007_variation13.phpt
+++ b/ext/standard/tests/file/007_variation13.phpt
@@ -45,7 +45,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "at") );  //Opening the non-existing file in "at" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation14.phpt b/ext/standard/tests/file/007_variation14.phpt
index ed76ab4834..ebcad6d830 100644
--- a/ext/standard/tests/file/007_variation14.phpt
+++ b/ext/standard/tests/file/007_variation14.phpt
@@ -39,7 +39,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+t") );  //Opening the non-existing file in "a+t" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt
index 11eed0d5a4..1a2d530b65 100644
--- a/ext/standard/tests/file/007_variation15.phpt
+++ b/ext/standard/tests/file/007_variation15.phpt
@@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions:  with 'xt' mode ***\n";
 $file_handle = fopen($file, "xt");  //opening the non-existing file in "xt" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "xt");  //Opening the existing data file in 'xt' mode to check for the warning message
diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt
index c725aa183f..633299dedf 100644
--- a/ext/standard/tests/file/007_variation16.phpt
+++ b/ext/standard/tests/file/007_variation16.phpt
@@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions:  with 'x+t' mode ***\n";
 $file_handle = fopen($file, "x+t");  //opening the non-existing file in "x+t" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
diff --git a/ext/standard/tests/file/007_variation18.phpt b/ext/standard/tests/file/007_variation18.phpt
index 991051d5e4..88350b8426 100644
--- a/ext/standard/tests/file/007_variation18.phpt
+++ b/ext/standard/tests/file/007_variation18.phpt
@@ -30,7 +30,7 @@ echo "*** Test fopen() & fclose() functions:  with 'r+b' mode ***\n";
 $file_handle = fopen($file, "r+b");  //opening the file in "r+b" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt
index 3830e4fc24..0731d454bb 100644
--- a/ext/standard/tests/file/007_variation19.phpt
+++ b/ext/standard/tests/file/007_variation19.phpt
@@ -31,12 +31,12 @@ echo "*** Test fopen() & fclose() functions:  with 'wb' mode ***\n";
 $file_handle = fopen($file, "wb");  //opening the file "wb" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 
@@ -48,7 +48,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wb") );  //Opening the non-existing file in "wb" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation2.phpt b/ext/standard/tests/file/007_variation2.phpt
index 4c883ea32c..deb51266ee 100644
--- a/ext/standard/tests/file/007_variation2.phpt
+++ b/ext/standard/tests/file/007_variation2.phpt
@@ -30,7 +30,7 @@ echo "*** Test fopen() & fclose() functions:  with 'r+' mode ***\n";
 $file_handle = fopen($file, "r+");  //opening the file in "r+" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
diff --git a/ext/standard/tests/file/007_variation20.phpt b/ext/standard/tests/file/007_variation20.phpt
index 4d66dc7eec..3eddec4258 100644
--- a/ext/standard/tests/file/007_variation20.phpt
+++ b/ext/standard/tests/file/007_variation20.phpt
@@ -31,7 +31,7 @@ echo "*** Test fopen() & fclose() functions:  with 'w+b' mode ***\n";
 $file_handle = fopen($file, "w+b");  //opening the file "w+b" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
@@ -48,7 +48,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+b") );  //Opening the non-existing file in "w+b" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt
index 6c968f229c..c70aaad784 100644
--- a/ext/standard/tests/file/007_variation21.phpt
+++ b/ext/standard/tests/file/007_variation21.phpt
@@ -40,7 +40,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "ab") );  //Opening the non-existing file in "ab" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation22.phpt b/ext/standard/tests/file/007_variation22.phpt
index d1456fe261..63deee4f84 100644
--- a/ext/standard/tests/file/007_variation22.phpt
+++ b/ext/standard/tests/file/007_variation22.phpt
@@ -39,7 +39,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+b") );  //Opening the non-existing file in "a+b" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt
index 528f05a86f..1826296a06 100644
--- a/ext/standard/tests/file/007_variation23.phpt
+++ b/ext/standard/tests/file/007_variation23.phpt
@@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions:  with 'xb' mode ***\n";
 $file_handle = fopen($file, "xb");  //opening the non-existing file in "xb" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "xb");  //Opening the existing data file in 'xb' mode to check for the warning message
diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt
index 41fc24cbe2..d898ba7b52 100644
--- a/ext/standard/tests/file/007_variation24.phpt
+++ b/ext/standard/tests/file/007_variation24.phpt
@@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions:  with 'x+b' mode ***\n";
 $file_handle = fopen($file, "x+b");  //opening the non-existing file in "x+b" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt
index cd31eba1e1..f4ae03658f 100644
--- a/ext/standard/tests/file/007_variation3.phpt
+++ b/ext/standard/tests/file/007_variation3.phpt
@@ -31,12 +31,12 @@ echo "*** Test fopen() & fclose() functions:  with 'w' mode ***\n";
 $file_handle = fopen($file, "w");  //opening the file "w" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 
@@ -48,7 +48,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w") );  //Opening the non-existing file in "w" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation4.phpt b/ext/standard/tests/file/007_variation4.phpt
index e88324e831..0dabc5b9ad 100644
--- a/ext/standard/tests/file/007_variation4.phpt
+++ b/ext/standard/tests/file/007_variation4.phpt
@@ -31,7 +31,7 @@ echo "*** Test fopen() & fclose() functions:  with 'w+' mode ***\n";
 $file_handle = fopen($file, "w+");  //opening the file "w+" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
@@ -48,7 +48,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+") );  //Opening the non-existing file in "w+" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt
index 9311534574..51e366d291 100644
--- a/ext/standard/tests/file/007_variation5.phpt
+++ b/ext/standard/tests/file/007_variation5.phpt
@@ -40,7 +40,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a") );  //Opening the non-existing file in "a" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation6.phpt b/ext/standard/tests/file/007_variation6.phpt
index b274b05925..92c0171751 100644
--- a/ext/standard/tests/file/007_variation6.phpt
+++ b/ext/standard/tests/file/007_variation6.phpt
@@ -39,7 +39,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+") );  //Opening the non-existing file in "a+" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt
index 131daff55b..06bf9117f3 100644
--- a/ext/standard/tests/file/007_variation7.phpt
+++ b/ext/standard/tests/file/007_variation7.phpt
@@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions:  with 'x' mode ***\n";
 $file_handle = fopen($file, "x");  //opening the non-existing file in "x" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "x");  //Opening the existing data file in 'x' mode to check for the warning message
diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt
index aa847115c0..fae6932048 100644
--- a/ext/standard/tests/file/007_variation8.phpt
+++ b/ext/standard/tests/file/007_variation8.phpt
@@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions:  with 'x+' mode ***\n";
 $file_handle = fopen($file, "x+");  //opening the non-existing file in "x+" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
index 91976b04db..3a9f9c31a4 100644
--- a/ext/standard/tests/file/bug52820.phpt
+++ b/ext/standard/tests/file/bug52820.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #52820 (writes to fopencookie FILE* not commited when seeking the stream)
+Bug #52820 (writes to fopencookie FILE* not committed when seeking the stream)
 --SKIPIF--
 <?php
 if (!function_exists('leak_variable'))
diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt
index f8349989a4..64efaa6cfd 100644
--- a/ext/standard/tests/file/fgetc_variation3.phpt
+++ b/ext/standard/tests/file/fgetc_variation3.phpt
@@ -30,7 +30,7 @@ foreach ($file_modes as $file_mode ) {
   $data = "fgetc_variation test";
   fwrite($file_handle, $data);
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( rewind($file_handle) ); 
   var_dump( ftell($file_handle) ); 
   var_dump( feof($file_handle) );
diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt
index a2bc9e5245..cb6f0cdce5 100644
--- a/ext/standard/tests/file/fgetc_variation4.phpt
+++ b/ext/standard/tests/file/fgetc_variation4.phpt
@@ -29,7 +29,7 @@ foreach ($file_modes as $file_mode ) {
   $data = "fgetc\n test";
   fwrite($file_handle, $data);
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( rewind($file_handle) ); 
   var_dump( ftell($file_handle) ); 
   var_dump( feof($file_handle) );
diff --git a/ext/standard/tests/file/fgetcsv_variation1.phpt b/ext/standard/tests/file/fgetcsv_variation1.phpt
index 8a698e40a0..969c9c0348 100644
--- a/ext/standard/tests/file/fgetcsv_variation1.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation1.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation10.phpt b/ext/standard/tests/file/fgetcsv_variation10.phpt
index 250237c21f..60a401bb86 100644
--- a/ext/standard/tests/file/fgetcsv_variation10.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation10.phpt
@@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt
index 815ede6f01..d5741248fb 100644
--- a/ext/standard/tests/file/fgetcsv_variation11.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation11.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation12.phpt b/ext/standard/tests/file/fgetcsv_variation12.phpt
index e513fe6761..3168684468 100644
--- a/ext/standard/tests/file/fgetcsv_variation12.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation12.phpt
@@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation13.phpt b/ext/standard/tests/file/fgetcsv_variation13.phpt
index a00405b90b..f191a26379 100644
--- a/ext/standard/tests/file/fgetcsv_variation13.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation13.phpt
@@ -37,7 +37,7 @@ $loop_counter = 1;
     fwrite($file_handle, "This is line of text without csv fields\n");
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation14.phpt b/ext/standard/tests/file/fgetcsv_variation14.phpt
index 927bf8a077..14c72a24b1 100644
--- a/ext/standard/tests/file/fgetcsv_variation14.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation14.phpt
@@ -36,7 +36,7 @@ $loop_counter = 1;
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt
index b36b88ed3f..c6859497ee 100644
--- a/ext/standard/tests/file/fgetcsv_variation15.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation15.phpt
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation16.phpt b/ext/standard/tests/file/fgetcsv_variation16.phpt
index 904c422428..9cfdd72460 100644
--- a/ext/standard/tests/file/fgetcsv_variation16.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation16.phpt
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation17.phpt b/ext/standard/tests/file/fgetcsv_variation17.phpt
index a54f8da61e..b8d918659f 100644
--- a/ext/standard/tests/file/fgetcsv_variation17.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation17.phpt
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation18.phpt b/ext/standard/tests/file/fgetcsv_variation18.phpt
index 19915e816f..f0ebcb7fae 100644
--- a/ext/standard/tests/file/fgetcsv_variation18.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation18.phpt
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation19.phpt b/ext/standard/tests/file/fgetcsv_variation19.phpt
index 2e282e1701..cb510099bd 100644
--- a/ext/standard/tests/file/fgetcsv_variation19.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation19.phpt
@@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation2.phpt b/ext/standard/tests/file/fgetcsv_variation2.phpt
index 7b875b821a..d1e446d1f9 100644
--- a/ext/standard/tests/file/fgetcsv_variation2.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation2.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation20.phpt b/ext/standard/tests/file/fgetcsv_variation20.phpt
index e96089e9ab..70bd8acbb0 100644
--- a/ext/standard/tests/file/fgetcsv_variation20.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation20.phpt
@@ -38,7 +38,7 @@ $loop_counter = 1;
     fwrite($file_handle, "This is line of text without csv fields\n");
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation21.phpt b/ext/standard/tests/file/fgetcsv_variation21.phpt
index e6a9ee586d..ae8c4f1ef6 100644
--- a/ext/standard/tests/file/fgetcsv_variation21.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation21.phpt
@@ -38,7 +38,7 @@ $loop_counter = 1;
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation24.phpt b/ext/standard/tests/file/fgetcsv_variation24.phpt
index 89b6d03b90..cdfadceb70 100644
--- a/ext/standard/tests/file/fgetcsv_variation24.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation24.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation25.phpt b/ext/standard/tests/file/fgetcsv_variation25.phpt
index 1877bc0a0e..52e830cb5b 100644
--- a/ext/standard/tests/file/fgetcsv_variation25.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation25.phpt
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation27.phpt b/ext/standard/tests/file/fgetcsv_variation27.phpt
index aafc3ab6c9..a215e90a3f 100644
--- a/ext/standard/tests/file/fgetcsv_variation27.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation27.phpt
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation28.phpt b/ext/standard/tests/file/fgetcsv_variation28.phpt
index 56dd538ac1..4e6fed3171 100644
--- a/ext/standard/tests/file/fgetcsv_variation28.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation28.phpt
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation29.phpt b/ext/standard/tests/file/fgetcsv_variation29.phpt
index 08c7503517..0420860321 100644
--- a/ext/standard/tests/file/fgetcsv_variation29.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation29.phpt
@@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation3.phpt b/ext/standard/tests/file/fgetcsv_variation3.phpt
index 52c094faa5..8cde39da20 100644
--- a/ext/standard/tests/file/fgetcsv_variation3.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation3.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation31.phpt b/ext/standard/tests/file/fgetcsv_variation31.phpt
index 1d896b7919..7d1e90e1f9 100644
--- a/ext/standard/tests/file/fgetcsv_variation31.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation31.phpt
@@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation4.phpt b/ext/standard/tests/file/fgetcsv_variation4.phpt
index 0c84484721..da945daa70 100644
--- a/ext/standard/tests/file/fgetcsv_variation4.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation4.phpt
@@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation5.phpt b/ext/standard/tests/file/fgetcsv_variation5.phpt
index 283fa40bd8..d3564e4015 100644
--- a/ext/standard/tests/file/fgetcsv_variation5.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation5.phpt
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation6.phpt b/ext/standard/tests/file/fgetcsv_variation6.phpt
index 9878cb98d2..844dd7c519 100644
--- a/ext/standard/tests/file/fgetcsv_variation6.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation6.phpt
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation7.phpt b/ext/standard/tests/file/fgetcsv_variation7.phpt
index 723328e086..271a55b009 100644
--- a/ext/standard/tests/file/fgetcsv_variation7.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation7.phpt
@@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation8.phpt b/ext/standard/tests/file/fgetcsv_variation8.phpt
index 21b6c88752..bf06d29b40 100644
--- a/ext/standard/tests/file/fgetcsv_variation8.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation8.phpt
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation9.phpt b/ext/standard/tests/file/fgetcsv_variation9.phpt
index 6400fc84e3..294241e6cd 100644
--- a/ext/standard/tests/file/fgetcsv_variation9.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation9.phpt
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt
index 48ea231194..68a20e8992 100644
--- a/ext/standard/tests/file/fgets_variation1.phpt
+++ b/ext/standard/tests/file/fgets_variation1.phpt
@@ -29,7 +29,7 @@ foreach ($file_modes as $file_mode ) {
   $data = "fgets_variation test";
   fwrite($file_handle, $data);
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( rewind($file_handle) ); 
   var_dump( ftell($file_handle) ); 
   var_dump( feof($file_handle) );
diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt
index 4f0364132a..b39ba0c6af 100644
--- a/ext/standard/tests/file/fgets_variation3.phpt
+++ b/ext/standard/tests/file/fgets_variation3.phpt
@@ -36,7 +36,7 @@ foreach($file_modes as $file_mode) {
     }
 
     echo "-- fgets() with default length, file pointer at 0 --\n";
-    // get the file pointer to begining of the file
+    // get the file pointer to beginning of the file
     rewind($file_handle);
 
     var_dump( ftell($file_handle) );
@@ -45,7 +45,7 @@ foreach($file_modes as $file_mode) {
     var_dump( feof($file_handle) );  // enusre if eof set
 
     echo "-- fgets() with length = 23, Expected: 22 chars, file pointer at 0 --\n";
-    // get the file pointer to begining of the file
+    // get the file pointer to beginning of the file
     rewind($file_handle);
 
     var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt
index 9187fe532a..ca6f40cb94 100644
--- a/ext/standard/tests/file/fgetss_basic2-win32.phpt
+++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt
@@ -48,7 +48,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt
index 63fdde850d..86be24810e 100644
--- a/ext/standard/tests/file/fgetss_basic2.phpt
+++ b/ext/standard/tests/file/fgetss_basic2.phpt
@@ -46,7 +46,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt
index 0aca5d3760..7cd49333bf 100644
--- a/ext/standard/tests/file/fgetss_variation1-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt
@@ -56,7 +56,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt
index d85b09556d..5a0556a198 100644
--- a/ext/standard/tests/file/fgetss_variation1.phpt
+++ b/ext/standard/tests/file/fgetss_variation1.phpt
@@ -52,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt
index d155f08683..a436e8c4b3 100644
--- a/ext/standard/tests/file/fgetss_variation2.phpt
+++ b/ext/standard/tests/file/fgetss_variation2.phpt
@@ -44,7 +44,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt
index 7539b36876..fc7561dff5 100644
--- a/ext/standard/tests/file/fgetss_variation3-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt
@@ -55,7 +55,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   rewind($file_handle);
   var_dump( ftell($file_handle) );
   var_dump( filesize($filename) );
diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt
index 5b339a1bb9..e6f63c310f 100644
--- a/ext/standard/tests/file/fgetss_variation3.phpt
+++ b/ext/standard/tests/file/fgetss_variation3.phpt
@@ -51,7 +51,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   rewind($file_handle);
   var_dump( ftell($file_handle) );
   var_dump( filesize($filename) );
diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt
index 6c201d1a9e..b93bc6afd0 100644
--- a/ext/standard/tests/file/fgetss_variation4.phpt
+++ b/ext/standard/tests/file/fgetss_variation4.phpt
@@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation5-win32.phpt b/ext/standard/tests/file/fgetss_variation5-win32.phpt
index cedc7b98da..a2d4a705e8 100644
--- a/ext/standard/tests/file/fgetss_variation5-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt
@@ -52,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt
index ea53382e2d..c499d598b2 100644
--- a/ext/standard/tests/file/fgetss_variation5.phpt
+++ b/ext/standard/tests/file/fgetss_variation5.phpt
@@ -49,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
index 18ecf9a1dd..915ab0e558 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
@@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){
     fwrite($file_handle,(binary)$data_to_be_written);
 
     // set file pointer to 0
-    var_dump( rewind($file_handle) ); // set to begining of file 
+    var_dump( rewind($file_handle) ); // set to beginning of file 
     var_dump( ftell($file_handle) );
 
     foreach($whence_set as $whence){
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
index 866009467a..63d0edd5a5 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){
     fwrite($file_handle,(binary)$data_to_be_written);
 
     // set file pointer to 0
-    var_dump( rewind($file_handle) ); // set to begining of file 
+    var_dump( rewind($file_handle) ); // set to beginning of file 
     var_dump( ftell($file_handle) );
 
     foreach($whence_set as $whence){
diff --git a/ext/standard/tests/mail/mail_include.inc b/ext/standard/tests/mail/mail_include.inc
index a0ff5e0c17..0785552e54 100644
--- a/ext/standard/tests/mail/mail_include.inc
+++ b/ext/standard/tests/mail/mail_include.inc
@@ -15,7 +15,7 @@ $mailbox_prefix = "phpttest"; // name used for test mailbox
  * @para, string mailbox_suffix Suffix used to uniquely identify mailboxes
  * @param int message_count number of test msgs to be written to new mailbox 
  * 
- * @return IMAP stream to new mailbox on sucesss; FALSE on failure
+ * @return IMAP stream to new mailbox on success; FALSE on failure
  */
 function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){
 	global $server, $default_mailbox, $username, $password;
diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt
index cc245ae04b..6dfeb7e69b 100644
--- a/ext/standard/tests/strings/addslashes_variation1.phpt
+++ b/ext/standard/tests/strings/addslashes_variation1.phpt
@@ -79,7 +79,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of addslashes()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing addslashes() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/bug36306.phpt b/ext/standard/tests/strings/bug36306.phpt
index 2d8449aac3..4527ea0edc 100644
--- a/ext/standard/tests/strings/bug36306.phpt
+++ b/ext/standard/tests/strings/bug36306.phpt
@@ -6,10 +6,10 @@ Bug #36306 (crc32() 64bit)
 /* as an example how to write crc32 tests
    PHP does not have uint values, you cannot
    display crc32 like a signed integer.
-   Have to find some small strings to truely reproduce 
+   Have to find some small strings to truly reproduce 
    the problem, this example being not a problem
 */
-echo dechex(crc32("platform independant")) . "\n";
+echo dechex(crc32("platform independent")) . "\n";
 ?>
 --EXPECT--
 ccd9fe66
diff --git a/ext/standard/tests/strings/bug50847.phpt b/ext/standard/tests/strings/bug50847.phpt
index 28e83f5111..1f7081930e 100644
--- a/ext/standard/tests/strings/bug50847.phpt
+++ b/ext/standard/tests/strings/bug50847.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #50847 (strip_tags() removes all tags greater then 1023 bytes long)
+Bug #50847 (strip_tags() removes all tags greater than 1023 bytes long)
 --FILE--
 <?php
 $var = '<param value="' . str_repeat("a", 2048) . '" />';
diff --git a/ext/standard/tests/strings/chop_variation1.phpt b/ext/standard/tests/strings/chop_variation1.phpt
index de5ecd8164..bb5bca4ecf 100644
--- a/ext/standard/tests/strings/chop_variation1.phpt
+++ b/ext/standard/tests/strings/chop_variation1.phpt
@@ -82,7 +82,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of chop()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 
 echo "\n--- Testing chop() by supplying different values for 'str' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/strings/chop_variation2.phpt b/ext/standard/tests/strings/chop_variation2.phpt
index f0416e77bc..02d32306ec 100644
--- a/ext/standard/tests/strings/chop_variation2.phpt
+++ b/ext/standard/tests/strings/chop_variation2.phpt
@@ -82,7 +82,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of chop()
-// when $charlist arugment is supplied with different values
+// when $charlist argument is supplied with different values
 
 echo "\n--- Testing chop() by supplying different values for 'charlist' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
index 7f7e229354..76d590c35b 100644
--- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
@@ -65,7 +65,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of get_html_translation_table()
-// when $table arugment is supplied with different values
+// when $table argument is supplied with different values
 echo "\n--- Testing get_html_translation_table() by supplying different values for 'table' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
index b792a55545..ea42af996c 100644
--- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
@@ -68,7 +68,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of get_html_translation_table()
-// when $quote_style arugment is supplied with different values
+// when $quote_style argument is supplied with different values
 echo "\n--- Testing get_html_translation_table() by supplying different values for 'quote_style' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
index b15307614a..b36556f1a2 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
@@ -30,7 +30,7 @@ $multiline_string = <<<EOT
 &quot;This is a double quoted string&quot;
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 <html>Roy&#039;s height\r &gt; Sam\t&#039;s height
 1111\t\t &amp; 0000\v\v = \f0000
diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt
index 02bcf34406..e2635f05f8 100644
--- a/ext/standard/tests/strings/join_variation1.phpt
+++ b/ext/standard/tests/strings/join_variation1.phpt
@@ -84,7 +84,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of join()
-// when $glue arugment is supplied with different values
+// when $glue argument is supplied with different values
 echo "\n--- Testing join() by supplying different values for 'glue' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt
index 50395f1764..46e91afd3b 100644
--- a/ext/standard/tests/strings/join_variation2.phpt
+++ b/ext/standard/tests/strings/join_variation2.phpt
@@ -82,7 +82,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of join()
-// when $pieces arugment is supplied with different values
+// when $pieces argument is supplied with different values
 echo "\n--- Testing join() by supplying different values for 'pieces' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/setlocale_basic1.phpt b/ext/standard/tests/strings/setlocale_basic1.phpt
index 957357f6c1..c806e6fabf 100644
--- a/ext/standard/tests/strings/setlocale_basic1.phpt
+++ b/ext/standard/tests/strings/setlocale_basic1.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , 
- *              or FALSE if locale functinality is not implemented in this platform. 
+ *              or FALSE if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt
index fe61b9b431..7204c45911 100644
--- a/ext/standard/tests/strings/setlocale_basic2.phpt
+++ b/ext/standard/tests/strings/setlocale_basic2.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE
-                if locale  functinality is not implemented in this platform. 
+                if locale  functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt
index 47917e34e4..997dad98e7 100644
--- a/ext/standard/tests/strings/setlocale_basic3.phpt
+++ b/ext/standard/tests/strings/setlocale_basic3.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) {
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);
  * Description: Sets locale information.Returns the new current locale , or FALSE
-                if locale functinality is not implemented in this platform.
+                if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt
index e3f3765fbf..361d00c584 100644
--- a/ext/standard/tests/strings/setlocale_error.phpt
+++ b/ext/standard/tests/strings/setlocale_error.phpt
@@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);  
- * Description: Sets locale information.Returns the new current locale , or FALSE if locale functinality is not implemented in this platform. 
+ * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation1.phpt b/ext/standard/tests/strings/setlocale_variation1.phpt
index 5e21d0b79f..04665b5455 100644
--- a/ext/standard/tests/strings/setlocale_variation1.phpt
+++ b/ext/standard/tests/strings/setlocale_variation1.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) {
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);
  * Description: Sets locale information.Returns the new current locale , or FALSE
-                if locale functinality is not implemented in this platform.
+                if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt
index af8739a767..038ba58c5e 100644
--- a/ext/standard/tests/strings/setlocale_variation2.phpt
+++ b/ext/standard/tests/strings/setlocale_variation2.phpt
@@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE 
-                if locale functinality is not implemented in this platform. 
+                if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt
index 09d6c1186a..44cbe1bda7 100644
--- a/ext/standard/tests/strings/setlocale_variation3.phpt
+++ b/ext/standard/tests/strings/setlocale_variation3.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL,'en_US.utf8') === false) {
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
  *            : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE
- *              if locale functinality is not implemented in this platform. 
+ *              if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt
index 4ab1db7ad4..7b27c106d9 100644
--- a/ext/standard/tests/strings/setlocale_variation4.phpt
+++ b/ext/standard/tests/strings/setlocale_variation4.phpt
@@ -16,7 +16,7 @@ LC_ALL=en_US.utf8;
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
  *            : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE
- *              if locale functinality is not implemented in this platform. 
+ *              if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt
index c8e947b09d..40eda3780b 100644
--- a/ext/standard/tests/strings/setlocale_variation5.phpt
+++ b/ext/standard/tests/strings/setlocale_variation5.phpt
@@ -16,7 +16,7 @@ LC_ALL=en_US.utf8;
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
  *            : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE 
- *              if locale functinality is not implemented in this platform. 
+ *              if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/strcspn_variation2.phpt b/ext/standard/tests/strings/strcspn_variation2.phpt
index cb7544c2a9..c21af6f256 100644
--- a/ext/standard/tests/strings/strcspn_variation2.phpt
+++ b/ext/standard/tests/strings/strcspn_variation2.phpt
@@ -15,7 +15,7 @@ error_reporting(E_ALL & ~E_NOTICE);
 * Testing strcspn() : with different unexpected values for mask argument
 */
 
-echo "*** Testing strcspn() : with diferent unexpected values of mask argument ***\n";
+echo "*** Testing strcspn() : with different unexpected values of mask argument ***\n";
 
 $str = 'string_val';
 $start = 1;
@@ -102,7 +102,7 @@ fclose($file_handle);
 echo "Done"
 ?>
 --EXPECTF--
-*** Testing strcspn() : with diferent unexpected values of mask argument ***
+*** Testing strcspn() : with different unexpected values of mask argument ***
 
 -- Iteration with mask value as "0" --
 int(10)
diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt
index 54601e9b65..20b5693905 100644
--- a/ext/standard/tests/strings/strip_tags_variation5.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation5.phpt
@@ -33,7 +33,7 @@ $multiline_string = <<<EOT
 <b>This is a double quoted string</b>
 EOT;
 
-// here doc with diferent whitespaces
+// here doc with different whitespaces
 $diff_whitespaces = <<<EOT
 <html>hello\r world\t
 1111\t\t != 2222\v\v</html>
diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt
index 32c8963df7..a2754c6103 100644
--- a/ext/standard/tests/strings/stripcslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt
@@ -81,7 +81,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of stripcslashes()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing stripcslashes() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt
index 5693a26efc..fb104199bd 100644
--- a/ext/standard/tests/strings/stripslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripslashes_variation1.phpt
@@ -80,7 +80,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of stripslashes()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing stripslashes() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt
index f396834837..1d4e50efdf 100644
--- a/ext/standard/tests/strings/strrchr_basic.phpt
+++ b/ext/standard/tests/strings/strrchr_basic.phpt
@@ -30,7 +30,7 @@ var_dump( strrchr("Hello, World", "Hello, World") ); //needle as haystack
 //needle string containing one existing and one non-existing char
 var_dump( strrchr("Hello, World", "Hi") );
 
-//multiple existance of needle in haystack
+//multiple existence of needle in haystack
 var_dump( strrchr("Hello, World", "o") );
 var_dump( strrchr("Hello, World", "ooo") );
 
diff --git a/ext/standard/tests/strings/strspn_variation2.phpt b/ext/standard/tests/strings/strspn_variation2.phpt
index 7af61e559a..57929fa352 100644
--- a/ext/standard/tests/strings/strspn_variation2.phpt
+++ b/ext/standard/tests/strings/strspn_variation2.phpt
@@ -15,7 +15,7 @@ error_reporting(E_ALL & ~E_NOTICE);
 * Testing strspn() : with different unexpected values for mask argument
 */
 
-echo "*** Testing strspn() : with diferent unexpected values of mask argument ***\n";
+echo "*** Testing strspn() : with different unexpected values of mask argument ***\n";
 
 $str = 'string_val';
 $start = 1;
@@ -102,7 +102,7 @@ fclose($file_handle);
 echo "Done"
 ?>
 --EXPECTF--
-*** Testing strspn() : with diferent unexpected values of mask argument ***
+*** Testing strspn() : with different unexpected values of mask argument ***
 
 -- Iteration with mask value as "0" --
 int(0)
diff --git a/ext/standard/tests/strings/strtok_variation1.phpt b/ext/standard/tests/strings/strtok_variation1.phpt
index b8febacfb9..cb06fc43c3 100644
--- a/ext/standard/tests/strings/strtok_variation1.phpt
+++ b/ext/standard/tests/strings/strtok_variation1.phpt
@@ -81,7 +81,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of strtok()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 
 echo "\n--- Testing strtok() by supplying different values for 'str' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/strings/strtok_variation2.phpt b/ext/standard/tests/strings/strtok_variation2.phpt
index 19a6f26fb5..13da440582 100644
--- a/ext/standard/tests/strings/strtok_variation2.phpt
+++ b/ext/standard/tests/strings/strtok_variation2.phpt
@@ -81,7 +81,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of strtok()
-// when $token arugment is supplied with different values
+// when $token argument is supplied with different values
 
 echo "\n--- Testing strtok() by supplying different values for 'token' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt
index b9323afbdf..dd52efd98e 100644
--- a/ext/standard/tests/strings/trim1.phpt
+++ b/ext/standard/tests/strings/trim1.phpt
diff --git a/ext/standard/tests/strings/trim_error.phpt b/ext/standard/tests/strings/trim_error.phpt
index 092deb6dca..51dc848c9d 100644
--- a/ext/standard/tests/strings/trim_error.phpt
+++ b/ext/standard/tests/strings/trim_error.phpt
@@ -4,7 +4,7 @@ Test trim() function : error conditions
 <?php
 
 /* Prototype  : string trim  ( string $str  [, string $charlist  ] )
- * Description: Strip whitespace (or other characters) from the begining and end of a string.
+ * Description: Strip whitespace (or other characters) from the beginning and end of a string.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/trim_variation1.phpt b/ext/standard/tests/strings/trim_variation1.phpt
index 625ec31824..4ef40c6801 100644
--- a/ext/standard/tests/strings/trim_variation1.phpt
+++ b/ext/standard/tests/strings/trim_variation1.phpt
@@ -4,7 +4,7 @@ Test trim() function : usage variations - test values for $str argument
 <?php
 
 /* Prototype  : string trim  ( string $str  [, string $charlist  ] )
- * Description: Strip whitespace (or other characters) from the begining and end of a string.
+ * Description: Strip whitespace (or other characters) from the beginning and end of a string.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/trim_variation2.phpt b/ext/standard/tests/strings/trim_variation2.phpt
index 009d61b2df..11b2aaf1cc 100644
--- a/ext/standard/tests/strings/trim_variation2.phpt
+++ b/ext/standard/tests/strings/trim_variation2.phpt
@@ -4,7 +4,7 @@ Test trim() function : usage variations - test values for $charlist argument
 <?php
 
 /* Prototype  : string trim  ( string $str  [, string $charlist  ] )
- * Description: Strip whitespace (or other characters) from the begining and end of a string.
+ * Description: Strip whitespace (or other characters) from the beginning and end of a string.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/ucwords_variation1.phpt b/ext/standard/tests/strings/ucwords_variation1.phpt
index 22c29163c4..02edf05131 100644
--- a/ext/standard/tests/strings/ucwords_variation1.phpt
+++ b/ext/standard/tests/strings/ucwords_variation1.phpt
@@ -94,7 +94,7 @@ $values =  array (
 );
 
 // loop through each element of the array and check the working of ucwords()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing ucwords() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/ucwords_variation2.phpt b/ext/standard/tests/strings/ucwords_variation2.phpt
index ab6eb2f45c..4c24d97a0d 100644
--- a/ext/standard/tests/strings/ucwords_variation2.phpt
+++ b/ext/standard/tests/strings/ucwords_variation2.phpt
@@ -29,7 +29,7 @@ multiline string using
 heredoc
 EOT;
 
-// here doc with diferent whitespaces
+// here doc with different whitespaces
 $diff_whitespaces = <<<EOT
 testing\rucword(str)\twith
 multiline   string\t\tusing
diff --git a/ext/standard/tests/strings/wordwrap_variation1.phpt b/ext/standard/tests/strings/wordwrap_variation1.phpt
index d13e7dee2d..28fc128bb7 100644
--- a/ext/standard/tests/strings/wordwrap_variation1.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation1.phpt
@@ -75,7 +75,7 @@ $values =  array (
 );
 
 // loop though each element of the array and check the working of wordwrap()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing wordwrap() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/wordwrap_variation2.phpt b/ext/standard/tests/strings/wordwrap_variation2.phpt
index 2718791943..b914a2a815 100644
--- a/ext/standard/tests/strings/wordwrap_variation2.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation2.phpt
@@ -73,7 +73,7 @@ $values =  array (
 
 
 // loop though each element of the array and check the working of wordwrap()
-// when $width arugment is supplied with different values
+// when $width argument is supplied with different values
 echo "\n--- Testing wordwrap() by supplying different values for 'width' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/wordwrap_variation3.phpt b/ext/standard/tests/strings/wordwrap_variation3.phpt
index 7d0c816707..ddf04c77c9 100644
--- a/ext/standard/tests/strings/wordwrap_variation3.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation3.phpt
@@ -75,7 +75,7 @@ $values =  array (
 );
 
 // loop though each element of the array and check the working of wordwrap()
-// when $break arugment is supplied with different values
+// when $break argument is supplied with different values
 echo "\n--- Testing wordwrap() by supplying different values for 'break' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/wordwrap_variation4.phpt b/ext/standard/tests/strings/wordwrap_variation4.phpt
index 440e93740a..7111f2d2ba 100644
--- a/ext/standard/tests/strings/wordwrap_variation4.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation4.phpt
@@ -66,7 +66,7 @@ $values =  array (
 );
 
 // loop though each element of the array and check the working of wordwrap()
-// when $cut arugment is supplied with different values
+// when $cut argument is supplied with different values
 echo "\n--- Testing wordwrap() by supplying different values for 'cut' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c
index f0142ed049..76701ff24b 100644
--- a/ext/standard/uuencode.c
+++ b/ext/standard/uuencode.c
@@ -70,7 +70,7 @@ PHPAPI int php_uuencode(char *src, int src_len, char **dest) /* {{{ */
 	int len = 45;
 	char *p, *s, *e, *ee;
 
-	/* encoded length is ~ 38% greater then the original */
+	/* encoded length is ~ 38% greater than the original */
 	p = *dest = safe_emalloc((size_t) ceil(src_len * 1.38), 1, 46);
 	s = src;
 	e = src + src_len;
diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index e268047b69..a57e25e6c3 100644
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -228,7 +228,7 @@ PHP_FUNCTION(msg_stat_queue)
 
 
 /* {{{ proto bool msg_queue_exists(int key)
-   Check wether a message queue exists */
+   Check whether a message queue exists */
 PHP_FUNCTION(msg_queue_exists)
 {
 	long key;
diff --git a/ext/sysvsem/tests/sysv.phpt b/ext/sysvsem/tests/sysv.phpt
index 3a962be31a..6f52f3bd7e 100644
--- a/ext/sysvsem/tests/sysv.phpt
+++ b/ext/sysvsem/tests/sysv.phpt
@@ -23,11 +23,11 @@ echo "Got semaphore $sem_id.\n";
 
 // Accuire semaphore
 if (! sem_acquire($sem_id)) {
-	echo "Fail to aquire semaphore $sem_id.\n";
+	echo "Fail to acquire semaphore $sem_id.\n";
 	sem_remove($sem_id);
 	exit;
 }
-echo "Success aquire semaphore $sem_id.\n";
+echo "Success acquire semaphore $sem_id.\n";
 
 $shm_id =   shm_attach($SHMKEY, $MEMSIZE);
 if ($shm_id === FALSE) {
@@ -100,7 +100,7 @@ echo "End.\n";
 --EXPECTF--
 Start.
 Got semaphore Resource id #%i.
-Success aquire semaphore Resource id #%i.
+Success acquire semaphore Resource id #%i.
 Success to attach shared memory : %s.
 Write var1 to shared memory.
 Write var2 to shared memory.
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 3c5bc32f28..02ebc7738e 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -708,7 +708,7 @@ PHP_METHOD(xmlreader, moveToAttribute)
 /* }}} */
 
 /* {{{ proto boolean XMLReader::moveToAttributeNo(int index)
-Positions reader at attribute at spcecified index.
+Positions reader at attribute at specified index.
 Returns TRUE on success and FALSE on failure */
 PHP_METHOD(xmlreader, moveToAttributeNo)
 {
@@ -805,7 +805,7 @@ PHP_METHOD(xmlreader, read)
 	if (intern != NULL && intern->ptr != NULL) {
 		retval = xmlTextReaderRead(intern->ptr);
 		if (retval == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while reading");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading");
 			RETURN_FALSE;
 		} else {
 			RETURN_BOOL(retval);
@@ -847,7 +847,7 @@ PHP_METHOD(xmlreader, next)
 			retval = xmlTextReaderNext(intern->ptr);
 		}
 		if (retval == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while reading");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading");
 			RETURN_FALSE;
 		} else {
 			RETURN_BOOL(retval);
@@ -1155,7 +1155,7 @@ PHP_METHOD(xmlreader, expand)
 		node = xmlTextReaderExpand(intern->ptr);
 
 		if (node == NULL) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while expanding ");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while expanding ");
 			RETURN_FALSE;
 		} else {
 			nodec = xmlDocCopyNode(node, docp, 1);
diff --git a/ext/xmlrpc/libxmlrpc/simplestring.c b/ext/xmlrpc/libxmlrpc/simplestring.c
index 7211d2cd94..a084d0e64f 100644
--- a/ext/xmlrpc/libxmlrpc/simplestring.c
+++ b/ext/xmlrpc/libxmlrpc/simplestring.c
@@ -66,7 +66,7 @@ static const char rcsid[] = "#(@) $Id$";
  *
  *   simplestring is, as the name implies, a simple API for dealing with C strings.
  *   Why would I write yet another string API?  Because I couldn't find any that were
- *   a) free / GPL, b) simple/lightweight, c) fast, not doing unneccesary strlens all
+ *   a) free / GPL, b) simple/lightweight, c) fast, not doing unnecessary strlens all
  *   over the place.  So.  It is simple, and it seems to work, and it is pretty fast.
  *
  *   Oh, and it is also binary safe, ie it can handle strings with embedded NULLs,
diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c
index ec2321b347..ce70c2afd9 100644
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.c
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c
@@ -897,7 +897,7 @@ const char *XMLRPC_SetValueID_Case(XMLRPC_VALUE value, const char* id, int len,
          (len > 0) ? simplestring_addn(&value->id, id, len) :
                      simplestring_add(&value->id, id);
 
-         /* upper or lower case string in place if required. could be a seperate func. */
+         /* upper or lower case string in place if required. could be a separate func. */
          if(id_case == xmlrpc_case_lower || id_case == xmlrpc_case_upper) {
             int i;
             for(i = 0; i < value->id.len; i++) {
@@ -1609,7 +1609,7 @@ XMLRPC_VALUE XMLRPC_CopyValue(XMLRPC_VALUE value) {
  *   XMLRPC_CopyValue ()
  * NOTES
  *   Use this when function when you need to modify the contents of
- *   the copied value seperately from the original.
+ *   the copied value separately from the original.
  *   
  *   this function is recursive, thus the value and all of its children
  *   (if any) will be duplicated.
diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c
index 2f56881b0a..5ce1c1070a 100644
--- a/ext/zip/lib/zip_open.c
+++ b/ext/zip/lib/zip_open.c
@@ -348,7 +348,7 @@ _zip_checkcons(FILE *fp, struct zip_cdir *cd, struct zip_error *error)
 
 
 /* _zip_check_torrentzip:
-   check wether ZA has a valid TORRENTZIP comment, i.e. is torrentzipped */
+   check whether ZA has a valid TORRENTZIP comment, i.e. is torrentzipped */
 
 static void
 _zip_check_torrentzip(struct zip *za)
diff --git a/ext/zip/tests/bug64342_0.phpt b/ext/zip/tests/bug64342_0.phpt
index 066d3e6fc2..ea7afa8e0a 100644
--- a/ext/zip/tests/bug64342_0.phpt
+++ b/ext/zip/tests/bug64342_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #64342 ZipArchive::addFile() has to check file existance (variation 1)
+Bug #64342 ZipArchive::addFile() has to check file existence (variation 1)
 --SKIPIF--
 <?php
 	if(!extension_loaded('zip')) die('skip');
diff --git a/ext/zip/tests/bug64342_1.phpt b/ext/zip/tests/bug64342_1.phpt
index 2b1357d12f..06b0b92cab 100644
--- a/ext/zip/tests/bug64342_1.phpt
+++ b/ext/zip/tests/bug64342_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #64342 ZipArchive::addFile() has to check file existance (variation 2)
+Bug #64342 ZipArchive::addFile() has to check file existence (variation 2)
 --SKIPIF--
 <?php
 /* $Id$ */
diff --git a/main/rfc1867.c b/main/rfc1867.c
index e3e6e1d1d5..ed7ce9c0c1 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -62,7 +62,7 @@ static void safe_php_register_variable(char *var, char *strval, int val_len, zva
 #define MAX_SIZE_ANONNAME 33
 
 /* Errors */
-#define UPLOAD_ERROR_OK   0  /* File upload succesful */
+#define UPLOAD_ERROR_OK   0  /* File upload successful */
 #define UPLOAD_ERROR_A    1  /* Uploaded file exceeded upload_max_filesize */
 #define UPLOAD_ERROR_B    2  /* Uploaded file exceeded MAX_FILE_SIZE */
 #define UPLOAD_ERROR_C    3  /* Partially uploaded */
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index beffc73e10..a9c050f267 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -194,7 +194,7 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC)
 			 * Essentially, we are waiting for the socket to become writeable, which means
 			 * that all pending data has been sent.
 			 * We use a small timeout which should encourage the OS to send the data,
-			 * but at the same time avoid hanging indefintely.
+			 * but at the same time avoid hanging indefinitely.
 			 * */
 			do {
 				n = php_pollfd_for_ms(sock->socket, POLLOUT, 500);
diff --git a/run-tests.php b/run-tests.php
index 84907a705f..8c8df610b8 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -683,7 +683,7 @@ Options:
     -d foo=bar  Pass -d option to the php binary (Define INI entry foo
                 with value 'bar').
 
-    -g          Comma seperated list of groups to show during test run
+    -g          Comma separated list of groups to show during test run
                 (possible values: PASS, FAIL, XFAIL, SKIP, BORK, WARN, LEAK, REDIRECT).
 
     -m          Test for memory leaks with Valgrind.
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 11be0ed222..8361f7f410 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -130,7 +130,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC)
 
 	/*
 	 * This handles the situation where the browser sends a Expect: 100-continue header
-	 * and needs to recieve confirmation from the server on whether or not it can send
+	 * and needs to receive confirmation from the server on whether or not it can send
 	 * the rest of the request. RFC 2616
 	 *
 	 */
diff --git a/sapi/apache2filter/README b/sapi/apache2filter/README
index 3054e208d3..bd6eb17066 100644
--- a/sapi/apache2filter/README
+++ b/sapi/apache2filter/README
@@ -54,7 +54,7 @@ HOW TO CONFIGURE
 
 DEBUGGING APACHE AND PHP
     
-    To debug Apache, we recommened:
+    To debug Apache, we recommend:
 
         1. Use the Prefork MPM (Apache 1.3-like process model) by
            configuring Apache with '--with-mpm=prefork'.
diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README
index 5cbd1b95dd..4defa336c6 100644
--- a/sapi/apache2handler/README
+++ b/sapi/apache2handler/README
@@ -58,7 +58,7 @@ HOW TO CONFIGURE
 
 DEBUGGING APACHE AND PHP
     
-    To debug Apache, we recommened:
+    To debug Apache, we recommend:
 
         1. Use the Prefork MPM (Apache 1.3-like process model) by
            configuring Apache with '--with-mpm=prefork'.
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index bcb2443112..b7f95e0c12 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -632,7 +632,7 @@ zend_first_try {
 		}
 
 		/*
-		 * check if comming due to ErrorDocument
+		 * check if coming due to ErrorDocument
 		 * We make a special exception of 413 (Invalid POST request) as the invalidity of the request occurs
 		 * during processing of the request by PHP during POST processing. Therefor we need to re-use the exiting
 		 * PHP instance to handle the request rather then creating a new one.
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c
index dda6e49891..66adb482ed 100644
--- a/sapi/apache_hooks/mod_php5.c
+++ b/sapi/apache_hooks/mod_php5.c
@@ -275,7 +275,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC)
 
 	/*
 	 * This handles the situation where the browser sends a Expect: 100-continue header
-	 * and needs to recieve confirmation from the server on whether or not it can send
+	 * and needs to receive confirmation from the server on whether or not it can send
 	 * the rest of the request. RFC 2616
 	 *
 	 */
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index d85df188bf..cd5fc34d0f 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -697,7 +697,7 @@ static int fpm_evaluate_full_path(char **path, struct fpm_worker_pool_s *wp, cha
 		if (tmp != NULL) {
 
 			if (tmp != *path) {
-				zlog(ZLOG_ERROR, "'$prefix' must be use at the begining of the value");
+				zlog(ZLOG_ERROR, "'$prefix' must be use at the beginning of the value");
 				return -1;
 			}
 
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index 1a1baa7078..548bcda170 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -579,7 +579,7 @@ static void queue_request(httpd_conn *hc)
 	m->next = NULL;
 	
 	tsrm_mutex_lock(qr_lock);
-	/* Create new threads when reaching a certain threshhold */
+	/* Create new threads when reaching a certain threshold */
 	if (nr_threads < max_threads && nr_free_threads < 2) {
 		nr_threads++; /* protected by qr_lock */
 		
diff --git a/server-tests-config.php b/server-tests-config.php
index 47df90f5e6..0ddff28cb2 100755
--- a/server-tests-config.php
+++ b/server-tests-config.php
@@ -59,7 +59,7 @@ $conf = array(
 /* if true doesn't run tests, just outputs executable info */
 'TEST_CONTEXT_INFO'    =>    false,
 
-/* : or ; seperated list of paths */
+/* : or ; separated list of paths */
 'TEST_PATHS'           =>    NULL
 /* additional configuration items that may be set
    to provide proxy support for testes:
diff --git a/server-tests.php b/server-tests.php
index ca39b198b8..688fee485a 100755
--- a/server-tests.php
+++ b/server-tests.php
@@ -413,7 +413,7 @@ class testHarness {
 	public $xargs = array(
 		#arg         env var                value        default   description
 		'c' => array(''                    ,'file'       ,NULL    ,'configuration file, see server-tests-config.php for example'),
-		'd' => array('TEST_PATHS'          ,'paths'      ,NULL    ,'colon seperate path list'),
+		'd' => array('TEST_PATHS'          ,'paths'      ,NULL    ,'colon separate path list'),
 		'e' => array('TEST_PHP_ERROR_STYLE','EMACS|MSVC' ,'EMACS' ,'editor error style'),
 		'h' => array(''                    ,''           ,NULL    ,'this help'),
 		'i' => array('PHPRC'               ,'path|file'  ,NULL    ,'ini file to use for tests (sets PHPRC)'),
diff --git a/win32/install.txt b/win32/install.txt
index b1d4ee5148..2883dd37f5 100644
--- a/win32/install.txt
+++ b/win32/install.txt
@@ -355,7 +355,7 @@ c:\php
    packages have the server modules in the sapi folder, PHP 5
    distributions have no such directory and instead they're in the PHP
    folder root. The supporting DLLs for the PHP 5 extensions are also not
-   in a seperate directory.
+   in a separate directory.
 
      Note: In PHP 4, you should move all files located in the dll and
      sapi folders to the main folder (e.g. C:\php).
diff --git a/win32/sendmail.c b/win32/sendmail.c
index 4b09697e95..3078307263 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -119,8 +119,8 @@ static char *ErrorMessages[] =
 	{"Error while trimming mail header with PCRE, please file a bug report at http://bugs.php.net/"} /* 21 */
 };
 
-/* This pattern converts all single occurences of \n (Unix)
- * withour a leading \r to \r\n and all occurences of \r (Mac)
+/* This pattern converts all single occurrences of \n (Unix)
+ * withour a leading \r to \r\n and all occurrences of \r (Mac)
  * without a trailing \n to \r\n
  * Thx to Nibbler from ircnet/#linuxger
  */
@@ -130,7 +130,7 @@ static char *ErrorMessages[] =
 /* This pattern removes \r\n from the start of the string,
  * \r\n from the end of the string and also makes sure every line
  * is only wrapped with a single \r\n (thus reduces multiple
- * occurences of \r\n between lines to a single \r\n) */
+ * occurrences of \r\n between lines to a single \r\n) */
 #define PHP_WIN32_MAIL_RMVDBL_PATTERN	"/^\r\n|(\r\n)+$/m"
 #define PHP_WIN32_MAIL_RMVDBL_REPLACE	""
 
@@ -142,11 +142,11 @@ static char *ErrorMessages[] =
 #define PHP_WIN32_MAIL_DOT_REPLACE	"\n.."
 
 /* This function is meant to unify the headers passed to to mail()
- * This means, use PCRE to transform single occurences of \n or \r in \r\n
- * As a second step we also eleminate all \r\n occurences which are:
+ * This means, use PCRE to transform single occurrences of \n or \r in \r\n
+ * As a second step we also eleminate all \r\n occurrences which are:
  * 1) At the start of the header
  * 2) At the end of the header
- * 3) Two or more occurences in the header are removed so only one is left
+ * 3) Two or more occurrences in the header are removed so only one is left
  *
  * Returns NULL on error, or the new char* buffer on success.
  * You have to take care and efree() the buffer on your own.
diff --git a/win32/signal.h b/win32/signal.h
index de43f98e80..df60dfb728 100644
--- a/win32/signal.h
+++ b/win32/signal.h
@@ -2,7 +2,7 @@
 ** Change here: if you plan to use your own version of <signal.h>
 ** the original "#include <signal.h>" produces an infinite reinclusion
 ** of this file, instead of including the standard include-file.
-** Under MS Visual Studio, there are occurences in the source where
+** Under MS Visual Studio, there are occurrences in the source where
 ** <signal.h> gets included throughout the PHP sources, and this should
 ** include THIS file, not the standard one which does not have the
 ** additional signals defined below.
author	Stanislav Malyshev <stas@php.net>	2013-06-10 14:31:57 -0700
committer	Stanislav Malyshev <stas@php.net>	2013-06-10 14:31:57 -0700
commit	8ac131503ddeee5b1de8225510f9d2927e903620 (patch)
tree	f02250a3e6cb8712adc02d23eb2e1b0f5dd3b3fd
parent	d7c943e2a1f54c445276fc77369918f33c4f6cce (diff)
parent	4427d1dcfdca5e5e4b7e1b1226cf4771cc82389f (diff)
download	php-git-8ac131503ddeee5b1de8225510f9d2927e903620.tar.gz