Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed typos 'occured' and 'occuring' #1346

Merged
merged 1 commit into from
Nov 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Cake.Core.Tests/Unit/CakeEngineTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ public void Should_Throw_Exception_Thrown_From_Setup_Action_If_Both_Setup_And_Te
}

[Fact]
public void Should_Throw_Exception_Occuring_In_Teardown_If_No_Previous_Exception_Was_Thrown()
public void Should_Throw_Exception_Occurring_In_Teardown_If_No_Previous_Exception_Was_Thrown()
{
// Given
var fixture = new CakeEngineFixture();
Expand Down Expand Up @@ -851,7 +851,7 @@ public void Should_Throw_Exception_Thrown_From_Task_Setup_Action_If_Both_Task_Se
}

[Fact]
public void Should_Throw_Exception_Occuring_In_Task_Teardown_If_No_Previous_Exception_Was_Thrown()
public void Should_Throw_Exception_Occurring_In_Task_Teardown_If_No_Previous_Exception_Was_Thrown()
{
// Given
var fixture = new CakeEngineFixture();
Expand Down
6 changes: 3 additions & 3 deletions src/Cake.Core/CakeEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ private void ExecuteTask(ICakeContext context, IExecutionStrategy strategy, Stop
}
catch (Exception exception)
{
_log.Error("An error occured when executing task '{0}'.", task.Name);
_log.Error("An error occurred when executing task '{0}'.", task.Name);

exceptionWasThrown = true;

Expand Down Expand Up @@ -293,7 +293,7 @@ private void PerformTaskTeardown(ICakeContext context, IExecutionStrategy strate
}
catch (Exception ex)
{
_log.Error("An error occured in the custom task teardown action ({0}).", task.Name);
_log.Error("An error occurred in the custom task teardown action ({0}).", task.Name);
if (!exceptionWasThrown)
{
// If no other exception was thrown, we throw this one.
Expand Down Expand Up @@ -361,7 +361,7 @@ private void PerformTeardown(IExecutionStrategy strategy, ICakeContext context,
}
catch (Exception ex)
{
_log.Error("An error occured in the custom teardown action.");
_log.Error("An error occurred in the custom teardown action.");
if (!exceptionWasThrown)
{
// If no other exception was thrown, we throw this one.
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Core/Scripting/ScriptAliasFinder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private ScriptAlias CreateAlias(Tuple<MethodInfo, ScriptAliasType> alias)
catch (Exception ex)
{
// Log this error.
const string format = "An error occured while generating code for alias {0}.";
const string format = "An error occurred while generating code for alias {0}.";
_log.Error(format, method.GetSignature(false));
_log.Error("Error: {0}", ex.Message);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Cake/CakeOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ public sealed class CakeOptions
public bool Experimental { get; set; }

/// <summary>
/// Gets or sets a value indicating whether an error occured during parsing.
/// Gets or sets a value indicating whether an error occurred during parsing.
/// </summary>
/// <value>
/// <c>true</c> if an error occured during parsing; otherwise, <c>false</c>.
/// <c>true</c> if an error occurred during parsing; otherwise, <c>false</c>.
/// </value>
public bool HasError { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion src/Cake/Scripting/Mono/MonoScriptSession.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void Execute(Script script)
catch (InternalErrorException)
{
// The error will be logged via the report printer.
throw new CakeException("An error occured while executing build script.");
throw new CakeException("An error occurred while executing build script.");
}
}
}
Expand Down