diff options
| -rw-r--r-- | bin/ksh/NOTES | 4 | ||||
| -rw-r--r-- | share/man/man9/ktrace.9 | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/scsi.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_bge.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_ti.c | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.c | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/bin/ksh/NOTES b/bin/ksh/NOTES index 49fc4b2f15b..fa1d321012a 100644 --- a/bin/ksh/NOTES +++ b/bin/ksh/NOTES @@ -1,4 +1,4 @@ -$OpenBSD: NOTES,v 1.8 2003/02/26 03:53:35 david Exp $ +$OpenBSD: NOTES,v 1.9 2003/10/26 15:07:25 jmc Exp $ General features of at&t ksh88 that are not (yet) in pdksh: - exported aliases and functions (not in ksh93). @@ -131,7 +131,7 @@ Known differences between pdksh & at&t ksh (that are not likely to change) - . file: at&t ksh parses the whole file before executing anything, pdksh executes as it parses. This means aliases defined in the file will affect how pdksh parses the file, but won't affect how at&t ksh - parses the file. Also means pdksh will not parse statements occuring + parses the file. Also means pdksh will not parse statements occurring after a (executed) return statement. - a return in $ENV in at&t ksh will cause the shell to exit, while in pdksh it will stop executing the script (this is consistent with diff --git a/share/man/man9/ktrace.9 b/share/man/man9/ktrace.9 index f3cbf41e76a..02437723c74 100644 --- a/share/man/man9/ktrace.9 +++ b/share/man/man9/ktrace.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ktrace.9,v 1.4 2003/10/23 18:31:34 jmc Exp $ +.\" $OpenBSD: ktrace.9,v 1.5 2003/10/26 15:07:25 jmc Exp $ .\" .\" Copyright (c) 2003 Michael Shalayeff .\" @@ -57,7 +57,7 @@ .Fn ktrsysret "struct proc *p" "register_t code" "int error" "register_t retval" .Sh DESCRIPTION This interface is meant for kernel subsystems and machine dependent code -to inform the user about the events occuring to the process should +to inform the user about the events occurring to the process should tracing of such be enabled using the .Xr ktrace 2 system call. diff --git a/sys/arch/hp300/dev/scsi.c b/sys/arch/hp300/dev/scsi.c index 50fed565e99..2492ba758d0 100644 --- a/sys/arch/hp300/dev/scsi.c +++ b/sys/arch/hp300/dev/scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi.c,v 1.15 2003/06/02 23:27:45 millert Exp $ */ +/* $OpenBSD: scsi.c,v 1.16 2003/10/26 15:07:25 jmc Exp $ */ /* $NetBSD: scsi.c,v 1.21 1997/05/05 21:08:26 thorpej Exp $ */ /* @@ -950,7 +950,7 @@ finishxfer(hs, hd, target) * The following delay is definitely needed when trying to * write on a write protected disk (in the optical jukebox anyways), * but we shall see if other unexplained machine freezeups - * also stop occuring... A value of 5 seems to work but + * also stop occurring... A value of 5 seems to work but * 10 seems safer considering the potential consequences. */ DELAY(10); diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 4dcf3a1ef35..f4494c27e88 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.21 2003/10/13 16:18:56 krw Exp $ */ +/* $OpenBSD: if_bge.c,v 1.22 2003/10/26 15:07:25 jmc Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -2109,14 +2109,14 @@ bge_intr(xsc) if (!(CSR_READ_4(sc, BGE_MISC_LOCAL_CTL) & BGE_MLC_INTR_STATE)) return (0); #endif - /* Ack interrupt and stop others from occuring. */ + /* Ack interrupt and stop others from occurring. */ CSR_WRITE_4(sc, BGE_MBX_IRQ0_LO, 1); /* * Process link state changes. * Grrr. The link status word in the status block does * not work correctly on the BCM5700 rev AX and BX chips, - * according to all avaibable information. Hence, we have + * according to all available information. Hence, we have * to enable MII interrupts in order to properly obtain * async link changes. Unfortunately, this also means that * we have to read the MAC status register to detect link diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index ab3c7d127b7..bc37466be66 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti.c,v 1.46 2003/03/06 23:07:27 jason Exp $ */ +/* $OpenBSD: if_ti.c,v 1.47 2003/10/26 15:07:26 jmc Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2048,7 +2048,7 @@ int ti_intr(xsc) if (!(CSR_READ_4(sc, TI_MISC_HOST_CTL) & TI_MHC_INTSTATE)) return (0); - /* Ack interrupt and stop others from occuring. */ + /* Ack interrupt and stop others from occurring. */ CSR_WRITE_4(sc, TI_MB_HOSTINTR, 1); if (ifp->if_flags & IFF_RUNNING) { diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c index 9c2611a9120..abe9a072f54 100644 --- a/sys/dev/raidframe/rf_reconstruct.c +++ b/sys/dev/raidframe/rf_reconstruct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_reconstruct.c,v 1.14 2003/01/19 14:27:01 tdeval Exp $ */ +/* $OpenBSD: rf_reconstruct.c,v 1.15 2003/10/26 15:07:26 jmc Exp $ */ /* $NetBSD: rf_reconstruct.c,v 1.26 2000/06/04 02:05:13 oster Exp $ */ /* @@ -505,7 +505,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t row, RF_RowCol_t col) #ifdef RAIDDEBUG printf("RAIDFRAME: Unable to reconstruct to disk at:\n" " Row: %d Col: %d Reconstruction already" - " occuring !\n", row, col); + " occurring !\n", row, col); #endif /* RAIDDEBUG */ RF_UNLOCK_MUTEX(raidPtr->mutex); |