Skip to content
Open
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
2 changes: 1 addition & 1 deletion harness/nbjunit/src/org/netbeans/junit/MultiTestCase.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ide/diff/src/org/netbeans/spi/diff/DiffProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 <code>null</code> when some error occured.
* or <code>null</code> when some error occurred.
* @throws IOException when the reading from input streams fails.
*/
public abstract Difference[] computeDiff(Reader r1, Reader r2) throws IOException;
Expand Down
2 changes: 1 addition & 1 deletion php/php.samples/samples_src/TodoList/page/500.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace TodoList;
?>
<h1>SERVER ERROR</h1>

<p class="p">Internal server error occured.</p>
<p class="p">Internal server error occurred.</p>
<p class="p">
<i>More information (<b>should be hidden on production server</b>):</i><br />
<?php echo $extra['message'] ?>
Expand Down