Module Name: src
Committed By: mbalmer
Date: Mon Aug 1 12:28:54 UTC 2011
Modified Files:
src/libexec/atrun: atrun.c
src/share/terminfo: terminfo
src/sys/arch/macppc/dev: ams.c
src/sys/dev/adb: adb_ms.c
src/sys/dev/ic: smc90cx6var.h tropic.c
src/sys/dev/pci: machfb.c
src/sys/dev/pci/n8/common/api: n8_sks.c
src/sys/dev/raidframe: rf_dagdegrd.c rf_dagdegwr.c rf_pqdegdags.c
src/sys/dev/sysmon: sysmon_envsys.c
src/usr.sbin/syslogd: tls.c
Log Message:
According to the Oxford Dictionary of Etymology, a wether is a male sheep
or ram.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/libexec/atrun/atrun.c
cvs rdiff -u -r1.3 -r1.4 src/share/terminfo/terminfo
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/macppc/dev/ams.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/adb/adb_ms.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/smc90cx6var.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/tropic.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/n8/common/api/n8_sks.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/raidframe/rf_dagdegrd.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/raidframe/rf_dagdegwr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/raidframe/rf_pqdegdags.c
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/syslogd/tls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/atrun/atrun.c
diff -u src/libexec/atrun/atrun.c:1.19 src/libexec/atrun/atrun.c:1.20
--- src/libexec/atrun/atrun.c:1.19 Sat Apr 5 20:17:37 2008
+++ src/libexec/atrun/atrun.c Mon Aug 1 12:28:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atrun.c,v 1.19 2008/04/05 20:17:37 christos Exp $ */
+/* $NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $ */
/*
* atrun.c - run jobs queued by at; run with root privileges.
@@ -59,7 +59,7 @@
#if 0
static char rcsid[] = "$OpenBSD: atrun.c,v 1.7 1997/09/08 22:12:10 millert Exp $";
#else
-__RCSID("$NetBSD: atrun.c,v 1.19 2008/04/05 20:17:37 christos Exp $");
+__RCSID("$NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $");
#endif
static int debug = 0;
@@ -366,7 +366,7 @@
main(int argc, char *argv[])
{
/*
- * Browse through _PATH_ATJOBS, checking all the jobfiles wether
+ * Browse through _PATH_ATJOBS, checking all the jobfiles whether
* they should be executed and or deleted. The queue is coded into
* the first byte of the job filename, the date (in minutes since
* Eon) as a hex number in the following eight bytes, followed by
Index: src/share/terminfo/terminfo
diff -u src/share/terminfo/terminfo:1.3 src/share/terminfo/terminfo:1.4
--- src/share/terminfo/terminfo:1.3 Sun Jun 19 16:27:23 2011
+++ src/share/terminfo/terminfo Mon Aug 1 12:28:54 2011
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# [email protected]
#
-# $Revision: 1.3 $
-# $Date: 2011/06/19 16:27:23 $
+# $Revision: 1.4 $
+# $Date: 2011/08/01 12:28:54 $
#
# The original header is preserved below for reference. It is noted that there
# is a "newer" version which differs in some cosmetic details (but actually
@@ -9081,7 +9081,7 @@
# terminfo. At one point, I found some reference indicating that this
# terminal bug (not sending \E[) was acknowledged by Wyse (so it's not just
# me), but I can't find that and the server under my bookmark to "Wyse
-# Technical" isn't responding. So there's the question of wether the wy85
+# Technical" isn't responding. So there's the question of whether the wy85
# terminfo should reflect the manufactuer's intended behaviour of the terminal
# or the actual."
wy85-8bit|wyse85-8bit|wyse 85 in 8-bit mode,
Index: src/sys/arch/macppc/dev/ams.c
diff -u src/sys/arch/macppc/dev/ams.c:1.27 src/sys/arch/macppc/dev/ams.c:1.28
--- src/sys/arch/macppc/dev/ams.c:1.27 Sat Jun 18 08:08:28 2011
+++ src/sys/arch/macppc/dev/ams.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ams.c,v 1.27 2011/06/18 08:08:28 matt Exp $ */
+/* $NetBSD: ams.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.27 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -676,7 +676,7 @@
adb_op_sync((Ptr)buffer, NULL, (Ptr)0, cmd);
/*
- * setup a sysctl node to control wether tapping the pad should
+ * setup a sysctl node to control whether tapping the pad should
* trigger mouse button events
*/
Index: src/sys/dev/adb/adb_ms.c
diff -u src/sys/dev/adb/adb_ms.c:1.10 src/sys/dev/adb/adb_ms.c:1.11
--- src/sys/dev/adb/adb_ms.c:1.10 Thu Jul 28 16:28:12 2011
+++ src/sys/dev/adb/adb_ms.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_ms.c,v 1.10 2011/07/28 16:28:12 macallan Exp $ */
+/* $NetBSD: adb_ms.c,v 1.11 2011/08/01 12:28:53 mbalmer Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.10 2011/07/28 16:28:12 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.11 2011/08/01 12:28:53 mbalmer Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -724,7 +724,7 @@
delay(1000);
/*
- * setup a sysctl node to control wether tapping the pad should
+ * setup a sysctl node to control whether tapping the pad should
* trigger mouse button events
*/
Index: src/sys/dev/ic/smc90cx6var.h
diff -u src/sys/dev/ic/smc90cx6var.h:1.9 src/sys/dev/ic/smc90cx6var.h:1.10
--- src/sys/dev/ic/smc90cx6var.h:1.9 Mon Apr 28 20:23:51 2008
+++ src/sys/dev/ic/smc90cx6var.h Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6var.h,v 1.9 2008/04/28 20:23:51 martin Exp $ */
+/* $NetBSD: smc90cx6var.h,v 1.10 2011/08/01 12:28:53 mbalmer Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
* As the reset functionality differs between the Amiga boards (using the
* 90c26 chip) and middle-aged ISA boards (using the 90c56 chip), we have
* a sc_reset callback function in the softc, which does a stop function
- * (reset and leave dead) or a reset function depending on wether the 2nd
+ * (reset and leave dead) or a reset function depending on whether the 2nd
* parameter is 0 or 1.
*/
Index: src/sys/dev/ic/tropic.c
diff -u src/sys/dev/ic/tropic.c:1.42 src/sys/dev/ic/tropic.c:1.43
--- src/sys/dev/ic/tropic.c:1.42 Mon Apr 5 07:19:37 2010
+++ src/sys/dev/ic/tropic.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tropic.c,v 1.42 2010/04/05 07:19:37 joerg Exp $ */
+/* $NetBSD: tropic.c,v 1.43 2011/08/01 12:28:53 mbalmer Exp $ */
/*
* Ported to NetBSD by Onno van der Linden
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.42 2010/04/05 07:19:37 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.43 2011/08/01 12:28:53 mbalmer Exp $");
#include "opt_inet.h"
@@ -211,7 +211,7 @@
/*
* XXX Not completely true because Fast Path Transmit has 514 byte buffers
* XXX and TR_MAX_LINK_HDR is only correct when source-routing is used.
- * XXX depending on wether source routing is used change the calculation
+ * XXX depending on whether source routing is used change the calculation
* XXX use IFM_TOK_SRCRT (IFF_LINK0)
* XXX recompute sc_minbuf !!
*/
Index: src/sys/dev/pci/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.68 src/sys/dev/pci/machfb.c:1.69
--- src/sys/dev/pci/machfb.c:1.68 Wed Jun 29 03:15:18 2011
+++ src/sys/dev/pci/machfb.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.68 2011/06/29 03:15:18 macallan Exp $ */
+/* $NetBSD: machfb.c,v 1.69 2011/08/01 12:28:53 mbalmer Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.68 2011/06/29 03:15:18 macallan Exp $");
+ "$NetBSD: machfb.c,v 1.69 2011/08/01 12:28:53 mbalmer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -855,7 +855,7 @@
int need_swap;
/*
- * Test wether the aperture is byte swapped or not
+ * Test whether the aperture is byte swapped or not
*/
p32 = (uint32_t*)sc->sc_aperture;
saved_value = *p32;
Index: src/sys/dev/pci/n8/common/api/n8_sks.c
diff -u src/sys/dev/pci/n8/common/api/n8_sks.c:1.1 src/sys/dev/pci/n8/common/api/n8_sks.c:1.2
--- src/sys/dev/pci/n8/common/api/n8_sks.c:1.1 Thu Oct 30 12:02:15 2008
+++ src/sys/dev/pci/n8/common/api/n8_sks.c Mon Aug 1 12:28:54 2011
@@ -32,7 +32,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: n8_sks.c,v 1.1 2008/10/30 12:02:15 darran Exp $";
+static char const n8_id[] = "$Id: n8_sks.c,v 1.2 2011/08/01 12:28:54 mbalmer Exp $";
/*****************************************************************************/
/** @file SKS_Management_Interface
* @brief Implementation for the SKS Management Interface.
@@ -1016,7 +1016,7 @@
* @param keyHandle_p WO: A N8_SKSKeyHandle_t pointer.
*
* @par Externals:
- * SKS_initialized_g RW: A boolean value that indicates wether the SKS
+ * SKS_initialized_g RW: A boolean value that indicates whether the SKS
* admin interface API has been initialized.
* @return
* N8_STATUS_OK indicates the key read successfully completed.
Index: src/sys/dev/raidframe/rf_dagdegrd.c
diff -u src/sys/dev/raidframe/rf_dagdegrd.c:1.27 src/sys/dev/raidframe/rf_dagdegrd.c:1.28
--- src/sys/dev/raidframe/rf_dagdegrd.c:1.27 Thu Nov 16 01:33:23 2006
+++ src/sys/dev/raidframe/rf_dagdegrd.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegrd.c,v 1.27 2006/11/16 01:33:23 christos Exp $ */
+/* $NetBSD: rf_dagdegrd.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.27 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -721,7 +721,7 @@
/* determine how many pda's we will have to generate per unaccess
* stripe. If there is only one failed data unit, it is one; if two,
- * possibly two, depending wether they overlap. */
+ * possibly two, depending whether they overlap. */
fone_start = rf_StripeUnitOffset(layoutPtr, fone->startSector);
fone_end = fone_start + fone->numSector;
Index: src/sys/dev/raidframe/rf_dagdegwr.c
diff -u src/sys/dev/raidframe/rf_dagdegwr.c:1.30 src/sys/dev/raidframe/rf_dagdegwr.c:1.31
--- src/sys/dev/raidframe/rf_dagdegwr.c:1.30 Thu Nov 16 01:33:23 2006
+++ src/sys/dev/raidframe/rf_dagdegwr.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegwr.c,v 1.30 2006/11/16 01:33:23 christos Exp $ */
+/* $NetBSD: rf_dagdegwr.c,v 1.31 2011/08/01 12:28:53 mbalmer Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.30 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.31 2011/08/01 12:28:53 mbalmer Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -590,7 +590,7 @@
/* determine how many pda's we will have to generate per unaccess
* stripe. If there is only one failed data unit, it is one; if two,
- * possibly two, depending wether they overlap. */
+ * possibly two, depending whether they overlap. */
fone_start = rf_StripeUnitOffset(layoutPtr, fone->startSector);
fone_end = fone_start + fone->numSector;
Index: src/sys/dev/raidframe/rf_pqdegdags.c
diff -u src/sys/dev/raidframe/rf_pqdegdags.c:1.12 src/sys/dev/raidframe/rf_pqdegdags.c:1.13
--- src/sys/dev/raidframe/rf_pqdegdags.c:1.12 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/raidframe/rf_pqdegdags.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_pqdegdags.c,v 1.12 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: rf_pqdegdags.c,v 1.13 2011/08/01 12:28:53 mbalmer Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.12 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.13 2011/08/01 12:28:53 mbalmer Exp $");
#include "rf_archs.h"
@@ -175,7 +175,7 @@
pda, pda, ... , p_1 pda, p_2 pda, q_1 pda, q_2 pda, raidptr, asm
- depending on wether two chunks of recovery data were required.
+ depending on whether two chunks of recovery data were required.
The second condition only arises if there are two failed buffers
whose lengths do not add up a stripe unit.
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.116 src/sys/dev/sysmon/sysmon_envsys.c:1.117
--- src/sys/dev/sysmon/sysmon_envsys.c:1.116 Sun Jun 19 11:40:26 2011
+++ src/sys/dev/sysmon/sysmon_envsys.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.116 2011/06/19 11:40:26 martin Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.117 2011/08/01 12:28:53 mbalmer Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.116 2011/06/19 11:40:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.117 2011/08/01 12:28:53 mbalmer Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1374,7 +1374,7 @@
/*
* Find the maximum of all currently reported values.
- * The provided callback decides wether a sensor is part of the
+ * The provided callback decides whether a sensor is part of the
* maximum calculation (by returning true) or ignored (callback
* returns false). Example usage: callback selects temperature
* sensors in a given thermal zone, the function calculates the
Index: src/usr.sbin/syslogd/tls.c
diff -u src/usr.sbin/syslogd/tls.c:1.6 src/usr.sbin/syslogd/tls.c:1.7
--- src/usr.sbin/syslogd/tls.c:1.6 Tue May 24 13:26:41 2011
+++ src/usr.sbin/syslogd/tls.c Mon Aug 1 12:28:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.6 2011/05/24 13:26:41 joerg Exp $ */
+/* $NetBSD: tls.c,v 1.7 2011/08/01 12:28:53 mbalmer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.6 2011/05/24 13:26:41 joerg Exp $");
+__RCSID("$NetBSD: tls.c,v 1.7 2011/08/01 12:28:53 mbalmer Exp $");
#ifndef DISABLE_TLS
#include "syslogd.h"
@@ -665,7 +665,7 @@
* Callback after OpenSSL has verified a peer certificate,
* gets called for every certificate in a chain (starting with root CA).
* preverify_ok indicates a valid trust path (necessary),
- * then we check wether the hostname or configured subject matches the cert.
+ * then we check whether the hostname or configured subject matches the cert.
*/
int
check_peer_cert(int preverify_ok, X509_STORE_CTX *ctx)
