pf spelling police

ok dhartmei@ jmc@

19 files changed, 47 insertions, 47 deletions

diff --git a/libexec/ftp-proxy/ftp-proxy.c b/libexec/ftp-proxy/ftp-proxy.c
index 387c3b51fc6..88b6fd16b86 100644
--- a/libexec/ftp-proxy/ftp-proxy.c
+++ b/libexec/ftp-proxy/ftp-proxy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftp-proxy.c,v 1.32 2003/07/29 14:46:06 henning Exp $ */
+/*	$OpenBSD: ftp-proxy.c,v 1.33 2003/08/22 21:50:34 david Exp $ */
 
 /*
  * Copyright (c) 1996-2001
@@ -119,7 +119,7 @@ int max_port = IPPORT_HILASTAUTO;
  * listening on.
  *
  * If the socket we are listening on gets a connection then we connect
- * to the other side's socket.  Similarily, if a connected socket is
+ * to the other side's socket.  Similarly, if a connected socket is
  * shutdown then we shutdown the other side's socket.
  */
 
diff --git a/libexec/spamd-setup/spamd-setup.c b/libexec/spamd-setup/spamd-setup.c
index 50998c738ce..9f61338819a 100644
--- a/libexec/spamd-setup/spamd-setup.c
+++ b/libexec/spamd-setup/spamd-setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spamd-setup.c,v 1.13 2003/07/29 18:39:23 deraadt Exp $ */
+/*	$OpenBSD: spamd-setup.c,v 1.14 2003/08/22 21:50:34 david Exp $ */
 /*
  * Copyright (c) 2003 Bob Beck.  All rights reserved.
  *
@@ -327,7 +327,7 @@ open_file(char *method, char *file)
  * fix_quoted_colons walks through a buffer returned by cgetent.  We
  * look for quoted strings, to escape colons (:) in quoted strings for
  * getcap by replacing them with \C so cgetstr() deals with it correctly
- * without having to see the \C bletchery in a configuration file tha
+ * without having to see the \C bletchery in a configuration file that
  * needs to have urls in it. Frees the buffer passed to it, passes back
  * another larger one, with can be used with cgetxxx(), like the original
  * buffer, it must be freed by the caller.
@@ -528,8 +528,8 @@ cmpbl(const void *a, const void *b)
 }
 
 /*
- * collapse_blacklist takes blacklist/whitelist enties sorts, removes
- * ovelaps and whitelist portions, and returns netblocks to blacklis
+ * collapse_blacklist takes blacklist/whitelist entries sorts, removes
+ * overlaps and whitelist portions, and returns netblocks to blacklist
  * as lists of nonoverlapping cidr blocks suitable for feeding in
  * printable form to pfctl or spamd.
  */
diff --git a/libexec/spamd/sdl.c b/libexec/spamd/sdl.c
index a668c32f06c..32df2ed512b 100644
--- a/libexec/spamd/sdl.c
+++ b/libexec/spamd/sdl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdl.c,v 1.7 2003/07/06 21:57:27 deraadt Exp $ */
+/*	$OpenBSD: sdl.c,v 1.8 2003/08/22 21:50:34 david Exp $ */
 /*
  * Copyright (c) 2003 Bob Beck.  All rights reserved.
  *
@@ -101,7 +101,7 @@ sdl_add(char *sdname, char *sdstring, char ** addrs, int addrc)
 
 	/*
 	 * Cycle through addrs, converting. We assume they are correctly
-	 * formatted v4 and v6 addrs, if they don't all convert correcly, the
+	 * formatted v4 and v6 addrs, if they don't all convert correctly, the
 	 * add fails. Each address should be address/maskbits
 	 */
 	blacklists[index].addrs = malloc(addrc * sizeof(struct sdentry));
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 99c93752428..49f0c1b6ce8 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.409 2003/08/21 19:12:08 frantzen Exp $	*/
+/*	$OpenBSD: parse.y,v 1.410 2003/08/22 21:50:34 david Exp $	*/
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -3590,7 +3590,7 @@ expand_queue(struct pf_altq *a, struct node_if *interfaces,
 			    tqueue->ifname, IFNAMSIZ)) ||
 			    (interface->not && strncmp(interface->ifname,
 			    tqueue->ifname, IFNAMSIZ)))) {
-				/* found ourselve in queues */
+				/* found ourself in queues */
 				found++;
 
 				memcpy(&pa, a, sizeof(struct pf_altq));
diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index d03d45a20f2..215e7e17f5c 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pfctl.8,v 1.98 2003/08/21 19:12:08 frantzen Exp $
+.\" $OpenBSD: pfctl.8,v 1.99 2003/08/22 21:50:34 david Exp $
 .\"
 .\" Copyright (c) 2001 Kjell Wooding.  All rights reserved.
 .\"
@@ -418,7 +418,7 @@ The flags are defined as follows:
 For constant tables, which cannot be altered outside
 .Xr pf.conf 5 .
 .It p
-For persistant tables, which don't get automatically flushed when no rules
+For persistent tables, which don't get automatically flushed when no rules
 refer to them.
 .It a
 For tables which are part of the
@@ -458,7 +458,7 @@ Generate debug messages only for serious errors.
 .It Fl x Ar misc
 Generate debug messages for various errors.
 .It Fl x Ar loud
-Generate debug messages for common conditons.
+Generate debug messages for common conditions.
 .El
 .It Fl z
 Clear per-rule statistics.
diff --git a/sbin/pfctl/pfctl_altq.c b/sbin/pfctl/pfctl_altq.c
index ba5fce525df..efe92ab9965 100644
--- a/sbin/pfctl/pfctl_altq.c
+++ b/sbin/pfctl/pfctl_altq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_altq.c,v 1.76 2003/08/20 13:03:35 henning Exp $	*/
+/*	$OpenBSD: pfctl_altq.c,v 1.77 2003/08/22 21:50:34 david Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -871,7 +871,7 @@ print_hfsc_opts(const struct pf_altq *a, const struct node_queue_opt *qopts)
  */
 #define	INFINITY	HUGE_VAL  /* positive infinity defined in <math.h> */
 
-/* add a new service curve to a generilized service curve */
+/* add a new service curve to a generalized service curve */
 static void
 gsc_add_sc(struct gen_sc *gsc, struct service_curve *sc)
 {
diff --git a/sbin/pfctl/pfctl_osfp.c b/sbin/pfctl/pfctl_osfp.c
index 24cfabd0d9e..0467bdceb4f 100644
--- a/sbin/pfctl/pfctl_osfp.c
+++ b/sbin/pfctl/pfctl_osfp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_osfp.c,v 1.2 2003/08/22 15:17:03 henning Exp $ */
+/*	$OpenBSD: pfctl_osfp.c,v 1.3 2003/08/22 21:50:34 david Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@openbsd.org>
@@ -369,7 +369,7 @@ pfctl_get_fingerprint(const char *name)
 		 * We'll do some fuzzy matching to pick up things like:
 		 *   Linux 2.2.14 (version=2.2 subtype=14)
 		 *   FreeBSD 4.0-STABLE (version=4.0 subtype=STABLE)
-		 *   Windows 2000 SP2	(versoin=2000 subtype=SP2)
+		 *   Windows 2000 SP2	(version=2000 subtype=SP2)
 		 */
 #define CONNECTOR(x)	((x) == '.' || (x) == ' ' || (x) == '\t' || (x) == '-')
 		wr_len = strlen(ptr);
diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c
index a07285f49fd..71dbe3174b4 100644
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_radix.c,v 1.19 2003/07/31 22:25:54 cedric Exp $ */
+/*	$OpenBSD: pfctl_radix.c,v 1.20 2003/08/22 21:50:34 david Exp $ */
 
 /*
  * Copyright (c) 2002 Cedric Berger
@@ -454,7 +454,7 @@ pfr_ina_define(struct pfr_table *tbl, struct pfr_addr *addr, int size,
 	return (0);
 }
 
-/* buffer managment code */
+/* buffer management code */
 
 size_t buf_esize[PFRB_MAX] = { 0,
 	sizeof(struct pfr_table), sizeof(struct pfr_tstats),
diff --git a/sbin/pflogd/pflogd.c b/sbin/pflogd/pflogd.c
index eecaf97afac..9777f151627 100644
--- a/sbin/pflogd/pflogd.c
+++ b/sbin/pflogd/pflogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pflogd.c,v 1.20 2003/05/14 08:56:12 canacar Exp $	*/
+/*	$OpenBSD: pflogd.c,v 1.21 2003/08/22 21:50:34 david Exp $	*/
 
 /*
  * Copyright (c) 2001 Theo de Raadt
@@ -198,7 +198,7 @@ reset_dump(void)
 	}
 
 	/*
-	 * Basically reimpliment pcap_dump_open() because it truncates
+	 * Basically reimplement pcap_dump_open() because it truncates
 	 * files and duplicates headers and such.
 	 */
 	fp = fopen(filename, "a+");
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 28d12852370..5a6d106472a 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pf.4,v 1.35 2003/08/21 19:12:59 frantzen Exp $
+.\"	$OpenBSD: pf.4,v 1.36 2003/08/22 21:50:34 david Exp $
 .\"
 .\" Copyright (C) 2001, Kjell Wooding.  All rights reserved.
 .\"
@@ -620,7 +620,7 @@ Get the passive OS fingerprint number
 .Va fp_getnum
 from the kernels fingerprint list.
 The rest of the structure members will come back filled.
-Get the whole list by repeatadly incrementing the
+Get the whole list by repeatedly incrementing the
 .Va fp_getnum
 number until the ioctl returns EBUSY.
 .El
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index ae90cb44212..16add0d7142 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pf.conf.5,v 1.266 2003/08/22 18:28:14 frantzen Exp $
+.\"	$OpenBSD: pf.conf.5,v 1.267 2003/08/22 21:50:34 david Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
 .\" All rights reserved.
@@ -562,7 +562,7 @@ And spoofing TCP packets into a connection requires knowing or guessing
 valid timestamps.
 Timestamps merely need to be monotonically increasing and not derived off a
 guessable base time.
-.Ar reassemple tcp
+.Ar reassemble tcp
 will cause
 .Ar scrub
 to modulate the TCP timestamps with a random number.
diff --git a/share/man/man5/pf.os.5 b/share/man/man5/pf.os.5
index 4814bfc5d67..7de8e739d51 100644
--- a/share/man/man5/pf.os.5
+++ b/share/man/man5/pf.os.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pf.os.5,v 1.2 2003/08/22 05:18:30 david Exp $
+.\"	$OpenBSD: pf.os.5,v 1.3 2003/08/22 21:50:34 david Exp $
 .\"
 .\" Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
 .\"
@@ -137,10 +137,10 @@ will match another NOP.
 The sixth
 .Ar W0
 will match a window scaling option with a zero scaling size.
-The seventh and eigth
+The seventh and eighth
 .Ar N
 options will match two NOPs.
-And the nineth and final option
+And the ninth and final option
 .Ar T
 will match the timestamp option with any time value.
 .Pp
diff --git a/share/pf/queue4 b/share/pf/queue4
index 3570179637f..e42299cff37 100644
--- a/share/pf/queue4
+++ b/share/pf/queue4
@@ -1,6 +1,6 @@
-# $OpenBSD: queue4,v 1.1 2003/04/29 12:48:35 henning Exp $
+# $OpenBSD: queue4,v 1.2 2003/08/22 21:50:34 david Exp $
 #
-# Hierarchial queueing for a university.
+# Hierarchical queueing for a university.
 # Three faculties; engineering, law and art are defined.
 # Departments under the engineering faculty are defined as child queues.
 # The total bandwidth for engineering faculty is shared between three
diff --git a/sys/altq/altq_cbq.h b/sys/altq/altq_cbq.h
index a0e3cdb9073..f0cec7251f1 100644
--- a/sys/altq/altq_cbq.h
+++ b/sys/altq/altq_cbq.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_cbq.h,v 1.8 2003/08/20 12:33:57 henning Exp $	*/
+/*	$OpenBSD: altq_cbq.h,v 1.9 2003/08/22 21:50:34 david Exp $	*/
 /*	$KAME: altq_cbq.h,v 1.5 2000/12/02 13:44:40 kjc Exp $	*/
 
 /*
@@ -50,7 +50,7 @@ extern "C" {
 #define	ROOT_CLASS_HANDLE	0xfffffffe
 #define	DEFAULT_CLASS_HANDLE	0xfffffffd
 
-/* class flags shoud be same as class flags in rm_class.h */
+/* class flags should be same as class flags in rm_class.h */
 #define	CBQCLF_RED		0x0001	/* use RED */
 #define	CBQCLF_ECN		0x0002  /* use RED/ECN */
 #define	CBQCLF_RIO		0x0004  /* use RIO */
diff --git a/sys/altq/altq_rmclass.c b/sys/altq/altq_rmclass.c
index b423a622be6..b83b3639cd4 100644
--- a/sys/altq/altq_rmclass.c
+++ b/sys/altq/altq_rmclass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rmclass.c,v 1.9 2003/03/13 16:42:52 kjc Exp $	*/
+/*	$OpenBSD: altq_rmclass.c,v 1.10 2003/08/22 21:50:34 david Exp $	*/
 /*	$KAME: altq_rmclass.c,v 1.10 2001/02/09 07:20:40 kjc Exp $	*/
 
 /*
@@ -783,7 +783,7 @@ rmc_queue_packet(struct rm_class *cl, mbuf_t *m)
 /*
  * void
  * rmc_tl_satisfied(struct rm_ifdat *ifd, struct timeval *now) - Check all
- *	classes to see if there are satified.
+ *	classes to see if they are satisfied.
  */
 
 static void
@@ -1426,7 +1426,7 @@ void rmc_dropall(struct rm_class *cl)
  * void
  * rmc_delay_action(struct rm_class *cl) - This function is the generic CBQ
  *	delay action routine.  It is invoked via rmc_under_limit when the
- *	packet is discoverd to be overlimit.
+ *	packet is discovered to be overlimit.
  *
  *	If the delay action is result of borrow class being overlimit, then
  *	delay for the offtime of the borrowing class that is overlimit.
diff --git a/sys/altq/altq_rmclass.h b/sys/altq/altq_rmclass.h
index 5c085f37cec..bca3216833a 100644
--- a/sys/altq/altq_rmclass.h
+++ b/sys/altq/altq_rmclass.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rmclass.h,v 1.7 2003/08/20 12:33:17 henning Exp $	*/
+/*	$OpenBSD: altq_rmclass.h,v 1.8 2003/08/22 21:50:34 david Exp $	*/
 /*	$KAME: altq_rmclass.h,v 1.6 2000/12/09 09:22:44 kjc Exp $	*/
 
 /*
@@ -183,7 +183,7 @@ struct rm_class {
  */
 struct rm_ifdat {
 	int		queued_;	/* # pkts queued downstream */
-	int		efficient_;	/* Link Efficency bit */
+	int		efficient_;	/* Link Efficiency bit */
 	int		wrr_;		/* Enable Weighted Round-Robin */
 	u_long		ns_per_byte_;	/* Link byte speed. */
 	int		maxqueued_;	/* Max packets to queue */
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 41d0cf6cb32..0607f96b7e6 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.80 2003/08/21 19:12:08 frantzen Exp $ */
+/*	$OpenBSD: pf_ioctl.c,v 1.81 2003/08/22 21:50:34 david Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1251,7 +1251,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		key.proto = pnl->proto;
 
 		/*
-		 * userland gives us source and dest of connetion, reverse
+		 * userland gives us source and dest of connection, reverse
 		 * the lookup so we ask for what happens with the return
 		 * traffic, enabling us to find it in the state tree.
 		 */
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index fdee9ba6dca..f0e16176bbd 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_norm.c,v 1.73 2003/08/22 15:19:23 henning Exp $ */
+/*	$OpenBSD: pf_norm.c,v 1.74 2003/08/22 21:50:34 david Exp $ */
 
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -605,7 +605,7 @@ pf_fragcache(struct mbuf **m0, struct ip *h, struct pf_fragment *frag, int mff,
 
 			off += precut;
 			max -= precut;
-			/* Update the previous frag to encompas this one */
+			/* Update the previous frag to encompass this one */
 			frp->fr_end = max;
 
 			if (!drop) {
@@ -712,7 +712,7 @@ pf_fragcache(struct mbuf **m0, struct ip *h, struct pf_fragment *frag, int mff,
 		}
 
 
-		/* Need to glue together two seperate fragment descriptors */
+		/* Need to glue together two separate fragment descriptors */
 		if (merge) {
 			if (cur && fra->fr_off <= cur->fr_end) {
 				/* Need to merge in a previous 'cur' */
@@ -995,7 +995,7 @@ pf_normalize_ip(struct mbuf **m0, int dir, struct ifnet *ifp, u_short *reason)
  bad:
 	DPFPRINTF(("dropping bad fragment\n"));
 
-	/* Free assoicated fragments */
+	/* Free associated fragments */
 	if (frag != NULL)
 		pf_free_fragment(frag);
 
@@ -1338,7 +1338,7 @@ pf_normalize_tcp_init(struct mbuf *m, int off, struct pf_pdesc *pd,
 		hlen = (th->th_off << 2) - sizeof(struct tcphdr);
 		while (hlen >= TCPOLEN_TIMESTAMP) {
 			switch (*opt) {
-			case TCPOPT_EOL:	/* FALLTHROUH */
+			case TCPOPT_EOL:	/* FALLTHROUGH */
 			case TCPOPT_NOP:
 				opt++;
 				hlen--;
@@ -1423,7 +1423,7 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd,
 		hlen = (th->th_off << 2) - sizeof(struct tcphdr);
 		while (hlen >= TCPOLEN_TIMESTAMP) {
 			switch (*opt) {
-			case TCPOPT_EOL:	/* FALLTHROUH */
+			case TCPOPT_EOL:	/* FALLTHROUGH */
 			case TCPOPT_NOP:
 				opt++;
 				hlen--;
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index d39894da2ac..058e425c300 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfvar.h,v 1.169 2003/08/22 15:19:23 henning Exp $ */
+/*	$OpenBSD: pfvar.h,v 1.170 2003/08/22 21:50:34 david Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -864,7 +864,7 @@ struct pf_altq {
 
 	/* scheduler spec */
 	u_int8_t		 scheduler;	/* scheduler type */
-	u_int16_t		 tbrsize;	/* tokenbuket regulator size */
+	u_int16_t		 tbrsize;	/* tokenbucket regulator size */
 	u_int32_t		 ifbandwidth;	/* interface bandwidth */
 
 	/* queue spec */