From 6f6fe2f3adce30b022f3dcfc15aa3f68e85edad4 Mon Sep 17 00:00:00 2001 From: simonb Date: Wed, 25 Apr 2001 02:33:08 +0000 Subject: [PATCH] Spell occurred correctly. --- bin/expr/expr.y | 8 ++++---- distrib/utils/sysinst/msg.mi.en | 4 ++-- games/trek/warp.c | 6 +++--- sys/arch/sparc64/sparc64/locore.s | 4 ++-- sys/dev/mca/edc_mca.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bin/expr/expr.y b/bin/expr/expr.y index c2b8ac2c228e..db12ef086131 100644 --- a/bin/expr/expr.y +++ b/bin/expr/expr.y @@ -1,4 +1,4 @@ -/* $NetBSD: expr.y,v 1.24 2001/02/04 19:51:14 christos Exp $ */ +/* $NetBSD: expr.y,v 1.25 2001/04/25 02:33:09 simonb Exp $ */ /*_ * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ %{ #include #ifndef lint -__RCSID("$NetBSD: expr.y,v 1.24 2001/02/04 19:51:14 christos Exp $"); +__RCSID("$NetBSD: expr.y,v 1.25 2001/04/25 02:33:09 simonb Exp $"); #endif /* not lint */ #include @@ -184,7 +184,7 @@ expr: item { $$ = $1; } /* very simplistic check for over-& underflow */ if ((res < 0 && l > 0 && r > 0 && l > r) || (res > 0 && l < 0 && r < 0 && l < r)) { - yyerror("integer overflow or underflow occured\ + yyerror("integer overflow or underflow occurred\ for operation '%s %s %s'", $1, $2, $3); /* NOTREACHED */ } @@ -194,7 +194,7 @@ expr: item { $$ = $1; } /* very simplistic check for over-& underflow */ if ((res < 0 && l > 0 && l > r) || (res > 0 && l < 0 && l < r) ) { - yyerror("integer overflow or underflow occured\ + yyerror("integer overflow or underflow occurred\ for operation '%s %s %s'", $1, $2, $3); /* NOTREACHED */ } diff --git a/distrib/utils/sysinst/msg.mi.en b/distrib/utils/sysinst/msg.mi.en index 734bd29482a5..07423a5ca6ba 100644 --- a/distrib/utils/sysinst/msg.mi.en +++ b/distrib/utils/sysinst/msg.mi.en @@ -1,4 +1,4 @@ -/* $NetBSD: msg.mi.en,v 1.81 2001/02/26 16:32:53 abs Exp $ */ +/* $NetBSD: msg.mi.en,v 1.82 2001/04/25 02:33:10 simonb Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -578,7 +578,7 @@ message endtar Your installation is incomplete. You selected %d distribution sets. %d sets couldn't be found -and %d were skipped after an error occured. Of the %d +and %d were skipped after an error occurred. Of the %d that were attempted, %d unpacked without errors and %d with errors. The installation is aborted. Please recheck your distribution source diff --git a/games/trek/warp.c b/games/trek/warp.c index d221d965646e..8f1a47baac41 100644 --- a/games/trek/warp.c +++ b/games/trek/warp.c @@ -1,4 +1,4 @@ -/* $NetBSD: warp.c,v 1.6 1998/09/11 14:28:28 hubertf Exp $ */ +/* $NetBSD: warp.c,v 1.7 2001/04/25 02:33:10 simonb Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)warp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: warp.c,v 1.6 1998/09/11 14:28:28 hubertf Exp $"); +__RCSID("$NetBSD: warp.c,v 1.7 2001/04/25 02:33:10 simonb Exp $"); #endif #endif /* not lint */ @@ -201,7 +201,7 @@ double d; /* test for just a lot of damage */ if (percent < 80) lose(L_TOOFAST); - printf("Equilibrium restored -- extreme damage occured to ship systems\n"); + printf("Equilibrium restored -- extreme damage occurred to ship systems\n"); for (i = 0; i < NDEV; i++) damage(i, (3.0 * (franf() + franf()) + 1.0) * Param.damfac[i]); Ship.shldup = 0; diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s index b0ba002d6ab7..6a093629ba9a 100644 --- a/sys/arch/sparc64/sparc64/locore.s +++ b/sys/arch/sparc64/sparc64/locore.s @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.114 2001/04/09 21:15:42 eeh Exp $ */ +/* $NetBSD: locore.s,v 1.115 2001/04/25 02:33:08 simonb Exp $ */ /* * Copyright (c) 1996-2000 Eduardo Horvath * Copyright (c) 1996 Paul Kranenburg @@ -7686,7 +7686,7 @@ Lcopyfault: nop restore .data -1: .asciz "copyfault: fault occured\n" +1: .asciz "copyfault: fault occurred\n" _ALIGN .text #endif diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c index 4e1f706777ae..4c454f21cb40 100644 --- a/sys/dev/mca/edc_mca.c +++ b/sys/dev/mca/edc_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: edc_mca.c,v 1.7 2001/04/24 09:15:06 jdolecek Exp $ */ +/* $NetBSD: edc_mca.c,v 1.8 2001/04/25 02:33:09 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -765,7 +765,7 @@ static const char * const edc_dev_errors[] = { "Bad Format", "Volume Overflow", "No Data AM Found", - "Block not found (No ID AM or ID CRC error occured)", + "Block not found (No ID AM or ID CRC error occurred)", "Reserved", "Reserved", "No ID found on track (ID search)",