Module Name: src
Committed By: maya
Date: Mon Dec 12 15:58:45 UTC 2016
Modified Files:
src/libexec/telnetd: state.c
src/sys/arch/amiga/dev: siop2_script.ss siop_script.ss
src/sys/arch/arc/dti: btl.c
src/sys/arch/pmax/ibus: sii.c
src/sys/dev/i2c: hytp14reg.h
src/sys/dev/microcode/siop: osiop.ss
src/sys/dev/qbus: if_qt.c
src/sys/net: slcompress.h
src/sys/netbt: l2cap_upper.c
src/sys/netisdn: i4b_ioctl.h
Log Message:
acknowleg -> acknowledg, proceedure -> procedure.
only comments were changed.
from miod
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/libexec/telnetd/state.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/dev/siop2_script.ss
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/siop_script.ss
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arc/dti/btl.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/pmax/ibus/sii.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/hytp14reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/siop/osiop.ss
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/qbus/if_qt.c
cvs rdiff -u -r1.18 -r1.19 src/sys/net/slcompress.h
cvs rdiff -u -r1.18 -r1.19 src/sys/netbt/l2cap_upper.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netisdn/i4b_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/state.c
diff -u src/libexec/telnetd/state.c:1.29 src/libexec/telnetd/state.c:1.30
--- src/libexec/telnetd/state.c:1.29 Mon Jan 9 16:36:48 2012
+++ src/libexec/telnetd/state.c Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: state.c,v 1.29 2012/01/09 16:36:48 christos Exp $ */
+/* $NetBSD: state.c,v 1.30 2016/12/12 15:58:44 maya Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: state.c,v 1.29 2012/01/09 16:36:48 christos Exp $");
+__RCSID("$NetBSD: state.c,v 1.30 2016/12/12 15:58:44 maya Exp $");
#endif
#endif /* not lint */
@@ -401,14 +401,14 @@ gotiac: switch (c) {
* Finally, there is one catch. If we send a negative response to a
* positive request, my_state will be the positive while want_state will
* remain negative. my_state will revert to negative when the negative
- * acknowlegment arrives from the peer. Thus, my_state generally tells
+ * acknowledgment arrives from the peer. Thus, my_state generally tells
* us not only the last negotiated state, but also tells us what the peer
* wants to be doing as well. It is important to understand this difference
* as we may wish to be processing data streams based on our desired state
* (want_state) or based on what the peer thinks the state is (my_state).
*
* This all works fine because if the peer sends a positive request, the data
- * that we receive prior to negative acknowlegment will probably be affected
+ * that we receive prior to negative acknowledgment will probably be affected
* by the positive state, and we can process it as such (if we can; if we
* can't then it really doesn't matter). If it is that important, then the
* peer probably should be buffering until this option state negotiation
Index: src/sys/arch/amiga/dev/siop2_script.ss
diff -u src/sys/arch/amiga/dev/siop2_script.ss:1.7 src/sys/arch/amiga/dev/siop2_script.ss:1.8
--- src/sys/arch/amiga/dev/siop2_script.ss:1.7 Wed Oct 21 23:53:38 2009
+++ src/sys/arch/amiga/dev/siop2_script.ss Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-; $NetBSD: siop2_script.ss,v 1.7 2009/10/21 23:53:38 snj Exp $
+; $NetBSD: siop2_script.ss,v 1.8 2016/12/12 15:58:44 maya Exp $
;
; Copyright (c) 1998 Michael L. Hitch
@@ -146,7 +146,7 @@ wait_reselect:
INT err9, WHEN NOT MSG_IN ; didn't get IDENTIFY
MOVE FROM ds_Msg, WHEN MSG_IN
INT err3 ; let host know about reconnect
- CLEAR ACK ; acknowlege the message
+ CLEAR ACK ; acknowledge the message
JUMP REL(switch)
Index: src/sys/arch/amiga/dev/siop_script.ss
diff -u src/sys/arch/amiga/dev/siop_script.ss:1.5 src/sys/arch/amiga/dev/siop_script.ss:1.6
--- src/sys/arch/amiga/dev/siop_script.ss:1.5 Wed Oct 21 23:53:38 2009
+++ src/sys/arch/amiga/dev/siop_script.ss Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-; $NetBSD: siop_script.ss,v 1.5 2009/10/21 23:53:38 snj Exp $
+; $NetBSD: siop_script.ss,v 1.6 2016/12/12 15:58:44 maya Exp $
;
; Copyright (c) 1995 Michael L. Hitch
@@ -141,7 +141,7 @@ wait_reselect:
INT err9, WHEN NOT MSG_IN ; didn't get IDENTIFY
MOVE FROM ds_Msg, WHEN MSG_IN
INT err3 ; let host know about reconnect
- CLEAR ACK ; acknowlege the message
+ CLEAR ACK ; acknowledge the message
JUMP REL(switch)
Index: src/sys/arch/arc/dti/btl.c
diff -u src/sys/arch/arc/dti/btl.c:1.26 src/sys/arch/arc/dti/btl.c:1.27
--- src/sys/arch/arc/dti/btl.c:1.26 Sat Oct 18 08:33:24 2014
+++ src/sys/arch/arc/dti/btl.c Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: btl.c,v 1.26 2014/10/18 08:33:24 snj Exp $ */
+/* $NetBSD: btl.c,v 1.27 2016/12/12 15:58:44 maya Exp $ */
/* NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp */
#undef BTDIAG
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.26 2014/10/18 08:33:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.27 2016/12/12 15:58:44 maya Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -515,7 +515,7 @@ btintr(void *arg)
#endif /* BTDEBUG */
/*
- * First acknowlege the interrupt, Then if it's not telling about
+ * First acknowledge the interrupt, Then if it's not telling about
* a completed operation just return.
*/
sts = isa_inb(iobase + BT_INTR_PORT);
Index: src/sys/arch/pmax/ibus/sii.c
diff -u src/sys/arch/pmax/ibus/sii.c:1.12 src/sys/arch/pmax/ibus/sii.c:1.13
--- src/sys/arch/pmax/ibus/sii.c:1.12 Mon Jun 20 20:19:43 2016
+++ src/sys/arch/pmax/ibus/sii.c Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sii.c,v 1.12 2016/06/20 20:19:43 maya Exp $ */
+/* $NetBSD: sii.c,v 1.13 2016/12/12 15:58:44 maya Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.12 2016/06/20 20:19:43 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.13 2016/12/12 15:58:44 maya Exp $");
#include "sii.h"
/*
@@ -352,7 +352,7 @@ sii_Reset(struct siisoftc* sc, int reset
/*
* Start a SCSI command by sending the cmd data
* to a SCSI controller via the SII.
- * Call the device done proceedure if it can't be started.
+ * Call the device done procedure if it can't be started.
* NOTE: we should be called with interrupts disabled.
*/
static void
@@ -1125,7 +1125,7 @@ again:
if (msg == 0)
msg = 256;
/*
- * We read and acknowlege all the bytes
+ * We read and acknowledge all the bytes
* except the last so we can assert ATN
* if needed before acknowledging the last.
*/
Index: src/sys/dev/i2c/hytp14reg.h
diff -u src/sys/dev/i2c/hytp14reg.h:1.2 src/sys/dev/i2c/hytp14reg.h:1.3
--- src/sys/dev/i2c/hytp14reg.h:1.2 Sun Jun 29 09:06:05 2014
+++ src/sys/dev/i2c/hytp14reg.h Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hytp14reg.h,v 1.2 2014/06/29 09:06:05 kardel Exp $ */
+/* $NetBSD: hytp14reg.h,v 1.3 2016/12/12 15:58:44 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -68,8 +68,8 @@
#define HYTP14_RESP_MASK 0x03
#define HYTP14_RESP_BUSY 0x00 /* device is busy */
-#define HYTP14_RESP_ACK 0x01 /* positive acknowlege */
-#define HYTP14_RESP_NACK 0x02 /* negative acknowlege */
+#define HYTP14_RESP_ACK 0x01 /* positive acknowledge */
+#define HYTP14_RESP_NACK 0x02 /* negative acknowledge */
#define HYTP14_ST_CMDMODE 0x8000 /* command mode */
#define HYTP14_ST_STALE 0x4000 /* stale measurement data */
Index: src/sys/dev/microcode/siop/osiop.ss
diff -u src/sys/dev/microcode/siop/osiop.ss:1.2 src/sys/dev/microcode/siop/osiop.ss:1.3
--- src/sys/dev/microcode/siop/osiop.ss:1.2 Wed Oct 21 23:53:38 2009
+++ src/sys/dev/microcode/siop/osiop.ss Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-; $NetBSD: osiop.ss,v 1.2 2009/10/21 23:53:38 snj Exp $
+; $NetBSD: osiop.ss,v 1.3 2016/12/12 15:58:44 maya Exp $
;
; Copyright (c) 1995 Michael L. Hitch
@@ -150,7 +150,7 @@ wait_reselect:
INT int_identify, WHEN NOT MSG_IN
MOVE FROM ds_Msg, WHEN MSG_IN
INT int_reconnect ; let host know about reconnect
- CLEAR ACK ; acknowlege the message
+ CLEAR ACK ; acknowledge the message
JUMP REL(switch)
select_adr:
Index: src/sys/dev/qbus/if_qt.c
diff -u src/sys/dev/qbus/if_qt.c:1.19 src/sys/dev/qbus/if_qt.c:1.20
--- src/sys/dev/qbus/if_qt.c:1.19 Tue Feb 9 08:32:11 2016
+++ src/sys/dev/qbus/if_qt.c Mon Dec 12 15:58:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qt.c,v 1.19 2016/02/09 08:32:11 ozaki-r Exp $ */
+/* $NetBSD: if_qt.c,v 1.20 2016/12/12 15:58:44 maya Exp $ */
/*
* Copyright (c) 1992 Steven M. Schultz
* All rights reserved.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.19 2016/02/09 08:32:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.20 2016/12/12 15:58:44 maya Exp $");
#include "opt_inet.h"
@@ -369,7 +369,7 @@ qtinit(struct ifnet *ifp)
/*
* Fill in most of the INIT block: vector, options (interrupt enable), ring
* locations. The physical address is copied from the ROMs as part of the
- * -YM testing proceedure. The CSR is saved here rather than in qtinit()
+ * -YM testing procedure. The CSR is saved here rather than in qtinit()
* because the qtturbo() routine needs it.
*
* The INIT block must be quadword aligned. Using malloc() guarantees click
Index: src/sys/net/slcompress.h
diff -u src/sys/net/slcompress.h:1.18 src/sys/net/slcompress.h:1.19
--- src/sys/net/slcompress.h:1.18 Wed Feb 20 17:05:53 2008
+++ src/sys/net/slcompress.h Mon Dec 12 15:58:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: slcompress.h,v 1.18 2008/02/20 17:05:53 matt Exp $ */
+/* $NetBSD: slcompress.h,v 1.19 2016/12/12 15:58:45 maya Exp $ */
/* Id: slcompress.h,v 1.4 1994/09/21 06:50:08 paulus Exp */
/*
@@ -60,7 +60,7 @@
*
* There are 5 numbers which can change (they are always inserted
* in the following order): TCP urgent pointer, window,
- * acknowlegement, sequence number and IP ID. (The urgent pointer
+ * acknowledgement, sequence number and IP ID. (The urgent pointer
* is different from the others in that its value is sent, not the
* change in value.) Since typical use of SLIP links is biased
* toward small packets (see comments on MTU/MSS below), changes
Index: src/sys/netbt/l2cap_upper.c
diff -u src/sys/netbt/l2cap_upper.c:1.18 src/sys/netbt/l2cap_upper.c:1.19
--- src/sys/netbt/l2cap_upper.c:1.18 Tue Aug 5 07:55:32 2014
+++ src/sys/netbt/l2cap_upper.c Mon Dec 12 15:58:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: l2cap_upper.c,v 1.18 2014/08/05 07:55:32 rtr Exp $ */
+/* $NetBSD: l2cap_upper.c,v 1.19 2016/12/12 15:58:45 maya Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: l2cap_upper.c,v 1.18 2014/08/05 07:55:32 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: l2cap_upper.c,v 1.19 2016/12/12 15:58:45 maya Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -386,7 +386,7 @@ l2cap_listen_pcb(struct l2cap_channel *c
* Note: I'm not sure how this will work out, but I think that
* if outgoing Retransmission Mode or Flow Control Mode is
* negotiated then this call will not be made until the SDU has
- * been acknowleged by the peer L2CAP entity. For 'Best Effort'
+ * been acknowledged by the peer L2CAP entity. For 'Best Effort'
* it will be made when the packet has cleared the controller
* buffers.
*
Index: src/sys/netisdn/i4b_ioctl.h
diff -u src/sys/netisdn/i4b_ioctl.h:1.13 src/sys/netisdn/i4b_ioctl.h:1.14
--- src/sys/netisdn/i4b_ioctl.h:1.13 Sun Sep 6 06:01:01 2015
+++ src/sys/netisdn/i4b_ioctl.h Mon Dec 12 15:58:45 2016
@@ -27,7 +27,7 @@
* i4b_ioctl.h - messages kernel <--> userland
* -------------------------------------------
*
- * $Id: i4b_ioctl.h,v 1.13 2015/09/06 06:01:01 dholland Exp $
+ * $Id: i4b_ioctl.h,v 1.14 2016/12/12 15:58:45 maya Exp $
*
* $FreeBSD$
*
@@ -348,7 +348,7 @@ typedef struct {
/*---------------------------------------------------------------------------*
* call proceeding indication
- * indicates outgoing SETUP has been acknowleged
+ * indicates outgoing SETUP has been acknowledged
*---------------------------------------------------------------------------*/
typedef struct {
msg_hdr_t header; /* common header */
