Merge commit 'refs/pullreqs/231' into bsdmake

Closes lloyd/yajl#231

Author: robohack

src/yajl.c

@@ -193,7 +193,7 @@ yajl_complete_parse(yajl_handle hand)
  * get an error string describing the state of the parse.
  *
  * If verbose is non-zero, the message will include the JSON text where the
- * error occured, along with an arrow pointing to the specific char.
+ * error occurred, along with an arrow pointing to the specific char.
  *
  *  \returns A dynamically allocated string will be returned which should be
  *  freed with yajl_free_error
@@ -214,7 +214,7 @@ yajl_get_error(yajl_handle hand, int verbose,
  *
  * In the event an error is encountered during parsing, this function
  * affords the client a way to get the offset into the most recent
- * chunk where the error occured.  0 will be returned if no error
+ * chunk where the error occurred.  0 will be returned if no error
  * was encountered.
  +*/
 size_t

src/yajl/yajl_parse.h

@@ -34,8 +34,8 @@ extern "C" {
         yajl_status_ok,
         /*+ a client callback returned zero, stopping the parse +*/
         yajl_status_client_canceled,
-        /*+ An error occured during the parse.  Call yajl_get_error for
-         *  more information about the encountered error +*/
+        /*+ An error occurred during the parse.  Call yajl_get_error() for
+         *  more information about the encountered error */
         yajl_status_error
     } yajl_status;