Module Name: src
Committed By: andvar
Date: Wed May 4 07:32:50 UTC 2022
Modified Files:
src/sys/arch/mips/cavium/dev: octeon_gmx.c
src/sys/dev/ic: aic6915reg.h aic6915var.h
src/usr.sbin/arp: arp.4
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
s/entires/entries/
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/cavium/dev/octeon_gmx.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/aic6915reg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/aic6915var.h
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/arp/arp.4
cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/cavium/dev/octeon_gmx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.20 src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.21
--- src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.20 Sat Aug 7 16:18:59 2021
+++ src/sys/arch/mips/cavium/dev/octeon_gmx.c Wed May 4 07:32:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmx.c,v 1.20 2021/08/07 16:18:59 thorpej Exp $ */
+/* $NetBSD: octeon_gmx.c,v 1.21 2022/05/04 07:32:50 andvar Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.20 2021/08/07 16:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.21 2022/05/04 07:32:50 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -593,7 +593,7 @@ octgmx_set_filter(struct octgmx_port_sof
}
/*
- * Note first entry is self MAC address; other 7 entires are available
+ * Note first entry is self MAC address; other 7 entries are available
* for multicast addresses.
*/
Index: src/sys/dev/ic/aic6915reg.h
diff -u src/sys/dev/ic/aic6915reg.h:1.6 src/sys/dev/ic/aic6915reg.h:1.7
--- src/sys/dev/ic/aic6915reg.h:1.6 Thu Aug 1 15:21:09 2019
+++ src/sys/dev/ic/aic6915reg.h Wed May 4 07:32:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6915reg.h,v 1.6 2019/08/01 15:21:09 msaitoh Exp $ */
+/* $NetBSD: aic6915reg.h,v 1.7 2022/05/04 07:32:50 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -224,7 +224,7 @@ struct sf_tcd {
/*
* To make matters worse, the manual lies about the indices in the
- * completion queue entires. It claims they are in 8-byte units,
+ * completion queue entries. It claims they are in 8-byte units,
* but they're actually *BYTES*, which means we need to divide by
* 128 to get the actual index.
*/
Index: src/sys/dev/ic/aic6915var.h
diff -u src/sys/dev/ic/aic6915var.h:1.4 src/sys/dev/ic/aic6915var.h:1.5
--- src/sys/dev/ic/aic6915var.h:1.4 Sat Oct 27 17:18:19 2012
+++ src/sys/dev/ic/aic6915var.h Wed May 4 07:32:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6915var.h,v 1.4 2012/10/27 17:18:19 chs Exp $ */
+/* $NetBSD: aic6915var.h,v 1.5 2022/05/04 07:32:50 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@ struct sf_control_data {
struct sf_txdesc0 scd_txdescs[SF_NTXDESC];
/*
- * The transmit completion queue entires.
+ * The transmit completion queue entries.
*/
struct sf_tcd scd_txcomp[SF_NTCD];
Index: src/usr.sbin/arp/arp.4
diff -u src/usr.sbin/arp/arp.4:1.14 src/usr.sbin/arp/arp.4:1.15
--- src/usr.sbin/arp/arp.4:1.14 Sun Oct 16 05:32:30 2016
+++ src/usr.sbin/arp/arp.4 Wed May 4 07:32:50 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: arp.4,v 1.14 2016/10/16 05:32:30 wiz Exp $
+.\" $NetBSD: arp.4,v 1.15 2022/05/04 07:32:50 andvar Exp $
.\"
.\" Copyright (c) 1985, 1986, 1988, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -65,7 +65,7 @@ for a non-responding router.
.Pp
Each ARP cache entry is stored in a network interface which a response
of ARP comes in.
-ARP cache entires time out periodically (normally 20 minutes after validated;
+ARP cache entries time out periodically (normally 20 minutes after validated;
entries are not validated when not in use).
.Pp
ARP entries may be added, deleted or changed with the
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.60 src/usr.sbin/sysinst/bsddisklabel.c:1.61
--- src/usr.sbin/sysinst/bsddisklabel.c:1.60 Sat Apr 16 18:15:23 2022
+++ src/usr.sbin/sysinst/bsddisklabel.c Wed May 4 07:32:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.60 2022/04/16 18:15:23 andvar Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.61 2022/05/04 07:32:50 andvar Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1240,7 +1240,7 @@ sort_and_sync_parts(struct partition_usa
if (infos == NULL)
return;
- /* pre-initialize the first entires as dummy entries */
+ /* pre-initialize the first entries as dummy entries */
for (i = 0; i < pset->parts->num_part; i++) {
infos[i].cur_part_id = NO_PART;
infos[i].cur_flags = PTI_PSCHEME_INTERNAL;
@@ -1284,7 +1284,7 @@ sort_and_sync_parts(struct partition_usa
infos[pno].fs_type = info.fs_type;
infos[pno].fs_version = info.fs_sub_type;
}
- /* Add the non-partition entires after that */
+ /* Add the non-partition entries after that */
j = pset->parts->num_part;
for (i = 0; i < pset->num; i++) {
if (j >= no)
