acknowlege -> acknowledge

compatability -> compatibility

OK jmc@.

7 files changed, 15 insertions, 15 deletions

diff --git a/sys/arch/vax/dec/sii.c b/sys/arch/vax/dec/sii.c
index 03e0686f5f8..ef8b5373add 100644
--- a/sys/arch/vax/dec/sii.c
+++ b/sys/arch/vax/dec/sii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sii.c,v 1.14 2012/02/24 06:19:00 guenther Exp $	*/
+/*	$OpenBSD: sii.c,v 1.15 2013/01/06 22:06:54 martynas Exp $	*/
 /*	$NetBSD: sii.c,v 1.42 2000/06/02 20:20:29 mhitch Exp $	*/
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -1072,7 +1072,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.
 				 */
diff --git a/sys/dev/ic/aacvar.h b/sys/dev/ic/aacvar.h
index 9a2c1986f08..dcaf6a90a5e 100644
--- a/sys/dev/ic/aacvar.h
+++ b/sys/dev/ic/aacvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aacvar.h,v 1.8 2009/02/16 21:19:06 miod Exp $	*/
+/*	$OpenBSD: aacvar.h,v 1.9 2013/01/06 22:06:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -38,7 +38,7 @@
  * - Niklas Hallqvist
  */
 
-/* compatability */
+/* compatibility */
 #define time_second (mono_time.tv_sec)
 
 /* Debugging */
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index f35e592716d..f447248c45c 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha.c,v 1.74 2011/04/07 13:27:48 krw Exp $	*/
+/*	$OpenBSD: aha.c,v 1.75 2013/01/06 22:06:54 martynas Exp $	*/
 /*	$NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $	*/
 
 #undef AHADIAG
@@ -518,7 +518,7 @@ ahaintr(arg)
 #endif /*AHADEBUG */
 
 	/*
-	 * 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 = inb(iobase + AHA_INTR_PORT);
diff --git a/sys/dev/microcode/siop/osiop.ss b/sys/dev/microcode/siop/osiop.ss
index 5c6511bcd5b..4978bb98405 100644
--- a/sys/dev/microcode/siop/osiop.ss
+++ b/sys/dev/microcode/siop/osiop.ss
@@ -1,4 +1,4 @@
-;	$OpenBSD: osiop.ss,v 1.1 2003/01/08 02:11:38 krw Exp $	
+;	$OpenBSD: osiop.ss,v 1.2 2013/01/06 22:06:54 martynas Exp $	
 ;	$NetBSD: osiop.ss,v 1.1 2001/04/30 04:47:51 tsutsui Exp $
 
 ;
@@ -156,7 +156,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:
diff --git a/sys/netbt/l2cap_upper.c b/sys/netbt/l2cap_upper.c
index 987373c38a4..bcefcf54719 100644
--- a/sys/netbt/l2cap_upper.c
+++ b/sys/netbt/l2cap_upper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2cap_upper.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $	*/
+/*	$OpenBSD: l2cap_upper.c,v 1.6 2013/01/06 22:06:54 martynas Exp $	*/
 /*	$NetBSD: l2cap_upper.c,v 1.9 2008/08/06 15:01:24 plunky Exp $	*/
 
 /*-
@@ -359,7 +359,7 @@ l2cap_listen(struct l2cap_channel *chan)
  *	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.
  *
diff --git a/usr.sbin/httpd/src/modules/standard/mod_log_config.c b/usr.sbin/httpd/src/modules/standard/mod_log_config.c
index 74ae4281a95..64e93178978 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_log_config.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_log_config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_log_config.c,v 1.19 2010/02/25 07:49:53 pyr Exp $ */
+/*	$OpenBSD: mod_log_config.c,v 1.20 2013/01/06 22:06:54 martynas Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -75,7 +75,7 @@
  *                        Log to file fn with format given by the format
  *                        argument
  *
- *    CookieLog fn        For backwards compatability with old Cookie
+ *    CookieLog fn        For backwards compatibility with old Cookie
  *                        logging module - now deprecated.
  *
  * There can be any number of TransferLog and CustomLog
@@ -86,7 +86,7 @@
  * the request will be logged to the log file(s) defined outside
  * the virtual host section. If a TransferLog or CustomLog directive
  * appears in the VirtualHost section, the log files defined outside
- * the VirtualHost will _not_ be used. This makes this module compatable
+ * the VirtualHost will _not_ be used. This makes this module compatible
  * with the CLF and config log modules, where the use of TransferLog
  * inside the VirtualHost section overrides its use outside.
  *
diff --git a/usr.sbin/ppp/ppp/slcompress.h b/usr.sbin/ppp/ppp/slcompress.h
index 054ad39c6eb..c8064123ec7 100644
--- a/usr.sbin/ppp/ppp/slcompress.h
+++ b/usr.sbin/ppp/ppp/slcompress.h
@@ -31,7 +31,7 @@
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  *
- * $OpenBSD: slcompress.h,v 1.7 2003/06/04 16:08:08 deraadt Exp $
+ * $OpenBSD: slcompress.h,v 1.8 2013/01/06 22:06:54 martynas Exp $
  */
 
 #define MIN_VJ_STATES 3
@@ -54,7 +54,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