diff options
| -rw-r--r-- | distrib/alpha/instkernel/ramdisk/install.sh | 4 | ||||
| -rw-r--r-- | doc/CHANGES.prev | 6 | ||||
| -rw-r--r-- | etc/defaults/rc.conf | 4 | ||||
| -rw-r--r-- | sbin/disklabel/main.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/stand/ahdilabel/privahdi.h | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/rd.c | 6 | ||||
| -rw-r--r-- | sys/compat/ultrix/ultrix_fs.c | 6 | ||||
| -rw-r--r-- | sys/dev/gpib/rd.c | 6 | ||||
| -rw-r--r-- | sys/dev/scsipi/cd.c | 6 | ||||
| -rw-r--r-- | sys/uvm/uvm_swap.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinst/arch/ews4800mips/md.c | 4 | ||||
| -rw-r--r-- | usr.sbin/timed/CHANGES | 2 | ||||
| -rw-r--r-- | usr.sbin/timed/timed/CHANGES | 2 |
13 files changed, 31 insertions, 31 deletions
diff --git a/distrib/alpha/instkernel/ramdisk/install.sh b/distrib/alpha/instkernel/ramdisk/install.sh index dc59f45a9ab..517731b735e 100644 --- a/distrib/alpha/instkernel/ramdisk/install.sh +++ b/distrib/alpha/instkernel/ramdisk/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.6 2009/09/20 22:44:06 abs Exp $ +# $NetBSD: install.sh,v 1.7 2020/09/29 02:49:55 msaitoh Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -339,7 +339,7 @@ while [ $part_used -lt $partition ]; do [1-9]*) total=$(( $part_used + $resp )) if [ $total -gt $partition ]; then - echo -n "That would make the parition" + echo -n "That would make the partition" echo "too large to fit!" else part_size=$resp diff --git a/doc/CHANGES.prev b/doc/CHANGES.prev index c592737a429..10d887971fa 100644 --- a/doc/CHANGES.prev +++ b/doc/CHANGES.prev @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.156 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.157 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -1759,7 +1759,7 @@ Changes from NetBSD 1.0 to NetBSD 1.1: scsi: Made the SCSI disk drivers wait for the disc to spin up on open. [mycroft 19950126] add sysctl() variable kern.maxpartitions, so one can easily get - the value of MAXPARITIONS w/o compiling it in. (cgd) + the value of MAXPARTITIONS w/o compiling it in. (cgd) remove ability to export null and umap file systems, by having their fhtovp and vptofh functions return EOPNOTSUPP. (cgd) config(8): fix config.new to handle differing values of MAXPARTITIONS. @@ -2684,7 +2684,7 @@ Changes from NetBSD 1.1 to NetBSD 1.2: scripts have been rewritten to deal with this. Also added an option to install from a 'normal' (== hd/mo/...) disk partition to allow people to gather the sets using the - native OS and mount that parition from the installer. + native OS and mount that partition from the installer. XXX: All of the above changes can (and should) be merged XXX: into the MI-miniroot. [leo 19960519] diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 4ea78e03863..c6698776a48 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.159 2020/09/11 09:59:35 kim Exp $ +# $NetBSD: rc.conf,v 1.160 2020/09/29 02:49:55 msaitoh Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -101,7 +101,7 @@ swapoff=YES # Remove block-type swap partitions upon shutdown # This defaults to yes, so that raids shutdown cleanly swapoff_umount=auto # Set to 'manual' to umount the tmpfs partitions listed # in swapoff_umount_fs before removing swap. Set to - # 'auto' to umount all tmpfs paritions that contain + # 'auto' to umount all tmpfs partitions that contain # no device nodes. swapoff_umount_fs= # space-separated list of tmpfs mount points to umount # before removing swap if swapoff_umount=manual diff --git a/sbin/disklabel/main.c b/sbin/disklabel/main.c index 1798bfb10ca..e437e8c9fa6 100644 --- a/sbin/disklabel/main.c +++ b/sbin/disklabel/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.53 2019/08/03 04:21:37 isaki Exp $ */ +/* $NetBSD: main.c,v 1.54 2020/09/29 02:49:55 msaitoh Exp $ */ /* * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -76,7 +76,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\ static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95"; /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ #else -__RCSID("$NetBSD: main.c,v 1.53 2019/08/03 04:21:37 isaki Exp $"); +__RCSID("$NetBSD: main.c,v 1.54 2020/09/29 02:49:55 msaitoh Exp $"); #endif #endif /* not lint */ @@ -642,7 +642,7 @@ main(int argc, char *argv[]) #ifndef HAVE_NBTOOL_CONFIG_H /* * If the disklabel has the same location as the native disklabel and - * fewer or equal paritions, we can use the native ioctls. Otherwise + * fewer or equal partitions, we can use the native ioctls. Otherwise * force file/raw access. */ native_p = native_params.labelusesmbr == labelusesmbr diff --git a/sys/arch/atari/stand/ahdilabel/privahdi.h b/sys/arch/atari/stand/ahdilabel/privahdi.h index bcf5c5da01c..b032a672003 100644 --- a/sys/arch/atari/stand/ahdilabel/privahdi.h +++ b/sys/arch/atari/stand/ahdilabel/privahdi.h @@ -1,4 +1,4 @@ -/* $NetBSD: privahdi.h,v 1.3 2009/03/14 14:45:57 dsl Exp $ */ +/* $NetBSD: privahdi.h,v 1.4 2020/09/29 02:49:55 msaitoh Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ /* Flags for ahdi_readlabel() */ #define FORCE_AHDI 0x01 /* Read AHDI label when NetBSD label exists */ #define AHDI_IGN_EXISTS 0x02 /* Ignore partition exists flag (ICD tools) */ -#define AHDI_IGN_EXT 0x04 /* Ignore last extended parition (HDDriver) */ +#define AHDI_IGN_EXT 0x04 /* Ignore last extended partition (HDDriver) */ #define AHDI_IGN_CKSUM 0x08 /* Ignore checksum mismatch on root sector */ #define AHDI_IGN_SPU 0x10 /* Ignore total sectors mismatch */ diff --git a/sys/arch/hp300/dev/rd.c b/sys/arch/hp300/dev/rd.c index ebdaf4737dd..b2781611b69 100644 --- a/sys/arch/hp300/dev/rd.c +++ b/sys/arch/hp300/dev/rd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.101 2015/04/13 21:18:42 riastradh Exp $ */ +/* $NetBSD: rd.c,v 1.102 2020/09/29 02:49:56 msaitoh Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.101 2015/04/13 21:18:42 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.102 2020/09/29 02:49:56 msaitoh Exp $"); #include "opt_useleds.h" @@ -639,7 +639,7 @@ rdclose(dev_t dev, int flag, int mode, struct lwp *l) dk->dk_openmask = dk->dk_copenmask | dk->dk_bopenmask; /* * On last close, we wait for all activity to cease since - * the label/parition info will become invalid. Since we + * the label/partition info will become invalid. Since we * might sleep, we must block any opens while we are here. * Note we don't have to about other closes since we know * we are the last one. diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c index 6124e11cac4..9f2cc60423a 100644 --- a/sys/compat/ultrix/ultrix_fs.c +++ b/sys/compat/ultrix/ultrix_fs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ultrix_fs.c,v 1.58 2017/12/03 12:53:52 maxv Exp $ */ +/* $NetBSD: ultrix_fs.c,v 1.59 2020/09/29 02:49:56 msaitoh Exp $ */ /* * Copyright (c) 1995, 1997 Jonathan Stone @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.58 2017/12/03 12:53:52 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.59 2020/09/29 02:49:56 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.58 2017/12/03 12:53:52 maxv Exp $"); ** Ultrix filesystem operations: mount(), getmnt(). ** These are included purely so one can place an (ECOFF or ELF) ** NetBSD/pmax kernel in an Ultrix root filesystem, boot it, - ** and over-write the Ultrix root parition with NetBSD binaries. + ** and over-write the Ultrix root partition with NetBSD binaries. **/ /* diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c index fda1587d099..6d152f0f01f 100644 --- a/sys/dev/gpib/rd.c +++ b/sys/dev/gpib/rd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.42 2017/10/28 04:53:56 riastradh Exp $ */ +/* $NetBSD: rd.c,v 1.43 2020/09/29 02:49:56 msaitoh Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.42 2017/10/28 04:53:56 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.43 2020/09/29 02:49:56 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -538,7 +538,7 @@ rdclose(dev_t dev, int flag, int mode, struct lwp *l) dk->dk_openmask = dk->dk_copenmask | dk->dk_bopenmask; /* * On last close, we wait for all activity to cease since - * the label/parition info will become invalid. Since we + * the label/partition info will become invalid. Since we * might sleep, we must block any opens while we are here. * Note we don't have to about other closes since we know * we are the last one. diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c index 408bddaa136..23c9a664677 100644 --- a/sys/dev/scsipi/cd.c +++ b/sys/dev/scsipi/cd.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd.c,v 1.344 2020/04/13 08:05:02 maxv Exp $ */ +/* $NetBSD: cd.c,v 1.345 2020/09/29 02:49:56 msaitoh Exp $ */ /*- * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation, @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.344 2020/04/13 08:05:02 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.345 2020/09/29 02:49:56 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -411,7 +411,7 @@ cd_firstopen(device_t self, dev_t dev, int flag, int fmt) /* * Start the pack spinning if necessary. Always allow the - * raw parition to be opened, for raw IOCTLs. Data transfers + * raw partition to be opened, for raw IOCTLs. Data transfers * will check for SDEV_MEDIA_LOADED. */ if (error == EIO) { diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c index 2a37af84f89..5f153d24fab 100644 --- a/sys/uvm/uvm_swap.c +++ b/sys/uvm/uvm_swap.c @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_swap.c,v 1.198 2020/07/25 22:14:35 riastradh Exp $ */ +/* $NetBSD: uvm_swap.c,v 1.199 2020/09/29 02:49:56 msaitoh Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.198 2020/07/25 22:14:35 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.199 2020/09/29 02:49:56 msaitoh Exp $"); #include "opt_uvmhist.h" #include "opt_compat_netbsd.h" @@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.198 2020/07/25 22:14:35 riastradh Exp * information that is passed up to the user (via system calls). * * each swap partition is assigned a "priority" (int) which controls - * swap parition usage. + * swap partition usage. * * the system maintains a global data structure describing all swap * partitions/files. there is a sorted LIST of "swappri" structures diff --git a/usr.sbin/sysinst/arch/ews4800mips/md.c b/usr.sbin/sysinst/arch/ews4800mips/md.c index 1a9176e5cc2..41f0c02b5d7 100644 --- a/usr.sbin/sysinst/arch/ews4800mips/md.c +++ b/usr.sbin/sysinst/arch/ews4800mips/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.5 2019/12/14 12:00:40 martin Exp $ */ +/* $NetBSD: md.c,v 1.6 2020/09/29 02:49:56 msaitoh Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -133,7 +133,7 @@ md_pre_disklabel(struct install_partition_desc *install, struct disk_part_info info; daddr_t boot_offset = ews4800mips_boot_offset(); - /* make sure the boot parition is at the right offset */ + /* make sure the boot partition is at the right offset */ for (part = 0; part < parts->num_part; part++) { if (!parts->pscheme->get_part_info(parts, part, &info)) continue; diff --git a/usr.sbin/timed/CHANGES b/usr.sbin/timed/CHANGES index 5865f307c92..026db0fcf74 100644 --- a/usr.sbin/timed/CHANGES +++ b/usr.sbin/timed/CHANGES @@ -75,7 +75,7 @@ add "-F host,host2,..." to "freerun" or "trust" only some hosts. This It is also handy to build a hierarchy of timed masters crossing networks. The TSP protocol has no provision of "goodness of clock", - no natural way to completely heal network paritions. Judicious + no natural way to completely heal network partitions. Judicious use of -F or -G can cause each gateway to trust only itself and machines closer to a central machine with a radio or atomic clock. diff --git a/usr.sbin/timed/timed/CHANGES b/usr.sbin/timed/timed/CHANGES index f5f3e0fb442..edc3c106450 100644 --- a/usr.sbin/timed/timed/CHANGES +++ b/usr.sbin/timed/timed/CHANGES @@ -84,7 +84,7 @@ add "-F host,host2,..." to "freerun" or "trust" only some hosts. This It is also handy to build a hierarchy of timed masters crossing networks. The TSP protocol has no provision of "goodness of clock", - no natural way to completely heal network paritions. Judicious + no natural way to completely heal network partitions. Judicious use of -F or -G can cause each gateway to trust only itself and machines closer to a central machine with a radio or atomic clock. |
