Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes

6 files changed, 8 insertions, 8 deletions

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>