Merge branch 'master' of github.com:svarshavchik/courier-libs

3 files changed, 10 insertions, 10 deletions

diff --git a/unicode/book.xml b/unicode/book.xml
index 7744501..f6a5dfd 100644
--- a/unicode/book.xml
+++ b/unicode/book.xml
@@ -2829,7 +2829,7 @@ if (unicode_composition_init(str, strsize, flags, &compositions) == 0)
 	      <function>unicode_convert_toutf8</function>()
 	      returns a non <literal>NULL</literal> value
 	      *<parameter>error</parameter> gets set to a non-zero value if
-	      a character conversion error has occured, and some characters
+	      a character conversion error has occurred, and some characters
 	      could not be converted.
 	    </para>
 
@@ -3395,7 +3395,7 @@ if (unicode_composition_init(str, strsize, flags, &compositions) == 0)
 	  <para>
 	    The callback function should return 0. A non-zero value
 	    indicates to the line breaking algorithm that an error has
-	    occured.
+	    occurred.
 	    <function>unicode_lb_next</function>() and
 	    <function>unicode_lb_next_cnt</function>() return zero either if
 	    they never invoked the callback function, or if each call to the
@@ -3712,7 +3712,7 @@ if (unicode_composition_init(str, strsize, flags, &compositions) == 0)
 	  <para>
 	    The callback function should return 0. A non-zero value
 	    indicates to the word breaking algorithm that an error has
-	    occured.
+	    occurred.
 	    <function>unicode_wb_next</function>() and
 	    <function>unicode_wb_next_cnt</function>() return zero either if
 	    they never invoked the callback function, or if each call to the
diff --git a/unicode/courier-unicode.h.in b/unicode/courier-unicode.h.in
index b9e2ee9..8ef2dc5 100644
--- a/unicode/courier-unicode.h.in
+++ b/unicode/courier-unicode.h.in
@@ -1112,7 +1112,7 @@ unicode_convert_tocbuf_fromutf8_init(const char *dst_chset,
 ** Convert a character string to UTF-8.
 **
 ** Returns a malloc-ed buffer holding the UTF-8 string, or NULL if an
-** error occured.
+** error occurred.
 */
 char *unicode_convert_toutf8(/* Text to convert to UTF-8 */
 			       const char *text,
@@ -1123,7 +1123,7 @@ char *unicode_convert_toutf8(/* Text to convert to UTF-8 */
 			       /*
 			       ** If non-NULL, and a non-NULL pointer is
 			       ** returned, *error is set to non-zero if
-			       ** a character conversion error has occured.
+			       ** a character conversion error has occurred.
 			       */
 			       int *error);
 
@@ -1131,7 +1131,7 @@ char *unicode_convert_toutf8(/* Text to convert to UTF-8 */
 ** Convert UTF-8 text to another character set.
 **
 ** Returns a malloc-ed buffer holding the string converted to the specified
-** character set, or NULL if an error occured.
+** character set, or NULL if an error occurred.
 */
 
 char *unicode_convert_fromutf8(/* A UTF-8 string */
@@ -1147,7 +1147,7 @@ char *unicode_convert_fromutf8(/* A UTF-8 string */
 				 /*
 				 ** If non-NULL, and a non-NULL pointer is
 				 ** returned, *error is set to non-zero if
-				 ** a character conversion error has occured.
+				 ** a character conversion error has occurred.
 				 */
 				 int *error);
 
@@ -1156,7 +1156,7 @@ char *unicode_convert_fromutf8(/* A UTF-8 string */
 ** buffer.
 **
 ** Returns a malloc-ed buffer holding the string converted to the specified
-** character set, or NULL if an error occured.
+** character set, or NULL if an error occurred.
 */
 
 char *unicode_convert_tobuf(/* A string to convert */
@@ -1176,7 +1176,7 @@ char *unicode_convert_tobuf(/* A string to convert */
 			      /*
 			      ** If non-NULL, and a non-NULL pointer is
 			      ** returned, *error is set to non-zero if
-			      ** a character conversion error has occured.
+			      ** a character conversion error has occurred.
 			      */
 			      int *error);
 
diff --git a/unicode/mkultcase.pl b/unicode/mkultcase.pl
index 918637a..083f14d 100644
--- a/unicode/mkultcase.pl
+++ b/unicode/mkultcase.pl
@@ -99,7 +99,7 @@ for ($i=0; $i<$tabsize; $i++)
 	    print "\n" if ($idx % 4) == 3;
 	    ++$idx;
 	}
-    } split(/\n/, $bucket[$i]);
+    } sort split(/\n/, $bucket[$i]);
 }
 print "{0,0,0,0}};