Fix spelling errors.

 * occured -> occurred
 * dosen't -> doesn't

diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp
index fae5665f3f9d20d5caec6f4f088628e73b42c95b..97946f5eea3c57d2810adcaf0d4c9c7346f64763 100644 (file)
--- a/lib/base/socket.cpp
+++ b/lib/base/socket.cpp
@@ -94,7 +94,7 @@ void Socket::Close()
 }
 
 /**
- * Retrieves the last error that occured for the socket.
+ * Retrieves the last error that occurred for the socket.
  *
  * @returns An error code.
  */

diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
index 89426f8a1d750edb1a7d655db42af0eaaf480ce2..5a4aa6157e5b751ae99636c763686c186b811ba5 100644 (file)
--- a/lib/checker/checkercomponent.cpp
+++ b/lib/checker/checkercomponent.cpp
@@ -221,7 +221,7 @@ void CheckerComponent::ExecuteCheckHelper(const Checkable::Ptr& checkable)
                CheckResult::Ptr cr = new CheckResult();
                cr->SetState(ServiceUnknown);
 
-               String output = "Exception occured while checking '" + checkable->GetName() + "': " + DiagnosticInformation(ex);
+               String output = "Exception occurred while checking '" + checkable->GetName() + "': " + DiagnosticInformation(ex);
                cr->SetOutput(output);
 
                double now = Utility::GetTime();

diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp
index fa188e7f00ebe5189248721d86b339dfbbe6f899..d0289b4fb04574c0be2cf475c9d64a735a292d46 100644 (file)
--- a/lib/cli/nodesetupcommand.cpp
+++ b/lib/cli/nodesetupcommand.cpp
@@ -262,7 +262,7 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
                        NodeUtility::UpdateConfiguration("\"conf.d/api-users.conf\"", true, false);
                } else {
                        Log(LogWarning, "cli")
-                               << "Included file dosen't exist " << apiUsersFilePath;
+                               << "Included file doesn't exist " << apiUsersFilePath;
                }
        }
 

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index faf50694ab16e465e309ea3bb6dfe6ed84d4a427..35c406d06c2d60f0675b27032b5f85ebecb9e25b 100644 (file)
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -293,7 +293,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
        bool send_notification = false;
 
        if (notification_reachable && !in_downtime && !IsAcknowledged()) {
-               /* Send notifications whether when a hard state change occured. */
+               /* Send notifications whether when a hard state change occurred. */
                if (hardChange && !(old_stateType == StateTypeSoft && IsStateOK(new_state)))
                        send_notification = true;
                /* Or if the checkable is volatile and in a HARD state. */

diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp
index 021b3f964ce895aa02a8c4b1494062bce7437bdf..3dad5a7af8ee1f4672fec371cbe4216f0084e455 100644 (file)
--- a/lib/icinga/checkable-notification.cpp
+++ b/lib/icinga/checkable-notification.cpp
@@ -76,7 +76,7 @@ void Checkable::SendNotifications(NotificationType type, const CheckResult::Ptr&
                                notification->BeginExecuteNotification(type, cr, force, false, author, text);
                } catch (const std::exception& ex) {
                        Log(LogWarning, "Checkable")
-                               << "Exception occured during notification for service '"
+                               << "Exception occurred during notification for service '"
                                << GetName() << "': " << DiagnosticInformation(ex);
                }
        }

diff --git a/lib/icinga/clusterevents-check.cpp b/lib/icinga/clusterevents-check.cpp
index 58d983eb863677c981bec5cfd8396140af89821b..9ad1c798f0e67eb83485da933cca5b0b9af44e6a 100644 (file)
--- a/lib/icinga/clusterevents-check.cpp
+++ b/lib/icinga/clusterevents-check.cpp
@@ -179,7 +179,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
                        CheckResult::Ptr cr = new CheckResult();
                        cr->SetState(ServiceUnknown);
 
-                       String output = "Exception occured while checking '" + host->GetName() + "': " + DiagnosticInformation(ex);
+                       String output = "Exception occurred while checking '" + host->GetName() + "': " + DiagnosticInformation(ex);
                        cr->SetOutput(output);
 
                        double now = Utility::GetTime();

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index 0e8d6dac2a570056c9654cb81c3930b69e776c29..ea3fdc90e5dc56ff321bf7292ff9f07f8a6fbb32 100644 (file)
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -524,7 +524,7 @@ void Notification::ExecuteNotificationHelper(NotificationType type, const User::
                        << "' and user '" << user->GetName() << "'.";
        } catch (const std::exception& ex) {
                Log(LogWarning, "Notification")
-                       << "Exception occured during notification for checkable '"
+                       << "Exception occurred during notification for checkable '"
                        << GetCheckable()->GetName() << "': " << DiagnosticInformation(ex);
        }
 }

diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp
index 3d7fbc60b63c4d32c4c32c9ef963fc9f224a1f93..bbe6ad4801fc0b2d2cc5566eb13dc48348fa3c62 100644 (file)
--- a/lib/notification/notificationcomponent.cpp
+++ b/lib/notification/notificationcomponent.cpp
@@ -130,7 +130,7 @@ void NotificationComponent::NotificationTimerHandler()
                        notification->BeginExecuteNotification(NotificationProblem, checkable->GetLastCheckResult(), false, true);
                } catch (const std::exception& ex) {
                        Log(LogWarning, "NotificationComponent")
-                               << "Exception occured during notification for object '"
+                               << "Exception occurred during notification for object '"
                                << GetName() << "': " << DiagnosticInformation(ex);
                }
        }

diff --git a/third-party/yajl/src/api/yajl_parse.h b/third-party/yajl/src/api/yajl_parse.h
index 1c25a60d5292c5b8c334bc593ee39b563f94ba44..fd5b9a067a2b5326537d6c1520c9addb5eec34fb 100644 (file)
--- a/third-party/yajl/src/api/yajl_parse.h
+++ b/third-party/yajl/src/api/yajl_parse.h
@@ -35,7 +35,7 @@ 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
+        /** An error occurred during the parse.  Call yajl_get_error for
          *  more information about the encountered error */
         yajl_status_error
     } yajl_status;
@@ -192,7 +192,7 @@ extern "C" {
      *  parse.
      *
      *  If verbose is non-zero, the message will include the JSON
-     *  text where the error occured, along with an arrow pointing to
+     *  text where the error occurred, along with an arrow pointing to
      *  the specific char.
      *
      *  \returns A dynamically allocated string will be returned which should
@@ -211,7 +211,7 @@ extern "C" {
      *
      * 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.
      */
     YAJL_API size_t yajl_get_bytes_consumed(yajl_handle hand);