Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src s/acknowledgment/acknowledgement/
details: https://anonhg.NetBSD.org/src/rev/a7b3640ee136
branches: trunk
changeset: 476229:a7b3640ee136
user: simonb <simonb%NetBSD.org@localhost>
date: Fri Sep 10 03:24:14 1999 +0000
description:
s/acknowledgment/acknowledgement/
diffstat:
sys/netccitt/llc_subr.c | 4 ++--
sys/netinet/tcp_input.c | 4 ++--
sys/netns/spp_usrreq.c | 4 ++--
usr.sbin/inetd/inetd.8 | 4 ++--
usr.sbin/syslogd/syslogd.8 | 4 ++--
usr.sbin/timed/SMM.doc/timed/timed.ms | 18 +++++++++---------
usr.sbin/timed/timed/readmsg.c | 8 ++++----
7 files changed, 23 insertions(+), 23 deletions(-)
diffs (199 lines):
diff -r c05a2d8e55b0 -r a7b3640ee136 sys/netccitt/llc_subr.c
--- a/sys/netccitt/llc_subr.c Fri Sep 10 02:05:24 1999 +0000
+++ b/sys/netccitt/llc_subr.c Fri Sep 10 03:24:14 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: llc_subr.c,v 1.10 1998/09/13 16:21:18 christos Exp $ */
+/* $NetBSD: llc_subr.c,v 1.11 1999/09/10 03:24:14 simonb Exp $ */
/*
* Copyright (c) 1990, 1991, 1992
@@ -1940,7 +1940,7 @@
* sequence. Before the local LLC entered this state it was
* performing a timer recovery operation and had sent a
* command PDU with the P bit set to ``1'', and is still
- * awaiting an acknowledgment from the remote LLC. I PDUs may
+ * awaiting an acknowledgement from the remote LLC. I PDUs may
* be received but not transmitted. Supervisory PDUs may be
* both transmitted and received.
*/
diff -r c05a2d8e55b0 -r a7b3640ee136 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c Fri Sep 10 02:05:24 1999 +0000
+++ b/sys/netinet/tcp_input.c Fri Sep 10 03:24:14 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.94 1999/08/26 00:04:30 thorpej Exp $ */
+/* $NetBSD: tcp_input.c,v 1.95 1999/09/10 03:24:14 simonb Exp $ */
/*
%%% portions-copyright-nrl-95
@@ -1856,7 +1856,7 @@
/*
* Process the segment text, merging it into the TCP sequencing queue,
- * and arranging for acknowledgment of receipt if necessary.
+ * and arranging for acknowledgement of receipt if necessary.
* This process logically involves adjusting tp->rcv_wnd as data
* is presented to the user (this happens in tcp_usrreq.c,
* case PRU_RCVD). If a FIN has already been received on this
diff -r c05a2d8e55b0 -r a7b3640ee136 sys/netns/spp_usrreq.c
--- a/sys/netns/spp_usrreq.c Fri Sep 10 02:05:24 1999 +0000
+++ b/sys/netns/spp_usrreq.c Fri Sep 10 03:24:14 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: spp_usrreq.c,v 1.20 1998/03/01 02:24:39 fvdl Exp $ */
+/* $NetBSD: spp_usrreq.c,v 1.21 1999/09/10 03:24:15 simonb Exp $ */
/*
* Copyright (c) 1984, 1985, 1986, 1987, 1993
@@ -1479,7 +1479,7 @@
break;
/*
- * After a receive, possibly send acknowledgment
+ * After a receive, possibly send acknowledgement
* updating allocation.
*/
case PRU_RCVD:
diff -r c05a2d8e55b0 -r a7b3640ee136 usr.sbin/inetd/inetd.8
--- a/usr.sbin/inetd/inetd.8 Fri Sep 10 02:05:24 1999 +0000
+++ b/usr.sbin/inetd/inetd.8 Fri Sep 10 03:24:14 1999 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: inetd.8,v 1.22 1999/08/13 13:57:52 itojun Exp $
+.\" $NetBSD: inetd.8,v 1.23 1999/09/10 03:26:49 simonb Exp $
.\"
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -16,7 +16,7 @@
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgment:
+.\" must display the following acknowledgement:
.\" This product includes software developed by the NetBSD
.\" Foundation, Inc. and its contributors.
.\" 4. Neither the name of The NetBSD Foundation nor the names of its
diff -r c05a2d8e55b0 -r a7b3640ee136 usr.sbin/syslogd/syslogd.8
--- a/usr.sbin/syslogd/syslogd.8 Fri Sep 10 02:05:24 1999 +0000
+++ b/usr.sbin/syslogd/syslogd.8 Fri Sep 10 03:24:14 1999 +0000
@@ -10,7 +10,7 @@
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgment:
+.\" must display the following acknowledgement:
.\" This product includes software developed by the University of
.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)syslogd.8 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: syslogd.8,v 1.13 1999/03/22 18:44:11 garbled Exp $
+.\" $NetBSD: syslogd.8,v 1.14 1999/09/10 03:26:49 simonb Exp $
.\"
.Dd February 18, 1999
.Dt SYSLOGD 8
diff -r c05a2d8e55b0 -r a7b3640ee136 usr.sbin/timed/SMM.doc/timed/timed.ms
--- a/usr.sbin/timed/SMM.doc/timed/timed.ms Fri Sep 10 02:05:24 1999 +0000
+++ b/usr.sbin/timed/SMM.doc/timed/timed.ms Fri Sep 10 03:24:14 1999 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: timed.ms,v 1.3 1998/01/09 08:11:55 perry Exp $
+.\" $NetBSD: timed.ms,v 1.4 1999/09/10 03:26:49 simonb Exp $
.\"
.\" Copyright (c) 1986, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -136,7 +136,7 @@
protocol.
Reliability is achieved by the use of acknowledgements, sequence numbers, and
retransmission when message losses occur.
-When a message that requires acknowledgment is not acknowledged after
+When a message that requires acknowledgement is not acknowledged after
multiple attempts,
the time daemon that has sent the message will assume that the
addressee is down.
@@ -195,17 +195,17 @@
the network time the master has just computed.
The slave will accordingly
adjust the time of its machine.
-This message requires an acknowledgment.
+This message requires an acknowledgement.
.sp 1
.SH
-Acknowledgment Message
+Acknowledgement Message
.so unused
.LP
Type: TSP_ACK (2)
.sp 1
.PP
Both the master and the slaves use this message for
-acknowledgment only.
+acknowledgement only.
It is used in several different contexts, for example
in reply to an Adjtime message.
.sp 1
@@ -218,7 +218,7 @@
.PP
A newly-started time daemon broadcasts this message to
locate a master. No other action is implied by this packet.
-It requires a Master Acknowledgment.
+It requires a Master Acknowledgement.
.sp 1
.SH
Master Acknowledgement
@@ -241,7 +241,7 @@
This packet is sent to newly started time daemons and when the network
date is changed.
It contains the master's time as an approximation of the network time.
-It requires an acknowledgment.
+It requires an acknowledgement.
The next
synchronization round will eliminate the small time difference
caused by the random delay in the communication channel.
@@ -360,13 +360,13 @@
desired date to the master using this message.
.sp 1
.SH
-Set Date Acknowledgment Message
+Set Date Acknowledgement Message
.so unused
.LP
Type: TSP_DATEACK (16)
.sp 1
.PP
-The master sends this message to a slave in acknowledgment of a
+The master sends this message to a slave in acknowledgement of a
Set Date Request Message.
The same message is sent by the local time daemon to the program
\fIdate(1)\fP to confirm that the network date has been set by the
diff -r c05a2d8e55b0 -r a7b3640ee136 usr.sbin/timed/timed/readmsg.c
--- a/usr.sbin/timed/timed/readmsg.c Fri Sep 10 02:05:24 1999 +0000
+++ b/usr.sbin/timed/timed/readmsg.c Fri Sep 10 03:24:14 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: readmsg.c,v 1.7 1997/10/17 14:19:36 lukem Exp $ */
+/* $NetBSD: readmsg.c,v 1.8 1999/09/10 03:26:49 simonb Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -38,12 +38,12 @@
#if 0
static char sccsid[] = "@(#)readmsg.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: readmsg.c,v 1.7 1997/10/17 14:19:36 lukem Exp $");
+__RCSID("$NetBSD: readmsg.c,v 1.8 1999/09/10 03:26:49 simonb Exp $");
#endif
#endif /* not lint */
#ifdef sgi
-#ident "$Revision: 1.7 $"
+#ident "$Revision: 1.8 $"
#endif
#include "globals.h"
@@ -387,7 +387,7 @@
}
/*
- * `masterack' sends the necessary acknowledgments
+ * `masterack' sends the necessary acknowledgements
* to the messages received by a master
*/
void
Home |
Main Index |
Thread Index |
Old Index