diff --git a/harness/nbjunit/src/org/netbeans/junit/MultiTestCase.java b/harness/nbjunit/src/org/netbeans/junit/MultiTestCase.java index f97f3a270829..93586e64e545 100644 --- a/harness/nbjunit/src/org/netbeans/junit/MultiTestCase.java +++ b/harness/nbjunit/src/org/netbeans/junit/MultiTestCase.java @@ -44,7 +44,7 @@ public MultiTestCase(String name) { private Throwable err = null; /** - * Internal method to set an error occured while preparation for executing the testcase. + * Internal method to set an error occurred while preparation for executing the testcase. */ void setError(Throwable e){ err = e; diff --git a/ide/diff/src/org/netbeans/spi/diff/DiffProvider.java b/ide/diff/src/org/netbeans/spi/diff/DiffProvider.java index 5856a7a22476..59a82a7773aa 100644 --- a/ide/diff/src/org/netbeans/spi/diff/DiffProvider.java +++ b/ide/diff/src/org/netbeans/spi/diff/DiffProvider.java @@ -48,7 +48,7 @@ public static DiffProvider getDefault() { * @param r1 the first source * @param r2 the second source to be compared with the first one. * @return the list of differences found, instances of {@link Difference}; - * or null when some error occured. + * or null when some error occurred. * @throws IOException when the reading from input streams fails. */ public abstract Difference[] computeDiff(Reader r1, Reader r2) throws IOException; diff --git a/php/php.samples/samples_src/TodoList/page/500.phtml b/php/php.samples/samples_src/TodoList/page/500.phtml index 9e1f30413da2..345ee1f44cd5 100644 --- a/php/php.samples/samples_src/TodoList/page/500.phtml +++ b/php/php.samples/samples_src/TodoList/page/500.phtml @@ -23,7 +23,7 @@ namespace TodoList; ?>

SERVER ERROR

-

Internal server error occured.

+

Internal server error occurred.

More information (should be hidden on production server):