Merge branch 'pull-request/341'

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

3 files changed, 8 insertions, 8 deletions

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.