Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,

especially in troff files.

219 files changed, 986 insertions, 967 deletions

diff --git a/UPDATING b/UPDATING
index f7223ef..00116c1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -30,7 +30,7 @@ NOTE TO PEOPLE WHO THINK THAT 5.0-CURRENT IS SLOW:
 	A name change in /etc/netconfig has been reverted to stay
 	compatible with with suns TIRPC and also with NetBSD. You need
 	to run mergemaster after make world. A new libc does still work
-	with a outdated /etc/netconfig for some time, but you'll get
+	with an outdated /etc/netconfig for some time, but you'll get
 	a warning. This warning will be removed in 20030301.
 
 20021202:
@@ -267,7 +267,7 @@ http://www.freebsd.org/cgi/mid.cgi?db=mid&id=<20011207155805.R8975@blossom.cjcla
 	MACHINE_ARCH to indicate the target.  In the future, one will
 	set TARGET_MACHINE where you set MACHINE now.  At the moment,
 	setting MACHINE alone for same MACHINE_ARCH machines works
-	(eg, you can build pc98 on a i386 machine and vice versa).
+	(eg, you can build pc98 on an i386 machine and vice versa).
 
 20010927:
 	Some weird problems result from using ACPI on some machines.
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 0ab034e..9012120 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -190,7 +190,7 @@ because of buggy firmware or the like.
 .Xc
 Change volume tag for an element in the media changer.  This command
 is only supported by few media changers.  If it is not supported by a
-device, using this command will usually result in a "Invalid Field in
+device, using this command will usually result in an "Invalid Field in
 CDB" error message on the console.
 .Pp
 If the
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 9ea8303..85ba0de 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -208,7 +208,7 @@ put_stream_line(FILE *fp, const char *s, int len)
 	return 0;
 }
 
-/* get_extended_line: get a an extended line from stdin */
+/* get_extended_line: get an extended line from stdin */
 char *
 get_extended_line(int *sizep, int nonl)
 {
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 68762b5..5f56837 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -724,8 +724,8 @@ ar_rdsync(void)
 
 	/*
 	 * Fail resync attempts at user request (done) or this is going to be
-	 * an update/append to a existing archive. if last i/o hit media end,
-	 * we need to go to the next volume not try a resync
+	 * an update/append to an existing archive. If last i/o hit media end,
+	 * we need to go to the next volume not try a resync.
 	 */
 	if ((done > 0) || (lstrval == 0))
 		return(-1);
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index f821a8a..154ec03 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -386,7 +386,7 @@ pback(char *pt, int cnt)
 
 /*
  * rd_skip()
- *	skip foward in the archive during a archive read. Used to get quickly
+ *	skip foward in the archive during an archive read. Used to get quickly
  *	past file data and padding for files the user did NOT select.
  * Return:
  *	0 if ok, -1 failure, and 1 when EOF on the archive volume was detected.
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 28bb895..840d850 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -170,7 +170,7 @@ grptb_start(void)
  *	caches the name (if any) for the uid. If frc set, we always return the
  *	the stored name (if valid or invalid match). We use a simple hash table.
  * Return
- *	Pointer to stored name (or a empty string)
+ *	Pointer to stored name (or an empty string).
  */
 
 char *
@@ -241,7 +241,7 @@ name_uid(uid_t uid, int frc)
  *	caches the name (if any) for the gid. If frc set, we always return the
  *	the stored name (if valid or invalid match). We use a simple hash table.
  * Return
- *	Pointer to stored name (or a empty string)
+ *	Pointer to stored name (or an empty string).
  */
 
 char *
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 779e5f9..2cf93f2 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -851,7 +851,7 @@ vcpio_wr(ARCHD *arcn)
 
 /*
  * bcpio_id()
- *      determine if a block given to us is a old binary cpio header
+ *      determine if a block given to us is an old binary cpio header
  *	(with/without header byte swapping)
  * Return:
  *      0 if a valid header, -1 otherwise
@@ -878,7 +878,7 @@ bcpio_id(char *blk, int size)
 
 /*
  * bcpio_rd()
- *	determine if a buffer is a old binary archive entry. (it may have byte
+ *	determine if a buffer is an old binary archive entry. (It may have byte
  *	swapped header) convert and store the values in the ARCHD parameter.
  *	This is a very old header format and should not really be used.
  * Return:
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 332bd02..6d5ec68 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -313,8 +313,8 @@ ftree_arg(void)
 		}
 
 		/*
-		 * watch it, fts wants the file arg stored in a array of char
-		 * ptrs, with the last one a null. we use a two element array
+		 * Watch it, fts wants the file arg stored in an array of char
+		 * ptrs, with the last one a null. We use a two element array
 		 * and set farray[0] to point at the buffer with the file name
 		 * in it. We cannot pass all the file args to fts at one shot
 		 * as we need to keep a handle on which file arg generates what
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 2f1dbc9..3dc01de 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1344,11 +1344,11 @@ bad_opt(void)
 
 /*
  * opt_add()
- *	breaks the value supplied to -o into a option name and value. options
+ *	breaks the value supplied to -o into an option name and value. Options
  *	are given to -o in the form -o name-value,name=value
  *	multiple -o may be specified.
  * Return:
- *	0 if format in name=value format, -1 if -o is passed junk
+ *	0 if format in name=value format, -1 if -o is passed junk.
  */
 
 int
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 8b7db8e..7c98f3f 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -296,7 +296,7 @@ pat_chk(void)
  *	NOTE: When the -c option is used, we are called when there was no match
  *	by pat_match() (that means we did match before the inverted sense of
  *	the logic). Now this seems really strange at first, but with -c  we
- *	need to keep track of those patterns that cause a archive member to NOT
+ *	need to keep track of those patterns that cause an archive member to NOT
  *	be selected (it found an archive member with a specified pattern)
  * Return:
  *	0 if the pattern pointed at by arcn->pat was tagged as creating a
@@ -471,9 +471,9 @@ pat_match(ARCHD *arcn)
 		return(cflag ? 0 : 1);
 
 	/*
-	 * we had a match, now when we invert the sense (-c) we reject this
+	 * We had a match, now when we invert the sense (-c) we reject this
 	 * member. However we have to tag the pattern a being successful, (in a
-	 * match, not in selecting a archive member) so we call pat_sel() here.
+	 * match, not in selecting an archive member) so we call pat_sel() here.
 	 */
 	arcn->pat = pt;
 	if (!cflag)
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index 2cf9e8a..a0d8de8 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -142,7 +142,7 @@ typedef struct {
 				/* a flawed archive header. */
 	int (*end_wr)();	/* end write. write the trailer and do any */
 				/* other format specific functions needed */
-				/* at the end of a archive write */
+				/* at the end of an archive write */
 	int (*trail)();		/* returns 0 if a valid trailer, -1 if not */
 				/* For formats which encode the trailer */
 				/* outside of a valid header, a return value */
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 130b8e9..181c083 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -306,11 +306,11 @@ grp_match(ARCHD *arcn)
  * -T flag). The user may specify any number of different file time ranges.
  * Time ranges are checked one at a time until a match is found (if at all).
  * If the file has a mtime (and/or ctime) which lies within one of the time
- * ranges, the file is selected. Time ranges may have a lower and/or a upper
+ * ranges, the file is selected. Time ranges may have a lower and/or an upper
  * value. These ranges are inclusive. When no time ranges are supplied to pax
  * with the -T option, all members in the archive will be selected by the time
  * range routines. When only a lower range is supplied, only files with a
- * mtime (and/or ctime) equal to or younger are selected. When only a upper
+ * mtime (and/or ctime) equal to or younger are selected. When only an upper
  * range is supplied, only files with a mtime (and/or ctime) equal to or older
  * are selected. When the lower time range is equal to the upper time range,
  * only files with a mtime (or ctime) of exactly that time are selected.
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 9696181..f60723b 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -264,10 +264,10 @@ purg_lnk(ARCHD *arcn)
 
 /*
  * lnk_end()
- *	pull apart a existing link table so we can reuse it. We do this between
+ *	Pull apart an existing link table so we can reuse it. We do this between
  *	read and write phases of append with update. (The format may have
  *	used the link table, and we need to start with a fresh table for the
- *	write phase
+ *	write phase).
  */
 
 void
@@ -314,7 +314,7 @@ lnk_end(void)
  * hash table is indexed by hashing the file path. The nodes in the table store
  * the length of the filename and the lseek offset within the scratch file
  * where the actual name is stored. Since there are never any deletions to this
- * table, fragmentation of the scratch file is never a issue. Lookups seem to
+ * table, fragmentation of the scratch file is never an issue. Lookups seem to
  * not exhibit any locality at all (files in the database are rarely
  * looked up more than once...). So caching is just a waste of memory. The
  * only limitation is the amount of scatch file space available to store the
@@ -617,7 +617,7 @@ sub_name(char *oname, int *onamelen, size_t onamesize)
  * device/inode mapping table routines
  * (used with formats that store device and inodes fields)
  *
- * device/inode mapping tables remap the device field in a archive header. The
+ * device/inode mapping tables remap the device field in an archive header. The
  * device/inode fields are used to determine when files are hard links to each
  * other. However these values have very little meaning outside of that. This
  * database is used to solve one of two different problems.
diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index 232b2e7..72a8fe3 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -1593,7 +1593,7 @@ snp?)
 	;;
 
 # dufault@hda.com: If I do much more work on other A-D boards
-# then eventually we'll have a "ad" and "dio" interface and some of these
+# then eventually we'll have an "ad" and "dio" interface and some of these
 # "labpcaio" ones will be gone.
 # labpcaio: D-A and A-D.
 # labpcdio: Digital in and Digital out.
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index c544c94..99a0786 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -1354,7 +1354,7 @@ a lowly bit twiddler.  Now with what I learned at MIT Tech I feel
 really important and can obfuscate and confuse with the best."
 
 Mr. MARC had this to say:  "Ten short days ago all I could look forward
-to was a dead-end job as a engineer.  Now I have a promising future and
+to was a dead-end job as an engineer.  Now I have a promising future and
 make really big Zorkmids."
 
 MIT Tech can't promise these fantastic results to everyone, but when
@@ -2507,7 +2507,7 @@ Blacks, 'cause if they couldn't, they'd have to wake up to the fact
 that life's one big, scary, glorious, complex and ultimately
 unfathomable crapshoot -- and the only reason THEY can't seem to keep
 up is they're a bunch of misfits and losers."
-		-- A analysis of Neo-Nazis, from "The Badger" comic
+		-- An analysis of Neo-Nazis, from "The Badger" comic
 %
 Air is water with holes in it
 %
diff --git a/games/fortune/datfiles/fortunes2 b/games/fortune/datfiles/fortunes2
index 63ae95a..d046d16 100644
--- a/games/fortune/datfiles/fortunes2
+++ b/games/fortune/datfiles/fortunes2
@@ -4435,7 +4435,7 @@ they're not selling."
 	Bowman hesitates.  "You aren't IBM compatible."
 [...]
 	"The letters H, A, and L are alphabetically adjacent to the letters
-I, B, and M.  That is a IBM compatible as I can be."
+I, B, and M.  That is as IBM compatible as I can be."
 	"Not quite, HAL.  The engineers have figured out a kludge."
 	"What kludge is that, Dave?"
 	"I'm going to disconnect your brain."
@@ -21036,7 +21036,7 @@ Human beings were created by water to transport it uphill.
 %
 Human cardiac catheterization was introduced by Werner Forssman in 1929.
 Ignoring his department chief, and tying his assistant to an operating
-table to prevent her interference, he placed a ureteral catheter into
+table to prevent her interference, he placed a urethral catheter into
 a vein in his arm, advanced it to the right atrium [of his heart], and
 walked upstairs to the x-ray department where he took the confirmatory
 x-ray film.  In 1956, Dr. Forssman was awarded the Nobel Prize.
@@ -36575,7 +36575,7 @@ Q:	How can you tell when a Burroughs salesman is lying?
 A:	When his lips move.
 %
 Q:	How did the elephant get to the top of the oak tree?
-A:	He sat on a acorn and waited for spring.
+A:	He sat on an acorn and waited for spring.
 
 Q:	But how did he get back down?
 A:	He crawled out on a leaf and waited for autumn.
@@ -40118,7 +40118,7 @@ Somewhere, something incredible is waiting to be known.
 Son, someday a man is going to walk up to you with a deck of cards on which
 the seal is not yet broken.  And he is going to offer to bet you that he can
 make the Ace of Spades jump out of the deck and squirt cider in your ears.
-But son, do not bet this man, for you will end up with a ear full of cider.
+But son, do not bet this man, for you will end up with an ear full of cider.
 		-- Sky Masterson's Father
 %
 Sooner or later you must pay for your sins.
@@ -50098,7 +50098,7 @@ We gotta get out of this place,
 If it's the last thing we ever do.
 		-- The Animals
 %
-We have a equal opportunity Calculus class -- it's fully integrated.
+We have an equal opportunity Calculus class -- it's fully integrated.
 %
 We have art that we do not die of the truth.
 		-- Nietzsche
@@ -55170,7 +55170,7 @@ a lowly bit twiddler.  Now with what I learned at MIT Tech I feel really
 important and can obfuscate and confuse with the best."
 
 Mr. Watkins had this to say:  "Ten short days ago all I could look forward
-to was a dead-end job as a engineer.  Now I have a promising future and
+to was a dead-end job as an engineer.  Now I have a promising future and
 make really big Zorkmids."
 
 MIT Tech can't promise these fantastic results to everyone, but when
diff --git a/games/fortune/datfiles/fortunes2-o b/games/fortune/datfiles/fortunes2-o
index 7f276a7..2c11a46 100644
--- a/games/fortune/datfiles/fortunes2-o
+++ b/games/fortune/datfiles/fortunes2-o
@@ -449,7 +449,7 @@ some good news and some bad news."
 	He muttered, "It's quarterly report day, Sally -- just the good news."
 	She replied, "You're not sterile."
 %
-	A sociologist, a psychologist, and a engineer were discussing the
+	A sociologist, a psychologist, and an engineer were discussing the
 consequences and implications of a married man's having a mistress.  The
 sociologist's opinion was that it is absolutely and categorically unforgivable
 for a married man to forfeit the bond of matrimony, and engage in such lowly
@@ -672,7 +672,7 @@ limited graphics capability.  Comes fully assembled, with 4 AA batteries.
 his waist had gone both East and West despite his daily racquetball, a young
 executive appeared at a local health resort.  Looking over the several weight
 loss plans offered, he selected one guaranteed to reduce his weight by two
-pounds per day.  After a light breakfast, and a almost non-existent lunch, he
+pounds per day.  After a light breakfast, and an almost non-existent lunch, he
 was escorted to a large room, where a young, attractive woman told him that
 "if he caught her, he could have her".  After an hour of hard running, he
 finally gave up; and weighing himself, was comforted to realize that he had
@@ -681,7 +681,7 @@ was to reduce his weight by four pounds per session.  After following the same
 regimen, he was again escorted to a large room, but after two hours of running,
 he caught the young woman.  Weight loss, just over four pounds.  Returning the
 following week, he chose to lose eight pounds in a single day.  He was shown
-to the largest room he'd seen, by far, where he was confronted by a extremely
+to the largest room he'd seen, by far, where he was confronted by an extremely
 muscular, burly man, who looked him square in the eye, flung his towel into
 a corner, and snarled, "You know the rules.  Start running!"
 %
@@ -1241,7 +1241,7 @@ it's a catch-22.  If he mates, he gets screwed out of an opportunity to mate
 again.  If he doesn't mate, he doesn't reproduce, ending his family tree.  This
 suicidal behavior is commonly called the Preying Mantis Syndrome -- and many
 life forms are periodically subject to its wrath.  How did the preying mantis
-become stuck in such a awful, vicious cycle?  This is probably what happened:
+become stuck in such an awful, vicious cycle?  This is probably what happened:
 	The male mantis arrives at the residence of the female mantis.  After
 some courtship exercises (dinner, a movie, inserting the diaphragm) they mate.
 The female mantis, her lust for... lust being satisfied, relaxes while the
@@ -4997,7 +4997,7 @@ Merry Christmas, Merry Christmas, Merry Christmas, Fuck you!!
 Chorus:
 	I don't want to join the army, I don't want to go to war,
 	I'd rather sit around, pickin' dillies off the ground,
-	And livin' off the favors of a 'igh-born lady.
+	And livin' off the favors of an 'igh-born lady.
 	I don't want a bullet up me arse 'ole,
 	I don't want me pecker blown away,
 	I'd rather live in England, in jolly, sunny, England,
@@ -10013,7 +10013,7 @@ On day a Monterey daughter
 Did scuba down under the water.
 	She later turned up
 	The mom of a pup,
-And they say t'was a otter that gotter.
+And they say t'was an otter that gotter.
 %
 On one hot dusty day in 1860, a lone Mexican bandit crossed the border into
 Texas.  After robbing a small bank and shooting up the town, he led the posse
@@ -10224,7 +10224,7 @@ and approached the farmer.
 	"Hey, buddy," he asked, "how come you're not wearing any clothes?"
 	Replied the farmer, "Well, boy, th' other day I was out a-workin'
 in the fields, an' I plum fergot t' wear mah shirt.  Got back to th' house
-that night, and mah neck was stiffer than a oak-wood board.  This here's
+that night, and mah neck was stiffer than an oak-wood board.  This here's
 mah wife's idea."
 %
 One day a little polar bear cub says to his mother, "Mommy, am I really
@@ -11385,7 +11385,7 @@ in the region of the anus  4. [Slang] person who excites in others the
 symptoms of a qwert.
 		-- Webster's Middle World Dictionary, 4th ed.
 %
-Ralph:	Lisa, you have no tits and a awful tight pussy.
+Ralph:	Lisa, you have no tits and an awful tight pussy.
 Lisa:	Ralph... get off my back!!
 %
 randel, n:
diff --git a/games/fortune/datfiles/murphy b/games/fortune/datfiles/murphy
index 0a23d20..498348b 100644
--- a/games/fortune/datfiles/murphy
+++ b/games/fortune/datfiles/murphy
@@ -1708,7 +1708,7 @@ home team.
 Whatever can go to New York, will.
 %
 Whenever a superstar is traded to your favorite team,
-he fades.  Whenever your team trades away a usless
+he fades.  Whenever your team trades away a useless
 no-name, he immediately rises to stardom.
 %
 Never leave hold of what you've got until you've
diff --git a/games/primes/pattern.c b/games/primes/pattern.c
index dff1f4d..66b2dc8 100644
--- a/games/primes/pattern.c
+++ b/games/primes/pattern.c
@@ -50,7 +50,7 @@ static const char rcsid[] =
  *   chongo <for a good prime call: 391581 * 2^216193 - 1> /\oo/\
  *
  * To avoid excessive sieves for small factors, we use the table below to
- * setup our sieve blocks.  Each element represents a odd number starting
+ * setup our sieve blocks.  Each element represents an odd number starting
  * with 1.  All non-zero elements are factors of 3, 5, 7, 11 and 13.
  */
 
diff --git a/games/primes/primes.h b/games/primes/primes.h
index f4a90fa..fde2b83 100644
--- a/games/primes/primes.h
+++ b/games/primes/primes.h
@@ -63,7 +63,7 @@ extern const ubig *const pr_limit;	/* largest prime in the prime array */
 
 /*
  * To avoid excessive sieves for small factors, we use the table below to
- * setup our sieve blocks.  Each element represents a odd number starting
+ * setup our sieve blocks.  Each element represents an odd number starting
  * with 1.  All non-zero elements are factors of 3, 5, 7, 11 and 13.
  */
 extern const char pattern[];
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 4f23e5e..5cb9abd 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -40,7 +40,7 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  *
  * The data structures are completely opaque to the client.  The client
- * is required to pass a AUTH * to routines that create rpc
+ * is required to pass an AUTH * to routines that create rpc
  * "sessions".
  */
 
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 45fd261..354b341 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -187,7 +187,7 @@ extern bool_t	xdr_replymsg(XDR *, struct rpc_msg *);
 
 
 /*
- * XDR routine to handle a accepted rpc reply.
+ * XDR routine to handle an accepted rpc reply.
  * xdr_accepted_reply(xdrs, rej)
  * 	XDR *xdrs;
  * 	struct accepted_reply *rej;
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 7af99ce..f389bcd 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -233,7 +233,7 @@ xdr_putint32(XDR *xdrs, int32_t *ip)
 /*
  * Support struct for discriminated unions.
  * You create an array of xdrdiscrim structures, terminated with
- * a entry with a null procedure pointer.  The xdr_union routine gets
+ * an entry with a null procedure pointer.  The xdr_union routine gets
  * the discriminant value and then searches the array of structures
  * for a matching value.  If a match is found the associated xdr routine
  * is called to handle that part of the union.  If there is
diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x
index 748caf6..c1c4851 100644
--- a/include/rpcsvc/nis.x
+++ b/include/rpcsvc/nis.x
@@ -192,7 +192,7 @@ struct ping_args {
 /* 
  * These are the type of entries that are stored in the transaction log, 
  * note that modifications will appear as two entries, for names, they have
- * a "OLD" entry followed by a "NEW" entry. For entries in tables, there
+ * an "OLD" entry followed by a "NEW" entry. For entries in tables, there
  * is a remove followed by an add. It is done this way so that we can read
  * the log backwards to back out transactions and forwards to propogate
  * updated.
diff --git a/lib/libalias/alias_nbt.c b/lib/libalias/alias_nbt.c
index 4bc41bc..508bf51 100644
--- a/lib/libalias/alias_nbt.c
+++ b/lib/libalias/alias_nbt.c
@@ -239,7 +239,7 @@ int AliasHandleUdpNbt(
 #ifdef DEBUG
 	printf("%s:%d-->", inet_ntoa(ndh->source_ip), ntohs(ndh->source_port) );
 #endif
-	/* Doing a IP address and Port number Translation */
+	/* Doing an IP address and Port number Translation */
 	if ( uh->uh_sum != 0 ) {
 		int				acc;
 		u_short			*sptr;
diff --git a/lib/libalias/alias_proxy.c b/lib/libalias/alias_proxy.c
index 6c95ea9..b9a9798 100644
--- a/lib/libalias/alias_proxy.c
+++ b/lib/libalias/alias_proxy.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
     modified.  In certain cases, it is necessary to somehow encode
     the original address/port info into the packet.  Two methods are
     presently supported: addition of a [DEST addr port] string at the
-    beginning a of tcp stream, or inclusion of an optional field
+    beginning of a tcp stream, or inclusion of an optional field
     in the IP header.
 
     There is one public API function:
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
index 8bbfade..0f8ef34 100644
--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@@ -224,7 +224,7 @@ __bt_defcmp(a, b)
 	/*
 	 * XXX
 	 * If a size_t doesn't fit in an int, this routine can lose.
-	 * What we need is a integral type which is guaranteed to be
+	 * What we need is an integral type which is guaranteed to be
 	 * larger than a size_t, and there is no such thing.
 	 */
 	len = MIN(a->size, b->size);
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 8464ac3..9e6d52f 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -208,8 +208,8 @@ static void elf_sym_to_nlist(struct nlist *, Elf_Sym *, Elf_Shdr *, int);
  * __elf_is_okay__ - Determine if ehdr really
  * is ELF and valid for the target platform.
  *
- * WARNING:  This is NOT a ELF ABI function and
- * as such it's use should be restricted.
+ * WARNING:  This is NOT an ELF ABI function and
+ * as such its use should be restricted.
  */
 int
 __elf_is_okay__(ehdr)
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
index 11967f6..80b2f3c 100644
--- a/lib/libc/i386/string/swab.S
+++ b/lib/libc/i386/string/swab.S
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
  *
  * On the i486, this code is negligibly faster than the code generated
  * by gcc at about half the size.  If my i386 databook is correct, it
- * should be considerably faster than the gcc code on a i386.
+ * should be considerably faster than the gcc code on an i386.
  *
  * Written by:
  *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
diff --git a/lib/libc/ia64/gen/__moddi3.S b/lib/libc/ia64/gen/__moddi3.S
index bc2cc61..897066c 100644
--- a/lib/libc/ia64/gen/__moddi3.S
+++ b/lib/libc/ia64/gen/__moddi3.S
@@ -55,7 +55,7 @@ __moddi3:
   // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
   // predicate registers used: p6
 
-  setf.sig f12=r32  // holds a in integer form
+  setf.sig f12=r32  // holds an in integer form
   setf.sig f7=r33
   nop.b 0
 } { .mlx
diff --git a/lib/libc/ia64/gen/__umoddi3.S b/lib/libc/ia64/gen/__umoddi3.S
index 84991b0..05a0304 100644
--- a/lib/libc/ia64/gen/__umoddi3.S
+++ b/lib/libc/ia64/gen/__umoddi3.S
@@ -54,7 +54,7 @@ __umoddi3:
   // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
   // predicate registers used: p6
 
-  setf.sig f12=r32  // holds a in integer form
+  setf.sig f12=r32  // holds an in integer form
   setf.sig f7=r33
   nop.b 0;;
 } { .mfi
diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c
index f145f54..0dadd5a 100644
--- a/lib/libc/locale/wcstoimax.c
+++ b/lib/libc/locale/wcstoimax.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <wctype.h>
 
 /*
- * Convert a wide character string to a intmax_t integer.
+ * Convert a wide character string to an intmax_t integer.
  */
 intmax_t
 wcstoimax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
diff --git a/lib/libc/net/inet_neta.c b/lib/libc/net/inet_neta.c
index f7c7ded..c918962 100644
--- a/lib/libc/net/inet_neta.c
+++ b/lib/libc/net/inet_neta.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 /*
  * char *
  * inet_neta(src, dst, size)
- *	format a in_addr_t network number into presentation format.
+ *	format an in_addr_t network number into presentation format.
  * return:
  *	pointer to dst, or NULL if an error occurred (check errno).
  * note:
diff --git a/lib/libc/net/ns_name.c b/lib/libc/net/ns_name.c
index 0183fdf..ae238b0 100644
--- a/lib/libc/net/ns_name.c
+++ b/lib/libc/net/ns_name.c
@@ -122,7 +122,7 @@ ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
 
 /*
  * ns_name_pton(src, dst, dstsiz)
- *	Convert a ascii string into an encoded domain name as per RFC1035.
+ *	Convert an ascii string into an encoded domain name as per RFC1035.
  * return:
  *	-1 if it fails
  *	1 if string was fully qualified
diff --git a/lib/libc/rpc/PSD.doc/rpc.prog.ms b/lib/libc/rpc/PSD.doc/rpc.prog.ms
index 290f99b..8b79130 100644
--- a/lib/libc/rpc/PSD.doc/rpc.prog.ms
+++ b/lib/libc/rpc/PSD.doc/rpc.prog.ms
@@ -23,9 +23,9 @@ This document assumes a working knowledge of network theory.  It is
 intended for programmers who wish to write network applications using
 remote procedure calls (explained below), and who want to understand
 the RPC mechanisms usually hidden by the
-.I rpcgen(1) 
+.I rpcgen(1)
 protocol compiler.
-.I rpcgen 
+.I rpcgen
 is described in detail in the previous chapter, the
 .I "\fBrpcgen\fP \fIProgramming Guide\fP".
 .SH
@@ -41,7 +41,7 @@ The
 .I "Generating XDR Routines"
 section of that chapter contains the complete source for a working RPC
 service\(ema remote directory listing service which uses
-.I rpcgen 
+.I rpcgen
 to generate XDR routines as well as client and server stubs.
 .LP
 .LP
@@ -64,36 +64,36 @@ The RPC interface can be seen as being divided into three layers.\**
 .FS
 For a complete specification of the routines in the remote procedure
 call Library, see the
-.I rpc(3N) 
+.I rpc(3N)
 manual page.
 .FE
 .LP
 .I "The Highest Layer:"
 .IX RPC "The Highest Layer"
-The highest layer is totally transparent to the operating system, 
-machine and network upon which is is run.  It's probably best to 
+The highest layer is totally transparent to the operating system,
+machine and network upon which is is run.  It's probably best to
 think of this level as a way of
 .I using
 RPC, rather than as
-a \fIpart of\fP RPC proper.  Programmers who write RPC routines 
-should (almost) always make this layer available to others by way 
+a \fIpart of\fP RPC proper.  Programmers who write RPC routines
+should (almost) always make this layer available to others by way
 of a simple C front end that entirely hides the networking.
-.LP 
+.LP
 To illustrate, at this level a program can simply make a call to
 .I rnusers (),
 a C routine which returns the number of users on a remote machine.
-The user is not explicitly aware of using RPC \(em they simply 
+The user is not explicitly aware of using RPC \(em they simply
 call a procedure, just as they would call
 .I malloc() .
 .LP
 .I "The Middle Layer:"
 .IX RPC "The Middle Layer"
 The middle layer is really \*QRPC proper.\*U  Here, the user doesn't
-need to consider details about sockets, the UNIX system, or other low-level 
+need to consider details about sockets, the UNIX system, or other low-level
 implementation mechanisms.  They simply make remote procedure calls
-to routines on other machines.  The selling point here is simplicity.  
+to routines on other machines.  The selling point here is simplicity.
 It's this layer that allows RPC to pass the \*Qhello world\*U test \(em
-simple things should be simple.  The middle-layer routines are used 
+simple things should be simple.  The middle-layer routines are used
 for most applications.
 .LP
 RPC calls are made with the system routines
@@ -102,27 +102,27 @@ RPC calls are made with the system routines
 and
 .I svc_run ().
 The first two of these are the most fundamental:
-.I registerrpc() 
+.I registerrpc()
 obtains a unique system-wide procedure-identification number, and
-.I callrpc() 
-actually executes a remote procedure call.  At the middle level, a 
-call to 
+.I callrpc()
+actually executes a remote procedure call.  At the middle level, a
+call to
 .I rnusers()
 is implemented by way of these two routines.
 .LP
-The middle layer is unfortunately rarely used in serious programming 
-due to its inflexibility (simplicity).  It does not allow timeout 
+The middle layer is unfortunately rarely used in serious programming
+due to its inflexibility (simplicity).  It does not allow timeout
 specifications or the choice of transport.  It allows no UNIX
 process control or flexibility in case of errors.  It doesn't support
-multiple kinds of call authentication.  The programmer rarely needs 
+multiple kinds of call authentication.  The programmer rarely needs
 all these kinds of control, but one or two of them is often necessary.
 .LP
 .I "The Lowest Layer:"
 .IX RPC "The Lowest Layer"
-The lowest layer does allow these details to be controlled by the 
-programmer, and for that reason it is often necessary.  Programs 
+The lowest layer does allow these details to be controlled by the
+programmer, and for that reason it is often necessary.  Programs
 written at this level are also most efficient, but this is rarely a
-real issue \(em since RPC clients and servers rarely generate 
+real issue \(em since RPC clients and servers rarely generate
 heavy network loads.
 .LP
 Although this document only discusses the interface to C,
@@ -203,7 +203,7 @@ main(argc, argv)
 .DE
 .KE
 RPC library routines such as
-.I rnusers() 
+.I rnusers()
 are in the RPC services library
 .I librpcsvc.a
 Thus, the program above should be compiled with
@@ -212,17 +212,17 @@ Thus, the program above should be compiled with
 % cc \fIprogram.c -lrpcsvc\fP
 .DE
 .I rnusers (),
-like the other RPC library routines, is documented in section 3R 
+like the other RPC library routines, is documented in section 3R
 of the
 .I "System Interface Manual for the Sun Workstation" ,
-the same section which documents the standard Sun RPC services.  
+the same section which documents the standard Sun RPC services.
 .IX "RPC Services"
-See the 
-.I intro(3R) 
-manual page for an explanation of the documentation strategy 
+See the
+.I intro(3R)
+manual page for an explanation of the documentation strategy
 for these services and their RPC protocols.
 .LP
-Here are some of the RPC service library routines available to the 
+Here are some of the RPC service library routines available to the
 C programmer:
 .LP
 \fBTable 3-3\fI RPC Service Library Routines\fR
@@ -251,18 +251,18 @@ and
 They do, however,
 have RPC program numbers so they can be invoked with
 .I callrpc()
-which will be discussed in the next section.  Most of them also 
-have compilable 
-.I rpcgen(1) 
+which will be discussed in the next section.  Most of them also
+have compilable
+.I rpcgen(1)
 protocol description files.  (The
 .I rpcgen
 protocol compiler radically simplifies the process of developing
-network applications.  
+network applications.
 See the \fBrpcgen\fI Programming Guide\fR
-for detailed information about 
-.I rpcgen 
-and 
-.I rpcgen 
+for detailed information about
+.I rpcgen
+and
+.I rpcgen
 protocol description files).
 .KS
 .NH 2
@@ -270,7 +270,7 @@ protocol description files).
 .IX "intermediate layer of RPC"
 .IX "RPC" "intermediate layer"
 .LP
-The simplest interface, which explicitly makes RPC calls, uses the 
+The simplest interface, which explicitly makes RPC calls, uses the
 functions
 .I callrpc()
 and
@@ -305,63 +305,63 @@ main(argc, argv)
 }
 .DE
 .KE
-Each RPC procedure is uniquely defined by a program number, 
-version number, and procedure number.  The program number 
-specifies a group of related remote procedures, each of 
-which has a different procedure number.  Each program also 
-has a version number, so when a minor change is made to a 
-remote service (adding a new procedure, for example), a new 
-program number doesn't have to be assigned.  When you want 
-to call a procedure to find the number of remote users, you 
+Each RPC procedure is uniquely defined by a program number,
+version number, and procedure number.  The program number
+specifies a group of related remote procedures, each of
+which has a different procedure number.  Each program also
+has a version number, so when a minor change is made to a
+remote service (adding a new procedure, for example), a new
+program number doesn't have to be assigned.  When you want
+to call a procedure to find the number of remote users, you
 look up the appropriate program, version and procedure numbers
-in a manual, just as you look up the name of a memory allocator 
+in a manual, just as you look up the name of a memory allocator
 when you want to allocate memory.
 .LP
-The simplest way of making remote procedure calls is with the the RPC 
+The simplest way of making remote procedure calls is with the the RPC
 library routine
 .I callrpc()
-It has eight parameters.  The first is the name of the remote server 
-machine.  The next three parameters are the program, version, and procedure 
+It has eight parameters.  The first is the name of the remote server
+machine.  The next three parameters are the program, version, and procedure
 numbers\(emtogether they identify the procedure to be called.
 The fifth and sixth parameters are an XDR filter and an argument to
-be encoded and passed to the remote procedure.  
-The final two parameters are a filter for decoding the results 
-returned by the remote procedure and a pointer to the place where 
+be encoded and passed to the remote procedure.
+The final two parameters are a filter for decoding the results
+returned by the remote procedure and a pointer to the place where
 the procedure's results are to be stored.  Multiple arguments and
-results are handled by embedding them in structures.  If 
-.I callrpc() 
-completes successfully, it returns zero; else it returns a nonzero 
+results are handled by embedding them in structures.  If
+.I callrpc()
+completes successfully, it returns zero; else it returns a nonzero
 value.  The return codes (of type
 .IX "enum clnt_stat (in RPC programming)" "" "\fIenum clnt_stat\fP (in RPC programming)"
-cast into an integer) are found in 
+cast into an integer) are found in
 .I <rpc/clnt.h> .
 .LP
 Since data types may be represented differently on different machines,
-.I callrpc() 
+.I callrpc()
 needs both the type of the RPC argument, as well as
 a pointer to the argument itself (and similarly for the result).  For
 .I RUSERSPROC_NUM ,
 the return value is an
 .I "unsigned long"
 so
-.I callrpc() 
+.I callrpc()
 has
-.I xdr_u_long() 
+.I xdr_u_long()
 as its first return parameter, which says
 that the result is of type
 .I "unsigned long"
 and
-.I &nusers 
+.I &nusers
 as its second return parameter,
 which is a pointer to where the long result will be placed.  Since
-.I RUSERSPROC_NUM 
+.I RUSERSPROC_NUM
 takes no argument, the argument parameter of
-.I callrpc() 
+.I callrpc()
 is
 .I xdr_void ().
 .LP
 After trying several times to deliver a message, if
-.I callrpc() 
+.I callrpc()
 gets no answer, it returns with an error code.
 The delivery mechanism is UDP,
 which stands for User Datagram Protocol.
@@ -429,15 +429,15 @@ given RPC procedure number.  The first three parameters,
 .I RUSERPROG ,
 .I RUSERSVERS ,
 and
-.I RUSERSPROC_NUM 
+.I RUSERSPROC_NUM
 are the program, version, and procedure numbers
 of the remote procedure to be registered;
-.I nuser() 
+.I nuser()
 is the name of the local procedure that implements the remote
 procedure; and
-.I xdr_void() 
+.I xdr_void()
 and
-.I xdr_u_long() 
+.I xdr_u_long()
 are the XDR filters for the remote procedure's arguments and
 results, respectively.  (Multiple arguments or multiple results
 are passed as structures).
@@ -455,7 +455,7 @@ arguments and results less than 8K bytes in length.
 After registering the local procedure, the server program's
 main procedure calls
 .I svc_run (),
-the RPC library's remote procedure dispatcher.  It is this 
+the RPC library's remote procedure dispatcher.  It is this
 function that calls the remote procedures in response to RPC
 call messages.  Note that the dispatcher takes care of decoding
 remote procedure arguments and encoding results, using the XDR
@@ -465,8 +465,8 @@ filters specified when the remote procedure was registered.
 .IX "program number assignment"
 .IX "assigning program numbers"
 .LP
-Program numbers are assigned in groups of 
-.I 0x20000000 
+Program numbers are assigned in groups of
+.I 0x20000000
 according to the following chart:
 .DS
 .ft CW
@@ -491,7 +491,7 @@ applications that generate program numbers dynamically.  The
 final groups are reserved for future use, and should not be
 used.
 .LP
-To register a protocol specification, send a request by network 
+To register a protocol specification, send a request by network
 mail to
 .I rpc@sun
 or write to:
@@ -501,20 +501,20 @@ Sun Microsystems
 2550 Garcia Ave.
 Mountain View, CA 94043
 .DE
-Please include a compilable 
-.I rpcgen 
+Please include a compilable
+.I rpcgen
 \*Q.x\*U file describing your protocol.
 You will be given a unique program number in return.
 .IX RPC administration
 .IX administration "of RPC"
 .LP
-The RPC program numbers and protocol specifications 
+The RPC program numbers and protocol specifications
 of standard Sun RPC services can be
-found in the include files in 
+found in the include files in
 .I "/usr/include/rpcsvc" .
-These services, however, constitute only a small subset 
-of those which have been registered.  The complete list of 
-registered programs, as of the time when this manual was 
+These services, however, constitute only a small subset
+of those which have been registered.  The complete list of
+registered programs, as of the time when this manual was
 printed, is:
 .LP
 \fBTable 3-2\fI RPC Registered Programs\fR
@@ -527,53 +527,53 @@ _
 .TH
 .sp .5
 100000&PMAPPROG&portmapper
-100001&RSTATPROG&remote stats            
-100002&RUSERSPROG&remote users            
-100003&NFSPROG&nfs                     
-100004&YPPROG&Yellow Pages            
-100005&MOUNTPROG&mount daemon             
-100006&DBXPROG&remote dbx              
-100007&YPBINDPROG&yp binder               
-100008&WALLPROG&shutdown msg            
-100009&YPPASSWDPROG&yppasswd server         
-100010&ETHERSTATPROG&ether stats             
-100011&RQUOTAPROG&disk quotas             
-100012&SPRAYPROG&spray packets           
-100013&IBM3270PROG&3270 mapper             
-100014&IBMRJEPROG&RJE mapper              
-100015&SELNSVCPROG&selection service       
-100016&RDATABASEPROG&remote database access  
-100017&REXECPROG&remote execution        
-100018&ALICEPROG&Alice Office Automation 
-100019&SCHEDPROG&scheduling service      
-100020&LOCKPROG&local lock manager      
-100021&NETLOCKPROG&network lock manager    
-100022&X25PROG&x.25 inr protocol       
-100023&STATMON1PROG&status monitor 1        
-100024&STATMON2PROG&status monitor 2        
-100025&SELNLIBPROG&selection library       
-100026&BOOTPARAMPROG&boot parameters service 
-100027&MAZEPROG&mazewars game           
-100028&YPUPDATEPROG&yp update               
-100029&KEYSERVEPROG&key server              
-100030&SECURECMDPROG&secure login            
-100031&NETFWDIPROG&nfs net forwarder init	
-100032&NETFWDTPROG&nfs net forwarder trans	
-100033&SUNLINKMAP_PROG&sunlink MAP		
-100034&NETMONPROG&network monitor		
-100035&DBASEPROG&lightweight database	
-100036&PWDAUTHPROG&password authorization	
-100037&TFSPROG&translucent file svc	
-100038&NSEPROG&nse server		
-100039&NSE_ACTIVATE_PROG&nse activate daemon	
+100001&RSTATPROG&remote stats
+100002&RUSERSPROG&remote users
+100003&NFSPROG&nfs
+100004&YPPROG&Yellow Pages
+100005&MOUNTPROG&mount daemon
+100006&DBXPROG&remote dbx
+100007&YPBINDPROG&yp binder
+100008&WALLPROG&shutdown msg
+100009&YPPASSWDPROG&yppasswd server
+100010&ETHERSTATPROG&ether stats
+100011&RQUOTAPROG&disk quotas
+100012&SPRAYPROG&spray packets
+100013&IBM3270PROG&3270 mapper
+100014&IBMRJEPROG&RJE mapper
+100015&SELNSVCPROG&selection service
+100016&RDATABASEPROG&remote database access
+100017&REXECPROG&remote execution
+100018&ALICEPROG&Alice Office Automation
+100019&SCHEDPROG&scheduling service
+100020&LOCKPROG&local lock manager
+100021&NETLOCKPROG&network lock manager
+100022&X25PROG&x.25 inr protocol
+100023&STATMON1PROG&status monitor 1
+100024&STATMON2PROG&status monitor 2
+100025&SELNLIBPROG&selection library
+100026&BOOTPARAMPROG&boot parameters service
+100027&MAZEPROG&mazewars game
+100028&YPUPDATEPROG&yp update
+100029&KEYSERVEPROG&key server
+100030&SECURECMDPROG&secure login
+100031&NETFWDIPROG&nfs net forwarder init
+100032&NETFWDTPROG&nfs net forwarder trans
+100033&SUNLINKMAP_PROG&sunlink MAP
+100034&NETMONPROG&network monitor
+100035&DBASEPROG&lightweight database
+100036&PWDAUTHPROG&password authorization
+100037&TFSPROG&translucent file svc
+100038&NSEPROG&nse server
+100039&NSE_ACTIVATE_PROG&nse activate daemon
 .sp .2i
-150001&PCNFSDPROG&pc passwd authorization 
+150001&PCNFSDPROG&pc passwd authorization
 .sp .2i
-200000&PYRAMIDLOCKINGPROG&Pyramid-locking         
-200001&PYRAMIDSYS5&Pyramid-sys5            
-200002&CADDS_IMAGE&CV cadds_image		
+200000&PYRAMIDLOCKINGPROG&Pyramid-locking
+200001&PYRAMIDSYS5&Pyramid-sys5
+200002&CADDS_IMAGE&CV cadds_image
 .sp .2i
-300001&ADT_RFLOCKPROG&ADT file locking	
+300001&ADT_RFLOCKPROG&ADT file locking
 .TE
 .NH 2
 \&Passing Arbitrary Data Types
@@ -593,11 +593,11 @@ to XDR format is called
 and the reverse process is called
 .I deserializing .
 The type field parameters of
-.I callrpc() 
+.I callrpc()
 and
-.I registerrpc() 
+.I registerrpc()
 can be a built-in procedure like
-.I xdr_u_long() 
+.I xdr_u_long()
 in the previous example, or a user supplied one.
 XDR has these built-in type routines:
 .IX RPC "built-in routines"
@@ -609,14 +609,14 @@ xdr_short()    xdr_u_short()    xdr_wrapstring()
 xdr_char()     xdr_u_char()
 .DE
 Note that the routine
-.I xdr_string() 
-exists, but cannot be used with 
-.I callrpc() 
+.I xdr_string()
+exists, but cannot be used with
+.I callrpc()
 and
 .I registerrpc (),
 which only pass two parameters to their XDR routines.
-.I xdr_wrapstring() 
-has only two parameters, and is thus OK.  It calls 
+.I xdr_wrapstring()
+has only two parameters, and is thus OK.  It calls
 .I xdr_string ().
 .LP
 As an example of a user-defined type routine,
@@ -629,7 +629,7 @@ struct simple {
 } simple;
 .DE
 then you would call
-.I callrpc() 
+.I callrpc()
 as
 .DS
 .ft CW
@@ -637,7 +637,7 @@ callrpc(hostname, PROGNUM, VERSNUM, PROCNUM,
         xdr_simple, &simple ...);
 .DE
 where
-.I xdr_simple() 
+.I xdr_simple()
 is written as:
 .ie t .DS
 .el .DS L
@@ -656,11 +656,11 @@ xdr_simple(xdrsp, simplep)
 }
 .DE
 .LP
-An XDR routine returns nonzero (true in the sense of C) if it 
+An XDR routine returns nonzero (true in the sense of C) if it
 completes successfully, and zero otherwise.
 A complete description of XDR is in the
-.I "XDR Protocol Specification" 
-section of this manual, only few implementation examples are 
+.I "XDR Protocol Specification"
+section of this manual, only few implementation examples are
 given here.
 .LP
 In addition to the built-in primitives,
@@ -687,7 +687,7 @@ callrpc(hostname, PROGNUM, VERSNUM, PROCNUM,
         xdr_varintarr, &arr...);
 .DE
 with
-.I xdr_varintarr() 
+.I xdr_varintarr()
 defined as:
 .ie t .DS
 .el .DS L
@@ -696,7 +696,7 @@ xdr_varintarr(xdrsp, arrp)
 	XDR *xdrsp;
 	struct varintarr *arrp;
 {
-	return (xdr_array(xdrsp, &arrp->data, &arrp->arrlnth, 
+	return (xdr_array(xdrsp, &arrp->data, &arrp->arrlnth,
 		MAXLEN, sizeof(int), xdr_int));
 }
 .DE
@@ -735,22 +735,22 @@ That is the reason for the XDR routine
 which is like
 .I xdr_array()
 except that it packs characters;
-.I xdr_bytes() 
+.I xdr_bytes()
 has four parameters, similar to the first four parameters of
 .I xdr_array ().
 For null-terminated strings, there is also the
 .I xdr_string()
 routine, which is the same as
-.I xdr_bytes() 
+.I xdr_bytes()
 without the length parameter.
 On serializing it gets the string length from
 .I strlen (),
 and on deserializing it creates a null-terminated string.
 .LP
 Here is a final example that calls the previously written
-.I xdr_simple() 
+.I xdr_simple()
 as well as the built-in functions
-.I xdr_string() 
+.I xdr_string()
 and
 .I xdr_reference (),
 which chases pointers:
@@ -776,7 +776,7 @@ xdr_finalexample(xdrsp, finalp)
 }
 .DE
 Note that we could as easily call
-.I xdr_simple() 
+.I xdr_simple()
 here instead of
 .I xdr_reference ().
 .NH 1
@@ -791,23 +791,23 @@ by using lower layers of the RPC library.
 It is assumed that you are familiar with sockets
 and the system calls for dealing with them.
 .LP
-There are several occasions when you may need to use lower layers of 
-RPC.  First, you may need to use TCP, since the higher layer uses UDP, 
-which restricts RPC calls to 8K bytes of data.  Using TCP permits calls 
-to send long streams of data.  
+There are several occasions when you may need to use lower layers of
+RPC.  First, you may need to use TCP, since the higher layer uses UDP,
+which restricts RPC calls to 8K bytes of data.  Using TCP permits calls
+to send long streams of data.
 For an example, see the
 .I TCP
 section below.  Second, you may want to allocate and free memory
-while serializing or deserializing with XDR routines.  
-There is no call at the higher level to let 
-you free memory explicitly.  
+while serializing or deserializing with XDR routines.
+There is no call at the higher level to let
+you free memory explicitly.
 For more explanation, see the
 .I "Memory Allocation with XDR"
-section below.  
-Third, you may need to perform authentication 
-on either the client or server side, by supplying 
+section below.
+Third, you may need to perform authentication
+on either the client or server side, by supplying
 credentials or verifying them.
-See the explanation in the 
+See the explanation in the
 .I Authentication
 section below.
 .NH 2
@@ -815,9 +815,9 @@ section below.
 .IX RPC "server side"
 .LP
 The server for the
-.I nusers() 
+.I nusers()
 program shown below does the same thing as the one using
-.I registerrpc() 
+.I registerrpc()
 above, but is written using a lower layer of the RPC package:
 .ie t .DS
 .el .DS L
@@ -865,7 +865,7 @@ nuser(rqstp, transp)
 		 * and assign it to the variable \fInusers\fP
 		 */
 .ft CW
-		if (!svc_sendreply(transp, xdr_u_long, &nusers)) 
+		if (!svc_sendreply(transp, xdr_u_long, &nusers))
 			fprintf(stderr, "can't reply to RPC call\en");
 		return;
 	default:
@@ -877,7 +877,7 @@ nuser(rqstp, transp)
 .LP
 First, the server gets a transport handle, which is used
 for receiving and replying to RPC messages.
-.I registerrpc() 
+.I registerrpc()
 uses
 .I svcudp_create()
 to get a UDP handle.
@@ -885,39 +885,39 @@ If you require a more reliable protocol, call
 .I svctcp_create()
 instead.
 If the argument to
-.I svcudp_create() 
+.I svcudp_create()
 is
 .I RPC_ANYSOCK
 the RPC library creates a socket
 on which to receive and reply to RPC calls.  Otherwise,
-.I svcudp_create() 
+.I svcudp_create()
 expects its argument to be a valid socket number.
 If you specify your own socket, it can be bound or unbound.
 If it is bound to a port by the user, the port numbers of
-.I svcudp_create() 
+.I svcudp_create()
 and
 .I clnttcp_create()
 (the low-level client routine) must match.
 .LP
 If the user specifies the
-.I RPC_ANYSOCK 
+.I RPC_ANYSOCK
 argument, the RPC library routines will open sockets.
 Otherwise they will expect the user to do so.  The routines
-.I svcudp_create() 
-and 
+.I svcudp_create()
+and
 .I clntudp_create()
 will cause the RPC library routines to
-.I bind() 
+.I bind()
 their socket if it is not bound already.
 .LP
 A service may choose to register its port number with the
 local portmapper service.  This is done is done by specifying
 a non-zero protocol number in
 .I svc_register ().
-Incidently, a client can discover the server's port number by 
-consulting the portmapper on their server's machine.  This can 
-be done automatically by specifying a zero port number in 
-.I clntudp_create() 
+Incidently, a client can discover the server's port number by
+consulting the portmapper on their server's machine.  This can
+be done automatically by specifying a zero port number in
+.I clntudp_create()
 or
 .I clnttcp_create ().
 .LP
@@ -926,21 +926,21 @@ After creating an
 the next step is to call
 .I pmap_unset()
 so that if the
-.I nusers() 
+.I nusers()
 server crashed earlier,
 any previous trace of it is erased before restarting.
 More precisely,
-.I pmap_unset() 
+.I pmap_unset()
 erases the entry for
 .I RUSERSPROG
 from the port mapper's tables.
 .LP
 Finally, we associate the program number for
-.I nusers() 
+.I nusers()
 with the procedure
 .I nuser ().
 The final argument to
-.I svc_register() 
+.I svc_register()
 is normally the protocol being used,
 which, in this case, is
 .I IPPROTO_UDP
@@ -952,14 +952,14 @@ Also, registration is done on the program,
 rather than procedure, level.
 .LP
 The user routine
-.I nuser() 
+.I nuser()
 must call and dispatch the appropriate XDR routines
 based on the procedure number.
 Note that
 two things are handled by
-.I nuser() 
+.I nuser()
 that
-.I registerrpc() 
+.I registerrpc()
 handles automatically.
 The first is that procedure
 .I NULLPROC
@@ -986,9 +986,9 @@ As an example, we can add a procedure
 which has an argument
 .I nusers (),
 and returns
-.I TRUE 
+.I TRUE
 or
-.I FALSE 
+.I FALSE
 depending on whether there are nusers logged on.
 It would look like this:
 .ie t .DS
@@ -1103,13 +1103,13 @@ svc_freeargs(transp, xdr_chararr2, &arrptr);
 .DE
 Note that, after being used, the character array can be freed with
 .I svc_freeargs()
-.I svc_freeargs() 
-will not attempt to free any memory if the variable indicating it 
-is NULL.  For example, in the the routine 
+.I svc_freeargs()
+will not attempt to free any memory if the variable indicating it
+is NULL.  For example, in the the routine
 .I xdr_finalexample (),
 given earlier, if
-.I finalp->string 
-was NULL, then it would not be freed.  The same is true for 
+.I finalp->string
+was NULL, then it would not be freed.  The same is true for
 .I finalp->simplep .
 .LP
 To summarize, each XDR routine is responsible
@@ -1123,11 +1123,11 @@ the deserializer is used.
 And when called from
 .I svc_freeargs()
 the memory deallocator is used.  When building simple examples like those
-in this section, a user doesn't have to worry 
-about the three modes.  
+in this section, a user doesn't have to worry
+about the three modes.
 See the
 .I "External Data Representation: Sun Technical Notes"
-for examples of more sophisticated XDR routines that determine 
+for examples of more sophisticated XDR routines that determine
 which of the three modes they are in and adjust their behavior accordingly.
 .KS
 .NH 2
@@ -1207,9 +1207,9 @@ is
 which takes a
 .I CLIENT
 pointer rather than a host name.  The parameters to
-.I clnt_call() 
+.I clnt_call()
 are a
-.I CLIENT 
+.I CLIENT
 pointer, the procedure number,
 the XDR routine for serializing the argument,
 a pointer to the argument,
@@ -1218,36 +1218,36 @@ a pointer to where the return value will be placed,
 and the time in seconds to wait for a reply.
 .LP
 The
-.I CLIENT 
+.I CLIENT
 pointer is encoded with the transport mechanism.
 .I callrpc()
 uses UDP, thus it calls
-.I clntudp_create() 
+.I clntudp_create()
 to get a
-.I CLIENT 
+.I CLIENT
 pointer.  To get TCP (Transmission Control Protocol), you would use
 .I clnttcp_create() .
 .LP
 The parameters to
-.I clntudp_create() 
+.I clntudp_create()
 are the server address, the program number, the version number,
 a timeout value (between tries), and a pointer to a socket.
 The final argument to
-.I clnt_call() 
+.I clnt_call()
 is the total time to wait for a response.
 Thus, the number of tries is the
-.I clnt_call() 
+.I clnt_call()
 timeout divided by the
-.I clntudp_create() 
+.I clntudp_create()
 timeout.
 .LP
 Note that the
 .I clnt_destroy()
 call
 always deallocates the space associated with the
-.I CLIENT 
+.I CLIENT
 handle.  It closes the socket associated with the
-.I CLIENT 
+.I CLIENT
 handle, however, only if the RPC library opened it.  It the
 socket was opened by the user, it stays open.  This makes it
 possible, in cases where there are multiple client handles
@@ -1255,7 +1255,7 @@ using the same socket, to destroy one handle without closing
 the socket that other handles are using.
 .LP
 To make a stream connection, the call to
-.I clntudp_create() 
+.I clntudp_create()
 is replaced with a call to
 .I clnttcp_create() .
 .DS
@@ -1265,10 +1265,10 @@ clnttcp_create(&server_addr, prognum, versnum, &sock,
 .DE
 There is no timeout argument; instead, the receive and send buffer
 sizes must be specified.  When the
-.I clnttcp_create() 
+.I clnttcp_create()
 call is made, a TCP connection is established.
 All RPC calls using that
-.I CLIENT 
+.I CLIENT
 handle would use this connection.
 The server side of an RPC call using TCP has
 .I svcudp_create()
@@ -1278,9 +1278,9 @@ replaced by
 .ft CW
 transp = svctcp_create(RPC_ANYSOCK, 0, 0);
 .DE
-The last two arguments to 
-.I svctcp_create() 
-are send and receive sizes respectively.  If `0' is specified for 
+The last two arguments to
+.I svctcp_create()
+are send and receive sizes respectively.  If `0' is specified for
 either of these, the system chooses a reasonable default.
 .KS
 .NH 1
@@ -1301,7 +1301,7 @@ If the other activity involves periodically updating a data structure,
 the process can set an alarm signal before calling
 .I svc_run()
 But if the other activity
-involves waiting on a a file descriptor, the
+involves waiting on a file descriptor, the
 .I svc_run()
 call won't work.
 The code for
@@ -1345,15 +1345,15 @@ yourself.
 All you need to know are the file descriptors
 of the socket(s) associated with the programs you are waiting on.
 Thus you can have your own
-.I select() 
+.I select()
 .IX select() "" \fIselect()\fP
 that waits on both the RPC socket,
 and your own descriptors.  Note that
-.I svc_fds() 
-is a bit mask of all the file descriptors that RPC is using for 
+.I svc_fds()
+is a bit mask of all the file descriptors that RPC is using for
 services.  It can change everytime that
 .I any
-RPC library routine is called, because descriptors are constantly 
+RPC library routine is called, because descriptors are constantly
 being opened and closed, for example for TCP connections.
 .NH 2
 \&Broadcast RPC
@@ -1364,7 +1364,7 @@ The
 .I portmapper
 is a daemon that converts RPC program numbers
 into DARPA protocol port numbers; see the
-.I portmap 
+.I portmap
 man page.  You can't do broadcast RPC without the portmapper.
 Here are the main differences between
 broadcast RPC and normal RPC calls:
@@ -1421,7 +1421,7 @@ whether or not the user wants more responses.
 .el .DS L
 .ft CW
 bool_t done;
-	. . . 
+	. . .
 done = eachresult(resultsp, raddr)
 	caddr_t resultsp;
 	struct sockaddr_in *raddr; /* \fIAddr of responding machine\fP */
@@ -1518,7 +1518,7 @@ windowdispatch(rqstp, transp)
 
 	switch (rqstp->rq_proc) {
 	case NULLPROC:
-		if (!svc_sendreply(transp, xdr_void, 0)) 
+		if (!svc_sendreply(transp, xdr_void, 0))
 			fprintf(stderr, "can't reply to RPC call\en");
 		return;
 	case RENDERSTRING:
@@ -1537,7 +1537,7 @@ windowdispatch(rqstp, transp)
 		 * Code here to render the string \fIs\fP
 		 */
 .ft CW
-		if (!svc_sendreply(transp, xdr_void, NULL)) 
+		if (!svc_sendreply(transp, xdr_void, NULL))
 			fprintf(stderr, "can't reply to RPC call\en");
 		break;
 	case RENDERSTRING_BATCHED:
@@ -1795,7 +1795,7 @@ if the style is not one of the styles supported by the RPC package.
 That the request's
 .I rq_clntcred
 field is either
-.I NULL 
+.I NULL
 or points to a well formed structure
 that corresponds to a supported style of authentication credentials.
 Remember that only
@@ -1846,7 +1846,7 @@ nuser(rqstp, transp)
 .ft CW
 	switch (rqstp->rq_cred.oa_flavor) {
 	case AUTH_UNIX:
-		unix_cred = 
+		unix_cred =
 			(struct authunix_parms *)rqstp->rq_clntcred;
 		uid = unix_cred->aup_uid;
 		break;
@@ -1900,9 +1900,9 @@ instead.
 .LP
 The last point underscores the relation between
 the RPC authentication package and the services;
-RPC deals only with 
-.I authentication 
-and not with individual services' 
+RPC deals only with
+.I authentication
+and not with individual services'
 .I "access control" .
 The services themselves must implement their own access control policies
 and reflect these policies as return statuses in their protocols.
@@ -1914,24 +1914,24 @@ and reflect these policies as return statuses in their protocols.
 UNIX authentication is quite easy to defeat.  Instead of using
 .I authunix_create_default (),
 one can call
-.I authunix_create() 
+.I authunix_create()
 and then modify the RPC authentication handle it returns by filling in
 whatever user ID and hostname they wish the server to think they have.
 DES authentication is thus recommended for people who want more security
 than UNIX authentication offers.
 .LP
 The details of the DES authentication protocol are complicated and
-are not explained here.  
+are not explained here.
 See
 .I "Remote Procedure Calls: Protocol Specification"
 for the details.
 .LP
 In  order for  DES authentication   to  work, the
-.I keyserv(8c) 
+.I keyserv(8c)
 daemon must be running  on both  the  server  and client machines.  The
 users on  these machines  need  public  keys  assigned by  the network
 administrator in  the
-.I publickey(5) 
+.I publickey(5)
 database.  And,  they  need to have decrypted  their  secret keys
 using  their  login   password.  This automatically happens when one
 logs in using
@@ -1963,12 +1963,12 @@ host2netname(servername, rhostname, NULL);
 Here,
 .I rhostname
 is the hostname of the machine the server process is running on.
-.I host2netname() 
+.I host2netname()
 fills in
 .I servername
 to contain this root process's netname.  If the
 server process was run by a regular user, one could use the call
-.I user2netname() 
+.I user2netname()
 instead.  Here is an example for a server process with the same user
 ID as the client:
 .DS
@@ -1977,15 +1977,15 @@ char servername[MAXNETNAMELEN];
 user2netname(servername, getuid(), NULL);
 .DE
 The last argument to both of these calls,
-.I user2netname() 
+.I user2netname()
 and
 .I host2netname (),
 is the name of the naming domain where the server is located.  The
-.I NULL 
+.I NULL
 used here means \*Quse the local domain name.\*U
 .LP
 The second argument to
-.I authdes_create() 
+.I authdes_create()
 is a lifetime for the credential.  Here it is set to sixty
 seconds.  What that means is that the credential will expire 60
 seconds from now.  If some mischievous user tries to reuse the
@@ -1997,7 +1997,7 @@ remembers which credentials it has already seen in the near past,
 and will not grant requests to duplicates.
 .LP
 The third argument to
-.I authdes_create() 
+.I authdes_create()
 is the address of the host to synchronize with.  In order for DES
 authentication to work, the server and client must agree upon the
 time.  Here we pass the address of the server itself, so the
@@ -2008,13 +2008,13 @@ which means \*Qdon't bother synchronizing.\*U You should only do this
 if you are sure the client and server are already synchronized.
 .LP
 The final argument to
-.I authdes_create() 
+.I authdes_create()
 is the address of a DES encryption key to use for encrypting
 timestamps and data.  If this argument is
 .I NULL ,
 as it is in this example, a random key will be chosen.  The client
 may find out the encryption key being used by consulting the
-.I ah_key 
+.I ah_key
 field of the authentication handle.
 .sp
 .IP "\fIServer Side\fP"
@@ -2047,7 +2047,7 @@ nuser(rqstp, transp)
 	 */
 .ft CW
 
-	if (rqstp->rq_proc == NULLPROC) { 
+	if (rqstp->rq_proc == NULLPROC) {
 		/* \fIsame as before\fP */
 	}
 
@@ -2078,7 +2078,7 @@ nuser(rqstp, transp)
 .ft I
 	/*
 	 * The rest is the same as before
- 	 */	
+ 	 */
 .ft CW
 .vs
 .DE
@@ -2087,7 +2087,7 @@ Note the use of the routine
 the inverse of
 .I user2netname ():
 it takes a network ID and converts to a unix ID.
-.I netname2user () 
+.I netname2user ()
 also supplies the group IDs which we don't use in this example,
 but which may be useful to other UNIX programs.
 .NH 2
@@ -2126,8 +2126,8 @@ you need to explicitly exit, since
 .I svc_run()
 never returns.
 .LP
-The format of entries in 
-.I /etc/inetd.conf 
+The format of entries in
+.I /etc/inetd.conf
 for RPC services is in one of the following two forms:
 .ie t .DS
 .el .DS L
@@ -2224,13 +2224,13 @@ nuser(rqstp, transp)
 		nusers2 = nusers;
 		switch (rqstp->rq_vers) {
 		case RUSERSVERS_ORIG:
-            if (!svc_sendreply(transp, xdr_u_long, 
+            if (!svc_sendreply(transp, xdr_u_long,
 		    &nusers)) {
                 fprintf(stderr,"can't reply to RPC call\en");
 			}
 			break;
 		case RUSERSVERS_SHORT:
-            if (!svc_sendreply(transp, xdr_u_short, 
+            if (!svc_sendreply(transp, xdr_u_short,
 		    &nusers2)) {
                 fprintf(stderr,"can't reply to RPC call\en");
 			}
@@ -2387,7 +2387,7 @@ callrpctcp(host, prognum, procnum, versnum,
 main()
 {
 	register SVCXPRT *transp;
-     int rcp_service(), xdr_rcp(); 
+     int rcp_service(), xdr_rcp();
 
 	if ((transp = svctcp_create(RPC_ANYSOCK,
 	  BUFSIZ, BUFSIZ)) == NULL) {
@@ -2524,7 +2524,7 @@ gettransient(proto, vers, sockp)
 		perror("getsockname");
 		return (0);
 	}
-	while (!pmap_set(prognum++, vers, proto, 
+	while (!pmap_set(prognum++, vers, proto,
 		ntohs(addr.sin_port))) continue;
 	return (prognum-1);
 }
@@ -2534,17 +2534,17 @@ gettransient(proto, vers, sockp)
 Note:
 .I
 The call to
-.I ntohs() 
+.I ntohs()
 is necessary to ensure that the port number in
 .I "addr.sin_port" ,
-which is in 
-.I network 
-byte order, is passed in 
+which is in
+.I network
+byte order, is passed in
 .I host
 byte order (as
-.I pmap_set() 
+.I pmap_set()
 expects).  See the
-.I byteorder(3N) 
+.I byteorder(3N)
 man page for more details on the conversion of network
 addresses from network to host byte order.
 .KS
diff --git a/lib/libc/rpc/PSD.doc/xdr.nts.ms b/lib/libc/rpc/PSD.doc/xdr.nts.ms
index 0c573e9..260c7f3 100644
--- a/lib/libc/rpc/PSD.doc/xdr.nts.ms
+++ b/lib/libc/rpc/PSD.doc/xdr.nts.ms
@@ -23,33 +23,33 @@ delim $$
 This chapter contains technical notes on Sun's implementation of the
 External Data Representation (XDR) standard, a set of library routines
 that allow a C programmer to describe arbitrary data structures in a
-machinex-independent fashion.  
+machinex-independent fashion.
 For a formal specification of the XDR
 standard, see the
 .I "External Data Representation Standard: Protocol Specification".
-XDR is the backbone of Sun's Remote Procedure Call package, in the 
-sense that data for remote procedure calls is transmitted using the 
+XDR is the backbone of Sun's Remote Procedure Call package, in the
+sense that data for remote procedure calls is transmitted using the
 standard.  XDR library routines should be used to transmit data
 that is accessed (read or written) by more than one type of machine.\**
 .FS
 .IX XDR "system routines"
 For a compete specification of the system External Data Representation
-routines, see the 
-.I xdr(3N) 
+routines, see the
+.I xdr(3N)
 manual page.
 .FE
 .LP
-This chapter contains a short tutorial overview of the XDR library 
+This chapter contains a short tutorial overview of the XDR library
 routines, a guide to accessing currently available XDR streams, and
 information on defining new streams and data types.  XDR was designed
-to work across different languages, operating systems, and machine 
+to work across different languages, operating systems, and machine
 architectures.  Most users (particularly RPC users) will only need
 the information in the
 .I "Number Filters",
 .I "Floating Point Filters",
 and
 .I "Enumeration Filters"
-sections.  
+sections.
 Programmers wishing to implement RPC and XDR on new machines
 will be interested in the rest of the chapter, as well as the
 .I "External Data Representaiton Standard: Protocol Specification",
@@ -57,7 +57,7 @@ which will be their primary reference.
 .SH
 Note:
 .I
-.I rpcgen 
+.I rpcgen
 can be used to write XDR routines even in cases where no RPC calls are
 being made.
 .LP
@@ -126,9 +126,9 @@ checking, and (b) they exhibit the same behavior when executed
 on two different hardware architectures, a Sun and a VAX.
 .LP
 Piping the output of the
-.I writer 
+.I writer
 program to the
-.I reader 
+.I reader
 program gives identical results on a Sun or a VAX.
 .DS
 .ft CW
@@ -141,11 +141,11 @@ vax% \fBwriter | reader\fP
 0 1 2 3 4 5 6 7
 vax%
 .DE
-With the advent of local area networks and 4.2BSD came the concept 
+With the advent of local area networks and 4.2BSD came the concept
 of \*Qnetwork pipes\*U \(em a process produces data on one machine,
 and a second process consumes data on another machine.
 A network pipe can be constructed with
-.I writer 
+.I writer
 and
 .I reader .
 Here are the results if the first produces data on a Sun,
@@ -158,9 +158,9 @@ sun% \fBwriter | rsh vax reader\fP
 sun%
 .DE
 Identical results can be obtained by executing
-.I writer 
+.I writer
 on the VAX and
-.I reader 
+.I reader
 on the Sun.  These results occur because the byte ordering
 of long integers differs between the VAX and the Sun,
 even though word size is the same.
@@ -170,9 +170,9 @@ when four bytes are reversed, the 1 winds up in the 24th bit.
 Whenever data is shared by two or more machine types, there is
 a need for portable data.  Programs can be made data-portable by
 replacing the
-.I read() 
+.I read()
 and
-.I write() 
+.I write()
 calls with calls to an XDR library routine
 .I xdr_long() ,
 a filter that knows the standard representation
@@ -257,7 +257,7 @@ outside the machine where they are defined.
 \&A Canonical Standard
 .IX XDR "canonical standard"
 .LP
-XDR's approach to standardizing data representations is 
+XDR's approach to standardizing data representations is
 .I canonical .
 That is, XDR defines a single byte order (Big Endian), a single
 floating-point representation (IEEE), and so on.  Any program running on
@@ -278,38 +278,38 @@ canonical standards that they already understand.
 .LP
 There are strong precedents for XDR's canonical approach.  For example,
 TCP/IP, UDP/IP, XNS, Ethernet, and, indeed, all protocols below layer five
-of the ISO model, are canonical protocols.  The advantage of any canonical 
-approach is simplicity; in the case of XDR, a single set of conversion 
-routines is written once and is never touched again.  The canonical approach 
-has a disadvantage, but it is unimportant in real-world data transfer 
+of the ISO model, are canonical protocols.  The advantage of any canonical
+approach is simplicity; in the case of XDR, a single set of conversion
+routines is written once and is never touched again.  The canonical approach
+has a disadvantage, but it is unimportant in real-world data transfer
 applications.  Suppose two Little-Endian machines are transferring integers
-according to the XDR standard.  The sending machine converts the integers 
+according to the XDR standard.  The sending machine converts the integers
 from Little-Endian byte order to XDR (Big-Endian) byte order; the receiving
 machine performs the reverse conversion.  Because both machines observe the
 same byte order, their conversions are unnecessary.  The point, however, is
 not necessity, but cost as compared to the alternative.
 .LP
 The time spent converting to and from a canonical representation is
-insignificant, especially in networking applications.  Most of the time 
-required to prepare a data structure for transfer is not spent in conversion 
-but in traversing the elements of the data structure.  To transmit a tree, 
+insignificant, especially in networking applications.  Most of the time
+required to prepare a data structure for transfer is not spent in conversion
+but in traversing the elements of the data structure.  To transmit a tree,
 for example, each leaf must be visited and each element in a leaf record must
 be copied to a buffer and aligned there; storage for the leaf may have to be
-deallocated as well.  Similarly, to receive a tree, storage must be 
+deallocated as well.  Similarly, to receive a tree, storage must be
 allocated for each leaf, data must be moved from the buffer to the leaf and
-properly aligned, and pointers must be constructed to link the leaves 
+properly aligned, and pointers must be constructed to link the leaves
 together.  Every machine pays the cost of traversing and copying data
-structures whether or not conversion is required.  In networking 
+structures whether or not conversion is required.  In networking
 applications, communications overhead\(emthe time required to move the data
-down through the sender's protocol layers, across the network and up through 
+down through the sender's protocol layers, across the network and up through
 the receiver's protocol layers\(emdwarfs conversion overhead.
 .NH 1
 \&The XDR Library
 .IX "XDR" "library"
 .LP
 The XDR library not only solves data portability problems, it also
-allows you to write and read arbitrary C constructs in a consistent, 
-specified, well-documented manner.  Thus, it can make sense to use the 
+allows you to write and read arbitrary C constructs in a consistent,
+specified, well-documented manner.  Thus, it can make sense to use the
 library even when the data is not shared among machines on a network.
 .LP
 The XDR library has filter routines for
@@ -333,19 +333,19 @@ so we use
 The parameters to XDR stream creation routines
 vary according to their function.
 In our example,
-.I xdrstdio_create() 
+.I xdrstdio_create()
 takes a pointer to an XDR structure that it initializes,
 a pointer to a
-.I FILE 
+.I FILE
 that the input or output is performed on, and the operation.
 The operation may be
 .I XDR_ENCODE
 for serializing in the
-.I writer 
+.I writer
 program, or
 .I XDR_DECODE
 for deserializing in the
-.I reader 
+.I reader
 program.
 .LP
 Note: RPC users never need to create XDR streams;
@@ -353,14 +353,14 @@ the RPC system itself creates these streams,
 which are then passed to the users.
 .LP
 The
-.I xdr_long() 
+.I xdr_long()
 .IX xdr_long() "" "\fIxdr_long()\fP"
-primitive is characteristic of most XDR library 
+primitive is characteristic of most XDR library
 primitives and all client XDR routines.
 First, the routine returns
-.I FALSE 
+.I FALSE
 (0) if it fails, and
-.I TRUE 
+.I TRUE
 (1) if it succeeds.
 Second, for each data type,
 .I xxx ,
@@ -374,18 +374,18 @@ xdr_xxx(xdrs, xp)
 }
 .DE
 In our case,
-.I xxx 
+.I xxx
 is long, and the corresponding XDR routine is
 a primitive,
 .I xdr_long() .
 The client could also define an arbitrary structure
-.I xxx 
+.I xxx
 in which case the client would also supply the routine
 .I xdr_xxx (),
 describing each field by calling XDR routines
 of the appropriate type.
 In all cases the first parameter,
-.I xdrs 
+.I xdrs
 can be treated as an opaque handle,
 and passed to the primitive routines.
 .LP
@@ -400,9 +400,9 @@ of an object rather than the object itself \(em
 only in the case of deserialization is the object modified.
 This feature is not shown in our trivial example,
 but its value becomes obvious when nontrivial data structures
-are passed among machines.  
+are passed among machines.
 If needed, the user can obtain the
-direction of the XDR operation.  
+direction of the XDR operation.
 See the
 .I "XDR Operation Directions"
 section below for details.
@@ -436,20 +436,20 @@ xdr_gnumbers(xdrs, gp)
 }
 .DE
 Note that the parameter
-.I xdrs 
+.I xdrs
 is never inspected or modified;
 it is only passed on to the subcomponent routines.
 It is imperative to inspect the return value of each XDR routine call,
 and to give up immediately and return
-.I FALSE 
+.I FALSE
 if the subroutine fails.
 .LP
 This example also shows that the type
 .I bool_t
 is declared as an integer whose only values are
-.I TRUE 
+.I TRUE
 (1) and
-.I FALSE 
+.I FALSE
 (0).  This document uses the following definitions:
 .ie t .DS
 .el .DS L
@@ -460,7 +460,7 @@ is declared as an integer whose only values are
 .DE
 .LP
 Keeping these conventions in mind,
-.I xdr_gnumbers() 
+.I xdr_gnumbers()
 can be rewritten as follows:
 .ie t .DS
 .el .DS L
@@ -540,9 +540,9 @@ is an XDR stream handle.
 The second parameter is the address of the number
 that provides data to the stream or receives data from it.
 All routines return
-.I TRUE 
+.I TRUE
 if they complete successfully, and
-.I FALSE 
+.I FALSE
 otherwise.
 .NH 2
 \&Floating Point Filters
@@ -561,15 +561,15 @@ bool_t xdr_double(xdrs, dp)
 	double *dp;
 .DE
 The first parameter,
-.I xdrs 
+.I xdrs
 is an XDR stream handle.
 The second parameter is the address
 of the floating point number that provides data to the stream
 or receives data from it.
 Both routines return
-.I TRUE 
+.I TRUE
 if they complete successfully, and
-.I FALSE 
+.I FALSE
 otherwise.
 .LP
 Note: Since the numbers are represented in IEEE floating point,
@@ -581,14 +581,14 @@ into a machine-specific representation, or vice-versa.
 .LP
 The XDR library provides a primitive for generic enumerations.
 The primitive assumes that a C
-.I enum 
+.I enum
 has the same representation inside the machine as a C integer.
 The boolean type is an important instance of the
 .I enum .
 The external representation of a boolean is always
-.I TRUE 
-(1) or 
-.I FALSE 
+.I TRUE
+(1) or
+.I FALSE
 (0).
 .DS
 .ft CW
@@ -610,7 +610,7 @@ The second parameters
 .I ep
 and
 .I bp
-are addresses of the associated type that provides data to, or 
+are addresses of the associated type that provides data to, or
 receives data from, the stream
 .I xdrs .
 .NH 2
@@ -674,42 +674,42 @@ bool_t xdr_string(xdrs, sp, maxlength)
 	u_int maxlength;
 .DE
 The first parameter
-.I xdrs 
+.I xdrs
 is the XDR stream handle.
 The second parameter
-.I sp 
+.I sp
 is a pointer to a string (type
 .I "char **" .
 The third parameter
-.I maxlength 
+.I maxlength
 specifies the maximum number of bytes allowed during encoding or decoding.
 its value is usually specified by a protocol.  For example, a protocol
 specification may say that a file name may be no longer than 255 characters.
 .LP
 The routine returns
-.I FALSE 
+.I FALSE
 if the number of characters exceeds
 .I maxlength ,
 and
-.I TRUE 
+.I TRUE
 if it doesn't.
 .SH
 Keep
-.I maxlength 
+.I maxlength
 small.  If it is too big you can blow the heap, since
-.I xdr_string() 
+.I xdr_string()
 will call
-.I malloc() 
+.I malloc()
 for space.
 .LP
 The behavior of
-.I xdr_string() 
+.I xdr_string()
 .IX xdr_string() "" \fIxdr_string()\fP
 is similar to the behavior of other routines
 discussed in this section.  The direction
-.I XDR_ENCODE 
+.I XDR_ENCODE
 is easiest to understand.  The parameter
-.I sp 
+.I sp
 points to a string of a certain length;
 if the string does not exceed
 .I maxlength ,
@@ -720,14 +720,14 @@ First the length of the incoming string is determined;
 it must not exceed
 .I maxlength .
 Next
-.I sp 
+.I sp
 is dereferenced; if the the value is
 .I NULL ,
 then a string of the appropriate length is allocated and
-.I *sp 
+.I *sp
 is set to this string.
 If the original value of
-.I *sp 
+.I *sp
 is non-null, then the XDR package assumes
 that a target area has been allocated,
 which can hold strings no longer than
@@ -736,33 +736,33 @@ In either case, the string is decoded into the target area.
 The routine then appends a null character to the string.
 .LP
 In the
-.I XDR_FREE 
+.I XDR_FREE
 operation, the string is obtained by dereferencing
 .I sp .
 If the string is not
 .I NULL ,
 it is freed and
-.I *sp 
+.I *sp
 is set to
 .I NULL .
 In this operation,
-.I xdr_string() 
+.I xdr_string()
 ignores the
-.I maxlength 
+.I maxlength
 parameter.
 .NH 3
 \&Byte Arrays
 .IX "XDR library" "byte arrays"
 .LP
 Often variable-length arrays of bytes are preferable to strings.
-Byte arrays differ from strings in the following three ways: 
+Byte arrays differ from strings in the following three ways:
 1) the length of the array (the byte count) is explicitly
 located in an unsigned integer,
 2) the byte sequence is not terminated by a null character, and
 3) the external representation of the bytes is the same as their
 internal representation.
 The primitive
-.I xdr_bytes() 
+.I xdr_bytes()
 .IX xdr_bytes() "" \fIxdr_bytes()\fP
 converts between the internal and external
 representations of byte arrays:
@@ -779,9 +779,9 @@ are identical to the first, second and third parameters of
 .I xdr_string (),
 respectively.
 The length of the byte area is obtained by dereferencing
-.I lp 
+.I lp
 when serializing;
-.I *lp 
+.I *lp
 is set to the byte length when deserializing.
 .NH 3
 \&Arrays
@@ -790,7 +790,7 @@ is set to the byte length when deserializing.
 The XDR library package provides a primitive
 for handling arrays of arbitrary elements.
 The
-.I xdr_bytes() 
+.I xdr_bytes()
 routine treats a subset of generic arrays,
 in which the size of array elements is known to be 1,
 and the external description of each element is built-in.
@@ -798,7 +798,7 @@ The generic array primitive,
 .I xdr_array() ,
 .IX xdr_array() "" \fIxdr_array()\fP
 requires parameters identical to those of
-.I xdr_bytes() 
+.I xdr_bytes()
 plus two more:
 the size of array elements,
 and an XDR routine to handle each of the elements.
@@ -816,23 +816,23 @@ xdr_array(xdrs, ap, lp, maxlength, elementsiz, xdr_element)
     bool_t (*xdr_element)();
 .DE
 The parameter
-.I ap 
+.I ap
 is the address of the pointer to the array.
 If
-.I *ap 
+.I *ap
 is
-.I NULL 
+.I NULL
 when the array is being deserialized,
 XDR allocates an array of the appropriate size and sets
-.I *ap 
+.I *ap
 to that array.
 The element count of the array is obtained from
-.I *lp 
+.I *lp
 when the array is serialized;
-.I *lp 
-is set to the array length when the array is deserialized. 
+.I *lp
+is set to the array length when the array is deserialized.
 The parameter
-.I maxlength 
+.I maxlength
 is the maximum number of elements that the array is allowed to have;
 .I elementsiz
 is the byte size of each element of the array
@@ -840,28 +840,28 @@ is the byte size of each element of the array
 .I sizeof()
 can be used to obtain this value).
 The
-.I xdr_element() 
+.I xdr_element()
 .IX xdr_element() "" \fIxdr_element()\fP
 routine is called to serialize, deserialize, or free
 each element of the array.
 .br
 .LP
-Before defining more constructed data types, it is appropriate to 
+Before defining more constructed data types, it is appropriate to
 present three examples.
 .LP
 .I "Example A:"
 .br
-A user on a networked machine can be identified by 
+A user on a networked machine can be identified by
 (a) the machine name, such as
 .I krypton :
 see the
-.I gethostname 
+.I gethostname
 man page; (b) the user's UID: see the
-.I geteuid 
-man page; and (c) the group numbers to which the user belongs: 
+.I geteuid
+man page; and (c) the group numbers to which the user belongs:
 see the
-.I getgroups 
-man page.  A structure with this information and its associated 
+.I getgroups
+man page.  A structure with this information and its associated
 XDR routine could be coded like this:
 .ie t .DS
 .el .DS L
@@ -882,7 +882,7 @@ xdr_netuser(xdrs, nup)
 {
     return(xdr_string(xdrs, &nup->nu_machinename, NLEN) &&
         xdr_int(xdrs, &nup->nu_uid) &&
-        xdr_array(xdrs, &nup->nu_gids, &nup->nu_glen, 
+        xdr_array(xdrs, &nup->nu_gids, &nup->nu_glen,
         NGRPS, sizeof (int), xdr_int));
 }
 .DE
@@ -973,13 +973,13 @@ xdr_history(xdrs, hp)
 }
 .DE
 The most confusing part of this example is that the routine
-.I xdr_wrap_string() 
+.I xdr_wrap_string()
 is needed to package the
-.I xdr_string() 
+.I xdr_string()
 routine, because the implementation of
-.I xdr_array() 
+.I xdr_array()
 only passes two parameters to the array element description routine;
-.I xdr_wrap_string() 
+.I xdr_wrap_string()
 supplies the third parameter to
 .I xdr_string ().
 .LP
@@ -995,7 +995,7 @@ Handles are never inspected by clients;
 they are obtained and submitted.
 That is to say, handles are opaque.
 The
-.I xdr_opaque() 
+.I xdr_opaque()
 .IX xdr_opaque() "" \fIxdr_opaque()\fP
 primitive is used for describing fixed sized, opaque bytes.
 .DS
@@ -1006,7 +1006,7 @@ bool_t xdr_opaque(xdrs, p, len)
     u_int len;
 .DE
 The parameter
-.I p 
+.I p
 is the location of the bytes;
 .I len
 is the number of bytes in the opaque object.
@@ -1042,7 +1042,7 @@ xdr_netuser(xdrs, nup)
         return(FALSE);
     if (!xdr_int(xdrs, &nup->nu_uid))
         return(FALSE);
-    if (!xdr_vector(xdrs, nup->nu_gids, NGRPS, sizeof(int), 
+    if (!xdr_vector(xdrs, nup->nu_gids, NGRPS, sizeof(int),
         xdr_int)) {
             return(FALSE);
     }
@@ -1071,18 +1071,18 @@ bool_t xdr_union(xdrs, dscmp, unp, arms, defaultarm)
     struct xdr_discrim *arms;
     bool_t (*defaultarm)();  /* \fImay equal NULL\fP */
 .DE
-First the routine translates the discriminant of the union located at 
+First the routine translates the discriminant of the union located at
 .I *dscmp .
 The discriminant is always an
 .I enum_t .
 Next the union located at
-.I *unp 
+.I *unp
 is translated.
 The parameter
 .I arms
 is a pointer to an array of
 .I xdr_discrim
-structures. 
+structures.
 Each structure contains an ordered pair of
 .I [value,proc] .
 If the union's discriminant is equal to the associated
@@ -1093,7 +1093,7 @@ is called to translate the union.
 The end of the
 .I xdr_discrim
 structure array is denoted by a routine of value
-.I NULL 
+.I NULL
 (0).  If the discriminant is not found in the
 .I arms
 array, then the
@@ -1105,7 +1105,7 @@ otherwise the routine returns
 .I "Example D:"
 Suppose the type of a union may be integer,
 character pointer (a string), or a
-.I gnumbers 
+.I gnumbers
 structure.
 Also, assume the union and its current type
 are declared in a structure.
@@ -1147,21 +1147,21 @@ xdr_u_tag(xdrs, utp)
 }
 .DE
 The routine
-.I xdr_gnumbers() 
-was presented above in 
+.I xdr_gnumbers()
+was presented above in
 .I "The XDR Library"
 section.
-.I xdr_wrap_string() 
+.I xdr_wrap_string()
 was presented in example C.
-The default 
-.I arm 
+The default
+.I arm
 parameter to
-.I xdr_union() 
+.I xdr_union()
 (the last parameter) is
-.I NULL 
+.I NULL
 in this example.  Therefore the value of the union's discriminant
 may legally take on only values listed in the
-.I u_tag_arms 
+.I u_tag_arms
 array.  This example also demonstrates that
 the elements of the arm's array do not need to be sorted.
 .LP
@@ -1175,7 +1175,7 @@ representation of the discriminant and guarantees that different
 C compilers emit identical discriminant values.
 .LP
 Exercise: Implement
-.I xdr_union() 
+.I xdr_union()
 using the other primitives in this section.
 .NH 3
 \&Pointers
@@ -1184,7 +1184,7 @@ using the other primitives in this section.
 In C it is often convenient to put pointers
 to another structure within a structure.
 The
-.I xdr_reference() 
+.I xdr_reference()
 .IX xdr_reference() "" \fIxdr_reference()\fP
 primitive makes it easy to serialize, deserialize, and free
 these referenced structures.
@@ -1198,40 +1198,40 @@ bool_t xdr_reference(xdrs, pp, size, proc)
 .DE
 .LP
 Parameter
-.I pp 
+.I pp
 is the address of
 the pointer to the structure;
 parameter
 .I ssize
 is the size in bytes of the structure (use the C function
-.I sizeof() 
+.I sizeof()
 to obtain this value); and
 .I proc
 is the XDR routine that describes the structure.
 When decoding data, storage is allocated if
-.I *pp 
+.I *pp
 is
 .I NULL .
 .LP
 There is no need for a primitive
-.I xdr_struct() 
+.I xdr_struct()
 to describe structures within structures,
 because pointers are always sufficient.
 .LP
 Exercise: Implement
-.I xdr_reference() 
+.I xdr_reference()
 using
 .I xdr_array ().
 Warning:
-.I xdr_reference() 
+.I xdr_reference()
 and
-.I xdr_array() 
+.I xdr_array()
 are NOT interchangeable external representations of data.
 .LP
 .I "Example E:"
 Suppose there is a structure containing a person's name
 and a pointer to a
-.I gnumbers 
+.I gnumbers
 structure containing the person's gross assets and liabilities.
 The construct is:
 .DS
@@ -1257,18 +1257,18 @@ xdr_pgn(xdrs, pp)
 }
 .DE
 .IX "pointer semantics and XDR"
-.I "Pointer Semantics and XDR" 
+.I "Pointer Semantics and XDR"
 .LP
-In many applications, C programmers attach double meaning to 
+In many applications, C programmers attach double meaning to
 the values of a pointer.  Typically the value
-.I NULL 
+.I NULL
 (or zero) means data is not needed,
 yet some application-specific interpretation applies.
 In essence, the C programmer is encoding
 a discriminated union efficiently
 by overloading the interpretation of the value of a pointer.
 For instance, in example E a
-.I NULL 
+.I NULL
 pointer value for
 .I gnp
 could indicate that
@@ -1280,21 +1280,21 @@ Linked lists are an extreme example of the use
 of application-specific pointer interpretation.
 .LP
 The primitive
-.I xdr_reference() 
+.I xdr_reference()
 .IX xdr_reference() "" \fIxdr_reference()\fP
 cannot and does not attach any special
 meaning to a null-value pointer during serialization.
 That is, passing an address of a pointer whose value is
-.I NULL 
+.I NULL
 to
-.I xdr_reference() 
+.I xdr_reference()
 when serialing data will most likely cause a memory fault and, on the UNIX
 system, a core dump.
 .LP
-.I xdr_pointer() 
-correctly handles 
-.I NULL 
-pointers.  For more information about its use, see 
+.I xdr_pointer()
+correctly handles
+.I NULL
+pointers.  For more information about its use, see
 the
 .I "Linked Lists"
 topics below.
@@ -1303,19 +1303,19 @@ topics below.
 After reading the section on
 .I "Linked Lists" ,
 return here and extend example E so that
-it can correctly deal with 
-.I NULL 
+it can correctly deal with
+.I NULL
 pointer values.
 .LP
 .I Exercise:
 Using the
 .I xdr_union (),
-.I xdr_reference() 
+.I xdr_reference()
 and
-.I xdr_void() 
+.I xdr_void()
 primitives, implement a generic pointer handling primitive
 that implicitly deals with
-.I NULL 
+.I NULL
 pointers.  That is, implement
 .I xdr_pointer ().
 .NH 2
@@ -1337,31 +1337,31 @@ xdr_destroy(xdrs)
     XDR *xdrs;
 .DE
 The routine
-.I xdr_getpos() 
+.I xdr_getpos()
 .IX xdr_getpos() "" \fIxdr_getpos()\fP
 returns an unsigned integer
 that describes the current position in the data stream.
 Warning: In some XDR streams, the returned value of
-.I xdr_getpos() 
+.I xdr_getpos()
 is meaningless;
 the routine returns a \-1 in this case
 (though \-1 should be a legitimate value).
 .LP
 The routine
-.I xdr_setpos() 
+.I xdr_setpos()
 .IX xdr_setpos() "" \fIxdr_setpos()\fP
 sets a stream position to
 .I pos .
 Warning: In some XDR streams, setting a position is impossible;
 in such cases,
-.I xdr_setpos() 
+.I xdr_setpos()
 will return
 .I FALSE .
 This routine will also fail if the requested position is out-of-bounds.
 The definition of bounds varies from stream to stream.
 .LP
 The
-.I xdr_destroy() 
+.I xdr_destroy()
 .IX xdr_destroy() "" \fIxdr_destroy()\fP
 primitive destroys the XDR stream.
 Usage of the stream
@@ -1403,7 +1403,7 @@ streams, TCP/IP connections and UNIX files, and memory.
 .IX "XDR" "standard I/O streams"
 .LP
 XDR streams can be interfaced to standard I/O using the
-.I xdrstdio_create() 
+.I xdrstdio_create()
 .IX xdrstdio_create() "" \fIxdrstdio_create()\fP
 routine as follows:
 .DS
@@ -1418,7 +1418,7 @@ xdrstdio_create(xdrs, fp, x_op)
     enum xdr_op x_op;
 .DE
 The routine
-.I xdrstdio_create() 
+.I xdrstdio_create()
 initializes an XDR stream pointed to by
 .I xdrs .
 The XDR stream interfaces to the standard I/O library.
@@ -1445,7 +1445,7 @@ xdrmem_create(xdrs, addr, len, x_op)
     enum xdr_op x_op;
 .DE
 The routine
-.I xdrmem_create() 
+.I xdrmem_create()
 .IX xdrmem_create() "" \fIxdrmem_create()\fP
 initializes an XDR stream in local memory.
 The memory is pointed to by parameter
@@ -1462,7 +1462,7 @@ are identical to the corresponding parameters of
 Currently, the UDP/IP implementation of RPC uses
 .I xdrmem_create ().
 Complete call or result messages are built in memory before calling the
-.I sendto() 
+.I sendto()
 system routine.
 .NH 3
 \&Record (TCP/IP) Streams
@@ -1483,7 +1483,7 @@ xdrrec_create(xdrs,
     int (*readproc)(), (*writeproc)();
 .DE
 The routine
-.I xdrrec_create() 
+.I xdrrec_create()
 provides an XDR stream interface that allows for a bidirectional,
 arbitrarily long sequence of records.
 The contents of the records are meant to be data in XDR form.
@@ -1502,13 +1502,13 @@ and
 determine the size in bytes of the output and input buffers, respectively;
 if their values are zero (0), then predetermined defaults are used.
 When a buffer needs to be filled or flushed, the routine
-.I readproc() 
+.I readproc()
 or
-.I writeproc() 
+.I writeproc()
 is called, respectively.
 The usage and behavior of these
 routines are similar to the UNIX system calls
-.I read() 
+.I read()
 and
 .I write ().
 However,
@@ -1521,9 +1521,9 @@ and
 and the results
 (byte count) are identical to the system routines.
 If
-.I xxx 
+.I xxx
 is
-.I readproc() 
+.I readproc()
 or
 .I writeproc (),
 then it has the following form:
@@ -1563,7 +1563,7 @@ xdrrec_eof(xdrs)
     XDR *xdrs;
 .DE
 The routine
-.I xdrrec_endofrecord() 
+.I xdrrec_endofrecord()
 .IX xdrrec_endofrecord() "" \fIxdrrec_endofrecord()\fP
 causes the current outgoing data to be marked as a record.
 If the parameter
@@ -1571,13 +1571,13 @@ If the parameter
 is
 .I TRUE ,
 then the stream's
-.I writeproc 
+.I writeproc
 will be called; otherwise,
-.I writeproc 
+.I writeproc
 will be called when the output buffer has been filled.
 .LP
 The routine
-.I xdrrec_skiprecord() 
+.I xdrrec_skiprecord()
 .IX xdrrec_skiprecord() "" \fIxdrrec_skiprecord()\fP
 causes an input stream's position to be moved past
 the current record boundary and onto the
@@ -1585,7 +1585,7 @@ beginning of the next record in the stream.
 .LP
 If there is no more data in the stream's input buffer,
 then the routine
-.I xdrrec_eof() 
+.I xdrrec_eof()
 .IX xdrrec_eof() "" \fIxdrrec_eof()\fP
 returns
 .I TRUE .
@@ -1658,13 +1658,13 @@ The caller can then use the buffer segment for any purpose.
 From the stream's point of view, the bytes in the
 buffer segment have been consumed or put.
 The routine may return
-.I NULL 
+.I NULL
 if it cannot return a buffer segment of the requested size.
 (The
-.I x_inline() 
+.I x_inline()
 routine is for cycle squeezers.
 Use of the resulting buffer is not data-portable.
-Users are encouraged not to use this feature.) 
+Users are encouraged not to use this feature.)
 .LP
 The operations
 .I x_getbytes()
@@ -1673,9 +1673,9 @@ and
 blindly get and put sequences of bytes
 from or to the underlying stream;
 they return
-.I TRUE 
+.I TRUE
 if they are successful, and
-.I FALSE 
+.I FALSE
 otherwise.  The routines have identical parameters (replace
 .I xxx ):
 .DS
@@ -1707,7 +1707,7 @@ have the same bit representations as unsigned integers.
 The routines return
 .I TRUE
 if they succeed, and
-.I FALSE 
+.I FALSE
 otherwise.  They have identical parameters:
 .DS
 .ft CW
@@ -1727,11 +1727,11 @@ This section describes techniques for passing data structures that
 are not covered in the preceding sections.  Such structures include
 linked lists (of arbitrary lengths).  Unlike the simpler examples
 covered in the earlier sections, the following examples are written
-using both the XDR C library routines and the XDR data description 
-language.  
+using both the XDR C library routines and the XDR data description
+language.
 The
 .I "External Data Representation Standard: Protocol Specification"
-describes this 
+describes this
 language in complete detail.
 .NH 2
 \&Linked Lists
@@ -1739,9 +1739,9 @@ language in complete detail.
 .LP
 The last example in the
 .I Pointers
-topic earlier in this chapter 
+topic earlier in this chapter
 presented a C data structure and its associated XDR
-routines for a individual's gross assets and liabilities.  
+routines for an individual's gross assets and liabilities.
 The example is duplicated below:
 .ie t .DS
 .el .DS L
@@ -1762,7 +1762,7 @@ xdr_gnumbers(xdrs, gp)
 }
 .DE
 .LP
-Now assume that we wish to implement a linked list of such information. 
+Now assume that we wish to implement a linked list of such information.
 A data structure could be constructed as follows:
 .ie t .DS
 .el .DS L
@@ -1777,16 +1777,16 @@ typedef struct gnumbers_node *gnumbers_list;
 .LP
 The head of the linked list can be thought of as the data object;
 that is, the head is not merely a convenient shorthand for a
-structure.  Similarly the 
-.I gn_next 
-field is used to indicate whether or not the object has terminated.  
-Unfortunately, if the object continues, the 
-.I gn_next 
-field is also the address of where it continues. The link addresses 
+structure.  Similarly the
+.I gn_next
+field is used to indicate whether or not the object has terminated.
+Unfortunately, if the object continues, the
+.I gn_next
+field is also the address of where it continues. The link addresses
 carry no useful information when the object is serialized.
 .LP
-The XDR data description of this linked list is described by the 
-recursive declaration of 
+The XDR data description of this linked list is described by the
+recursive declaration of
 .I gnumbers_list :
 .ie t .DS
 .el .DS L
@@ -1803,22 +1803,22 @@ struct gnumbers_node {
 .DE
 .LP
 In this description, the boolean indicates whether there is more data
-following it. If the boolean is 
+following it. If the boolean is
 .I FALSE ,
-then it is the last data field of the structure. If it is 
+then it is the last data field of the structure. If it is
 .I TRUE ,
-then it is followed by a gnumbers structure and (recursively) by a 
+then it is followed by a gnumbers structure and (recursively) by a
 .I gnumbers_list .
-Note that the C declaration has no boolean explicitly declared in it 
-(though the 
-.I gn_next 
-field implicitly carries the information), while the XDR data 
+Note that the C declaration has no boolean explicitly declared in it
+(though the
+.I gn_next
+field implicitly carries the information), while the XDR data
 description has no pointer explicitly declared in it.
 .LP
-Hints for writing the XDR routines for a 
-.I gnumbers_list 
-follow easily from the XDR description above. Note how the primitive 
-.I xdr_pointer() 
+Hints for writing the XDR routines for a
+.I gnumbers_list
+follow easily from the XDR description above. Note how the primitive
+.I xdr_pointer()
 is used to implement the XDR union above.
 .ie t .DS
 .el .DS L
@@ -1837,8 +1837,8 @@ xdr_gnumbers_list(xdrs, gnp)
 	XDR *xdrs;
 	gnumbers_list *gnp;
 {
-	return(xdr_pointer(xdrs, gnp, 
-		sizeof(struct gnumbers_node), 
+	return(xdr_pointer(xdrs, gnp,
+		sizeof(struct gnumbers_node),
 		xdr_gnumbers_node));
 }
 .DE
@@ -1870,12 +1870,12 @@ xdr_gnumbers_list(xdrs, gnp)
 		if (xdrs->x_op == XDR_FREE) {
 			nextp = &(*gnp)->gn_next;
 		}
-		if (!xdr_reference(xdrs, gnp, 
+		if (!xdr_reference(xdrs, gnp,
 			sizeof(struct gnumbers_node), xdr_gnumbers)) {
 
 		return(FALSE);
 		}
-		gnp = (xdrs->x_op == XDR_FREE) ? 
+		gnp = (xdrs->x_op == XDR_FREE) ?
 			nextp : &(*gnp)->gn_next;
 	}
 	*gnp = NULL;
@@ -1885,83 +1885,83 @@ xdr_gnumbers_list(xdrs, gnp)
 .LP
 The first task is to find out whether there is more data or not,
 so that this boolean information can be serialized. Notice that
-this statement is unnecessary in the 
-.I XDR_DECODE 
-case, since the value of more_data is not known until we 
+this statement is unnecessary in the
+.I XDR_DECODE
+case, since the value of more_data is not known until we
 deserialize it in the next statement.
 .LP
-The next statement XDR's the more_data field of the XDR union. 
-Then if there is truly no more data, we set this last pointer to 
-.I NULL 
-to indicate the end of the list, and return 
-.I TRUE 
-because we are done. Note that setting the pointer to 
-.I NULL 
-is only important in the 
-.I XDR_DECODE 
-case, since it is already 
-.I NULL 
-in the 
-.I XDR_ENCODE 
-and 
-XDR_FREE 
+The next statement XDR's the more_data field of the XDR union.
+Then if there is truly no more data, we set this last pointer to
+.I NULL
+to indicate the end of the list, and return
+.I TRUE
+because we are done. Note that setting the pointer to
+.I NULL
+is only important in the
+.I XDR_DECODE
+case, since it is already
+.I NULL
+in the
+.I XDR_ENCODE
+and
+XDR_FREE
 cases.
 .LP
-Next, if the direction is 
+Next, if the direction is
 .I XDR_FREE ,
-the value of 
-.I nextp 
-is set to indicate the location of the next pointer in the list. 
-We do this now because we need to dereference gnp to find the 
-location of the next item in the list, and after the next 
+the value of
+.I nextp
+is set to indicate the location of the next pointer in the list.
+We do this now because we need to dereference gnp to find the
+location of the next item in the list, and after the next
 statement the storage pointed to by
-.I gnp 
+.I gnp
 will be freed up and no be longer valid.  We can't do this for all
-directions though, because in the 
-.I XDR_DECODE 
-direction the value of 
-.I gnp 
+directions though, because in the
+.I XDR_DECODE
+direction the value of
+.I gnp
 won't be set until the next statement.
 .LP
-Next, we XDR the data in the node using the primitive 
+Next, we XDR the data in the node using the primitive
 .I xdr_reference ().
-.I xdr_reference() 
-is like 
-.I xdr_pointer() 
+.I xdr_reference()
+is like
+.I xdr_pointer()
 which we used before, but it does not
-send over the boolean indicating whether there is more data. 
-We use it instead of 
-.I xdr_pointer() 
-because we have already XDR'd this information ourselves. Notice 
-that the xdr routine passed is not the same type as an element 
-in the list. The routine passed is 
+send over the boolean indicating whether there is more data.
+We use it instead of
+.I xdr_pointer()
+because we have already XDR'd this information ourselves. Notice
+that the xdr routine passed is not the same type as an element
+in the list. The routine passed is
 .I xdr_gnumbers (),
-for XDR'ing gnumbers, but each element in the list is actually of 
-type 
+for XDR'ing gnumbers, but each element in the list is actually of
+type
 .I gnumbers_node .
-We don't pass 
-.I xdr_gnumbers_node() 
-because it is recursive, and instead use 
-.I xdr_gnumbers() 
-which XDR's all of the non-recursive part.  Note that this trick 
-will work only if the 
-.I gn_numbers 
-field is the first item in each element, so that their addresses 
-are identical when passed to 
+We don't pass
+.I xdr_gnumbers_node()
+because it is recursive, and instead use
+.I xdr_gnumbers()
+which XDR's all of the non-recursive part.  Note that this trick
+will work only if the
+.I gn_numbers
+field is the first item in each element, so that their addresses
+are identical when passed to
 .I xdr_reference ().
 .LP
-Finally, we update 
-.I gnp 
-to point to the next item in the list. If the direction is 
+Finally, we update
+.I gnp
+to point to the next item in the list. If the direction is
 .I XDR_FREE ,
-we set it to the previously saved value, otherwise we can 
-dereference 
-.I gnp 
-to get the proper value.  Though harder to understand than the 
+we set it to the previously saved value, otherwise we can
+dereference
+.I gnp
+to get the proper value.  Though harder to understand than the
 recursive version, this non-recursive routine is far less likely
 to blow the C stack.  It will also run more efficiently since
-a lot of procedure call overhead has been removed. Most lists 
-are small though (in the hundreds of items or less) and the 
+a lot of procedure call overhead has been removed. Most lists
+are small though (in the hundreds of items or less) and the
 recursive version should be sufficient for them.
 .EQ
 delim off
diff --git a/lib/libc/rpc/rpc_svc_calls.3 b/lib/libc/rpc/rpc_svc_calls.3
index 1569d76..1118576 100644
--- a/lib/libc/rpc/rpc_svc_calls.3
+++ b/lib/libc/rpc/rpc_svc_calls.3
@@ -111,7 +111,7 @@ has global scope and ends all RPC server activity.
 .Vt fd_set Va svc_fdset
 .Xc
 A global variable reflecting the
-RPC server's read file descriptor bit mask; it is suitable as a argument
+RPC server's read file descriptor bit mask; it is suitable as an argument
 to the
 .Xr select 2
 system call.
diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c
index ec66018..0cb387b 100644
--- a/lib/libc/stdlib/strtoimax.c
+++ b/lib/libc/stdlib/strtoimax.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <inttypes.h>
 
 /*
- * Convert a string to a intmax_t integer.
+ * Convert a string to an intmax_t integer.
  *
  * Assumes that the upper and lower case
  * alphabets and digits are each contiguous.
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index a1c8122..65f74ac 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -203,7 +203,7 @@ by forcing transmissions
 roughly every minute in the absence of other activity.
 An error is then indicated if no response can be
 elicited on an otherwise
-idle connection for a extended period (e.g. 5 minutes).
+idle connection for an extended period (e.g. 5 minutes).
 A
 .Dv SIGPIPE
 signal is raised if a process sends
diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h
index b3c5e08..fd7b4a5 100644
--- a/lib/libdisk/libdisk.h
+++ b/lib/libdisk/libdisk.h
@@ -294,7 +294,7 @@ __END_DECLS
 
 /* TODO
  *
- * Need a error string mechanism from the functions instead of warn()
+ * Need an error string mechanism from the functions instead of warn()
  *
  * Make sure only FreeBSD start at offset==0
  *
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
index 9d6c4ad..80606bb 100644
--- a/lib/libedit/chared.h
+++ b/lib/libedit/chared.h
@@ -52,7 +52,7 @@
 #define	EL_MAXMACRO	10
 
 /*
- * This is a issue of basic "vi" look-and-feel. Defining VI_MOVE works
+ * This is an issue of basic "vi" look-and-feel. Defining VI_MOVE works
  * like real vi: i.e. the transition from command<->insert modes moves
  * the cursor.
  *
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index f2d02e3..145f4b7 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -175,7 +175,7 @@ ed_delete_next_char(EditLine *el, int c)
 				return (CC_ERROR);
 #else
 				term_overwrite(el, STReof, 4);
-					/* then do a EOF */
+					/* then do an EOF */
 				term__flush();
 				return (CC_EOF);
 #endif
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index 2e82f13..eff478d 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -61,7 +61,7 @@ em_delete_or_list(EditLine *el, int c)
 					/* if I'm at the end */
 		if (el->el_line.cursor == el->el_line.buffer) {
 					/* and the beginning */
-			term_overwrite(el, STReof, 4);	/* then do a EOF */
+			term_overwrite(el, STReof, 4);	/* then do an EOF */
 			term__flush();
 			return (CC_EOF);
 		} else {
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index 34f781c..72de5c9 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -744,7 +744,7 @@ vi_list_or_eof(EditLine *el, int c)
 	if (el->el_line.cursor == el->el_line.lastchar &&
 	    el->el_line.cursor == el->el_line.buffer) {
 #endif
-		term_overwrite(el, STReof, 4);	/* then do a EOF */
+		term_overwrite(el, STReof, 4);	/* then do an EOF */
 		term__flush();
 		return (CC_EOF);
 #ifdef notyet
diff --git a/lib/libipsec/ipsec_set_policy.3 b/lib/libipsec/ipsec_set_policy.3
index 9c781a7..3d2f25c 100644
--- a/lib/libipsec/ipsec_set_policy.3
+++ b/lib/libipsec/ipsec_set_policy.3
@@ -77,7 +77,7 @@ Therefore,
 can be regarded as inverse conversion of
 .Fn ipsec_set_policy .
 .Fa buf
-points to a IPsec policy structure,
+points to an IPsec policy structure,
 .Li struct sadb_x_policy .
 .Fa delim
 is a delimiter string, which is usually a blank character.
diff --git a/lib/libnetgraph/sock.c b/lib/libnetgraph/sock.c
index 44af94f..d3bdf59 100644
--- a/lib/libnetgraph/sock.c
+++ b/lib/libnetgraph/sock.c
@@ -70,7 +70,7 @@ NgMkSockNode(const char *name, int *csp, int *dsp)
 		name = NULL;
 
 	/* Create control socket; this also creates the netgraph node.
-	   If we get a EPROTONOSUPPORT then the socket node type is
+	   If we get an EPROTONOSUPPORT then the socket node type is
 	   not loaded, so load it and try again. */
 	if ((cs = socket(AF_NETGRAPH, SOCK_DGRAM, NG_CONTROL)) < 0) {
 		if (errno == EPROTONOSUPPORT) {
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index 96a7eb3..a5bdf8b 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -377,7 +377,7 @@ And
 .Va object
 must be
 .Va VGLDisplay .
-Passing a in-memory bitmap to this function results in error.
+Passing an in-memory bitmap to this function results in error.
 .Pp
 The desired virtual screen width may not be achievable because
 of the video card hardware.  In such case the video driver (and
@@ -401,7 +401,7 @@ foreground.
 .Va object
 must be
 .Va VGLDisplay .
-Passing a in-memory bitmap to this function results in error.
+Passing an in-memory bitmap to this function results in error.
 .Pp
 .Fn VGLBlankDisplay
 blank the display if the argument
diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c
index 101f8b1..75cd81e 100644
--- a/lib/msun/bsdsrc/b_log.c
+++ b/lib/msun/bsdsrc/b_log.c
@@ -442,7 +442,7 @@ log(x) double x;
 
 /*
  * Extra precision variant, returning struct {double a, b;};
- * log(x) = a+b to 63 bits, with a is rounded to 26 bits.
+ * log(x) = a+b to 63 bits, with a rounded to 26 bits.
  */
 struct Double
 #ifdef _ANSI_SOURCE
diff --git a/lib/msun/src/k_tan.c b/lib/msun/src/k_tan.c
index 7da811f..bb7770d 100644
--- a/lib/msun/src/k_tan.c
+++ b/lib/msun/src/k_tan.c
@@ -24,7 +24,7 @@ static char rcsid[] = "$FreeBSD$";
  * Algorithm
  *	1. Since tan(-x) = -tan(x), we need only to consider positive x.
  *	2. if x < 2^-28 (hx<0x3e300000 0), return x with inexact if x!=0.
- *	3. tan(x) is approximated by a odd polynomial of degree 27 on
+ *	3. tan(x) is approximated by an odd polynomial of degree 27 on
  *	   [0,0.67434]
  *		  	         3             27
  *	   	tan(x) ~ x + T1*x + ... + T13*x
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index ce27e89..cc74d2f 100644
--- a/libexec/mknetid/mknetid.8
+++ b/libexec/mknetid/mknetid.8
@@ -58,7 +58,7 @@ files into the format used to generate the
 .Tn NIS
 map.
 This map is used to hold credential information for both users
-and hosts in a operating system independent format.
+and hosts in an operating system independent format.
 .Pp
 The
 .Nm
diff --git a/libexec/rtld-aout/dynamic.h b/libexec/rtld-aout/dynamic.h
index 00d449f..3c8bacd 100644
--- a/libexec/rtld-aout/dynamic.h
+++ b/libexec/rtld-aout/dynamic.h
@@ -233,7 +233,7 @@ struct file_entry {
 	int	lib_major, lib_minor;	/* Version numbers of a shared object */
 
 	int	flags;
-#define E_IS_LIBRARY		1	/* File is a an archive */
+#define E_IS_LIBRARY		1	/* File is an archive */
 #define E_HEADER_VALID		2	/* File's header has been read */
 #define E_SEARCH_DIRS		4	/* Search directories for file */
 #define E_SEARCH_DYNAMIC	8	/* Search for shared libs allowed */
diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c
index 1d0f2bd..8d165c1 100644
--- a/libexec/rtld-aout/rtld.c
+++ b/libexec/rtld-aout/rtld.c
@@ -1987,7 +1987,7 @@ rtfindfile(name)
 
 /*
  * Buffer for error messages and a pointer that is set to point to the buffer
- * when a error occurs.  It acts as a last error flag, being set to NULL
+ * when an error occurs.  It acts as a last error flag, being set to NULL
  * after an error is returned.
  */
 #define DLERROR_BUF_SIZE 512
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
index 151f061..940f66f 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
@@ -182,7 +182,7 @@
 
 	  <para>Unfortunately, the only program capable of reading
 	  them is the 3COM supplied DOS program.  This program must be
-	  run on a absolutely clean system (no other drivers must be
+	  run on an absolutely clean system (no other drivers must be
 	  running), and the program will whine about CARD-Services not
 	  being found, but it will continue.  This is necessary to
 	  read the NVRAM values.  You want to know the IRQ, port, and
diff --git a/release/scripts/print-cdrom-packages.sh b/release/scripts/print-cdrom-packages.sh
index 15f4427..7ce9399 100755
--- a/release/scripts/print-cdrom-packages.sh
+++ b/release/scripts/print-cdrom-packages.sh
@@ -10,7 +10,7 @@
 # a given CDROM number, that numer currently referring to the 4 CD
 # "official set" published by BSDi.  If there is no minimum package
 # set for the given CDROM, or none is known, the script will exit
-# with a error code of 1.  At some point, this script should be extended
+# with an error code of 1.  At some point, this script should be extended
 # to at least cope with other official CD distributions, like non-US ones.
 #
 # usage: print-cdrom-packages.sh cdrom-number
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index 40b7771..612d130 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.c
@@ -605,7 +605,7 @@ asn_set_int ( bufp, val )
 }
 
 /*
- * Utility to print a object identifier
+ * Utility to print an object identifier.
  *
  * Arguments:
  *	objid	- pointer to objid representation
@@ -1088,7 +1088,7 @@ oid_ncmp ( oid1, oid2, len )
 }
 
 /*
- * Find the index of a OBJID which matches this Variable instance 
+ * Find the index of an OBJID which matches this Variable instance.
  *
  * Arguments:
  *	var	- pointer to Variable instance
@@ -1216,7 +1216,7 @@ build_pdu ( hdr, type )
 	    asn_set_int ( &bp, hdr->reqid );
 	    /*
 	     * Check to see if all the vaiables were resolved - we do this
-	     * by looking for something which still has a ASN_NULL value.
+	     * by looking for something which still has an ASN_NULL value.
 	     */
 	    var = hdr->head;
 	    if ( type == PDU_TYPE_GETRESP ) {
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index c038dd3..77863a5 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -2435,7 +2435,7 @@ add_ports(ipfw_insn *cmd, char *av, u_char proto, int opcode)
  *
  * The syntax for a rule starts with the action, followed by an
  * optional log action, and the various match patterns.
- * In the assembled microcode, the first opcode must be a O_PROBE_STATE
+ * In the assembled microcode, the first opcode must be an O_PROBE_STATE
  * (generated if the rule includes a keep-state option), then the
  * various match patterns, the "log" action, and the actual action.
  *
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 6a08c28..e93c495 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -45,7 +45,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility attaches a ext2fs file system
+utility attaches an ext2fs file system
 .Ar special
 device on to the file system tree at the point
 .Ar node .
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index fbb8aed..a3fe7d6 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -473,7 +473,7 @@ static void DoAliasing (int fd, int direction)
 		return;
 	}
 /*
- * This is a IP packet.
+ * This is an IP packet.
  */
 	ip = (struct ip*) buf;
 	if (direction == DONT_KNOW) {
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 55da15f..548fc7c 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -367,7 +367,7 @@ ripv1_mask_host(naddr addr,		/* in network byte order */
 }
 
 
-/* See if a IP address looks reasonable as a destination
+/* See if an IP address looks reasonable as a destination.
  */
 int					/* 0=bad */
 check_dst(naddr addr)
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index a8ea949..96737f9 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -1435,7 +1435,7 @@ walk_kern(struct radix_node *rn,
 		 * it must be a "gateway."
 		 *
 		 * If it is a "remote" interface, it is also a "gateway" to
-		 * the kernel if is not a alias.
+		 * the kernel if is not an alias.
 		 */
 		if (RT->rt_ifp == 0
 		    || (RT->rt_ifp->int_state & IS_REMOTE))
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 6cd5e2c..019d184 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -225,7 +225,7 @@ DoFile(char *savedir, const char *device)
 	 * XXX On ia64 something breaks when the buffer is put on the
 	 * stack. When the buffer is roughly larger than 128K the read()
 	 * below simply fails with errno=14 (EFAULT). We work around
-	 * this by doing a on-time allocation...
+	 * this by doing a one-time allocation...
 	 */
 	if (buf == NULL) {
 		buf = malloc(BUFFERSIZE);
diff --git a/sbin/setkey/sample.cf b/sbin/setkey/sample.cf
index 978289d..3318f9b 100644
--- a/sbin/setkey/sample.cf
+++ b/sbin/setkey/sample.cf
@@ -166,10 +166,10 @@ add fec0:0:0:2::1 fec0:0:0:1::1 esp 0x10004
 	-E rc5-cbc "kamekame"
 	-A hmac-md5 "this is the test" ;
 
-# By "get" command, you can get a entry of either SP or SA.
+# By "get" command, you can get an entry of either SP or SA.
 get fec0:0:0:1::1 fec0:0:0:2::2 ah 0x10004 ;
 
-# Also delete command, you can delete a entry of either SP or SA.
+# Also delete command, you can delete an entry of either SP or SA.
 spddelete fec0:0:0:1::/64 fec0:0:0:2::/64 any -P out;
 delete fec0:0:0:1::1 fec0:0:0:2::2 ah 0x10004 ;
 
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index f25cf34f..7c8cf38 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -283,9 +283,9 @@ Specify hard/soft life time duration of the SA.
 .It Ar algorithm
 .Bl -tag -width Fl -compact
 .It Fl E Ar ealgo Ar key
-Specify a encryption algorithm.
+Specify an encryption algorithm.
 .It Fl A Ar aalgo Ar key
-Specify a authentication algorithm.
+Specify an authentication algorithm.
 If
 .Fl A
 is used with
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index a376ceb..9191f59 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -512,8 +512,8 @@ getmntname(const char *fromname, const char *onname,
 	 * are marked or unmarked in a table called 'mntcheck'.
 	 * Unmount(const char *dir, int flags) does only take the
 	 * mountpoint as argument, not the destination. If we don't pay
-	 * attention to the order, it can happen that a overlaying
-	 * file system get's unmounted instead of the one the user
+	 * attention to the order, it can happen that an overlaying
+	 * file system gets unmounted instead of the one the user
 	 * has choosen.
 	 */
 	switch (mark) {
diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION
index ea1715f..1b663dc 100644
--- a/share/doc/IPv6/IMPLEMENTATION
+++ b/share/doc/IPv6/IMPLEMENTATION
@@ -187,7 +187,7 @@ even if instructed not to do so (especially in promiscuous mode).
 In such cases DAD may fail, because DAD engine sees inbound NS packet
 (actually from the node itself) and considers it as a sign of duplicate.
 In this case, drivers should be corrected to honor IFF_SIMPLEX behavior.
-For example, you may need to check source MAC address on a inbound packet,
+For example, you may need to check source MAC address on an inbound packet,
 and reject it if it is from the node itself.
 You may also want to look at #if condition marked "heuristics" in
 sys/netinet6/nd6_nbr.c:nd6_dad_timer() as workaround (note that the code
diff --git a/share/doc/papers/diskperf/motivation.ms b/share/doc/papers/diskperf/motivation.ms
index 2884fc5..d5fde9d 100644
--- a/share/doc/papers/diskperf/motivation.ms
+++ b/share/doc/papers/diskperf/motivation.ms
@@ -31,6 +31,8 @@
 .\"
 .\"	@(#)motivation.ms	6.2 (Berkeley) 4/16/91
 .\"
+.\"	$FreeBSD$
+.\"
 .ds RH Motivation
 .NH
 Motivation
@@ -45,7 +47,7 @@ DEC has become, with the introduction of the UDA50/RA81 system,
 cost competitive
 in the area of disk storage for the first time.
 Emulex's entry into the VAX 11/780 SBI controller
-field, the SC780, represented a important choice for us to examine, given
+field, the SC780, represented an important choice for us to examine, given
 our previous success with their VAX 11/750 SC750 controller and
 their UNIBUS controllers.
 The Fujitsu 2351A
diff --git a/share/doc/papers/diskperf/tests.ms b/share/doc/papers/diskperf/tests.ms
index 40bbe0f..e937931 100644
--- a/share/doc/papers/diskperf/tests.ms
+++ b/share/doc/papers/diskperf/tests.ms
@@ -71,7 +71,7 @@ This is typical of most 4.2BSD user programs since a standard set of
 I/O support routines is commonly used and these routines buffer
 data in similar block sizes.
 .PP
-For each test run, a empty eight Kilobyte block
+For each test run, an empty eight Kilobyte block
 file system was created in the target
 storage system.
 Then each of the four tests was run and timed.
@@ -79,9 +79,9 @@ Each test was run three times;
 the first to clear out any useful data in the cache,
 and the second two to insure that the experiment
 had stablized and was repeatable.
-Each test operated on eight Megabytes of data to 
+Each test operated on eight Megabytes of data to
 insure that the cache did not overly influence the results.
-Another file system was then initialized using a 
+Another file system was then initialized using a
 basic blocking factor of four Kilobytes and the same tests
 were run again and timed.
 A command script for a run appears as follows:
diff --git a/share/doc/papers/sysperf/4.t b/share/doc/papers/sysperf/4.t
index cf52502..373a0d0 100644
--- a/share/doc/papers/sysperf/4.t
+++ b/share/doc/papers/sysperf/4.t
@@ -31,11 +31,13 @@
 .\"
 .\"	@(#)4.t	5.1 (Berkeley) 4/17/91
 .\"
+.\"	$FreeBSD$
+.\"
 .ds RH Performance Improvements
 .NH
 Performance Improvements
 .PP
-This section outlines the changes made to the system 
+This section outlines the changes made to the system
 since the 4.2BSD distribution.
 The changes reported here were made in response
 to the problems described in Section 3.
@@ -79,7 +81,7 @@ The inner loop performs a linear search through a directory looking
 for a particular pathname component.
 .PP
 Our first idea was to reduce the number of iterations
-around the inner loop of \fInamei\fP by observing that many programs 
+around the inner loop of \fInamei\fP by observing that many programs
 step through a directory performing an operation on each entry in turn.
 To improve performance for processes doing directory scans,
 the system keeps track of the directory offset of the last component of the
@@ -99,7 +101,7 @@ delim off
 .EN
 .PP
 The cost of the cache is about 20 lines of code
-(about 0.2 kilobytes) 
+(about 0.2 kilobytes)
 and 16 bytes per process, with the cached data
 stored in a process's \fIuser\fP vector.
 .PP
@@ -162,7 +164,7 @@ For each path name component,
 for the needed name.
 If it exists, the directory search can be completely eliminated.
 .PP
-The system already maintained a cache of recently accessed inodes, 
+The system already maintained a cache of recently accessed inodes,
 so the initial name cache
 maintained a simple name-inode association that was used to
 check each component of a path name during name translations.
@@ -172,7 +174,7 @@ but eventually decided to have a separate data structure that
 kept names with pointers to the inode table.
 Tagging inodes has two drawbacks;
 many inodes such as those associated with login ports remain in
-the inode table for a long period of time, but are never looked 
+the inode table for a long period of time, but are never looked
 up by name.
 Other inodes, such as those describing directories are looked up
 frequently by many different names (\fIe.g.\fP ``..'').
@@ -183,7 +185,7 @@ of the inode table, so that machines with small amounts of memory
 can reduce the size of the cache (or even eliminate it)
 without modifying the inode table structure.
 .PP
-Another issue to be considered is how the name cache should 
+Another issue to be considered is how the name cache should
 hold references to the inode table.
 Normally processes hold ``hard references'' by incrementing the
 reference count in the inode they reference.
@@ -219,7 +221,7 @@ searching through the entire cache;
 instead all you need to do is assign a new capability to the inode.
 .PP
 The cost of the name cache is about 200 lines of code
-(about 1.2 kilobytes) 
+(about 1.2 kilobytes)
 and 48 bytes per cache entry.
 Depending on the size of the system,
 about 200 to 1000 entries will normally be configured,
@@ -304,7 +306,7 @@ it is impossible to statically select the most efficient input mode to use.
 .PP
 We therefore changed the terminal multiplexor handlers
 to dynamically choose between the use of the silo and the use of
-per-character interrupts. 
+per-character interrupts.
 At low input rates the handler processes characters on an
 interrupt basis, avoiding the overhead
 of checking each interface on each clock interrupt.
@@ -389,7 +391,7 @@ As most of the clock-based events need not be done at high priority,
 the system schedules a lower priority software interrupt to do the less
 time-critical events such as cpu scheduling and timeout processing.
 Often there are no such events, and the software interrupt handler
-finds nothing to do and returns. 
+finds nothing to do and returns.
 The high priority event now checks to see if there are low priority
 events to process;
 if there is nothing to do, the software interrupt is not requested.
@@ -533,7 +535,7 @@ run over the assembly language and replace calls to small
 routines with the code for the body of the routine, often
 a single VAX instruction.
 While this optimization eliminated the cost of the subroutine
-call and return, 
+call and return,
 it did not eliminate the pushing and popping of several arguments
 to the routine.
 The \fIsed\fP script has been replaced by a more intelligent expander,
@@ -587,7 +589,7 @@ dramatically improved simply by enlarging the size of the hash table.
 .NH 2
 Improvements to Libraries and Utilities
 .PP
-Intuitively, changes to the kernel would seem to have the greatest 
+Intuitively, changes to the kernel would seem to have the greatest
 payoff since they affect all programs that run on the system.
 However, the kernel has been tuned many times before, so the
 opportunity for significant improvement was small.
@@ -661,7 +663,7 @@ on the entire mail system.  The first problem identified was a bug
 in the \fIsyslog\fP program.  The mail delivery program, \fIsendmail\fP
 logs all mail transactions through this process with the 4.2BSD interprocess
 communication facilities.  \fISyslog\fP then records the information in
-a log file.  Unfortunately, \fIsyslog\fP was performing a \fIsync\fP 
+a log file.  Unfortunately, \fIsyslog\fP was performing a \fIsync\fP
 operation after each message it received, whether it was logged to a file
 or not.  This wreaked havoc on the effectiveness of the
 buffer cache and explained, to a large
@@ -670,22 +672,22 @@ heavy load on the system (one syslog message was generated for each
 message recipient causing almost a continuous sequence of sync operations).
 .PP
 The hashed data base files were
-installed in all mail programs, resulting in a order of magnitude
+installed in all mail programs, resulting in an order of magnitude
 speedup on large distribution lists.  The code in \fI/bin/mail\fP
 that notifies the \fIcomsat\fP program when mail has been delivered to
 a user was changed to cache host table lookups, resulting in a similar
-speedup on large distribution lists. 
+speedup on large distribution lists.
 .PP
 Next, the file locking facilities
 provided in 4.2BSD, \fIflock\fP\|(2), were used in place of the old
-locking mechanism. 
+locking mechanism.
 The mail system previously used \fIlink\fP and \fIunlink\fP in
-implementing file locking primitives. 
+implementing file locking primitives.
 Because these operations usually modify the contents of directories
 they require synchronous disk operations and cannot take
 advantage of the name cache maintained by the system.
 Unlink requires that the entry be found in the directory so that
-it can be removed; 
+it can be removed;
 link requires that the directory be scanned to insure that the name
 does not already exist.
 By contrast the advisory locking facility in 4.2BSD is
@@ -698,7 +700,7 @@ compiling it without debugging code reduced the overhead by another 20%.
 Network Servers
 .PP
 With the introduction of the network facilities in 4.2BSD,
-a myriad of services became available, each of which 
+a myriad of services became available, each of which
 required its own daemon process.
 Many of these daemons were rarely if ever used,
 yet they lay asleep in the process table consuming
diff --git a/share/doc/psd/21.ipc/3.t b/share/doc/psd/21.ipc/3.t
index 0d429cf..62e8c37 100644
--- a/share/doc/psd/21.ipc/3.t
+++ b/share/doc/psd/21.ipc/3.t
@@ -31,6 +31,8 @@
 .\"
 .\"	@(#)3.t	8.1 (Berkeley) 6/8/93
 .\"
+.\"	$FreeBSD$
+.\"
 .\".ds RH "Network Library Routines
 .bp
 .nr H1 3
@@ -245,7 +247,7 @@ struct	protoent {
 .DE
 .PP
 In the NS domain, protocols are indicated by the "client type"
-field of a IDP header.  No protocol database exists; see section
+field of an IDP header.  No protocol database exists; see section
 5 for more information.
 .NH 2
 Service names
diff --git a/share/doc/smm/01.setup/3.t b/share/doc/smm/01.setup/3.t
index 54531ad..0f3e859 100644
--- a/share/doc/smm/01.setup/3.t
+++ b/share/doc/smm/01.setup/3.t
@@ -380,7 +380,7 @@ the kernel will use
 .Pn \*(Dk1a
 as its root filesystem. If
 .Pn /dev/\*(Dk1b
-is configured as a swap partition, 
+is configured as a swap partition,
 it will be used as the initial swap area,
 otherwise the normal primary swap area (\c
 .Pn /dev/\*(Dk0b )
@@ -489,7 +489,7 @@ tape, extract them into a scratch directory, say
 .PP
 The data files marked in the previous table with a dagger (\(dg)
 may be used without change from the previous system.
-Those data files marked with a double dagger (\(dd) have syntax 
+Those data files marked with a double dagger (\(dd) have syntax
 changes or substantial enhancements.
 You should start with the \*(4B version and carefully
 integrate any local changes into the new file.
@@ -605,8 +605,8 @@ _	_	_
 /etc/passwd	/etc/master.passwd	new format; see below
 /usr/lib/sendmail.cf	/etc/sendmail.cf	changed pathnames
 /usr/lib/aliases	/etc/aliases	may contain changed pathnames
-/etc/*.pid	/var/run/*.pid	
-	
+/etc/*.pid	/var/run/*.pid
+
 .T&
 l l l
 lfC lfC l.
@@ -859,7 +859,7 @@ The ``daemon'' user is used for daemon processes that
 do not need root privileges.
 The ``operator'' user-id is used as an account for dumpers
 so that they can log in without having the root password.
-By placing them in the ``operator'' group, 
+By placing them in the ``operator'' group,
 they can get read access to the disks.
 The ``uucp'' login has existed long before \*(4B,
 and is noted here just to provide a common user-id.
@@ -1002,7 +1002,7 @@ privilege to set kernel state.
 .Sh 3 "Security"
 .PP
 The kernel runs with four different levels of security.
-Any superuser process can raise the security level, but only 
+Any superuser process can raise the security level, but only
 .Fn init (8)
 can lower it.
 Security levels are defined as follows:
@@ -1027,7 +1027,7 @@ but also inhibits running
 while the system is multi-user.
 See
 .Xr chflags (1)
-and the \-\fBo\fP option to 
+and the \-\fBo\fP option to
 .Xr ls (1)
 for information on setting and displaying the immutable and append-only
 flags.
@@ -1165,14 +1165,14 @@ structure into the kernel (e.g.
 .Fn sendto
 and
 .Fn connect )
-have a separate parameter that specifies the 
+have a separate parameter that specifies the
 .I sockaddr
 length, and thus it is not necessary to fill in the
 .I sa_len
 field for those system calls.
 System calls that pass a
 .I sockaddr
-structure back from the kernel (e.g. 
+structure back from the kernel (e.g.
 .Fn recvfrom
 and
 .Fn accept )
@@ -1319,7 +1319,7 @@ See
 and
 .Xr lfs_cleanerd (8)
 for more information.
-For a in-depth description of the implementation and performance
+For an in-depth description of the implementation and performance
 characteristics of log-structured filesystems in general,
 and this one in particular, see Dr. Margo Seltzer's doctoral thesis,
 available from the University of California Computer Science Department.
@@ -1328,7 +1328,7 @@ We have also added a memory-based filesystem that runs in
 pageable memory, allowing large temporary filesystems without
 requiring dedicated physical memory.
 .PP
-The local ``fast filesystem'' has been enhanced to do 
+The local ``fast filesystem'' has been enhanced to do
 clustering that allows large pieces of files to be
 allocated contiguously resulting in near doubling
 of filesystem throughput.
@@ -1355,7 +1355,7 @@ When set on a file,
 .Xr dump (8)
 will omit the file from incremental backups
 but retain them on full backups.
-See the ``-h'' flag to 
+See the ``-h'' flag to
 .Xr dump (8)
 for details on how to change this default.
 The ``nodump'' flag is usually set on core dumps,
@@ -1867,7 +1867,7 @@ yacc	A new, freely redistributable, significantly faster version.
 .PP
 The new versions of
 .Xr lex (1)
-(``flex'') and 
+(``flex'') and
 .Xr yacc (1)
 (``zoo'') should be installed early on if attempting to
 cross-compile \*(4B on another system.
@@ -1889,7 +1889,7 @@ for an example of their use.
 .Sh 2 "Hints on converting from \*(Ps to \*(4B"
 .PP
 This section summarizes changes between
-\*(Ps and \*(4B that are likely to 
+\*(Ps and \*(4B that are likely to
 cause difficulty in doing the conversion.
 It does not include changes in the network;
 see section 5 for information on setting up the network.
diff --git a/share/doc/smm/05.fastfs/3.t b/share/doc/smm/05.fastfs/3.t
index e2ac4ba..23db86a 100644
--- a/share/doc/smm/05.fastfs/3.t
+++ b/share/doc/smm/05.fastfs/3.t
@@ -31,6 +31,8 @@
 .\"
 .\"	@(#)3.t	8.1 (Berkeley) 6/8/93
 .\"
+.\"	$FreeBSD$
+.\"
 .ds RH New file system
 .NH
 New file system organization
@@ -55,7 +57,7 @@ bytes with only two levels of indirection,
 the minimum size of a file system block is 4096 bytes.
 The size of file system blocks can be any power of two
 greater than or equal to 4096.
-The block size of a file system is recorded in the 
+The block size of a file system is recorded in the
 file system's super-block
 so it is possible for file systems with different block sizes
 to be simultaneously accessible on the same system.
@@ -80,7 +82,7 @@ For each cylinder group a static number of inodes
 is allocated at file system creation time.
 The default policy is to allocate one inode for each 2048
 bytes of space in the cylinder group, expecting this
-to be far more than will ever be needed. 
+to be far more than will ever be needed.
 .PP
 All the cylinder group bookkeeping information could be
 placed at the beginning of each cylinder group.
@@ -109,7 +111,7 @@ This is because of a requirement that the first 8 kilobytes of the disk
 be reserved for a bootstrap program and a separate requirement that
 the cylinder group information begin on a file system block boundary.
 To start the cylinder group on a file system block boundary,
-file systems with block sizes larger than 8 kilobytes 
+file systems with block sizes larger than 8 kilobytes
 would have to leave an empty space between the end of
 the boot block and the beginning of the cylinder group.
 Without knowing the size of the file system blocks,
@@ -131,7 +133,7 @@ In large files, several
 4096 byte blocks may be allocated from the same cylinder so that
 even larger data transfers are possible before requiring a seek.
 .PP
-The main problem with 
+The main problem with
 larger blocks is that most UNIX
 file systems are composed of many small files.
 A uniformly large block size wastes space.
@@ -197,7 +199,7 @@ Figure 1 \- Example layout of blocks and fragments in a 4096/1024 file system.
 .KE
 Each bit in the map records the status of a fragment;
 an ``X'' shows that the fragment is in use,
-while a ``O'' shows that the fragment is available for allocation.
+while an ``O'' shows that the fragment is available for allocation.
 In this example,
 fragments 0\-5, 10, and 11 are in use,
 while fragments 6\-9, and 12\-15 are free.
@@ -256,7 +258,7 @@ a block with the necessary fragments is located,
 otherwise a full block is located.
 The remaining new data is written into the located space.
 .IP 3)
-The file contains one or more fragments (and the 
+The file contains one or more fragments (and the
 fragments contain insufficient space to hold the new data).
 If the size of the new data plus the size of the data
 already in the fragments exceeds the size of a full block,
@@ -274,7 +276,7 @@ appended with the new data
 are written into the allocated space.
 .PP
 The problem with expanding a file one fragment at a
-a time is that data may be copied many times as a 
+a time is that data may be copied many times as a
 fragmented block expands to a full block.
 Fragment reallocation can be minimized
 if the user program writes a full block at a time,
@@ -345,7 +347,7 @@ with the free space reserve set at 5%.
 (Compare 11.8% wasted with the old file system
 to 6.9% waste + 5% reserved space in the
 new file system.)
-.NH 2 
+.NH 2
 File system parameterization
 .PP
 Except for the initial creation of the free list,
@@ -353,11 +355,11 @@ the old file system ignores the parameters of the underlying hardware.
 It has no information about either the physical characteristics
 of the mass storage device,
 or the hardware that interacts with it.
-A goal of the new file system is to parameterize the 
+A goal of the new file system is to parameterize the
 processor capabilities and
 mass storage characteristics
 so that blocks can be allocated in an
-optimum configuration-dependent way. 
+optimum configuration-dependent way.
 Parameters used include the speed of the processor,
 the hardware support for mass storage transfers,
 and the characteristics of the mass storage devices.
@@ -370,8 +372,8 @@ it is placed.
 .PP
 For mass storage devices such as disks,
 the new file system tries to allocate new blocks
-on the same cylinder as the previous block in the same file. 
-Optimally, these new blocks will also be 
+on the same cylinder as the previous block in the same file.
+Optimally, these new blocks will also be
 rotationally well positioned.
 The distance between ``rotationally optimal'' blocks varies greatly;
 it can be a consecutive block
@@ -439,7 +441,7 @@ and the disk pack is then moved to a system that has a
 processor requiring 4 milliseconds to schedule a disk operation,
 the throughput will drop precipitously because of lost disk revolutions
 on nearly every block.
-If the eventual target machine is known, 
+If the eventual target machine is known,
 the file system can be parameterized for it
 even though it is initially created on a different processor.
 Even if the move is not known in advance,
@@ -464,7 +466,7 @@ the local allocation routines that use a locally optimal scheme to
 lay out data blocks.
 .PP
 Two methods for improving file system performance are to increase
-the locality of reference to minimize seek latency 
+the locality of reference to minimize seek latency
 as described by [Trivedi80], and
 to improve the layout of data to make larger transfers possible
 as described by [Nevalainen77].
@@ -486,7 +488,7 @@ while spreading out unrelated data.
 One allocatable resource is inodes.
 Inodes are used to describe both files and directories.
 Inodes of files in the same directory are frequently accessed together.
-For example, the ``list directory'' command often accesses 
+For example, the ``list directory'' command often accesses
 the inode for each file in a directory.
 The layout policy tries to place all the inodes of
 files in a directory in the same cylinder group.
@@ -547,10 +549,10 @@ a megabyte of data is typically accessible before
 a long seek must be performed,
 and the cost of one long seek per megabyte is small.
 .PP
-The global policy routines call local allocation routines with 
+The global policy routines call local allocation routines with
 requests for specific blocks.
 The local allocation routines will
-always allocate the requested block 
+always allocate the requested block
 if it is free, otherwise it
 allocates a free block of the requested size that is
 rotationally closest to the requested block.
@@ -558,7 +560,7 @@ If the global layout policies had complete information,
 they could always request unused blocks and
 the allocation routines would be reduced to simple bookkeeping.
 However, maintaining complete information is costly;
-thus the implementation of the global layout policy 
+thus the implementation of the global layout policy
 uses heuristics that employ only partial information.
 .PP
 If a requested block is not available, the local allocator uses
@@ -566,7 +568,7 @@ a four level allocation strategy:
 .IP 1)
 Use the next available block rotationally closest
 to the requested block on the same cylinder.  It is assumed
-here that head switching time is zero.  On disk 
+here that head switching time is zero.  On disk
 controllers where this is not the case, it may be possible
 to incorporate the time required to switch between disk platters
 when constructing the rotational layout tables.  This, however,
@@ -575,7 +577,7 @@ has not yet been tried.
 If there are no blocks available on the same cylinder,
 use a block within the same cylinder group.
 .IP 3)
-If that cylinder group is entirely full, 
+If that cylinder group is entirely full,
 quadratically hash the cylinder group number to choose
 another cylinder group to look for a free block.
 .IP 4)
diff --git a/share/doc/smm/06.nfs/1.t b/share/doc/smm/06.nfs/1.t
index 0806cad..57d1b9c 100644
--- a/share/doc/smm/06.nfs/1.t
+++ b/share/doc/smm/06.nfs/1.t
@@ -85,7 +85,7 @@ use of the Sun RPC library.
 .sh 1 "Mount Problems"
 .pp
 There are several problems that can be encountered at the time of an NFS
-mount, ranging from a unresponsive NFS server (crashed, network partitioned
+mount, ranging from an unresponsive NFS server (crashed, network partitioned
 from client, etc.) to various interoperability problems between different
 NFS implementations.
 .pp
diff --git a/share/doc/smm/06.nfs/2.t b/share/doc/smm/06.nfs/2.t
index 841dd5f..85e2896 100644
--- a/share/doc/smm/06.nfs/2.t
+++ b/share/doc/smm/06.nfs/2.t
@@ -34,6 +34,8 @@
 .\"
 .\"	@(#)2.t	8.1 (Berkeley) 6/8/93
 .\"
+.\"	$FreeBSD$
+.\"
 .sh 1 "Not Quite NFS, Crash Tolerant Cache Consistency for NFS"
 .pp
 Not Quite NFS (NQNFS) is an NFS like protocol designed to maintain full cache
@@ -127,7 +129,7 @@ the number of seconds the server is willing to wait for a client with
 an expired write caching lease to push dirty writes.
 .pp
 The server maintains a \fBmodify_revision\fR number for each file. It is
-defined as a unsigned quadword integer that is never zero and that must
+defined as an unsigned quadword integer that is never zero and that must
 increase whenever the corresponding file is modified on the server.
 It is used
 by the client to determine whether or not cached data for the file is
@@ -400,7 +402,7 @@ modifyrev
 .(l
         typedef unsigned hyper modifyrev;
 .)l
-The "modifyrev" is a unsigned quadword integer value that is never zero
+The "modifyrev" is an unsigned quadword integer value that is never zero
 and increases every time the corresponding file is modified on the server.
 .ip \(bu
 nqnfs_time
diff --git a/share/doc/smm/18.net/7.t b/share/doc/smm/18.net/7.t
index 8ccecc8..e165de0 100644
--- a/share/doc/smm/18.net/7.t
+++ b/share/doc/smm/18.net/7.t
@@ -31,6 +31,8 @@
 .\"
 .\"	@(#)7.t	8.1 (Berkeley) 6/8/93
 .\"
+.\"	$FreeBSD$
+.\"
 .nr H2 1
 .br
 .ne 30v
@@ -115,7 +117,7 @@ to carry out this request (if possible).  A ``listen'' request
 always precedes a request to accept a connection.
 .IP PRU_CONNECT
 .br
-The ``connect'' request indicates the user wants to a establish
+The ``connect'' request indicates the user wants to establish
 an association.  The \fIaddr\fP parameter supplied describes
 the peer to be connected to.  The effect of a connect request
 may vary depending on the protocol.  Virtual circuit protocols,
diff --git a/share/doc/usd/18.msdiffs/ms.diffs b/share/doc/usd/18.msdiffs/ms.diffs
index 1193f6f..10eb449 100644
--- a/share/doc/usd/18.msdiffs/ms.diffs
+++ b/share/doc/usd/18.msdiffs/ms.diffs
@@ -31,6 +31,8 @@
 .\"
 .\"	@(#)ms.diffs	8.1 (Berkeley) 6/8/93
 .\"
+.\"	$FreeBSD$
+.\"
 .nr LL 6.5i
 .nr FL 6.0i
 .if t .nr PD .5v
@@ -268,7 +270,7 @@ This document was produced with:
 \&.OH  \'\ef\^IThe  -mx  Macros\'\'Page  %\ef\^P\'
 \&.EH  \'\ef\^IPage  %\'\'The  -mx  Macros\ef\^P\'
 .DE
-Note that it would be a error to have an apostrophe in the header text;
+Note that it would be an error to have an apostrophe in the header text;
 if you need one, you will have to use a different delimiter
 around the left, center, and right portions of the title.
 You can use any character as a delimiter, provided it doesn't appear
diff --git a/share/doc/usd/21.troff/m1 b/share/doc/usd/21.troff/m1
index ff9194d..0df1d52 100644
--- a/share/doc/usd/21.troff/m1
+++ b/share/doc/usd/21.troff/m1
@@ -1,26 +1,26 @@
 .\" Copyright (C) Caldera International Inc. 2001-2002.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions are
 .\" met:
-.\" 
+.\"
 .\" Redistributions of source code and documentation must retain the above
 .\" copyright notice, this list of conditions and the following
 .\" disclaimer.
-.\" 
+.\"
 .\" Redistributions in binary form must reproduce the above copyright
 .\" notice, this list of conditions and the following disclaimer in the
 .\" documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" All advertising materials mentioning features or use of this software
 .\" must display the following acknowledgement:
-.\" 
+.\"
 .\" This product includes software developed or owned by Caldera
 .\" International, Inc.  Neither the name of Caldera International, Inc.
 .\" nor the names of other contributors may be used to endorse or promote
 .\" products derived from this software without specific prior written
 .\" permission.
-.\" 
+.\"
 .\" USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
 .\" INTERNATIONAL, INC.  AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -33,7 +33,7 @@
 .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\"	@(#)m1	8.1 (Berkeley) 8/14/93
 .\"
 .\" $FreeBSD$
@@ -381,7 +381,7 @@ A paired sequence
 will work because the previous requested value is also remembered.
 Ignored in \*(NR.
 .bt
-\fB&fz\fI|F|\(+-N\fR	off	-	E	The characters in font \fIF\fR will be adjusted to 
+\fB&fz\fI|F|\(+-N\fR	off	-	E	The characters in font \fIF\fR will be adjusted to
 be in size \(+-\fIN\fR.  Characters in the Special Font encountered during the
 use of font \fIF\fR will have the same size modification. (Use the \fB&fz S\fR
 request if different treatment of Special Font characters is required). \fB&fz\fR
@@ -524,7 +524,7 @@ or, if \fIN\fR is absent, to a
 place marked by a previous \fBmk\fR.
 Note that the \fBsp\fR request (\(sc5.3) may be used
 in all cases instead of \fBrt\fR
-by spacing to the absolute place stored in a explicit register;
+by spacing to the absolute place stored in an explicit register;
 e.|g. using the sequence \fB.mk|\fIR\fR ... \fB.sp|~\|\en\fIR\fBu\fR.
 .mh
 Text Filling, Adjusting, and Centering
@@ -532,7 +532,7 @@ Text Filling, Adjusting, and Centering
 Filling and adjusting.
 Normally,
 words are collected from input text lines
-and assembled into a output text line
+and assembled into an output text line
 until some word doesn't fit.
 An attempt is then made
 to hyphenate the word to assemble a part
@@ -589,7 +589,7 @@ using \fBtr\fR (\(sc10.5).
 .tr &.
 .sc
 Interrupted text.
-The copying of a input line in \fInofill\fR
+The copying of an input line in \fInofill\fR
 (non-fill) mode can be \fIinterrupted\fR by terminating
 the partial line with a \fB\ec\fR.
 The \fInext\fR encountered input text line will be considered to be a continuation
diff --git a/share/doc/usd/21.troff/m2 b/share/doc/usd/21.troff/m2
index a0130cc..b94f478 100644
--- a/share/doc/usd/21.troff/m2
+++ b/share/doc/usd/21.troff/m2
@@ -1,26 +1,26 @@
 .\" Copyright (C) Caldera International Inc. 2001-2002.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions are
 .\" met:
-.\" 
+.\"
 .\" Redistributions of source code and documentation must retain the above
 .\" copyright notice, this list of conditions and the following
 .\" disclaimer.
-.\" 
+.\"
 .\" Redistributions in binary form must reproduce the above copyright
 .\" notice, this list of conditions and the following disclaimer in the
 .\" documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" All advertising materials mentioning features or use of this software
 .\" must display the following acknowledgement:
-.\" 
+.\"
 .\" This product includes software developed or owned by Caldera
 .\" International, Inc.  Neither the name of Caldera International, Inc.
 .\" nor the names of other contributors may be used to endorse or promote
 .\" products derived from this software without specific prior written
 .\" permission.
-.\" 
+.\"
 .\" USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
 .\" INTERNATIONAL, INC.  AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -33,7 +33,7 @@
 .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\"	@(#)m2	8.1 (Berkeley) 8/14/93
 .\"
 .\" $FreeBSD$
@@ -167,7 +167,7 @@ arguments is in the \fB.$\fR register.
 No arguments are available at the top (non-macro) level
 in this implementation.
 Because string referencing is implemented
-as a input-level push down,
+as an input-level push down,
 no arguments are available from \fIwithin\fR a string.
 No arguments are available within a trap-invoked macro.
 .pg
diff --git a/share/doc/usd/22.trofftut/tt04 b/share/doc/usd/22.trofftut/tt04
index f78ec6d..c44c94b 100644
--- a/share/doc/usd/22.trofftut/tt04
+++ b/share/doc/usd/22.trofftut/tt04
@@ -4,28 +4,28 @@
 .\"
 .\"	@(#)tt04	8.1 (Berkeley) 6/8/93
 .\" Copyright (C) Caldera International Inc. 2001-2002.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions are
 .\" met:
-.\" 
+.\"
 .\" Redistributions of source code and documentation must retain the above
 .\" copyright notice, this list of conditions and the following
 .\" disclaimer.
-.\" 
+.\"
 .\" Redistributions in binary form must reproduce the above copyright
 .\" notice, this list of conditions and the following disclaimer in the
 .\" documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" All advertising materials mentioning features or use of this software
 .\" must display the following acknowledgement:
-.\" 
+.\"
 .\" This product includes software developed or owned by Caldera
 .\" International, Inc.  Neither the name of Caldera International, Inc.
 .\" nor the names of other contributors may be used to endorse or promote
 .\" products derived from this software without specific prior written
 .\" permission.
-.\" 
+.\"
 .\" USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
 .\" INTERNATIONAL, INC.  AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -38,7 +38,7 @@
 .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\" $FreeBSD$
 .\"
 .NH
@@ -114,7 +114,7 @@ makes them one inch
 .ul
 long.
 .PP
-With 
+With
 .BD .in ,
 .BD .ll
 and
@@ -139,7 +139,7 @@ as for most horizontally oriented commands
 is ems;
 an em is roughly the width of the letter `m'
 in the current point size.
-(Precisely, a em in size
+(Precisely, an em in size
 .ul
 p
 is
diff --git a/share/examples/ipfilter/examples.txt b/share/examples/ipfilter/examples.txt
index 8444908..a323a84 100644
--- a/share/examples/ipfilter/examples.txt
+++ b/share/examples/ipfilter/examples.txt
@@ -350,7 +350,7 @@ in brackets following the "return-icmp" directive:
 block return-icmp (3) in proto udp from any to any port > 30000
 block return-icmp (port-unr) in proto udp from any to any port > 30000
 
-Those two examples are equivalent, and return a ICMP port unreachable error
+Those two examples are equivalent, and return an ICMP port unreachable error
 packet to in response to any UDP packet received destined for a port greater
 than 30,000.
   ------------------------------------------------------------------------
diff --git a/share/examples/ipfilter/ipf-howto.txt b/share/examples/ipfilter/ipf-howto.txt
index baef95c..73a1ecf 100644
--- a/share/examples/ipfilter/ipf-howto.txt
+++ b/share/examples/ipfilter/ipf-howto.txt
@@ -2182,7 +2182,7 @@ ing.ps.gz>
                             -34-
 
 
-This  is  a ICMP router discovery broadcast.  We can tell by
+This  is an ICMP router discovery broadcast.  We can tell by
 the ICMP type 9/0.
 
 Finally, ipmon also lets us look at the NAT table in action.
diff --git a/share/examples/isdn/FAQ b/share/examples/isdn/FAQ
index b8e5be4..b32ce7b 100644
--- a/share/examples/isdn/FAQ
+++ b/share/examples/isdn/FAQ
@@ -485,16 +485,16 @@ kind of problem to look into his BIOS.
 i4b now works for me, I had a USB-device interfering on IRQ 9,
 which was supposed to be only for my Creatix Card.
 (NetBSD 1.3, Creatix)
-	
+
 Strange enough, my DOS s0-test worked, are they just polling the card?
-	
+
 Even when the testsoftware under DOS is working, don't be shure, that
 your hw-setup is correct for xxx(x)BSD. Triplecheck all your IRQ and
 enable and disable PNP to triple-verify. Even unconfigured devices can
 block your card. .....
-	
+
 And that took me more than 2 months to discover :-((((
-	
+
 			(from Andreas Lohrum, andreas.lohrum@consol.de)
 
 
@@ -1016,7 +1016,7 @@ But I could not use the card, because I forgot
 
 Q: Hi,
 
-   I am trying to set up a ELSA QuickStep 1000pro PCI ISDN adaptor in a FreeBSD
+   I am trying to set up an ELSA QuickStep 1000pro PCI ISDN adaptor in a FreeBSD
    3.3 box. I configured the kernel according to the i4b.ps documentation. At
    boottime, these messages are displayed:
 
diff --git a/share/examples/isdn/Overview b/share/examples/isdn/Overview
index e8e09e2..8313506 100644
--- a/share/examples/isdn/Overview
+++ b/share/examples/isdn/Overview
@@ -18,7 +18,7 @@ Contents:
 	Layer 2
 	Layer 3
 	Debugging control
-	Layer 4    
+	Layer 4
 	ISDN protocol trace
 
 
@@ -43,7 +43,7 @@ Functional block diagram
  | debug |  |     Layer 4 - common call control interface        |   |  ISDN  |
  |control|  |                                                    |   | trace  |
  +:-:-:--+  +----------------------------------------------------+   +--------+
-  : : :          ^                                          ^              ^ 
+  : : :          ^                                          ^              ^
   : : :     Call |           various ptr arrays             | Call         %
   . . .  Control |             in i4b_l3l4.h                | Control      %
                  V                                          V              %
@@ -111,14 +111,14 @@ Layer 1
    routines. These routines handle the card/manufacturer specific stuff
    required to talk to a particular card.
 
-   This addresses of the read/write routines are put into a arrays found
+   The addresses of the read/write routines are put into an array found
    in struct isic_softc and they are later called by the macros:
 
    ISAC_READ(r), ISAC_WRITE(r,v), ISAC_RDFIFO(b,s), ISAC_WRFIFO(b,s),
    HSCX_READ(n,r), HSCX_WRITE(n,r,v), HSCX_RDFIFO(n,b,s), HSCX_WRFIFO(n,b,s)
 
    (see file layer1/i4b_l1.h)
-   
+
    Files currently used for this purpose are
    	- i4b_avm_a1.c    AVM A1 and AVM Fritz!Card drivers
    	- i4b_ctx_s0P.c   Creatix S0 PnP (experimental!)
@@ -256,7 +256,7 @@ Debugging control
     sources. It is only usable for passive cards.
 
 
-Layer 4    
+Layer 4
 =======
 
 (7) Layer 4 is "just" an abstraction layer used to shield the differences
diff --git a/share/examples/isdn/i4brunppp/README b/share/examples/isdn/i4brunppp/README
index ea0ba9a..81ebe75 100644
--- a/share/examples/isdn/i4brunppp/README
+++ b/share/examples/isdn/i4brunppp/README
@@ -3,12 +3,12 @@ $FreeBSD$
 BEWARE: HIGHLY EXPERIMENTAL!
 ---------------------------
 
-This program is used in conjunction with a isdnd.rc entry similar to
+This program is used in conjunction with an isdnd.rc entry similar to
 
 	regexpr = "ULPPP.*call active"   # look for matches in log messages
 	regprog = i4brunppp              # execute program when match is found
 
-this one (see also i4brunppp-isdnd.rc). 
+this one (see also i4brunppp-isdnd.rc).
 
 i4brunppp _must_ be put into /etc/isdn!
 
@@ -16,4 +16,3 @@ When an active call is detected, isdnd fires off i4brunppp, which attaches
 the rbch device used to stdin/stdout and then runs ppp which is given the
 "-direct" command and the string "inc_rbchX" (where X is the i4brbch unit
 number) as arguments.
-
diff --git a/share/examples/isdn/i4brunppp/i4brunppp.c b/share/examples/isdn/i4brunppp/i4brunppp.c
index cb239d8..7d1fe3c 100644
--- a/share/examples/isdn/i4brunppp/i4brunppp.c
+++ b/share/examples/isdn/i4brunppp/i4brunppp.c
@@ -35,8 +35,8 @@
  *
  * BEWARE: HIGHLY EXPERIMENTAL!
  * ---------------------------
- * 
- * This program is used in conjunction with a isdnd.rc entry similar to
+ *
+ * This program is used in conjunction with an isdnd.rc entry similar to
  *
  *  regexpr = "ULPPP.*call active"   # look for matches in log messages
  *  regprog = i4brunppp              # execute program when match is found
@@ -62,7 +62,7 @@
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_rbch_ioctl.h>
 
-#define I4BDEVICE	"/dev/i4b"	
+#define I4BDEVICE	"/dev/i4b"
 
 #define PPPPROG		"/usr/sbin/ppp"
 #define PPPNAME		"ppp"
@@ -85,21 +85,21 @@ main(int argc, char **argv)
 	char *p = "DeadPointer";
 	int found;
 	int i;
-	
+
 #ifdef PPPDEBUG
 	FILE *dfp;
 	time_t tim;
         register struct tm *tp;
 #endif
-	
+
 	/* open syslog */
-	
+
 	(void)openlog("i4brunppp", LOG_PID|LOG_CONS|LOG_NDELAY, LOG_USER);
 
 #ifdef PPPDEBUG
 
 	/* open debug log */
-	
+
 	if((dfp = fopen("/tmp/i4brunppp-debug.log", "a")) == NULL)
 	{
 		syslog(LOG_INFO, "cannot open logfile: %s", strerror(errno));
@@ -116,9 +116,9 @@ main(int argc, char **argv)
 #endif
 
 	/* check if this is the right message */
-	
+
 	found = 0;
-	
+
 	for(i=0; i < argc; i++)
 	{
 		if((strstr(argv[i], VERIFYSTRING)) != NULL)
@@ -135,11 +135,11 @@ main(int argc, char **argv)
 #endif
 		exit(0);
 	}
-		
+
 	found = 0;
 
 	/* check if we got a good device name */
-	
+
 	for(; i < argc; i++)
 	{
 		if((p = strstr(argv[i], DEVSTRING)) != NULL)
@@ -157,10 +157,10 @@ main(int argc, char **argv)
 		exit(0);
 	}
 
-	/* everything ok, now prepare for running ppp */	
+	/* everything ok, now prepare for running ppp */
 
 	/* close all file descriptors */
-	
+
 	i = getdtablesize();
 
 	for(;i >= 0; i--)
@@ -168,7 +168,7 @@ main(int argc, char **argv)
 		close(i);
 
 	/* fiddle a terminating zero after the rbch unit number */
-	
+
 	p += strlen(DEVSTRING);
 
 	if(isdigit(*p) && isdigit(*(p+1)))
@@ -177,16 +177,16 @@ main(int argc, char **argv)
 		*(p+1) = '\0';
 
 	/* construct /dev/i4brbchX device name */
-	
+
 	sprintf(buffer, "%s%s%s", I4BDEVICE, DEVSTRING, p);
 
 	/* open the rbch device as fd 0 = stdin */
-	
+
 	rbch_fd = open(buffer, O_RDWR);
 
 	if(rbch_fd != 0)
 	{
-		if(rbch_fd < 0)		
+		if(rbch_fd < 0)
 			syslog(LOG_INFO, "cannot open %s: %s", buffer, strerror(errno));
 		else
 			syslog(LOG_INFO, "cannot open %s as fd 0 (is %d): %s", buffer, rbch_fd, strerror(errno));
@@ -194,10 +194,10 @@ main(int argc, char **argv)
 	}
 
 	/* dup rbch device fd as fd 1 = stdout */
-	
+
 	if((i = dup(rbch_fd)) != 1)
 	{
-		if(i < 0)		
+		if(i < 0)
 			syslog(LOG_INFO, "cannot dup rbch_fd: %s", strerror(errno));
 		else
 			syslog(LOG_INFO, "cannot dup rbch as fd 1 (is %d): %s", i, strerror(errno));
@@ -205,13 +205,13 @@ main(int argc, char **argv)
 	}
 
 	/* construct the label for ppp's ppp.conf file */
-	
+
 	sprintf(buffer, "%s%s%s", PPPLABEL, DEVSTRING, p);
 
 	syslog(LOG_INFO, "executing: %s %s %s %s", PPPPROG, PPPNAME, PPPARG1, buffer);
 
 	/* execute ppp */
-	
+
 	if((execl(PPPPROG, PPPNAME, PPPARG1, buffer, NULL)) == -1)
 	{
 		syslog(LOG_INFO, "cannot exec: %s", strerror(errno));
diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample
index db6cdf1..9d0539d 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -108,7 +108,7 @@ PAPorCHAPpmdemand:
 #
 #  With static IP numbers, our setup is similar to dynamic:
 #  Remember, ppp.linkup is searched for a "192.244.176.44" label, then
-#  a "ondemand" label, and finally the "MYADDR" label.
+#  an "ondemand" label, and finally the "MYADDR" label.
 #
 ondemand:
  set phone 1234567
@@ -354,16 +354,16 @@ dodgynet:
     # If the remote host allowed IP forwarding and we wanted to use it, the
     # following rules could be split into two groups to separately validate
     # the source and destination addresses.
-    set filter dial  7 permit 172.17.16.0/20  172.17.20.248 
-    set filter dial  8 permit 172.17.36.0/22  172.17.20.248 
-    set filter dial  9 permit 172.17.118.0/26 172.17.20.248 
-    set filter dial 10 permit 10.123.5.0/24   172.17.20.248 
+    set filter dial  7 permit 172.17.16.0/20  172.17.20.248
+    set filter dial  8 permit 172.17.36.0/22  172.17.20.248
+    set filter dial  9 permit 172.17.118.0/26 172.17.20.248
+    set filter dial 10 permit 10.123.5.0/24   172.17.20.248
 
     # Once the link's up, limit outgoing access to the specified hosts
-    set filter out  0 4      172.17.16.0/20  172.17.20.248 
-    set filter out  1 4      172.17.36.0/22  172.17.20.248 
-    set filter out  2 4      172.17.118.0/26 172.17.20.248 
-    set filter out  3 deny ! 10.123.5.0/24   172.17.20.248 
+    set filter out  0 4      172.17.16.0/20  172.17.20.248
+    set filter out  1 4      172.17.36.0/22  172.17.20.248
+    set filter out  2 4      172.17.118.0/26 172.17.20.248
+    set filter out  3 deny ! 10.123.5.0/24   172.17.20.248
 
     # Allow established TCP connections
     set filter out  4 permit 0 0 tcp estab
@@ -481,7 +481,7 @@ direct-client:
  set ifaddr 10.0.4.2 10.0.4.1
  enable lqr
  accept lqr
- 
+
 direct-server:
  set timeout 0
  set lqrperiod 10
@@ -567,7 +567,7 @@ inet-loop:
  set login
  set ifaddr 127.0.0.2 127.0.0.3
  set server /var/run/ppp/loop "" 0177
- 
+
 inet-loop-in:
  set timeout 0
  set log phase lcp ipcp command
@@ -687,8 +687,8 @@ mloop:
  clone 1 2 3
  link deflink remove
  # dial
- # link 2 dial 
- # link 3 dial 
+ # link 2 dial
+ # link 3 dial
 
 mloop-in:
  set timeout 0                                 # No idle timer
@@ -780,10 +780,10 @@ loop:
  set device "!ppp -direct loop-in"
  set dial
  set login
- set ifaddr 10.0.1.1/0 10.0.10.1-10.0.19.255   
+ set ifaddr 10.0.1.1/0 10.0.10.1-10.0.19.255
  disable deflate pred1 mppe
  deny deflate pred1 mppe
- 
+
 loop-in:
  set timeout 0
  set log
diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index 24d9098..b19b0de 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -117,7 +117,7 @@ the exact key meanings from the kernel (fx. used by the X server).
 .Pp
 The function keys can be programmed using the SETFKEY ioctl call.
 .Pp
-This ioctl takes a argument of the type fkeyarg_t:
+This ioctl takes an argument of the type fkeyarg_t:
 .Bd -literal -offset indent
 		struct fkeyarg {
 			u_short	keynum;
diff --git a/share/man/man4/polling.4 b/share/man/man4/polling.4
index bb7eb57..9b62058 100644
--- a/share/man/man4/polling.4
+++ b/share/man/man4/polling.4
@@ -34,7 +34,7 @@ which ultimately reduces the chances of livelock in the system.
 In the normal, interrupt-based mode, devices generate an interrupt
 whenever they need attention.
 This in turn causes a
-context switch and the execution of a interrupt handler
+context switch and the execution of an interrupt handler
 which performs whatever processing is needed by the device.
 The duration of the interrupt handler is potentially unbounded
 unless the device driver has been programmed with real-time
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index f9f102c..76ae738 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -1164,7 +1164,7 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m)
 		if ((pmap->pm_pdir[PTDPTDI] & PG_FRAME) ==
 		    (PTDpde & PG_FRAME)) {
 			/*
-			 * Do a invltlb to make the invalidated mapping
+			 * Do an invltlb to make the invalidated mapping
 			 * take effect immediately.
 			 */
 			pteva = VM_MAXUSER_ADDRESS + i386_ptob(m->pindex);
diff --git a/sys/amd64/include/_limits.h b/sys/amd64/include/_limits.h
index 4f3afe1..e740acf 100644
--- a/sys/amd64/include/_limits.h
+++ b/sys/amd64/include/_limits.h
@@ -82,8 +82,8 @@
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
 
 /* Quads and longs are the same on the alpha.  Ensure they stay in sync. */
 #define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h
index 4f3afe1..e740acf 100644
--- a/sys/amd64/include/limits.h
+++ b/sys/amd64/include/limits.h
@@ -82,8 +82,8 @@
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
 
 /* Quads and longs are the same on the alpha.  Ensure they stay in sync. */
 #define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 56810ce..1bfdf3f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -415,7 +415,7 @@ device		musycc	# LMC/SBE LMC1504 quad T1/E1
 # Network interfaces:
 #  The `loop' device is MANDATORY when networking is enabled.
 #  The `ether' device provides generic code to handle
-#  Ethernets; it is MANDATORY when a Ethernet device driver is
+#  Ethernets; it is MANDATORY when an Ethernet device driver is
 #  configured or token-ring is enabled.
 #  The `fddi' device provides generic code to support FDDI.
 #  The `arcnet' device provides generic code to support Arcnet.
@@ -1978,7 +1978,7 @@ device		iicsmb		# smb over i2c bridge
 options 	PPC_PROBE_CHIPSET # Enable chipset specific detection
 				  # (see flags in ppc(4))
 options 	DEBUG_1284	# IEEE1284 signaling protocol debug
-options 	PERIPH_1284	# Makes your computer act as a IEEE1284
+options 	PERIPH_1284	# Makes your computer act as an IEEE1284
 				# compliant peripheral
 options 	DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
 options 	VP0_DEBUG	# ZIP/ZIP+ debug
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index 66bfe12..7027cc7 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -846,7 +846,7 @@ acpi_pci_link_set_bootdisabled_priority(void)
 	TAILQ_INIT(&sorted_list);
 	while (!TAILQ_EMPTY(&acpi_pci_link_entries)) {
 		link = TAILQ_FIRST(&acpi_pci_link_entries);
-		/* find a entry which have the highest priority. */
+		/* find an entry which has the highest priority. */
 		TAILQ_FOREACH(link_pri, &acpi_pci_link_entries, links) {
 			if (link->priority < link_pri->priority) {
 				link = link_pri;
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index f43a41f..b4dc58b 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -306,7 +306,7 @@ aha_probe(struct aha_softc* aha)
 
 	/*
 	 * Get the board ID.  We use this to see if we're dealing with
-	 * a buslogic card or a aha card (or clone).
+	 * a buslogic card or an aha card (or clone).
 	 */
 	error = aha_cmd(aha, AOP_INQUIRE_BOARD_ID, NULL, /*parmlen*/0,
 		       (u_int8_t*)&board_id, sizeof(board_id),
@@ -806,7 +806,7 @@ ahaaction(struct cam_sim *sim, union ccb *ccb)
 		struct	aha_hccb *hccb;
 
 		/*
-		 * get a accb to use.
+		 * Get an accb to use.
 		 */
 		if ((accb = ahagetccb(aha)) == NULL) {
 			int s;
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index 552d20e..fe5150a 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.h
@@ -31,7 +31,7 @@
 #define _IF_ARREGS_H_
 
 #define NCHAN			2    /* A HD64570 chip have 2 channels */
-#define NPORT			4    /* A ArNet board can have 4 ports or */
+#define NPORT			4    /* An ArNet board can have 4 ports or */
 				     /* channels */
 
 #define AR_BUF_SIZ		512
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index c9a2959..4e1c284 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -988,7 +988,7 @@ ASR_queue_s (
 } /* ASR_queue_s */
 
 /*
- *	Send a message synchronously to a Asr_softc_t
+ *	Send a message synchronously to an Asr_softc_t.
  */
 STATIC int
 ASR_queue_c (
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index ff2f589..a243c04 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -325,7 +325,7 @@ uSHORT		osdDestroySemaphore(SEMAPHORE_T);
 uLONG		osdRequestSemaphore(SEMAPHORE_T,uLONG);
   /* Release access to the specified mutually exclusive semaphore */
 uSHORT		osdReleaseSemaphore(SEMAPHORE_T);
-	/* wait for a event to happen */
+	/* wait for an event to happen */
 uLONG				 osdWaitForEventSemaphore(SEMAPHORE_T, uLONG);
 	/* signal an event */
 uLONG				 osdSignalEventSemaphore(SEMAPHORE_T);
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 88280d1..d186586 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -3417,7 +3417,7 @@ tulip_rx_intr(
 	     * those buffers and chain to the starting mbuf.  All buffers but
 	     * the last buffer have the same length so we can set that now.
 	     * (we add to last_offset instead of multiplying since we normally
-	     * won't go into the loop and thereby saving a ourselves from
+	     * won't go into the loop and thereby saving ourselves from
 	     * doing a multiplication by 0 in the normal case).
 	     */
 	    _IF_DEQUEUE(&sc->tulip_rxq, ms);
@@ -3918,7 +3918,7 @@ tulip_intr_handler(
 
 #if defined(TULIP_USE_SOFTINTR)
 /*
- * This is a experimental idea to alleviate problems due to interrupt
+ * This is an experimental idea to alleviate problems due to interrupt
  * livelock.  What is interrupt livelock?  It's when you spend all your
  * time servicing device interrupts and never drop below device ipl
  * to do "useful" work.
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 5ad04e3..8d1c849 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -936,7 +936,7 @@ ed_probe_Novell_generic(dev, flags)
 	/*
 	 * I don't know if this is necessary; probably cruft leftover from
 	 * Clarkson packet driver code. Doesn't do a thing on the boards I've
-	 * tested. -DG [note that a outb(0x84, 0) seems to work here, and is
+	 * tested. -DG [note that an outb(0x84, 0) seems to work here, and is
 	 * non-invasive...but some boards don't seem to reset and I don't have
 	 * complete documentation on what the 'right' thing to do is...so we
 	 * do the invasive thing for now. Yuck.]
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index 307323f..c447530 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -754,7 +754,7 @@ ed98_probe_Novell(dev, port_rid, flags)
 	/*
 	 * I don't know if this is necessary; probably cruft leftover from
 	 * Clarkson packet driver code. Doesn't do a thing on the boards I've
-	 * tested. -DG [note that a outb(0x84, 0) seems to work here, and is
+	 * tested. -DG [note that an outb(0x84, 0) seems to work here, and is
 	 * non-invasive...but some boards don't seem to reset and I don't have
 	 * complete documentation on what the 'right' thing to do is...so we
 	 * do the invasive thing for now. Yuck.]
diff --git a/sys/dev/em/if_em_hw.h b/sys/dev/em/if_em_hw.h
index 9e6172d..6f1874c 100644
--- a/sys/dev/em/if_em_hw.h
+++ b/sys/dev/em/if_em_hw.h
@@ -280,7 +280,7 @@ void em_write_reg_io(struct em_hw *hw, uint32_t offset, uint32_t value);
 #define HALF_DUPLEX 1
 #define FULL_DUPLEX 2
 
-/* The sizes (in bytes) of a ethernet packet */
+/* The sizes (in bytes) of an ethernet packet */
 #define ENET_HEADER_SIZE             14
 #define MAXIMUM_ETHERNET_FRAME_SIZE  1518 /* With FCS */
 #define MINIMUM_ETHERNET_FRAME_SIZE  64   /* With FCS */
diff --git a/sys/dev/hea/eni.h b/sys/dev/hea/eni.h
index e3fd644..0133458 100644
--- a/sys/dev/hea/eni.h
+++ b/sys/dev/hea/eni.h
@@ -365,7 +365,7 @@ typedef volatile struct vci_table VCI_Table;
 /*
  * Access to Serial EEPROM [as opposed to expansion (E)PROM].
  *
- * This is a ATMEL AT24C01 serial EEPROM part.
+ * This is an ATMEL AT24C01 serial EEPROM part.
  * See http://www.atmel.com/atmel/products/prod162.htm for timimg diagrams
  * for START/STOP/ACK/READ cycles.
  */
@@ -387,7 +387,7 @@ typedef volatile struct vci_table VCI_Table;
  * Device VCC Entry
  *
  * Contains the common and ENI-specific information for each VCC
- * which is opened through a ENI device.
+ * which is opened through an ENI device.
  */
 struct eni_vcc {
 	struct cmn_vcc	ev_cmn;		/* Common VCC stuff */
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index 9fc3cab..dd08b75 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -951,8 +951,8 @@ idt_connect_opencls(IDT * idt, CONNECTION * connection, int opflag)
  *    the DMA address.
  *
  *    returns -1 if queue is full, the address is not word aligned, or
- *    a invalid queue is specified
- *    returns 0 if parameters were acceptable
+ *    an invalid queue is specified.
+ *    returns 0 if parameters were acceptable.
  */
 
 int
diff --git a/sys/dev/idt/idtvar.h b/sys/dev/idt/idtvar.h
index 16e0c45..6761a00 100644
--- a/sys/dev/idt/idtvar.h
+++ b/sys/dev/idt/idtvar.h
@@ -196,7 +196,7 @@ typedef struct idt_softc IDT;
  * Device VCC Entry
  * 
  * Contains the common and IDT-specific information for each VCC
- * which is opened through a IDT device.
+ * which is opened through an IDT device.
  */
 struct nidt_vcc {
 	struct cmn_vcc iv_cmn;  /* Common VCC stuff */
diff --git a/sys/dev/isp/Hardware.txt b/sys/dev/isp/Hardware.txt
index dfdc0e7..75f01bf 100644
--- a/sys/dev/isp/Hardware.txt
+++ b/sys/dev/isp/Hardware.txt
@@ -147,7 +147,7 @@ JMR 4-Bay
 
 JMR Fortra
 
-	I rather like this box. The blue LEDs are a very nice touch- you 
+	I rather like this box. The blue LEDs are a very nice touch- you
 	can see them very clearly from 50 feet away.
 
 	I paid 2000$ for one used.
@@ -159,7 +159,7 @@ Sun A5X00
 	code in /usr/share/examples) for power/thermal/slot monitoring.
 
 	Approx Cost: The last I saw for a price list item on this was 22K$
-	for a unpopulated (no disk drive) A5X00.
+	for an unpopulated (no disk drive) A5X00.
 
 
 DataDirect E1000 RAID
@@ -175,7 +175,7 @@ DataDirect E1000 RAID
 Veritas ServPoint
 
 	This is a software storage virtualization engine that
-	runs on Sparc/Solaris in target mode for frontend 
+	runs on Sparc/Solaris in target mode for frontend
 	and with other FC or SCSI as the backend storage. FreeBSD
 	has been used extensively to test it.
 
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index 531af30..431c85b 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -790,7 +790,7 @@ again:
 	 * It turns out that even for QLogic 2100s with ROM 1.10 and above
 	 * we do get a firmware attributes word returned in mailbox register 6.
 	 *
-	 * Because the lun is in a a different position in the Request Queue
+	 * Because the lun is in a different position in the Request Queue
 	 * Entry structure for Fibre Channel with expanded lun firmware, we
 	 * can only support one lun (lun zero) when we don't know what kind
 	 * of firmware we're running.
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index 5d71cd9..83250cf 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -563,7 +563,7 @@ lmc_rx_intr(lmc_softc_t * const sc)
 			 * length so we can set that now. (we add to
 			 * last_offset instead of multiplying since we
 			 * normally won't go into the loop and thereby
-			 * saving a ourselves from doing a multiplication
+			 * saving ourselves from doing a multiplication
 			 * by 0 in the normal case).
 			 */
 			_IF_DEQUEUE(&sc->lmc_rxq, ms);
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 317b6cc..3887ba1 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -850,7 +850,7 @@ mse_getlogi(tag, handle, dx, dy, but)
  * Routines for the ATI Inport bus mouse.
  */
 /*
- * Test for a ATI Inport bus mouse and return 1 if it is.
+ * Test for an ATI Inport bus mouse and return 1 if it is.
  * (do not enable interrupts)
  */
 static int
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 7412435..8c1d488 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -285,7 +285,7 @@ static int pcf_stop(device_t pcfdev)
 
 	/*
 	 * Send STOP condition iff the START condition was previously sent.
-	 * STOP is sent only once even if a iicbus_stop() is called after
+	 * STOP is sent only once even if an iicbus_stop() is called after
 	 * an iicbus_read()... see pcf_read(): the pcf needs to send the stop
 	 * before the last char is read.
 	 */
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index bbc41a9..98c2f1d 100644
--- a/sys/dev/pst/pst-iop.c
+++ b/sys/dev/pst/pst-iop.c
@@ -76,7 +76,7 @@ iop_init(struct iop_softc *sc)
 
     /* register iop_attach to be run when interrupts are enabled */
     if (!(sc->iop_delayed_attach = (struct intr_config_hook *)
-				   malloc(sizeof(struct intr_config_hook), 
+				   malloc(sizeof(struct intr_config_hook),
 				   M_PSTIOP, M_NOWAIT | M_ZERO))) {
 	printf("pstiop: malloc of delayed attach hook failed\n");
 	return 0;
@@ -162,9 +162,9 @@ iop_intr(void *data)
 
 	reply = (struct i2o_single_reply *)(sc->obase + (mfa - sc->phys_obase));
 
-	/* if this is a event register reply, shout! */
+	/* If this is an event register reply, shout! */
 	if (reply->function == I2O_UTIL_EVENT_REGISTER) {
-	    struct i2o_util_event_reply_message *event = 
+	    struct i2o_util_event_reply_message *event =
 		(struct i2o_util_event_reply_message *)reply;
 
 	    printf("pstiop: EVENT!! idx=%08x data=%08x\n",
@@ -175,7 +175,7 @@ iop_intr(void *data)
 	/* if reply is a failurenotice we need to free the original mfa */
 	if (reply->message_flags & I2O_MESSAGE_FLAGS_FAIL)
 	    iop_free_mfa(sc,((struct i2o_fault_reply *)(reply))->preserved_mfa);
-	
+
 	/* reply->initiator_context points to the service routine */
 	((void (*)(struct iop_softc *, u_int32_t, struct i2o_single_reply *))
 	    (reply->initiator_context))(sc, mfa, reply);
@@ -255,7 +255,7 @@ iop_init_outqueue(struct iop_softc *sc)
     /* wait for init to complete */
     while (--timeout && reply != I2O_EXEC_OUTBOUND_INIT_COMPLETE)
 	DELAY(1000);
-    
+
     if (!timeout) {
 	printf("pstiop: timeout waiting for init-complete response\n");
 	iop_free_mfa(sc, mfa);
@@ -309,7 +309,7 @@ iop_get_lct(struct iop_softc *sc)
 	contigfree(reply, ALLOCSIZE, M_PSTIOP);
 	return 0;
     }
-    bcopy(&reply->entry[0], sc->lct, 
+    bcopy(&reply->entry[0], sc->lct,
 	  reply->table_size * sizeof(struct i2o_lct_entry));
     sc->lct_count = reply->table_size;
     contigfree(reply, ALLOCSIZE, M_PSTIOP);
@@ -432,7 +432,7 @@ iop_create_sgl(struct i2o_basic_message *msg, caddr_t data, int count, int dir)
 	printf("pstiop: zero length DMA transfer attempted\n");
 	return 0;
     }
-    
+
     sgl_count = min(count, (PAGE_SIZE - ((uintptr_t)data & PAGE_MASK)));
     sgl_phys = vtophys(data);
     sgl->flags = dir | I2O_SGL_PAGELIST | I2O_SGL_EOB | I2O_SGL_END;
diff --git a/sys/dev/raidframe/rf_freebsdkintf.c b/sys/dev/raidframe/rf_freebsdkintf.c
index 1a06659..5e134d7 100644
--- a/sys/dev/raidframe/rf_freebsdkintf.c
+++ b/sys/dev/raidframe/rf_freebsdkintf.c
@@ -1660,7 +1660,7 @@ rf_DispatchKernelIO(queue, req)
 	/* splx(s); */ /* want to test this */
 	return (0);
 }
-/* this is the callback function associated with a I/O invoked from
+/* This is the callback function associated with an I/O invoked from
    kernel code.
  */
 static void 
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index fd4731f74..1c92d50 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -774,8 +774,8 @@ ray_init_user(struct ray_softc *sc)
 	 *		init_download	- download the network to the card
 	 *		init_mcast	- reset multicast list
 	 *		init_sj		- find or start a BSS
-	 *		init_auth	- authenticate with a ESSID if needed
-	 *		init_assoc	- associate with a ESSID if needed
+	 *		init_auth	- authenticate with an ESSID if needed
+	 *		init_assoc	- associate with an ESSID if needed
 	 *
 	 * They are only actually executed if the card is not running.
 	 * We may enter this routine from a simple change of IP
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 42d52a7..b7e1dab 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1376,7 +1376,7 @@ mss_detect(device_t dev, struct mss_info *mss)
 		if ((tmp = io_rd(mss, MSS_INDEX)) & MSS_IDXBUSY) DELAY(10000);
 		else break;
 
-    	if (i >= 10) {	/* Not a AD1848 */
+    	if (i >= 10) {	/* Not an AD1848 */
 		BVDDB(printf("mss_detect, busy still set (0x%02x)\n", tmp));
 		goto no;
     	}
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index 0e1cb76..517bf7e 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -27,7 +27,7 @@
 /*
  * als4000.c - driver for the Avance Logic ALS 4000 chipset.
  *
- * The ALS4000 is a effectively an SB16 with a PCI interface.
+ * The ALS4000 is effectively an SB16 with a PCI interface.
  *
  * This driver derives from ALS4000a.PDF, Bart Hartgers alsa driver, and
  * SB16 register descriptions.
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 4afdd9e..866d984 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -27,7 +27,7 @@
  * Much of register handling is based on NetBSD CMI8x38 audio driver
  * by Takuya Shiozaki <AoiMoe@imou.to>.  Chen-Li Tien
  * <cltien@cmedia.com.tw> clarified points regarding the DMA related
- * registers and the 8738 mixer devices.  His Linux was driver a also
+ * registers and the 8738 mixer devices.  His Linux driver was also a
  * useful reference point.
  *
  * TODO: MIDI
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index d15a1ff..689ce89 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -5387,9 +5387,9 @@ static void sym_sir_task_recovery(hcb_p np, int num)
 
 		/*
 		 *  If we want to abort an untagged command, we 
-		 *  will send a IDENTIFY + M_ABORT.
+		 *  will send an IDENTIFY + M_ABORT.
 		 *  Otherwise (tagged command), we will send 
-		 *  a IDENTITFY + task attributes + ABORT TAG.
+		 *  an IDENTIFY + task attributes + ABORT TAG.
 		 */
 		if (cp->tag == NO_TAG) {
 			np->abrt_msg[1] = M_ABORT;
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index f8df5c9..89b9cbc 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -1935,8 +1935,8 @@ ubsec_cleanchip(struct ubsec_softc *sc)
 }
 
 /*
- * free a ubsec_q
- * It is assumed that the caller is within spimp()
+ * Free an ubsec_q.
+ * It is assumed that the caller is within spimp().
  */
 static int
 ubsec_free_q(struct ubsec_softc *sc, struct ubsec_q *q)
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 0f57724..68a8070 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1310,7 +1310,7 @@ uhci_check_intr(uhci_softc_t *sc, uhci_intr_info_t *ii)
 #endif
 	/*
 	 * If the last TD is still active we need to check whether there
-	 * is a an error somewhere in the middle, or whether there was a
+	 * is an error somewhere in the middle, or whether there was a
 	 * short packet (SPD and not ACTIVE).
 	 */
 	if (le32toh(lstd->td.td_status) & UHCI_TD_ACTIVE) {
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index d030293..726669a 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -739,7 +739,7 @@ ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 #if 0
 /* XXX This does not belong here. */
 /*
- * Print select parts of a IEEE 1284 device ID.
+ * Print select parts of an IEEE 1284 device ID.
  */
 void
 ieee1284_print_id(char *str)
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index db3c936..4fce190 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -2943,7 +2943,7 @@ Static int
 umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
 		      unsigned char **rcmd, int *rcmdlen)
 {
-	/* A ATAPI command is always 12 bytes in length */
+	/* An ATAPI command is always 12 bytes in length. */
 	KASSERT(*rcmdlen >= ATAPI_COMMAND_LENGTH,
 		("rcmdlen = %d < %d, buffer too small",
 		 *rcmdlen, ATAPI_COMMAND_LENGTH));
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index f3b29ce..dfaca89 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -52,7 +52,7 @@
  * i.e., it uses MAC addresses.  This should not be a surprise since
  * it uses an ethernet controller as a major hw item.
  * It can broadcast, unicast or apparently multicast in a base cell 
- * using a omni-directional antennae that is 
+ * using an omni-directional antennae that is 
  * about 800 feet around the base cell barring walls and metal.  
  * With directional antennae, it can be used point to point over a mile
  * or so apparently (haven't tried that).
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 8f27bdb..d91a92e 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -686,7 +686,7 @@ ext2_mountfs(devvp, mp, td)
 	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, M_WAITOK);
 	bzero((caddr_t)ump, sizeof *ump);
 	/* I don't know whether this is the right strategy. Note that
-	   we dynamically allocate both a ext2_sb_info and a ext2_super_block
+	   we dynamically allocate both an ext2_sb_info and an ext2_super_block
 	   while Linux keeps the super block in a locked buffer
 	 */
 	ump->um_e2fs = bsd_malloc(sizeof(struct ext2_sb_info), 
@@ -955,7 +955,7 @@ loop:
 }
 
 /*
- * Look up a EXT2FS dinode number to find its incore vnode, otherwise read it
+ * Look up an EXT2FS dinode number to find its incore vnode, otherwise read it
  * in from disk.  If it is in core, wait for the lock bit to clear, then
  * return the inode locked.  Detection and handling of mount points must be
  * done by the calling routine.
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 8f27bdb..d91a92e 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -686,7 +686,7 @@ ext2_mountfs(devvp, mp, td)
 	ump = bsd_malloc(sizeof *ump, M_EXT2MNT, M_WAITOK);
 	bzero((caddr_t)ump, sizeof *ump);
 	/* I don't know whether this is the right strategy. Note that
-	   we dynamically allocate both a ext2_sb_info and a ext2_super_block
+	   we dynamically allocate both an ext2_sb_info and an ext2_super_block
 	   while Linux keeps the super block in a locked buffer
 	 */
 	ump->um_e2fs = bsd_malloc(sizeof(struct ext2_sb_info), 
@@ -955,7 +955,7 @@ loop:
 }
 
 /*
- * Look up a EXT2FS dinode number to find its incore vnode, otherwise read it
+ * Look up an EXT2FS dinode number to find its incore vnode, otherwise read it
  * in from disk.  If it is in core, wait for the lock bit to clear, then
  * return the inode locked.  Detection and handling of mount points must be
  * done by the calling routine.
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index f9f102c..76ae738 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -1164,7 +1164,7 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m)
 		if ((pmap->pm_pdir[PTDPTDI] & PG_FRAME) ==
 		    (PTDpde & PG_FRAME)) {
 			/*
-			 * Do a invltlb to make the invalidated mapping
+			 * Do an invltlb to make the invalidated mapping
 			 * take effect immediately.
 			 */
 			pteva = VM_MAXUSER_ADDRESS + i386_ptob(m->pindex);
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 8b8f536..b909140 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -411,7 +411,7 @@ again:
 			break;
 		}
 		/*
-		 * Massage in place to make a iBCS2-shaped dirent (otherwise
+		 * Massage in place to make an iBCS2-shaped dirent (otherwise
 		 * we have to worry about touching user memory outside of
 		 * the copyout() call).
 		 */
@@ -574,7 +574,7 @@ again:
 			break;
 		}
 		/*
-		 * Massage in place to make a iBCS2-shaped dirent (otherwise
+		 * Massage in place to make an iBCS2-shaped dirent (otherwise
 		 * we have to worry about touching user memory outside of
 		 * the copyout() call).
 		 *
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index b5e3bd1..13ea139 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -92,8 +92,8 @@
 #if !defined(_POSIX_SOURCE)
 #define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LLONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LLONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LLONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LLONG_MIN	/* min value for an off_t */
 
 /* Quads and long longs are the same size.  Ensure they stay in sync. */
 #define	UQUAD_MAX	ULLONG_MAX	/* max value for a uquad_t */
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index b5e3bd1..13ea139 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -92,8 +92,8 @@
 #if !defined(_POSIX_SOURCE)
 #define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LLONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LLONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LLONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LLONG_MIN	/* min value for an off_t */
 
 /* Quads and long longs are the same size.  Ensure they stay in sync. */
 #define	UQUAD_MAX	ULLONG_MAX	/* max value for a uquad_t */
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 6096549..dd62365 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -653,7 +653,7 @@ elintr(void *xsc)
 }
 
 /*
- * Pull read data off a interface.
+ * Pull read data off an interface.
  * Len is length of data, with local net header stripped.
  */
 static struct mbuf *
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 317b6cc..3887ba1 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -850,7 +850,7 @@ mse_getlogi(tag, handle, dx, dy, but)
  * Routines for the ATI Inport bus mouse.
  */
 /*
- * Test for a ATI Inport bus mouse and return 1 if it is.
+ * Test for an ATI Inport bus mouse and return 1 if it is.
  * (do not enable interrupts)
  */
 static int
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 7412435..8c1d488 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -285,7 +285,7 @@ static int pcf_stop(device_t pcfdev)
 
 	/*
 	 * Send STOP condition iff the START condition was previously sent.
-	 * STOP is sent only once even if a iicbus_stop() is called after
+	 * STOP is sent only once even if an iicbus_stop() is called after
 	 * an iicbus_read()... see pcf_read(): the pcf needs to send the stop
 	 * before the last char is read.
 	 */
diff --git a/sys/i4b/layer3/i4b_q931.h b/sys/i4b/layer3/i4b_q931.h
index e09f023b..ed5898f 100644
--- a/sys/i4b/layer3/i4b_q931.h
+++ b/sys/i4b/layer3/i4b_q931.h
@@ -117,7 +117,7 @@
 
 /* ALERT */
 
-#define MSG_ALERT_LEN		4	/* length of a alert message */
+#define MSG_ALERT_LEN		4	/* length of an alert message */
 
 #endif /* _I4B_Q931_H_ */
 
diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c
index 8556e37..3f0e6ea 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -67,12 +67,12 @@ get_cdid(void)
 	int i;
 	int x;
 
-	x = SPLI4B();   
+	x = SPLI4B();
 
 	/* get next id */
-	
+
 	cdid_count++;
-	
+
 again:
 	if(cdid_count == CDID_UNUSED)		/* zero is invalid */
 		cdid_count++;
@@ -80,7 +80,7 @@ again:
 		cdid_count = 1;
 
 	/* check if id already in use */
-	
+
 	for(i=0; i < N_CALL_DESC; i++)
 	{
 		if(call_desc[i].cdid == cdid_count)
@@ -91,7 +91,7 @@ again:
 	}
 
 	splx(x);
-	
+
 	return(cdid_count);
 }
 
@@ -113,7 +113,7 @@ reserve_cd(void)
 	x = SPLI4B();
 
 	cd = NULL;
-	
+
 	for(i=0; i < N_CALL_DESC; i++)
 	{
 		if(call_desc[i].cdid == CDID_UNUSED)
@@ -140,7 +140,7 @@ reserve_cd(void)
 /*---------------------------------------------------------------------------*
  *      free a calldescriptor
  *      ---------------------
- *      free a unused calldescriptor by giving address of calldescriptor
+ *      free an unused calldescriptor by giving address of calldescriptor
  *      and writing a 0 into the cdid field marking it as unused.
  *---------------------------------------------------------------------------*/
 void
@@ -148,7 +148,7 @@ freecd_by_cd(call_desc_t *cd)
 {
 	int i;
 	int x = SPLI4B();
-	
+
 	for(i=0; i < N_CALL_DESC; i++)
 	{
 		if( (call_desc[i].cdid != CDID_UNUSED) &&
@@ -164,7 +164,7 @@ freecd_by_cd(call_desc_t *cd)
 	if(i == N_CALL_DESC)
 		panic("freecd_by_cd: ERROR, cd not found, cr = %d\n", cd->cr);
 
-	splx(x);		
+	splx(x);
 }
 
 /*---------------------------------------------------------------------------*
@@ -234,13 +234,13 @@ get_rand_cr(int unit)
 	register int i, j;
 	static u_char val, retval;
 	static int called = 42;
-	
+
 	val += ++called;
-	
+
 	for(i=0; i < 50 ; i++, val++)
 	{
 		int found = 1;
-		
+
 #ifdef RANDOMDEV
 		read_random((char *)&val, sizeof(val));
 #else
@@ -248,7 +248,7 @@ get_rand_cr(int unit)
 #endif /* RANDOMDEV */
 
 		retval = val & 0x7f;
-		
+
 		if(retval == 0 || retval == 0x7f)
 			continue;
 
@@ -291,13 +291,13 @@ i4b_init_callout(call_desc_t *cd)
 /*---------------------------------------------------------------------------*
  *      daemon is attached
  *---------------------------------------------------------------------------*/
-void 
+void
 i4b_l4_daemon_attached(void)
 {
 	int i;
 
 	int x = SPLI4B();
-	
+
 	for(i=0; i < nctrl; i++)
 	{
 /*XXX*/		if(ctrl_desc[i].ctrl_type == CTRL_PASSIVE)
@@ -312,7 +312,7 @@ i4b_l4_daemon_attached(void)
 /*---------------------------------------------------------------------------*
  *      daemon is detached
  *---------------------------------------------------------------------------*/
-void 
+void
 i4b_l4_daemon_detached(void)
 {
 	int i;
@@ -338,11 +338,11 @@ void i4b_print_cdp(call_desc_t *cdp);
 void i4b_print_cdx(int index);
 void i4b_print_cda(void);
 void i4b_print_cdaa(void);
-	
+
 /*---------------------------------------------------------------------------*
  *	print a call descriptor by cd-pointer
  *---------------------------------------------------------------------------*/
-void 
+void
 i4b_print_cdp(call_desc_t *cdp)
 {
 	if((cdp > &(call_desc[N_CALL_DESC])) || (cdp < &(call_desc[0])))
@@ -359,12 +359,12 @@ i4b_print_cdp(call_desc_t *cdp)
 			ctrl_desc[cdp->controller].unit,
 			ctrl_desc[cdp->controller].dl_est,
 			ctrl_desc[cdp->controller].bch_state[CHAN_B1],
-			ctrl_desc[cdp->controller].bch_state[CHAN_B2]);	
+			ctrl_desc[cdp->controller].bch_state[CHAN_B2]);
 	printf("           cr = 0x%02x\n", cdp->cr);
 	printf("       crflag = %d\n", cdp->crflag);
 	printf("    channelid = %d\n", cdp->channelid);
 	printf("        bprot = %d\n", cdp->bprot);
-	printf("         bcap = %d\n", cdp->bcap);	
+	printf("         bcap = %d\n", cdp->bcap);
 	printf("       driver = %d\n", cdp->driver);
 	printf("  driver_unit = %d\n", cdp->driver_unit);
 	printf("   call_state = %d\n", cdp->call_state);
@@ -386,7 +386,7 @@ i4b_print_cdp(call_desc_t *cdp)
 /*---------------------------------------------------------------------------*
  *	print a call descriptor by index
  *---------------------------------------------------------------------------*/
-void 
+void
 i4b_print_cdx(int index)
 {
 	if(index >= N_CALL_DESC)
@@ -400,7 +400,7 @@ i4b_print_cdx(int index)
 /*---------------------------------------------------------------------------*
  *	print all call descriptors
  *---------------------------------------------------------------------------*/
-void 
+void
 i4b_print_cda(void)
 {
 	int i;
@@ -414,7 +414,7 @@ i4b_print_cda(void)
 /*---------------------------------------------------------------------------*
  *	print all active call descriptors
  *---------------------------------------------------------------------------*/
-void 
+void
 i4b_print_cdaa(void)
 {
 	int i;
diff --git a/sys/ia64/include/_limits.h b/sys/ia64/include/_limits.h
index 2f9d6ed..b694386 100644
--- a/sys/ia64/include/_limits.h
+++ b/sys/ia64/include/_limits.h
@@ -79,8 +79,8 @@
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
 
 /* Quads and longs are the same.  Ensure they stay in sync. */
 #define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
diff --git a/sys/ia64/include/limits.h b/sys/ia64/include/limits.h
index 2f9d6ed..b694386 100644
--- a/sys/ia64/include/limits.h
+++ b/sys/ia64/include/limits.h
@@ -79,8 +79,8 @@
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
 
 /* Quads and longs are the same.  Ensure they stay in sync. */
 #define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 1ea1ad4..4e0d6bc 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -329,7 +329,7 @@ Flush(void *vp, u_char * ptr, u_long siz)
 	u_char         *p = ptr, *q;
 	int             i;
 
-	/* First, find a a.out-header */
+	/* First, find an a.out-header. */
 	if (gz->output < sizeof gz->a_out) {
 		q = (u_char *) & gz->a_out;
 		i = min(siz, sizeof gz->a_out - gz->output);
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index 3df4890..7151f6c 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -40,7 +40,7 @@
 #endif
 
 /*
- * Shell interpreter image activator. A interpreter name beginning
+ * Shell interpreter image activator. An interpreter name beginning
  *	at imgp->stringbase is the minimal successful exit requirement.
  */
 int
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index dddea788..7444a00 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -193,8 +193,8 @@ void print_devclass_list(void);
  * Also note: we specifically do not attach a device to the device_t tree
  * to avoid potential chicken and egg problems.  One could argue that all
  * of this belongs to the root node.  One could also further argue that the
- * sysctl interface that we have not might more properly be a ioctl
- * interface, but at this stage of the game, I'm not inclinde to rock that
+ * sysctl interface that we have not might more properly be an ioctl
+ * interface, but at this stage of the game, I'm not inclined to rock that
  * boat.
  *
  * I'm also not sure that the SIGIO support is done correctly or not, as
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 78bb231..165f628 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -149,7 +149,7 @@ cblock_alloc_cblocks(number)
 }
 
 /*
- * Set the cblock allocation policy for a a clist.
+ * Set the cblock allocation policy for a clist.
  * Must be called in process context at spltty().
  */
 void
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 78bb231..165f628 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -149,7 +149,7 @@ cblock_alloc_cblocks(number)
 }
 
 /*
- * Set the cblock allocation policy for a a clist.
+ * Set the cblock allocation policy for a clist.
  * Must be called in process context at spltty().
  */
 void
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index c44e1c6..336ca3f 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -2932,7 +2932,7 @@ bioq_remove(struct bio_queue_head *head, struct bio *bp)
  *	bufwait:
  *
  *	Wait for buffer I/O completion, returning error status.  The buffer
- *	is left locked and B_DONE on return.  B_EINTR is converted into a EINTR
+ *	is left locked and B_DONE on return.  B_EINTR is converted into an EINTR
  *	error and cleared.
  */
 int
diff --git a/sys/libkern/ia64/__moddi3.S b/sys/libkern/ia64/__moddi3.S
index 0eedf4f..a1e330a 100644
--- a/sys/libkern/ia64/__moddi3.S
+++ b/sys/libkern/ia64/__moddi3.S
@@ -55,7 +55,7 @@ __moddi3:
   // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
   // predicate registers used: p6
 
-  setf.sig f12=r32  // holds a in integer form
+  setf.sig f12=r32  // holds an in integer form
   setf.sig f7=r33
   nop.b 0
 } { .mlx
diff --git a/sys/libkern/ia64/__umoddi3.S b/sys/libkern/ia64/__umoddi3.S
index 3c56677..a4d8a0b 100644
--- a/sys/libkern/ia64/__umoddi3.S
+++ b/sys/libkern/ia64/__umoddi3.S
@@ -54,7 +54,7 @@ __umoddi3:
   // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
   // predicate registers used: p6
 
-  setf.sig f12=r32  // holds a in integer form
+  setf.sig f12=r32  // holds an in integer form
   setf.sig f7=r33
   nop.b 0;;
 } { .mfi
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index e55bf45..acb1147 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -321,7 +321,7 @@ iso88025_output(ifp, m, dst, rt0)
 		 * full mac, llc, and source routing function to be controlled.
 		 * llc and source routing information must already be in the
 		 * mbuf provided, ac/fc are set in sa_data.  sockaddr.sa_data
-		 * should be a iso88025_sockaddr_data structure see iso88025.h
+		 * should be an iso88025_sockaddr_data structure see iso88025.h
 		 */
                 loop_copy = -1;
 		sd = (struct iso88025_sockaddr_data *)dst->sa_data;
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 6bfc844..4c95804 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -52,12 +52,12 @@
  * and then transmits it on its medium.
  *
  * On input, each interface unwraps the data received by it, and either
- * places it on the input queue of a internetwork datagram routine
+ * places it on the input queue of an internetwork datagram routine
  * and posts the associated software interrupt, or passes the datagram to a raw
  * packet input routine.
  *
  * Routines exist for locating interfaces by their addresses
- * or for locating a interface on a certain network, as well as more general
+ * or for locating an interface on a certain network, as well as more general
  * routing and gateway routines maintaining information used to locate
  * interfaces.  These routines live in the files if.c and route.c
  */
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index 851ce4b..b101abf 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -2118,7 +2118,7 @@ atm_cm_match(ap, pcop)
 /*
  * Find Shareable LLC VCC
  * 
- * Given a endpoint-supplied connection attribute using LLC multiplexing,
+ * Given an endpoint-supplied connection attribute using LLC multiplexing,
  * this function will attempt to locate an existing connection which meets
  * the requirements of the supplied attributes.
  *
diff --git a/sys/netatm/spans/spans_kxdr.h b/sys/netatm/spans/spans_kxdr.h
index c6f80c5..6ffead7 100644
--- a/sys/netatm/spans/spans_kxdr.h
+++ b/sys/netatm/spans/spans_kxdr.h
@@ -252,7 +252,7 @@ xdr_putint32(XDR *xdrs, int32_t *ip)
 /*
  * Support struct for discriminated unions.
  * You create an array of xdrdiscrim structures, terminated with
- * a entry with a null procedure pointer.  The xdr_union routine gets
+ * an entry with a null procedure pointer.  The xdr_union routine gets
  * the discriminant value and then searches the array of structures
  * for a matching value.  If a match is found the associated xdr routine
  * is called to handle that part of the union.  If there is
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 8db5bd6..d3ad342 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -178,7 +178,7 @@ find_type(tbl, type)
  * Print an ATM address
  *
  * Arguments:
- *	p	pointer to a Atm_address
+ *	p	pointer to an Atm_address
  *
  * Returns:
  *	none
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 00bd663..603d722 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -1355,7 +1355,7 @@ ubt_isoc_in_start(ubt_softc_p sc)
 	usbd_status	status;
 	int		i;
 
-	/* Initialize a isoc-in USB transfer and then schedule it */
+	/* Initialize an isoc-in USB transfer and then schedule it. */
 
 	for (i = 0; i < sc->sc_isoc_nframes; i++)
 		sc->sc_isoc_in_frlen[i] = sc->sc_isoc_size;
@@ -1576,7 +1576,7 @@ ubt_isoc_out_start(ubt_softc_p sc, struct mbuf *m)
 
 	NG_FREE_M(m);
 
-	/* Initialize a isoc-out USB transfer and then schedule it */
+	/* Initialize an isoc-out USB transfer and then schedule it. */
 
 	usbd_setup_isoc_xfer(
 			sc->sc_isoc_out_xfer,
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index 3956b93..eb5a8eb 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -885,7 +885,7 @@ ng_name2noderef(node_p here, const char *name)
 }
 
 /*
- * Decode a ID name, eg. "[f03034de]". Returns 0 if the
+ * Decode an ID name, eg. "[f03034de]". Returns 0 if the
  * string is not valid, otherwise returns the value.
  */
 static ng_ID_t
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 357c2a9..d5f24b8 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -562,7 +562,7 @@ ng_detach_common(struct ngpcb *pcbp, int which)
 
 #ifdef NOTYET
 /*
- * File descriptors can be passed into a AF_NETGRAPH socket.
+ * File descriptors can be passed into an AF_NETGRAPH socket.
  * Note, that file descriptors cannot be passed OUT.
  * Only character device descriptors are accepted.
  * Character devices are useful to connect a graph to a device,
@@ -597,7 +597,7 @@ ng_internalize(struct mbuf *control, struct thread *td)
 		return (error);
 
 	/* Depending on what kind of resource it is, act differently. For
-	 * devices, we treat it as a file. For a AF_NETGRAPH socket,
+	 * devices, we treat it as a file. For an AF_NETGRAPH socket,
 	 * shortcut straight to the node. */
 	switch (fp->f_type) {
 	case DTYPE_VNODE:
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index c974bc5..83eeae7 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -273,7 +273,7 @@ __END_DECLS
  * sysctl(3).  (net.inet.ip.port{hi,low}{first,last}_auto)
  *
  * Changing those values has bad security implications if you are
- * using a a stateless firewall that is allowing packets outside of that
+ * using a stateless firewall that is allowing packets outside of that
  * range in order to allow transparent outgoing connections.
  *
  * Such a firewall configuration will generally depend on the use of these
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 9cd2d6f..abee7d6 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -1094,7 +1094,7 @@ dummynet_io(struct mbuf *m, int pipe_nr, int dir, struct ip_fw_args *fwa)
     pipe_nr &= 0xffff ;
 
     /*
-     * this is a dummynet rule, so we expect a O_PIPE or O_QUEUE rule
+     * This is a dummynet rule, so we expect an O_PIPE or O_QUEUE rule.
      */
     fs = locate_flowset(pipe_nr, fwa->rule);
     if (fs == NULL)
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 4c19090..3484905 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -874,7 +874,7 @@ spd_done:
 			 * initiated packets) If we used the loopback inteface,
 			 * we would not be able to control what happens 
 			 * as the packet runs through ip_input() as
-			 * it is done through a ISR.
+			 * it is done through an ISR.
 			 */
 			LIST_FOREACH(ia,
 			    INADDR_HASH(dst->sin_addr.s_addr), ia_hash) {
diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c
index 4bc41bc..508bf51 100644
--- a/sys/netinet/libalias/alias_nbt.c
+++ b/sys/netinet/libalias/alias_nbt.c
@@ -239,7 +239,7 @@ int AliasHandleUdpNbt(
 #ifdef DEBUG
 	printf("%s:%d-->", inet_ntoa(ndh->source_ip), ntohs(ndh->source_port) );
 #endif
-	/* Doing a IP address and Port number Translation */
+	/* Doing an IP address and Port number Translation */
 	if ( uh->uh_sum != 0 ) {
 		int				acc;
 		u_short			*sptr;
diff --git a/sys/netinet/libalias/alias_proxy.c b/sys/netinet/libalias/alias_proxy.c
index 6c95ea9..b9a9798 100644
--- a/sys/netinet/libalias/alias_proxy.c
+++ b/sys/netinet/libalias/alias_proxy.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
     modified.  In certain cases, it is necessary to somehow encode
     the original address/port info into the packet.  Two methods are
     presently supported: addition of a [DEST addr port] string at the
-    beginning a of tcp stream, or inclusion of an optional field
+    beginning of a tcp stream, or inclusion of an optional field
     in the IP header.
 
     There is one public API function:
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index cd49b88..170fe2e 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -85,7 +85,7 @@
 
 /*
  * m MUST contain a continuous IP6 header.
- * off is a offset where TCP/UDP/ICMP6 header starts.
+ * off is an offset where TCP/UDP/ICMP6 header starts.
  * len is a total length of a transport segment.
  * (e.g. TCP header + TCP payload)
  */
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index c25b1bf..000ab1b 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -418,7 +418,7 @@ ipsec4_getpolicybyaddr(m, dir, flag, error)
 
 	bzero(&spidx, sizeof(spidx));
 
-	/* make a index to look for a policy */
+	/* Make an index to look for a policy. */
 	*error = ipsec_setspidx_mbuf(&spidx, dir, AF_INET, m,
 	    (flag & IP_FORWARDING) ? 0 : 1);
 
@@ -635,7 +635,7 @@ ipsec6_getpolicybyaddr(m, dir, flag, error)
 
 	bzero(&spidx, sizeof(spidx));
 
-	/* make a index to look for a policy */
+	/* Make an index to look for a policy. */
 	*error = ipsec_setspidx_mbuf(&spidx, dir, AF_INET6, m,
 	    (flag & IP_FORWARDING) ? 0 : 1);
 
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 338a00c..dde4714 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1611,7 +1611,7 @@ in6_ifadd(pr, ifid)
 	 * of DAD.  we omitted DAD for this reason in the past.
 	 * (3) a user can prevent autoconfiguration of global address 
 	 * by removing link-local address by hand (this is partly because we
-	 * don't have other way to control the use of IPv6 on a interface.
+	 * don't have other way to control the use of IPv6 on an interface.
 	 * this has been our design choice - cf. NRL's "ifconfig auto").
 	 * (4) it is easier to manage when an interface has addresses
 	 * with the same interface identifier, than to have multiple addresses
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index 9f126c5..2e765e0 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -409,7 +409,7 @@ ipsec_getpolicybyaddr(m, dir, flag, error)
 
 	sp = NULL;
 	if (key_havesp(dir)) {
-		/* make a index to look for a policy */
+		/* Make an index to look for a policy. */
 		*error = ipsec_setspidx(m, &spidx,
 					(flag & IP_FORWARDING) ? 0 : 1);
 		if (*error != 0) {
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 8fc161c..ff6bae1 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -137,7 +137,7 @@ static LIST_HEAD(_spacqtree, secspacq) spacqtree;	/* SP acquiring list */
 static u_int saorder_state_valid[] = {
 	SADB_SASTATE_DYING, SADB_SASTATE_MATURE,
 	/*
-	 * This order is important because we must select a oldest SA
+	 * This order is important because we must select the oldest SA
 	 * for outbound processing.  For inbound, This is not important.
 	 */
 };
@@ -1673,7 +1673,7 @@ fail:
 
 /*
  * SADB_X_SPDADD, SADB_X_SPDSETIDX or SADB_X_SPDUPDATE processing
- * add a entry to SP database, when received
+ * add an entry to SP database, when received
  *   <base, address(SD), (lifetime(H),) policy>
  * from the user(?).
  * Adding to SP database,
@@ -2201,7 +2201,7 @@ key_spdacquire(sp)
 	if (sp->policy != IPSEC_POLICY_IPSEC)
 		panic("key_spdacquire: policy mismathed. IPsec is expected.\n");
 
-	/* get a entry to check whether sent message or not. */
+	/* Get an entry to check whether sent message or not. */
 	if ((newspacq = key_getspacq(&sp->spidx)) != NULL) {
 		if (key_blockacq_count < newspacq->count) {
 			/* reset counter and do send message. */
@@ -4822,7 +4822,7 @@ key_getsavbyseq(sah, seq)
 
 /*
  * SADB_ADD processing
- * add a entry to SA database, when received
+ * add an entry to SA database, when received
  *   <base, SA, (SA2), (lifetime(HSC),) address(SD), (address(P),)
  *       key(AE), (identity(SD),) (sensitivity)>
  * from the ikmpd,
@@ -5647,7 +5647,7 @@ key_acquire(const struct secasindex *saidx, struct secpolicy *sp)
 	 * getting something message from IKEd.  In later case, to be
 	 * managed with ACQUIRING list.
 	 */
-	/* get a entry to check whether sending message or not. */
+	/* Get an entry to check whether sending message or not. */
 	if ((newacq = key_getacq(saidx)) != NULL) {
 		if (key_blockacq_count < newacq->count) {
 			/* reset counter and do send message. */
diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h
index cd1bfe5..32adcc88 100644
--- a/sys/netipx/ipx_pcb.h
+++ b/sys/netipx/ipx_pcb.h
@@ -74,7 +74,7 @@ struct ipxpcb {
 #define	sotoipxpcb(so)		((struct ipxpcb *)((so)->so_pcb))
 
 /*
- * Nominal space allocated to a IPX socket.
+ * Nominal space allocated to an IPX socket.
  */
 #define	IPXSNDQ		16384
 #define	IPXRCVQ		40960
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index 25f7858..dbc0a2a 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -1708,7 +1708,7 @@ fail:
 
 /*
  * SADB_X_SPDADD, SADB_X_SPDSETIDX or SADB_X_SPDUPDATE processing
- * add a entry to SP database, when received
+ * add an entry to SP database, when received
  *   <base, address(SD), (lifetime(H),) policy>
  * from the user(?).
  * Adding to SP database,
@@ -2239,7 +2239,7 @@ key_spdacquire(sp)
 	if (sp->policy != IPSEC_POLICY_IPSEC)
 		panic("key_spdacquire: policy mismathed. IPsec is expected.\n");
 
-	/* get a entry to check whether sent message or not. */
+	/* Get an entry to check whether sent message or not. */
 	if ((newspacq = key_getspacq(&sp->spidx)) != NULL) {
 		if (key_blockacq_count < newspacq->count) {
 			/* reset counter and do send message. */
@@ -5004,7 +5004,7 @@ key_getsavbyseq(sah, seq)
 
 /*
  * SADB_ADD processing
- * add a entry to SA database, when received
+ * add an entry to SA database, when received
  *   <base, SA, (SA2), (lifetime(HSC),) address(SD), (address(P),)
  *       key(AE), (identity(SD),) (sensitivity)>
  * from the ikmpd,
@@ -5818,7 +5818,7 @@ key_acquire(saidx, sp)
 	 * getting something message from IKEd.  In later case, to be
 	 * managed with ACQUIRING list.
 	 */
-	/* get a entry to check whether sending message or not. */
+	/* Get an entry to check whether sending message or not. */
 	if ((newacq = key_getacq(saidx)) != NULL) {
 		if (key_blockacq_count < newacq->count) {
 			/* reset counter and do send message. */
diff --git a/sys/netsmb/smb.h b/sys/netsmb/smb.h
index 56cfbcc..a6dc8ee 100644
--- a/sys/netsmb/smb.h
+++ b/sys/netsmb/smb.h
@@ -432,7 +432,7 @@ enum smb_dialects {
 #define ERRwrite	29	/* Write fault */
 #define ERRread		30	/* Read fault */
 #define ERRgeneral	31	/* General failure */
-#define	ERRbadshare	32	/* A open conflicts with an existing open */
+#define	ERRbadshare	32	/* An open conflicts with an existing open */
 #define	ERRlock		33	/* lock/unlock conflict */
 #define ERRwrongdisk	34	/* The wrong disk was found in a drive */
 #define ERRFCBunavail	35	/* No FCBs available */
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 19fc992..1d953cd 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -3212,7 +3212,7 @@ again:
 				if (xfer > 0)
 					cp += tsiz;
 			}
-			/* And null pad to a int32_t boundary */
+			/* And null pad to an int32_t boundary. */
 			for (i = 0; i < rem; i++)
 				*bp++ = '\0';
 			nfsm_clget;
@@ -3539,7 +3539,7 @@ again:
 				if (xfer > 0)
 					cp += tsiz;
 			}
-			/* And null pad to a int32_t boundary */
+			/* And null pad to an int32_t boundary. */
 			for (i = 0; i < rem; i++)
 				*bp++ = '\0';
 
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 3aa3101..d866963 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -304,7 +304,7 @@ struct com_s {
 	Port_t	sts_port;
 	Port_t	in_modem_port;
 	Port_t	intr_ctrl_port;
-	Port_t	rsabase;	/* iobase address of a I/O-DATA RSA board */
+	Port_t	rsabase;	/* Iobase address of an I/O-DATA RSA board. */
 	int	intr_enable;
 	int	pc98_prev_modem_status;
 	int	pc98_modem_delta;
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index ac3a1da..52bd373 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -912,7 +912,7 @@ mse_getlogi(tag, handle, dx, dy, but)
  * Routines for the ATI Inport bus mouse.
  */
 /*
- * Test for a ATI Inport bus mouse and return 1 if it is.
+ * Test for an ATI Inport bus mouse and return 1 if it is.
  * (do not enable interrupts)
  */
 static int
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 3aa3101..d866963 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -304,7 +304,7 @@ struct com_s {
 	Port_t	sts_port;
 	Port_t	in_modem_port;
 	Port_t	intr_ctrl_port;
-	Port_t	rsabase;	/* iobase address of a I/O-DATA RSA board */
+	Port_t	rsabase;	/* Iobase address of an I/O-DATA RSA board. */
 	int	intr_enable;
 	int	pc98_prev_modem_status;
 	int	pc98_modem_delta;
diff --git a/sys/pccard/pcic_isa.c b/sys/pccard/pcic_isa.c
index a35dc01..92db4e5 100644
--- a/sys/pccard/pcic_isa.c
+++ b/sys/pccard/pcic_isa.c
@@ -143,7 +143,7 @@ pcic_isa_probe(device_t dev)
 	 * offset we set after we assume it's broken.
 	 *
 	 * Note: because of this, we may incorrectly detect a single
-	 * slot vlsi chip as a i82365sl step D.  I cannot find a
+	 * slot vlsi chip as an i82365sl step D.  I cannot find a
 	 * datasheet for the affected chip, so that's the best we can
 	 * do for now.
 	 */
@@ -224,7 +224,7 @@ pcic_isa_probe(device_t dev)
 		/*
 		 *	Intel i82365sl-DF step or maybe a vlsi 82c146
 		 * we detected the vlsi case earlier, so if the controller
-		 * isn't set, we know it is a i82365sl step D.
+		 * isn't set, we know it is an i82365sl step D.
 		 */
 		case PCIC_INTEL2:
 			if (sp->controller == -1)
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 88280d1..d186586 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -3417,7 +3417,7 @@ tulip_rx_intr(
 	     * those buffers and chain to the starting mbuf.  All buffers but
 	     * the last buffer have the same length so we can set that now.
 	     * (we add to last_offset instead of multiplying since we normally
-	     * won't go into the loop and thereby saving a ourselves from
+	     * won't go into the loop and thereby saving ourselves from
 	     * doing a multiplication by 0 in the normal case).
 	     */
 	    _IF_DEQUEUE(&sc->tulip_rxq, ms);
@@ -3918,7 +3918,7 @@ tulip_intr_handler(
 
 #if defined(TULIP_USE_SOFTINTR)
 /*
- * This is a experimental idea to alleviate problems due to interrupt
+ * This is an experimental idea to alleviate problems due to interrupt
  * livelock.  What is interrupt livelock?  It's when you spend all your
  * time servicing device interrupts and never drop below device ipl
  * to do "useful" work.
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 8a693df..95bcf77 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -78,7 +78,7 @@
  * (3c59x) also supported a bus master mode, however for those chips
  * you could only DMA packets to/from a contiguous memory buffer. For
  * transmission this would mean copying the contents of the queued mbuf
- * chain into a an mbuf cluster and then DMAing the cluster. This extra
+ * chain into an mbuf cluster and then DMAing the cluster. This extra
  * copy would sort of defeat the purpose of the bus master support for
  * any packet that doesn't fit into a single mbuf.
  *
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index b5e3bd1..13ea139 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -92,8 +92,8 @@
 #if !defined(_POSIX_SOURCE)
 #define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LLONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LLONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LLONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LLONG_MIN	/* min value for an off_t */
 
 /* Quads and long longs are the same size.  Ensure they stay in sync. */
 #define	UQUAD_MAX	ULLONG_MAX	/* max value for a uquad_t */
diff --git a/sys/powerpc/include/limits.h b/sys/powerpc/include/limits.h
index b5e3bd1..13ea139 100644
--- a/sys/powerpc/include/limits.h
+++ b/sys/powerpc/include/limits.h
@@ -92,8 +92,8 @@
 #if !defined(_POSIX_SOURCE)
 #define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LLONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LLONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LLONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LLONG_MIN	/* min value for an off_t */
 
 /* Quads and long longs are the same size.  Ensure they stay in sync. */
 #define	UQUAD_MAX	ULLONG_MAX	/* max value for a uquad_t */
diff --git a/sys/sparc64/include/_limits.h b/sys/sparc64/include/_limits.h
index 4620e36..be8cf0d 100644
--- a/sys/sparc64/include/_limits.h
+++ b/sys/sparc64/include/_limits.h
@@ -73,8 +73,8 @@
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
 
 /* Quads and longs are the same on the alpha.  Ensure they stay in sync. */
 #define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
diff --git a/sys/sparc64/include/limits.h b/sys/sparc64/include/limits.h
index 4620e36..be8cf0d 100644
--- a/sys/sparc64/include/limits.h
+++ b/sys/sparc64/include/limits.h
@@ -73,8 +73,8 @@
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for a off_t */
+#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
+#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
 
 /* Quads and longs are the same on the alpha.  Ensure they stay in sync. */
 #define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
diff --git a/sys/sparc64/sparc64/cache.c b/sys/sparc64/sparc64/cache.c
index 6b27f14..227577e 100644
--- a/sys/sparc64/sparc64/cache.c
+++ b/sys/sparc64/sparc64/cache.c
@@ -328,7 +328,7 @@ icache_flush(vm_offset_t start, vm_offset_t end)
 }
 
 /*
- * Invalidate a I$ physical range using diagnostic accesses.
+ * Invalidate an I$ physical range using diagnostic accesses.
  * NOTE: there is a race between checking the tag and invalidating it. It
  * cannot be closed by disabling interrupts, since the fetch for the next
  * instruction may be in that line, so we don't even bother.
@@ -454,7 +454,7 @@ dcache_blast()
 		stxa_sync(dca, ASI_DCACHE_TAG, 0);
 }
 
-/* Flush a E$ physical range using block commit stores. */
+/* Flush an E$ physical range using block commit stores. */
 void
 ecache_flush(vm_offset_t start, vm_offset_t end)
 {
@@ -480,7 +480,7 @@ ecache_flush(vm_offset_t start, vm_offset_t end)
 
 #if 0
 /*
- * Invalidate a E$ range using diagnostic accesses.
+ * Invalidate an E$ range using diagnostic accesses.
  * This is disabled: it suffers from the same races as dcache_blast() and
  * icache_blast_phys(), but they may be fatal here because blasting an E$ line
  * can discard modified data.
diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S
index 971de31..11c1753 100644
--- a/sys/sparc64/sparc64/interrupt.S
+++ b/sys/sparc64/sparc64/interrupt.S
@@ -110,7 +110,7 @@ ENTRY(intr_vector)
 	lduw	[%g2 + IV_PRI], %g6
 
 	/*
-	 * Get a intr_request from the free list.  There should always be one
+	 * Get an intr_request from the free list.  There should always be one
 	 * unless we are getting an interrupt storm from stray interrupts, in
 	 * which case the we will deference a NULL pointer and panic.
 	 */
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index e8dd24e..01f3713 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -135,7 +135,7 @@ struct protosw {
  * The arguments to usrreq are:
  *	(*protosw[].pr_usrreq)(up, req, m, nam, opt);
  * where up is a (struct socket *), req is one of these requests,
- * m is a optional mbuf chain containing a message,
+ * m is an optional mbuf chain containing a message,
  * nam is an optional mbuf chain containing an address,
  * and opt is a pointer to a socketopt structure or nil.
  * The protocol is responsible for disposal of the mbuf chain m,
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 620d657..8733413 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -364,7 +364,7 @@ struct patch_info {
  *
  * The low_note and high_note fields define the minimum and maximum note
  * frequencies for which this sample is valid. It is possible to define
- * more than one samples for a instrument number at the same time. The
+ * more than one samples for an instrument number at the same time. The
  * low_note and high_note fields are used to select the most suitable one.
  *
  * The fields base_note, high_note and low_note should contain
@@ -446,7 +446,7 @@ struct patmgr_info {	/* Note! size must be < 4k since kmalloc() is used */
 	  u_long key;	/* Don't worry. Reserved for communication
 	  			   between the patch manager and the driver. */
 #define PM_K_EVENT		1 /* Event from the /dev/sequencer driver */
-#define PM_K_COMMAND		2 /* Request from a application */
+#define PM_K_COMMAND		2 /* Request from an application */
 #define PM_K_RESPONSE		3 /* From patmgr to application */
 #define PM_ERROR		4 /* Error returned by the patmgr */
 	  int device;
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index b6c3657..78383d6 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -992,7 +992,7 @@ static long	num_inodedep;	/* number of inodedep allocated */
 static struct sema inodedep_in_progress;
 
 /*
- * Look up a inodedep. Return 1 if found, 0 if not found.
+ * Look up an inodedep. Return 1 if found, 0 if not found.
  * If not found, allocate if DEPALLOC flag is passed.
  * Found or allocated entry is returned in inodedeppp.
  * This routine must be called with splbio interrupts blocked.
diff --git a/sys/ufs/ufs/dirhash.h b/sys/ufs/ufs/dirhash.h
index 1acb4ef..7f3aef9 100644
--- a/sys/ufs/ufs/dirhash.h
+++ b/sys/ufs/ufs/dirhash.h
@@ -38,7 +38,7 @@
  * long linear searches. Deleted entries that are not the last
  * in a chain must be marked DIRHASH_DEL.
  *
- * We also maintain a information about free space in each block
+ * We also maintain information about free space in each block
  * to speed up creations.
  */
 #define DIRHASH_EMPTY	(-1)	/* entry unused */
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index a3da677..76e345a 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -1036,7 +1036,7 @@ zone_ctor(void *mem, int size, void *udata)
 	/*
 	 * If we're putting the slab header in the actual page we need to
 	 * figure out where in each page it goes.  This calculates a right 
-	 * justified offset into the memory on a ALIGN_PTR boundary.
+	 * justified offset into the memory on an ALIGN_PTR boundary.
 	 */
 	if (!(zone->uz_flags & UMA_ZFLAG_OFFPAGE)) {
 		int totsize;
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index ae26d19..6b0168b 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -384,7 +384,7 @@ vm_object_reference(vm_object_t object)
 }
 
 /*
- * handle deallocating a object of type OBJT_VNODE
+ * Handle deallocating an object of type OBJT_VNODE.
  */
 void
 vm_object_vndeallocate(vm_object_t object)
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 62a82d0..d903cbb 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -686,7 +686,7 @@ check_type:
 	case semicolon:	/* got a ';' */
 	    ps.in_or_st = false;/* we are not in an initialization or
 				 * structure declaration */
-	    scase = false;	/* these will only need resetting in a error */
+	    scase = false;	/* these will only need resetting in an error */
 	    squest = 0;
 	    if (ps.last_token == rparen && rparen_count == 0)
 		ps.in_parameter_declaration = 0;
@@ -715,7 +715,7 @@ check_type:
 		 */
 		diag2(1, "Unbalanced parens");
 		ps.p_l_follow = 0;
-		if (sp_sw) {	/* this is a check for a if, while, etc. with
+		if (sp_sw) {	/* this is a check for an if, while, etc. with
 				 * unbalanced parens */
 		    sp_sw = false;
 		    parse(hd_type);	/* dont lose the if, or whatever */
@@ -728,7 +728,7 @@ check_type:
 
 	    if (!sp_sw) {	/* if not if for (;;) */
 		parse(semicolon);	/* let parser know about end of stmt */
-		force_nl = true;/* force newline after a end of stmt */
+		force_nl = true;/* force newline after an end of stmt */
 	    }
 	    break;
 
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index 6fc168c..03651ea 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -368,7 +368,7 @@ extern struct hash_entry *ccltab[CCL_HASH_SIZE];
  * use_read - if true (-f, -F, or -Cr) then use read() for scanner input;
  *   otherwise, use fread().
  * yytext_is_array - if true (i.e., %array directive), then declare
- *   yytext as a array instead of a character pointer.  Nice and inefficient.
+ *   yytext as an array instead of a character pointer.  Nice and inefficient.
  * do_yywrap - do yywrap() processing on EOF.  If false, EOF treated as
  *   "no more files".
  * csize - size of character set for the scanner we're generating;
diff --git a/usr.bin/lex/lex.1 b/usr.bin/lex/lex.1
index dcfc827..918039b 100644
--- a/usr.bin/lex/lex.1
+++ b/usr.bin/lex/lex.1
@@ -3132,7 +3132,7 @@ can't figure this out, and it will plan for possibly needing to back up
 when it has scanned a token like "auto" and then the next character
 is something other than a newline or a letter.  Previously it would
 then just match the "auto" rule and be done, but now it has no "auto"
-rule, only a "auto\\n" rule.  To eliminate the possibility of backing up,
+rule, only an "auto\\n" rule.  To eliminate the possibility of backing up,
 we could either duplicate all rules but without final newlines, or,
 since we never expect to encounter such an input and therefore don't
 how it's classified, we can introduce one more catch-all rule, this
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 590181e..7a8f086 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -180,8 +180,8 @@ process_file(const char *fn)
 		(void)printf("\n%s:\n", fn);
 
 	/*
-	 * first check whether this is an object file - read a object
-	 * header, and skip back to the beginning
+	 * First check whether this is an object file - read an object
+	 * header, and skip back to the beginning.
 	 */
 	if (fread((char *)&exec_head, sizeof(exec_head), (size_t)1, fp) != 1) {
 		warnx("%s: bad format", fn);
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index e04eae9..4372856 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -54,7 +54,7 @@ static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #include "extern.h"
 
 /*
- * Return a string for a regular expression error passed.  This is a overkill,
+ * Return a string for a regular expression error passed.  This is overkill,
  * because of the silly semantics of regerror (we can never know the size of
  * the buffer).
  */
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 789467e..9b83d52 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -55,7 +55,7 @@ int	curses_initialized = 0;
 
 /*
  * max HAS to be a function, it is called with
- * a argument of the form --foo at least once.
+ * an argument of the form --foo at least once.
  */
 int
 max(a,b)
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index c783161..a6e98e8 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -182,7 +182,7 @@ send_delete()
 
 	msg.type = DELETE;
 	/*
-	 * This is just a extra clean up, so just send it
+	 * This is just an extra clean up, so just send it
 	 * and don't wait for an answer
 	 */
 	msg.id_num = htonl(remote_id);
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index 2eb0dcb..db72715 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -105,7 +105,7 @@ When invoked as
 sets cooked and echo modes, turns off cbreak and raw modes, turns on
 newline translation and resets any unset special characters to their
 default values before doing the terminal initialization described above.
-This is useful after a program dies leaving a terminal in a abnormal state.
+This is useful after a program dies leaving a terminal in an abnormal state.
 Note, you may have to type
 .Dq Li <LF>reset<LF>
 (the line-feed character is normally control-J) to get the terminal
diff --git a/usr.sbin/IPXrouted/sap_tables.c b/usr.sbin/IPXrouted/sap_tables.c
index f2d83e0..df2fc4b 100644
--- a/usr.sbin/IPXrouted/sap_tables.c
+++ b/usr.sbin/IPXrouted/sap_tables.c
@@ -145,7 +145,7 @@ next:;
 }
 
 /*
- * Add a entry to the SAP table.
+ * Add an entry to the SAP table.
  *
  * If the malloc fail, the entry will silently be thrown away.
  */
diff --git a/usr.sbin/bluetooth/hccontrol/status.c b/usr.sbin/bluetooth/hccontrol/status.c
index c857349..0494aa7 100644
--- a/usr.sbin/bluetooth/hccontrol/status.c
+++ b/usr.sbin/bluetooth/hccontrol/status.c
@@ -231,7 +231,7 @@ struct hci_command	status_commands[] = {
 "read_rssi <connection_handle>",
 "\nThis command will read the value for the difference between the\n" \
 "measured Received Signal Strength Indication (RSSI) and the limits of\n" \
-"the Golden Receive Power Range for a ACL connection handle to another\n" \
+"the Golden Receive Power Range for an ACL connection handle to another\n" \
 "Bluetooth device. Any positive RSSI value returned by the Host Controller\n" \
 "indicates how many dB the RSSI is above the upper limit, any negative\n" \
 "value indicates how many dB the RSSI is below the lower limit. The value\n" \
diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM
index a728a78..02b1544 100644
--- a/usr.sbin/ctm/mkCTM/mkCTM
+++ b/usr.sbin/ctm/mkCTM/mkCTM
@@ -1,4 +1,6 @@
 #!/usr/local/bin/tclsh7.4
+#
+# $FreeBSD$
 
 #############################################################################
 ### Do we already have this delta ?
@@ -168,7 +170,7 @@ while 1 {
     # If we did an absolute delta: stop.
     if {$CTMsuff != ""} break
 
-    # Make a absolute delta (!) every 100 deltas
+    # Make an absolute delta (!) every 100 deltas
     if {$CTMnbr == 0 || ($CTMnbr % 100)} break
 
     # Make an absolute delta too...
diff --git a/usr.sbin/faithd/README b/usr.sbin/faithd/README
index 606a590..af0bfed 100644
--- a/usr.sbin/faithd/README
+++ b/usr.sbin/faithd/README
@@ -7,7 +7,7 @@ $FreeBSD$
 Introduction
 ============
 
-FAITH is a IPv6-to-IPv4 TCP relay.  It performs tcp relay just as some of
+FAITH is an IPv6-to-IPv4 TCP relay.  It performs tcp relay just as some of
 firewall-oriented gateway does, but between IPv6 and IPv4 with address
 translation.
 TCP connections has to be made from IPv6 node to IPv4 node.  FAITH will
@@ -29,7 +29,7 @@ invoked per each TCP services (TCP port number).
 You will have to allocate an IPv6 address prefix to map IPv4 addresses into.
 The following description uses 3ffe:0501:ffff:0000:: as example.
 Please use a prefix which belongs to your site.
-FAITH will make it possible to make a IPv6 TCP connection From IPv6 node
+FAITH will make it possible to make an IPv6 TCP connection From IPv6 node
 "src", toward IPv4 node "dest", by specifying FAITH-mapped address
 3ffe:0501:ffff:0000::123.4.5.6
 (which is, 3ffe:0501:ffff:0000:0000:0000:7b04:0506).
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfdecode.c b/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
index 1ef49a9..16c68e6 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
+++ b/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
@@ -23,7 +23,7 @@
 #define FSC	(1<<12)
 
 /* Alaw parameters */
-#define SIGN_BIT        (0x80)          /* Sign bit for a A-law byte. */
+#define SIGN_BIT        (0x80)          /* Sign bit for an A-law byte. */
 #define QUANT_MASK      (0xf)           /* Quantization field mask. */
 #define SEG_SHIFT       (4)             /* Left shift for segment number. */
 #define SEG_MASK        (0x70)          /* Segment field mask. */
diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index c848bf7..be31920 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -907,7 +907,7 @@ This specifies a Raw B CHannel access interface.
 .It Ar tel
 ISDN telephony.
 .It Ar ing
-configures a ISDN B-channel to NetGraph interface.
+configures an ISDN B-channel to NetGraph interface.
 .El
 .It Li usrdeviceunit
 Specifies the unit number for the device which is specified with
diff --git a/usr.sbin/i4b/isdnmonitor/monitor.h b/usr.sbin/i4b/isdnmonitor/monitor.h
index f5d532f..4862c48 100644
--- a/usr.sbin/i4b/isdnmonitor/monitor.h
+++ b/usr.sbin/i4b/isdnmonitor/monitor.h
@@ -147,7 +147,7 @@
 #define	I4B_MON_DUMPRIGHTS_SIZE		I4B_MON_CMD_HDR		/* no parameters */
 
 /*
- * in response to a I4B_MON_DUMPRIGHTS_CODE command, the daemon sends
+ * In response to an I4B_MON_DUMPRIGHTS_CODE command, the daemon sends
  * this event:
  */
 #define	I4B_MON_DRINI_CODE		2	/* event code */
@@ -167,7 +167,7 @@
 #define	I4B_MON_DUMPMCONS_SIZE		I4B_MON_CMD_HDR		/* no parameters */
 
 /*
- * in response to a I4B_MON_DUMPMCONS_CODE command, the daemon sends
+ * In response to an I4B_MON_DUMPMCONS_CODE command, the daemon sends
  * this event:
  */
 #define	I4B_MON_DCINI_CODE		4	/* event code */
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 06ad9b0..5dec9c1 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -952,8 +952,8 @@ moused(void)
 	            ioctl(rodent.cfd, CONS_MOUSECTL, &mouse);
 	    }
 
-            /*
-	     * If the Z axis movement is mapped to a imaginary physical 
+	    /*
+	     * If the Z axis movement is mapped to an imaginary physical
 	     * button, we need to cook up a corresponding button `up' event
 	     * after sending a button `down' event.
 	     */
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index 1f91e07..68087af 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -925,7 +925,7 @@
 /* Do we want the SCO clock hacks? */
 /* #undef SCO5_CLOCK */
 
-/* The size of a `int', as computed by sizeof. */
+/* The size of an `int', as computed by sizeof. */
 #define SIZEOF_INT 4
 
 /* The size of a `long', as computed by sizeof. */
diff --git a/usr.sbin/ntp/doc/ntp-genkeys.8 b/usr.sbin/ntp/doc/ntp-genkeys.8
index 25c493a..96fc142 100644
--- a/usr.sbin/ntp/doc/ntp-genkeys.8
+++ b/usr.sbin/ntp/doc/ntp-genkeys.8
@@ -95,7 +95,7 @@ specified by the
 .Ic keys
 configuration file command and made
 visible only to root.
-An additional key consisting of a easily
+An additional key consisting of an easily
 remembered password should be added by hand for use with the
 .Xr ntpq 8
 and
diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5
index 7798a97..1686c1d 100644
--- a/usr.sbin/ntp/doc/ntp.conf.5
+++ b/usr.sbin/ntp/doc/ntp.conf.5
@@ -134,7 +134,7 @@ be used and the mode in which to operate.
 The
 .Ar address
 can be
-either a DNS name or a IP address in dotted-quad notation.
+either a DNS name or an IP address in dotted-quad notation.
 Additional information on association behavior can be found in the
 .Qq "Association Management"
 page.
diff --git a/usr.sbin/pcvt/Misc/Doc/NotesAndHints b/usr.sbin/pcvt/Misc/Doc/NotesAndHints
index 725831a..8accc2f 100644
--- a/usr.sbin/pcvt/Misc/Doc/NotesAndHints
+++ b/usr.sbin/pcvt/Misc/Doc/NotesAndHints
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
 Random Notes and Hints                Last Edit-Date: [Sun Apr  2 18:28:09 1995]
 --------------------------------------------------------------------------------
 
@@ -16,16 +18,16 @@ below.
 
 ] Just for the record, in case someone else is asking for this: Al's
 ] confirmation that pcvt w/ PCVT_SCANSET=2 works for the ThinkPad:
-] 
+]
 ] As Al Elia wrote:
 ] | Date: Mon, 28 Nov 1994 18:24:42 GMT
 ] | From: Al Elia <aelia%aelia.student.harvard.edu@sax.sax.de>
 ] | Message-Id: <199411281824.SAA01554@aelia.student.harvard.edu>
 ] | To: joerg_wunsch@bonnie.tcd-dresden.de
 ] | Subject: Re: Anyone got FreeBSD 1.1.5.1 running on a ThinkPad?
-] | 
+] |
 ] | PCVT_SCANSET=2 worked...I had put in PCVT_SCAN_SET=2 (Doh!)
-] | 
+] |
 ] | --Al Elia
 ] | <aelia@aelia.student.harvard,edu>
 
@@ -106,7 +108,7 @@ There used to be an entry in the BugList:
 
 This was solved some time ago:
 
-	On another note: if I use stty xtabs, the 'printf "\t\t\t\t\t\t\t" 
+	On another note: if I use stty xtabs, the 'printf "\t\t\t\t\t\t\t"
 	bug goes away. With stty xtabs the tab handling is done in the kernel.
 
 (See also below: "Vttest shows strange results")
@@ -169,11 +171,11 @@ board has a programmable clock generator and you run X and you switch from
 132 col mode into X and back.
 
 I have currently no idea how to solve this, other than having a similar
-scheme as XFree86 applied to pcvt: Letting the user probe his board by using 
+scheme as XFree86 applied to pcvt: Letting the user probe his board by using
 SuperProbe and recompiling pcvt according to the result.
 
 I stumbled a bit deeper into this with my ELSA Winner 1000, which is equipped
-with a ICD2061 clock synthesizer chip. For 132 column mode to work properly,
+with an ICD2061 clock synthesizer chip. For 132 column mode to work properly,
 clock generator 2 must deliver 40 MHz to the S3 VGA chip, but this value has
 to be programmed or initialized. If this VGA board has ever been switched
 into 132 colums, i.e. in my case from a DOS program, it will continue to do
@@ -231,7 +233,7 @@ try to issue the command: "scon -p8,60,60,60", EXPERIMENT !!!
 
 How to change the color palette on VGA cards:
 ===============================================================================
-	
+
 try out the following commands:
 
 	/usr/local/bin/scon -d/dev/ttyv0 -pblack:0,0,0 -pblue:20,20,40
diff --git a/usr.sbin/pcvt/keycap/man5/keycap.5 b/usr.sbin/pcvt/keycap/man5/keycap.5
index b5208661..7e40183 100644
--- a/usr.sbin/pcvt/keycap/man5/keycap.5
+++ b/usr.sbin/pcvt/keycap/man5/keycap.5
@@ -75,10 +75,10 @@ upper case and blanks for readability.
 .It "nl<n>	num	specify key number for the NUM LOCK key
 .It "sc<n>	num	specify key number for the SCROLL LOCK key
 .It "
-.It "K<n>	str	bind a string to a unshifted (normal) key
+.It "K<n>	str	bind a string to an unshifted (normal) key
 .It "S<n>	str	bind a string to a shifted key
 .It "C<n>	str	bind a string to a control key
-.It "A<n>	str	bind a string to a altgr key
+.It "A<n>	str	bind a string to an altgr key
 .It "
 .It "tc	str	Entry of similar map \- must be last."
 .El
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.1 b/usr.sbin/pcvt/userkeys/vt220keys.1
index 1da8544..3a4e231 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.1
+++ b/usr.sbin/pcvt/userkeys/vt220keys.1
@@ -99,7 +99,7 @@ or
 .Pa .profile
 file.
 Typically an user
-will create a initialization file and include a line like
+will create an initialization file and include a line like
 .Pp
 .Dl "vt220keys -ci"
 OR
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index d810d09..4aeb7d6 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -79,7 +79,7 @@ will search them in each directory named by
 .It Fl v
 Turn on verbose output.
 .It Fl I
-If a installation scripts (pre-install or post-install) exist for a given
+If an installation scripts (pre-install or post-install) exist for a given
 package, do not execute them.
 .It Fl n
 Don't actually install a package, just report the steps that
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index 1897d12..b25a158 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -1232,7 +1232,7 @@ IpcpDecodeConfig(struct fsm *fp, u_char *cp, u_char *end, int mode_type,
           fsm_nak(dec, &nak);
         } else {
           /*
-           * Otherwise they have it right (this time) so we send a ack packet
+           * Otherwise they have it right (this time) so we send an ack packet
            * back confirming it... end of story
            */
           fsm_ack(dec, opt);
diff --git a/usr.sbin/pppd/RELNOTES b/usr.sbin/pppd/RELNOTES
index 12d9c7f..1c1e3922 100644
--- a/usr.sbin/pppd/RELNOTES
+++ b/usr.sbin/pppd/RELNOTES
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
 This is the README file for ppp-2.3, a package which implements the
 Point-to-Point Protocol (PPP) to provide Internet connections over
 serial lines.
@@ -403,14 +405,14 @@ Most of the code can be freely used and redistributed.  The STREAMS
 code for SunOS 4.x, OSF/1 and AIX 4 is under a more restrictive
 copyright:
 
-	This code is Copyright (C) 1989, 1990 By Brad K. Clements, 
+	This code is Copyright (C) 1989, 1990 By Brad K. Clements,
 	All Rights Reserved.
 
 	You may use this code for your personal use, to provide a non-profit
 	service to others, or to use as a test platform for a commercial
 	implementation.
 
-	You may NOT use this code in a commercial product, nor to provide a 
+	You may NOT use this code in a commercial product, nor to provide a
 	commercial service, nor may you sell this code without express
 	written permission of the author.
 
@@ -489,7 +491,7 @@ security holes.  In addition, the authentication mechanisms were quite
 weak: if the peer refused to agree to authenticate, pppd would print a
 warning message but still allow the link to come up.  The CHAP
 implementation also appeared to be quite broken (has anybody actually
-used it?).  
+used it?).
 
 This new version of pppd addresses these problems.  My aim has been to
 provide system administrators with sufficient access control that PPP
@@ -541,7 +543,7 @@ for several combinations of server (authenticating peer) and client
 and client, and that different protocols can be used in the two
 directions if desired.
 
-A secrets file is parsed into words as for a options file.  A secret
+A secrets file is parsed into words as for an options file.  A secret
 is specified by a line containing at least 3 words, in the order
 client, server, secret.  Any following words on the same line are
 taken to be a list of acceptable IP addresses for that client.  If
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index d035709..bdf24d1 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -1076,7 +1076,7 @@ endswitch:
     /*
      * If we aren't rejecting this packet, and we want to negotiate
      * their address, and they didn't send their address, then we
-     * send a NAK with a IPX_NODE_NUMBER option appended. We assume the
+     * send a NAK with an IPX_NODE_NUMBER option appended. We assume the
      * input buffer is long enough that we can append the extra
      * option safely.
      */
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index ce82a73..41cefa1 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -760,7 +760,7 @@ the client, the name of the server, and the secret.  These fields may
 be followed by a list of the IP addresses that the specified client
 may use when connecting to the specified server.
 .LP
-A secrets file is parsed into words as for a options file, so the
+A secrets file is parsed into words as for an options file, so the
 client name, server name and secrets fields must each be one word,
 with any embedded spaces or other special characters quoted or
 escaped.  Any following words on the same line are taken to be a list
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index d41efd0..98e4647 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -83,7 +83,7 @@ static char _rcsid[] = "$KAME: route6d.c,v 1.64 2001/05/08 04:36:37 itojun Exp $
 #ifdef	DEBUG
 #define	INIT_INTERVAL6	6
 #else
-#define	INIT_INTERVAL6	10	/* Wait to submit a initial riprequest */
+#define	INIT_INTERVAL6	10	/* Wait to submit an initial riprequest. */
 #endif
 
 /* alignment constraint for routing socket */
@@ -1778,7 +1778,7 @@ rt_del(sdst, sgw, smask)
 		 * fresh list.
 		 */
 		struct riprt *longest;
-		trace(1, "\t%s is a interface route, guessing prefixlen\n",
+		trace(1, "\t%s is an interface route, guessing prefixlen\n",
 			inet6_n2p(dst));
 		longest = NULL;
 		for (rrt = riprt; rrt; rrt = rrt->rrt_next) {
diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c
index 60c3864..541d168 100644
--- a/usr.sbin/rpcbind/rpcb_svc_com.c
+++ b/usr.sbin/rpcbind/rpcb_svc_com.c
@@ -1385,7 +1385,7 @@ add_pmaplist(RPCB *arg)
 		/* It is TCP */
 		pmap.pm_prot = IPPROTO_TCP;
 	} else
-		/* Not a IP protocol */
+		/* Not an IP protocol */
 		return (0);
 
 	/* interpret the universal address for TCP/IP */
@@ -1437,7 +1437,7 @@ del_pmaplist(RPCB *arg)
 	} else if (arg->r_netid[0] == NULL) {
 		prot = 0;	/* Remove all occurrences */
 	} else {
-		/* Not a IP protocol */
+		/* Not an IP protocol */
 		return (0);
 	}
 	for (prevpml = NULL, pml = list_pml; pml; /* cstyle */) {
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index 9a12ac0..21c19b0 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -97,7 +97,7 @@ int rpcbindlockfd;
 
 #ifdef WARMSTART
 /* Local Variable */
-static int warmstart = 0;	/* Grab a old copy of registrations */
+static int warmstart = 0;	/* Grab an old copy of registrations. */
 #endif
 
 #ifdef PORTMAP
@@ -339,7 +339,7 @@ init_transport(struct netconfig *nconf)
 					hints.ai_flags &= AI_NUMERICHOST;
 				} else {
 					/*
-					 * Skip if we have a AF_INET6 adress
+					 * Skip if we have an AF_INET6 adress.
 					 */
 					if (inet_pton(AF_INET6,
 					    hosts[nhostsbak], host_addr) == 1)
@@ -352,7 +352,7 @@ init_transport(struct netconfig *nconf)
 					hints.ai_flags &= AI_NUMERICHOST;
 				} else {
 					/*
-					 * Skip if we have a AF_INET adress
+					 * Skip if we have an AF_INET adress.
 					 */
 					if (inet_pton(AF_INET, hosts[nhostsbak],
 					    host_addr) == 1)
diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c
index fed9231..1962e1c 100644
--- a/usr.sbin/rpcbind/warmstart.c
+++ b/usr.sbin/rpcbind/warmstart.c
@@ -28,7 +28,7 @@
  */
 /*
  * warmstart.c
- * Allows for gathering of registrations from a earlier dumped file.
+ * Allows for gathering of registrations from an earlier dumped file.
  *
  * Copyright (c) 1990 by Sun Microsystems, Inc.
  */
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index fe85383..a287640 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -294,7 +294,7 @@ Default: none.
 If set, bring up the interactive disk partition editor.
 .El
 .Pp
-Note: Nothing is actually written to disk by this function, a explicit call to
+Note: Nothing is actually written to disk by this function, an explicit call to
 .Ar diskPartitionWrite
 being required for that to happen.
 .It diskPartitionWrite
diff --git a/usr.sbin/setkey/sample.cf b/usr.sbin/setkey/sample.cf
index 978289d..3318f9b 100644
--- a/usr.sbin/setkey/sample.cf
+++ b/usr.sbin/setkey/sample.cf
@@ -166,10 +166,10 @@ add fec0:0:0:2::1 fec0:0:0:1::1 esp 0x10004
 	-E rc5-cbc "kamekame"
 	-A hmac-md5 "this is the test" ;
 
-# By "get" command, you can get a entry of either SP or SA.
+# By "get" command, you can get an entry of either SP or SA.
 get fec0:0:0:1::1 fec0:0:0:2::2 ah 0x10004 ;
 
-# Also delete command, you can delete a entry of either SP or SA.
+# Also delete command, you can delete an entry of either SP or SA.
 spddelete fec0:0:0:1::/64 fec0:0:0:2::/64 any -P out;
 delete fec0:0:0:1::1 fec0:0:0:2::2 ah 0x10004 ;
 
diff --git a/usr.sbin/setkey/setkey.8 b/usr.sbin/setkey/setkey.8
index f25cf34f..7c8cf38 100644
--- a/usr.sbin/setkey/setkey.8
+++ b/usr.sbin/setkey/setkey.8
@@ -283,9 +283,9 @@ Specify hard/soft life time duration of the SA.
 .It Ar algorithm
 .Bl -tag -width Fl -compact
 .It Fl E Ar ealgo Ar key
-Specify a encryption algorithm.
+Specify an encryption algorithm.
 .It Fl A Ar aalgo Ar key
-Specify a authentication algorithm.
+Specify an authentication algorithm.
 If
 .Fl A
 is used with
diff --git a/usr.sbin/stallion/bootcode/stl.4 b/usr.sbin/stallion/bootcode/stl.4
index 7fd9362..ea98335 100644
--- a/usr.sbin/stallion/bootcode/stl.4
+++ b/usr.sbin/stallion/bootcode/stl.4
@@ -108,7 +108,7 @@ No configuration information is required in advance for these
 board types.
 During boot up the
 .Nm
-driver will issue messages to indicate that a EasyConnection 8/32
+driver will issue messages to indicate that an EasyConnection 8/32
 PCI board was found, and some information about it.
 .Pp
 Following are some examples of configuration entries for each of the ISA
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index fe85383..a287640 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -294,7 +294,7 @@ Default: none.
 If set, bring up the interactive disk partition editor.
 .El
 .Pp
-Note: Nothing is actually written to disk by this function, a explicit call to
+Note: Nothing is actually written to disk by this function, an explicit call to
 .Ar diskPartitionWrite
 being required for that to happen.
 .It diskPartitionWrite
diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h
index b84ee2c..3e7c885 100644
--- a/usr.sbin/tcpdump/tcpdump/config.h
+++ b/usr.sbin/tcpdump/tcpdump/config.h
@@ -101,7 +101,7 @@
 /* The number of bytes in a char.  */
 #define SIZEOF_CHAR 1
 
-/* The number of bytes in a int.  */
+/* The number of bytes in an int.  */
 #define SIZEOF_INT 4
 
 /* The number of bytes in a long.  */
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index f5f3fbe..da3ff1c 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -205,7 +205,7 @@ static const char rcsid[] =
  * This program requires a kernel mod that does not appear in any
  * system available from Berkeley:  A raw ip socket using proto
  * IPPROTO_RAW must interpret the data sent as an ip datagram (as
- * opposed to data to be wrapped in a ip datagram).  See the README
+ * opposed to data to be wrapped in an ip datagram).  See the README
  * file that came with the source to this program for a description
  * of the mods I made to /sys/netinet/raw_ip.c.  Your mileage may
  * vary.  But, again, ANY 4.x (x < 4) BSD KERNEL WILL HAVE TO BE