summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libc/rpc/clnt_udp.c4
-rw-r--r--lib/libwrap/rfc931.c6
-rw-r--r--sys/arch/mac68k/conf/GENERIC4
-rw-r--r--sys/arch/mac68k/conf/GENERICSBC4
-rw-r--r--sys/compat/ultrix/ultrix_fs.c4
-rw-r--r--sys/dev/ic/bha.c4
-rw-r--r--sys/kern/kern_descrip.c4
-rw-r--r--sys/sys/mbuf.h4
-rw-r--r--usr.bin/ssh/ssh.h4
-rw-r--r--usr.sbin/named/include/netdb.h4
-rw-r--r--usr.sbin/named/include/resolv.h4
-rw-r--r--usr.sbin/timed/CHANGES4
12 files changed, 25 insertions, 25 deletions
diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c
index 3ee71861e09..5a5f9c3a038 100644
--- a/lib/libc/rpc/clnt_udp.c
+++ b/lib/libc/rpc/clnt_udp.c
@@ -28,7 +28,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: clnt_udp.c,v 1.17 2001/09/15 13:51:00 deraadt Exp $";
+static char *rcsid = "$OpenBSD: clnt_udp.c,v 1.18 2002/06/03 12:04:08 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -97,7 +97,7 @@ struct cu_data {
* Caller may wish to set this something more useful.
*
* wait is the amount of time used between retransmitting a call if
- * no response has been heard; retransmition occurs until the actual
+ * no response has been heard; retransmission occurs until the actual
* rpc call times out.
*
* sendsz and recvsz are the maximum allowable packet sizes that can be
diff --git a/lib/libwrap/rfc931.c b/lib/libwrap/rfc931.c
index 951907adf47..d3c3f6d886c 100644
--- a/lib/libwrap/rfc931.c
+++ b/lib/libwrap/rfc931.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rfc931.c,v 1.7 2002/04/25 10:58:39 mpech Exp $ */
+/* $OpenBSD: rfc931.c,v 1.8 2002/06/03 12:04:08 deraadt Exp $ */
/* rfc1413 does an attempt at an ident query to a client. Originally written
* by Wietse Venema, rewritten by Bob Beck <beck@openbsd.org> to avoid
@@ -6,7 +6,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: rfc931.c,v 1.7 2002/04/25 10:58:39 mpech Exp $";
+static char rcsid[] = "$OpenBSD: rfc931.c,v 1.8 2002/06/03 12:04:08 deraadt Exp $";
#endif
#include <stdio.h>
@@ -39,7 +39,7 @@ timeout(s)
}
/*
- * The old rfc931 from original libwrap for compatiblity. Now it calls
+ * The old rfc931 from original libwrap for compatibility. Now it calls
* rfc1413 with the default global parameters, but puts in the string
* "unknown" (from global unknown) on failure just like the original.
*/
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 83de12bc70c..87362810dae 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.29 2002/04/16 15:32:55 miod Exp $
+# $OpenBSD: GENERIC,v 1.30 2002/06/03 12:04:08 deraadt Exp $
# $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
#
# GENERIC - an all-in-one kernel for the mac68k
@@ -13,7 +13,7 @@ option M68030
option M68020 # Must have 68851 PMMU
option FPSP
option FPU_EMULATE
-option COMPAT_SUNOS # SunOS m68k binary compatiblity
+option COMPAT_SUNOS # SunOS m68k binary compatibility
option ZS_CONSOLE_ABORT
option DISABLE_EXT_CACHE # Don't use IIci external cache
option DISABLE_ADB_WITH_SERIAL_CONSOLE
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
index b675e3973b2..79f178bbae2 100644
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ b/sys/arch/mac68k/conf/GENERICSBC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERICSBC,v 1.13 2002/04/16 15:32:55 miod Exp $
+# $OpenBSD: GENERICSBC,v 1.14 2002/06/03 12:04:08 deraadt Exp $
# $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
#
# GENERICSBC --- our generic kernel using the SBC SCSI driver
@@ -13,7 +13,7 @@ option M68030
option M68020 # Must have 68851 PMMU
option FPSP
option FPU_EMULATE
-option COMPAT_SUNOS # SunOS m68k binary compatiblity
+option COMPAT_SUNOS # SunOS m68k binary compatibility
option ZS_CONSOLE_ABORT
option DISABLE_EXT_CACHE # Don't use IIci external cache
option DISABLE_ADB_WITH_SERIAL_CONSOLE
diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c
index eafa1f03136..a0cfa887030 100644
--- a/sys/compat/ultrix/ultrix_fs.c
+++ b/sys/compat/ultrix/ultrix_fs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ultrix_fs.c,v 1.8 2002/04/23 18:54:12 espie Exp $ */
+/* $OpenBSD: ultrix_fs.c,v 1.9 2002/06/03 12:04:08 deraadt Exp $ */
/* $NetBSD: ultrix_fs.c,v 1.4 1996/04/07 17:23:06 jonathan Exp $ */
/*
@@ -59,7 +59,7 @@
/*
* Ultrix file system data structure, as modified by
* Ultrix getmntent(). This structure is padded to 2560 bytes, for
- * compatiblity with the size the Ultrix kernel and user apps expect.
+ * compatibility with the size the Ultrix kernel and user apps expect.
*/
struct ultrix_fs_data {
u_int32_t ufsd_flags; /* how mounted */
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index 276764893d2..e621dee35ae 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bha.c,v 1.3 2002/03/14 03:16:04 millert Exp $ */
+/* $OpenBSD: bha.c,v 1.4 2002/06/03 12:04:08 deraadt Exp $ */
/* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */
#undef BHADEBUG
@@ -1038,7 +1038,7 @@ bha_find(iot, ioh, sc)
/*
- * Disable the ISA-compatiblity ioports on PCI bha devices,
+ * Disable the ISA-compatibility ioports on PCI bha devices,
* to ensure they're not autoconfigured a second time as an ISA bha.
*/
int
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 9fcdaec27a3..d54f2880dc7 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_descrip.c,v 1.57 2002/05/23 14:25:20 art Exp $ */
+/* $OpenBSD: kern_descrip.c,v 1.58 2002/06/03 12:04:08 deraadt Exp $ */
/* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */
/*
@@ -796,7 +796,7 @@ fdexpand(p)
/*
* Create a new open file structure and allocate
- * a file decriptor for the process that refers to it.
+ * a file descriptor for the process that refers to it.
*/
int
falloc(p, resultfp, resultfd)
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 9eecf486b38..32e2f47dde9 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbuf.h,v 1.60 2002/03/15 01:20:04 millert Exp $ */
+/* $OpenBSD: mbuf.h,v 1.61 2002/06/03 12:04:06 deraadt Exp $ */
/* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */
/*
@@ -508,7 +508,7 @@ void _sk_mclget(struct mbuf *, int);
/* length to m_copy to copy all */
#define M_COPYALL 1000000000
-/* compatiblity with 4.3 */
+/* compatibility with 4.3 */
#define m_copy(m, o, l) m_copym((m), (o), (l), M_DONTWAIT)
/*
diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h
index adc69111525..54c2988eafe 100644
--- a/usr.bin/ssh/ssh.h
+++ b/usr.bin/ssh/ssh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.h,v 1.69 2002/05/11 20:24:48 stevesk Exp $ */
+/* $OpenBSD: ssh.h,v 1.70 2002/06/03 12:04:07 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -31,7 +31,7 @@
#define SSH_MAX_IDENTITY_FILES 100
/*
- * Major protocol version. Different version indicates major incompatiblity
+ * Major protocol version. Different version indicates major incompatibility
* that prevents communication.
*
* Minor protocol version. Different version indicates minor incompatibility
diff --git a/usr.sbin/named/include/netdb.h b/usr.sbin/named/include/netdb.h
index 844bf9255ac..a5ac7fa3ef2 100644
--- a/usr.sbin/named/include/netdb.h
+++ b/usr.sbin/named/include/netdb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netdb.h,v 1.4 2002/02/16 21:28:05 millert Exp $ */
+/* $OpenBSD: netdb.h,v 1.5 2002/06/03 12:04:08 deraadt Exp $ */
/*
* ++Copyright++ 1980, 1983, 1988, 1993
@@ -88,7 +88,7 @@ struct hostent {
int h_addrtype; /* host address type */
int h_length; /* length of address */
char **h_addr_list; /* list of addresses from name server */
-#define h_addr h_addr_list[0] /* address, for backward compatiblity */
+#define h_addr h_addr_list[0] /* address, for backward compatibility */
};
/*
diff --git a/usr.sbin/named/include/resolv.h b/usr.sbin/named/include/resolv.h
index ebf9b712468..aa58931bdb7 100644
--- a/usr.sbin/named/include/resolv.h
+++ b/usr.sbin/named/include/resolv.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: resolv.h,v 1.5 2002/02/17 19:42:37 millert Exp $ */
+/* $OpenBSD: resolv.h,v 1.6 2002/06/03 12:04:08 deraadt Exp $ */
/*
* ++Copyright++ 1983, 1987, 1989, 1993
@@ -105,7 +105,7 @@
#define RES_MAXNDOTS 15 /* should reflect bit field size */
struct __res_state {
- int retrans; /* retransmition time interval */
+ int retrans; /* retransmission time interval */
int retry; /* number of times to retransmit */
u_long options; /* option flags - see below. */
int nscount; /* number of name servers */
diff --git a/usr.sbin/timed/CHANGES b/usr.sbin/timed/CHANGES
index a1da6e633f2..4172af3741e 100644
--- a/usr.sbin/timed/CHANGES
+++ b/usr.sbin/timed/CHANGES
@@ -1,4 +1,4 @@
-# $OpenBSD: CHANGES,v 1.2 2001/04/07 20:02:08 ho Exp $
+# $OpenBSD: CHANGES,v 1.3 2002/06/03 12:04:08 deraadt Exp $
#
# @(#)CHANGES 5.1 (Berkeley) 5/11/93
@@ -95,7 +95,7 @@ Practically any users can send to the master TSP messages and this
way corrupt the reliability of the system. Authentication
of messages should be provided. Unfortunately, that would
require changing the protocol with all of the implied
- compatiblity problems. Fortunately, the new -F and -G args
+ compatibility problems. Fortunately, the new -F and -G args
can be used to cause the daemon to ignore time changes from
untrusted machines.