spelling fix: occured -> occurred per #4757

Over-the-virtual-shoulder by @danielmewes
Based on work by @AlexSalas from pull request #4757

admin/static/coffee/dataexplorer.coffee

@@ -39,7 +39,7 @@ dataexplorer_state = _.extend({}, DEFAULTS)
 # It triggers the following events:
 #  * ready: The first response has been received
 #  * add: Another row has been received from a cursor
-#  * error: An error has occured
+#  * error: An error has occurred
 #  * end: There are no more documents to fetch
 #  * discard: The results have been discarded
 class QueryResult

admin/static/handlebars/secondary_indexes-error.hbs

@@ -1,5 +1,5 @@
 {{#if connect_fail}}
-<p>An error occured: Could not open a connection. <a href="#" class="reconnect_link">Try again</a>.</p>
+<p>An error occurred: Could not open a connection. <a href="#" class="reconnect_link">Try again</a>.</p>
 {{/if}}
 {{#if index_list_fail}}
 <p>An error occurred: could not retrieve secondary indexes. <a href="#" class="reconnect_link">Try again</a>.</p>

src/rapidjson/document.h

@@ -1799,7 +1799,7 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     //!@name Handling parse errors
     //!@{
 
-    //! Whether a parse error has occured in the last parsing.
+    //! Whether a parse error has occurred in the last parsing.
     bool HasParseError() const { return parseResult_.IsError(); }
 
     //! Get the \ref ParseErrorCode of last parsing.

src/rapidjson/reader.h

@@ -447,7 +447,7 @@ class GenericReader {
         return Parse<kParseDefaultFlags>(is, handler);
     }
 
-    //! Whether a parse error has occured in the last parsing.
+    //! Whether a parse error has occurred in the last parsing.
     bool HasParseError() const { return parseResult_.IsError(); }
 
     //! Get the \ref ParseErrorCode of last parsing.

src/rdb_protocol/protocol.cc

@@ -912,7 +912,7 @@ void rdb_r_unshard_visitor_t::unshard_range_batch(const query_t &q, sorting_t so
             : ql::make_unsharding_append());
         acc->unshard(&env, results);
         // The semantics here are that we aborted before ever iterating since no
-        // iteration occured (since we don't actually have a btree here).
+        // iteration occurred (since we don't actually have a btree here).
         acc->finish(continue_bool_t::ABORT, &out->result);
     } catch (const ql::exc_t &ex) {
         *out = query_response_t(ex);

src/rdb_protocol/ql2.proto

@@ -98,8 +98,8 @@ message Query {
 // A backtrace frame (see `backtrace` in Response below)
 message Frame {
     enum FrameType {
-        POS = 1; // Error occured in a positional argument.
-        OPT = 2; // Error occured in an optional argument.
+        POS = 1; // Error occurred in a positional argument.
+        OPT = 2; // Error occurred in an optional argument.
     }
     optional FrameType type = 1;
     optional int64 pos = 2; // The index of the positional argument.
@@ -186,7 +186,7 @@ message Response {
 
     // If [type] is [CLIENT_ERROR], [TYPE_ERROR], or [RUNTIME_ERROR], then a
     // backtrace will be provided.  The backtrace says where in the query the
-    // error occured.  Ideally this information will be presented to the user as
+    // error occurred.  Ideally this information will be presented to the user as
     // a pretty-printed version of their query with the erroneous section
     // underlined.  A backtrace is a series of 0 or more [Frame]s, each of which
     // specifies either the index of a positional argument or the name of an

test/common/test_exceptions.py

@@ -5,7 +5,7 @@
 class TestingFrameworkException(Exception):
     '''Generic exception for this testing framework, mostly a base class for others'''
 
-    _message = 'A generic testing framework error occured'
+    _message = 'A generic testing framework error occurred'
     detail = None
     debugInfo = None