pseudo-device -> device in kernel config lines. Removed whitespace at EOL.

Reviewed by:	joerg, dd

28 files changed, 361 insertions, 361 deletions

diff --git a/share/examples/drivers/make_pseudo_driver.sh b/share/examples/drivers/make_pseudo_driver.sh
index 32cce89..19c4acc 100644
--- a/share/examples/drivers/make_pseudo_driver.sh
+++ b/share/examples/drivers/make_pseudo_driver.sh
@@ -29,7 +29,7 @@ grep -v GENERIC < GENERIC >>${UPPER}
 cat >>${UPPER} <<DONE
 # trust me, you'll need this
 options	DDB		
-pseudo-device	${1}	4	# might as well allow 4 of them 
+device	${1}	4	# might as well allow 4 of them 
 DONE
 
 cat >../../dev/${1}.c <<DONE
diff --git a/share/examples/isdn/FAQ b/share/examples/isdn/FAQ
index 201ed7f..dcc6e67 100644
--- a/share/examples/isdn/FAQ
+++ b/share/examples/isdn/FAQ
@@ -14,7 +14,7 @@ Contents:
 
 	 1. How do I get started with synchronous PPP (sPPP) ?
 	 2. does anyone know a software that can receive/send fax over ISDN ?
-	 3. does i4b callback only work with setups where the remote end 
+	 3. does i4b callback only work with setups where the remote end
 		returns a busy ?
 	 4. trouble with kernel options IPFIREWALL and IPDIVERT and natd
 	 5. I want to use -r with isdnd but it does not work
@@ -51,68 +51,68 @@ Contents:
   entries should have been automatically made in /sys/conf/files for you.
   For NetBSD it isn't quite as simple since NetBSD/install-netbsd.sh does
   not do it for you.
-  
+
   Then all you need to do is put an entry like this:
-  
-  	pseudo-device   "i4bisppp"      4
-  
+
+  	device   "i4bisppp"      4
+
   into your kernel configuration file (if it's not already there) and
   generate and boot the new kernel. The above line will give you 4
   sPPP interfaces - isp0 to isp3.
-  
+
   Then just modify /etc/isdn/isdnd.rc (see the example in etc-isdn/isdnd.rc)
   to suit your needs (telephone numbers, etc).
-  
+
   The next step is to read the ispppcontrol man page and then to look at
   etc/rc.isdn-PPP. ispppcontrol is a very important component in getting
   sPPP working correctly and the ispppcontrol lines in your /etc/rc.isdn
   must be correct.
-  
+
   In my experience there are two things which can cause problems:
-  
+
   1) the authproto line has to agree with what your ISP desires. In
      general I've found that it's best to have something like this -
-  
+
   	ispppcontrol <interface> myauthproto={pap,chap} myauthname=<AuthName>
   		myauthsecret=<AuthSecret> hisauthproto=none callin
-  
+
      The "hisauthproto=none" is usually needed because the ISP does not want
      to authorise himself to you; he expects you to authorize yourself to him !
      I once forgot to set hisauthproto and it took me quite a while to figure
      out why I couldn't connect.
-  
+
   2) the IP address at your ISP's end must be correct.
-  
+
   How can I find out (1) whether my ISP wants pap or chap and (2) what his
   IP address is ? you might ask. Generally, your ISP should have provide
   this information to you. But, if he didn't, or you've mislayed the
   documentation (as I did), there's still hope.
-  
+
   Fortunately, J"org Wunsch implemented the sPPP kernel code so that it
   provides all the information required if the interface is configured
   with the debug flag set (e.g. ``ifconfig isp0 debug''). It's just a
   little cryptic.
-  
+
   By the way, I suggest turning the debug flag on until you have things
   working and then turning it off. The debug output is rather voluminous
   and could fill up your /var partition, otherwise.
-  
+
   The debug output will appear on the console and also be logged to
   /var/log/messages (under FreeBSD) unless you changed /etc/syslog.conf.
-  
+
   A. How to figure out the authproto
   ----------------------------------
-  
+
   Here is an example where I configured isp0 with myauthproto=pap, my
   ISP wanted chap, but was willing to accept pap:
-  
+
   /kernel: isp0: lcp up(starting)
   /kernel: isp0: lcp output <conf-req id=0x7 len=10 5-6-34-e4-30-5a>
   /kernel: isp0: lcp input(req-sent): <conf-req id=0x1 len=30 0-4-0-0-1-4-5-
   f4-3-5-c2-23-5-11-4-5-f4-13-9-3-0-c0-7b-6e-fe-b5>
          ^^^^^
              |___ c223 is chap, it's what the ISP wants to use
-  
+
   /kernel: isp0: lcp parse opts:  0x0 [rej]  mru  auth-proto  0x11 [rej]
   x13 [rej]  send conf-rej (I didn't agree)
   /kernel: isp0: lcp output <conf-rej id=0x1 len=21 0-4-0-0-11-4-5-f4-13-9-3-
@@ -126,17 +126,17 @@ Contents:
   /kernel: isp0: lcp output <conf-nak id=0x2 len=9 3-5-c0-23-5>
                                                          ^^^^^
                                                              |___ c023 is pap
-  
+
   /kernel: isp0: lcp input(ack-rcvd): <conf-req id=0x3 len=12 1-4-5-f4-3-4-
   c0-23> (he agrees to use pap)
   /kernel: isp0: lcp parse opts:  mru  auth-proto
   /kernel: isp0: lcp parse opt values:  mru 1524  auth-proto  send conf-ack
   /kernel: isp0: lcp output <conf-ack id=0x3 len=12 1-4-5-f4-3-4-c0-23>
   					he agrees to use pap ___|^^^^^
-  
+
   so, if you have problems in the lcp phase, check which authentication method
   your ISP wants to use. Usually chap is prefered, but pap will be accepted.
-  
+
   B. How to figure out the ISP's IP address
   -----------------------------------------
 
@@ -146,28 +146,28 @@ Contents:
 
 	Jan Riedinger writes:
 	---------------------
-	>I further think Gary should mention 
+	>I further think Gary should mention
 	>in the FAQ in the section "B. How to figure out the ISP's IP address
-	>that it isn't normaly necessary to do it because of the auto 
+	>that it isn't normaly necessary to do it because of the auto
 	>address negotiation.
 
 	Gary answers:
 	-------------
-	I think you're right. I wrote that stuff before the support for 
+	I think you're right. I wrote that stuff before the support for
 	negotiation of the IPS's address was added to if_spppsubr.c.
 
 	======================================================================
 
-  
+
   I also intentionally configured the interface with the wrong address for
   my ISP, like this:
-  
+
   	ifconfig isp0 0.0.0.0 10.0.0.1 debug link1
-  
+
   this means that I want the ISP to assign me an address (the 0.0.0.0) and
   that I expect him to use 10.0.0.1 (which is wrong). Here's the result:
   (note that these addresses have been changed by me)
-  
+
   /kernel: isp0: phase network
   /kernel: isp0: ipcp open(initial)
   /kernel: isp0: ipcp up(starting)
@@ -180,7 +180,7 @@ Contents:
   /kernel: isp0: ipcp nak opts:  address [wantaddr 12.34.56.78] [agree]
                                                      ^^^^^
                                                          |___ he assigns me this
-  
+
   /kernel: isp0: ipcp output <conf-req id=0xa len=10 3-6-c3-b4-eb-63>
   /kernel: isp0: ipcp input(req-sent): <conf-req id=0x2 len=10 3-6-62-4c-36-20>
   /kernel: isp0: ipcp parse opts:  address
@@ -191,16 +191,16 @@ Contents:
   /kernel: isp0: ipcp output <conf-nak id=0x2 len=10 3-6-a-0-0-1>
   	I expect a different address and (incorrectly) reject what he wants.
   	I tell him that I expect 10.0.0.1. After this the connection fails.
-  
+
   Anyway, I now know that his address is really 98.76.54.32 and can use
   it to correctly configure the interface.
-  
+
   With the correct IP address I shoulkd now be able to connect with no
   problems. As stated above, the authorization protocol is normally not
   so important since most ISPs are willing to use pap, although chap is
   more secure. Generally, I'd try chap first and only switch to pap if
   the ISP doesn't accept it.
-  
+
   (by Gary Jennejohn, Home - garyj@muc.de, Work - garyj@fkr.dec.com)
 
 
@@ -209,12 +209,12 @@ Contents:
 ================================================================================
 
  > Hi,
- > 
+ >
  > does anyone know a software that can receive/send fax over ISDN? I am
  > using a Fritz!Card, which can handle group 3 (analogous) fax, but I
  > can't find any hint in the i4b software that this is supported in any
  > way.
- 
+
 This is probably not implemented.
 
 Implementing G3 fax in ISDN would mean simulating an analog modem
@@ -224,7 +224,7 @@ which you had to run FFT analysis on and then interpret.
 
 In addition you have to do this in realtime, to be able to deal with
 the timing involved in the fax protocol, something neither
-FreeBSD or Linux is good at in their native form.. 
+FreeBSD or Linux is good at in their native form..
 
 A third point is that a software simulated faxmodem usually does not
 work well. I tested Teles software faxmodem in Win-95 towards an Ericsson V34
@@ -259,14 +259,14 @@ a configurable time and the calls back. Information on who has called and
 who is to be called back relies on the ISDN calling party number information
 and stuff statically configured in the routers (or isnd's) configuration.
 
-The other type of callback (not supported by i4b right now) means: the 
+The other type of callback (not supported by i4b right now) means: the
 called system accepts the connection and starts ppp negotiation. During this
-the ppp's aggree to do a callback. Information on who called in and who is 
+the ppp's aggree to do a callback. Information on who called in and who is
 going to be called back is subject to the authentication/negotiation already
 done by the two ppp's. Then ppp closes down, the connection is disconnected
 and the called system calls back.
 
-I've never seen someone actually use the second type due to its obvious 
+I've never seen someone actually use the second type due to its obvious
 disadvantages. It may be usefull if you travel, call in from an unknown
 number and want to be called back at that number.
 
@@ -282,12 +282,12 @@ Martin Husemann <martin@rumolt.teuto.de>
 This section
 > Trying to build a router/gateway between my privat Ethernet and
 > the Internet (via my ISP), I have problems with I4B or NAT (I think:).
-> 
+>
 > The 2.2.5-R kernel with options IPFIREWALL and IPDIVERT works fine
 > with ISDN4BSD 0.50-alpha and firewall rule 'pass all from any to any'.
 > However, when I add 'divert natd all from any to any via isp0'
 > and start natd, name server lookups to the ISP's NS don't work.
-> 
+>
 > Also, ping and nslookup fails from any other internal host.
 
 I had exactly the same problems. natd doesn't seem to get a message if
@@ -309,9 +309,9 @@ sleep 5
 kill -HUP $pid
 
 It looks ugly, but at least for me it works. The two sleeps are necessary
-since I have to wait for ppp negotiation to complete (I don't get a message 
-from isdnd for that). If I'm lucky I have my connection after 3 seconds, 
-but 8 seconds should suffice for worst case (the first HUP without a sleep 
+since I have to wait for ppp negotiation to complete (I don't get a message
+from isdnd for that). If I'm lucky I have my connection after 3 seconds,
+but 8 seconds should suffice for worst case (the first HUP without a sleep
 sometimes even succeeded on an slow 486/33 with 8MB RAM, more HUPs don't hurt).
 
 I'm really interested in some more elegant method.
@@ -348,20 +348,20 @@ So am I, let's see what may come out of the discussion on the list.
 ================================================================================
 
 > > Use isdnd in fullscreen mode.
-> 
+>
 > I tried that already, but got an error when I start isdnd that way:
-> 
+>
 >       /usr/local/bin/isdnd -d 0xf9 -f -r /dev/ttyv1 -t cons25
-> 
+>
 > root is logged in on device /dev/ttyv1, the message in /var/log/messages looks like:
-> 
+>
 > "May 22 11:52:28 asterix isdnd[4160]: ERR ERROR, cannot setup tty as controlling terminal: Operation not permitted"
-> 
+>
 > How can I give this device permission ?
-  
+
 
 In case you want to use switch "-r" noone else _must_ use the tty you redirect
-to, you have to remove the getty from the virtual terminal in /etc/ttys and 
+to, you have to remove the getty from the virtual terminal in /etc/ttys and
 restart the init process.
 
 
@@ -382,7 +382,7 @@ are named:
 	"tell-record"	calling number as answer, message is recorded
 	"isdntel.sh"	answers and records messages; by using the
 			program "isdntel", one has the control over
-			the recorded messages in the directory 
+			the recorded messages in the directory
 			"/var/isdn". Look at "man isdntel" and
 			"man isdntelctl".
 
@@ -477,7 +477,7 @@ it all worked without the smallest problem, great data rates :)
 I tried hard to found what the something special was I changed in the BIOS
 settings, but I just couldnt get isdnd back to its stupid behaviour it
 showed all the time before, but I would recommend everybody who has this
-kind of problem to look into his BIOS. 
+kind of problem to look into his BIOS.
 
 			(from Meike Aulbach, strange@stoned.rhein-main.de)
 
@@ -521,7 +521,7 @@ out the PNP-stuff with my Sedlbauer-card soon too though.
 10. Incoming alert - what does it mean ?
 ================================================================================
 
-In the log on vty6 (isdnd full screen log) I'm seeing 
+In the log on vty6 (isdnd full screen log) I'm seeing
 
 16.07.98 11:42:35 CHD 00001 rwth rate 90 sec/unit (rate)
 16.07.98 11:42:35 CHD 00001 rwth dialing from 4191236 to 441291234
@@ -559,7 +559,7 @@ This one seems to be specific for the Netherlands. (-hm)
 
 Question:
 
-I'm trying to get i4b running on my new FreeBSD 2.2.8 system. The kernel 
+I'm trying to get i4b running on my new FreeBSD 2.2.8 system. The kernel
 compiles smootly and everything is looking fine until it's time to dial.
 I get the following error:
 
@@ -568,11 +568,11 @@ Feb 10 20:31:00 goofy isdnd[498]: CHD 00018 I4BPPP cause 101: Message not compat
 Feb 10 20:31:00 goofy isdnd[498]: ERR set_channel_idle: controller [0], invalid channel [-1]!
 Feb 10 20:31:00 goofy isdnd[498]: ERR msg_disconnect_ind: set_channel_idle failed!
 
-The remote site is a Cisco 4000 type router.  I used debug to take a view at 
+The remote site is a Cisco 4000 type router.  I used debug to take a view at
 the ISDN events on the router but according to that the call doesn't arrive
-over there. 
+over there.
 
-Same hardware has worked fine with FreeBSD 2.2.6/i4b 0.63. 
+Same hardware has worked fine with FreeBSD 2.2.6/i4b 0.63.
 
 Who knows what's wrong?
 
@@ -587,7 +587,7 @@ EXCLUDING the city code... so if you live in Utrecht and your number is
 I have seen this in several locations in the Netherlands for years, not
 just with i4b, but also with differentt isdn equipment.. why? guess it
 simply depends on which operator defines your line or what exchange it
-is connected to... :P 
+is connected to... :P
 What I found is that what solved this with other isdn hardware/software,
 also solves it for i4b.. ie.. make sure the local phone number is
 specified, and is specified without the city code.
@@ -659,8 +659,8 @@ I've only seen the problems against old linux kernels (about two years ago),
 are there still machines out there that have such a broken TCP/IP stack? We
 should start to blame the vendors...
 
-	(by Gary Jennejohn, garyj@muc.de, with additions from 
-	 Harold Gutch <logix@foobar.franken.de> and 
+	(by Gary Jennejohn, garyj@muc.de, with additions from
+	 Harold Gutch <logix@foobar.franken.de> and
 	 Martin Husemann <martin@rumolt.teuto.de>).
 
 
@@ -672,7 +672,7 @@ Question:
 
 The system is FreeBSD 3.1-RELEASE with i4b-00.80.00-beta-070599 [...]
 
-I'm trying to compile a Kernel with support for my AVM Fritz!PCI card, 
+I'm trying to compile a Kernel with support for my AVM Fritz!PCI card,
 however, when compiling, it fails with the following error
 
 sh ../../conf/newvers.sh GENERIC -DAVM_A1_PCI
@@ -680,9 +680,9 @@ cc -c -O -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit  -Wnested-
 externs
 -Wstrict-prototypes -Wmissing-prototypes  -Wpointer-arith -Winline -
 Wuninitializ
-ed -Wformat -Wunused  -fformat-extensions -ansi  -nostdinc -I- -I. -I../.. 
+ed -Wformat -Wunused  -fformat-extensions -ansi  -nostdinc -I- -I. -I../..
 -I/us
-r/include -DAVM_A1_PCI -DKERNEL -DVM_STACK -include opt_global.h -elf  
+r/include -DAVM_A1_PCI -DKERNEL -DVM_STACK -include opt_global.h -elf
 vers.c
 loading kernel
 i4b_isic_pci.o: In function `i4b_pci_attach':
@@ -696,17 +696,17 @@ Solution:
 =========
 
 > I have added
-> 
+>
 > i4b/layer1/i4b_avm_fritz_pci.c  optional        isic    device-driver
-> 
-> and am recomiling at the moment, but given that it's a 486, it could take 
+>
+> and am recomiling at the moment, but given that it's a 486, it could take
 > some time :-)
 
-The problem appears to be that overinstall.sh does not update files.i386 
-and options.i386, and that AVM_A1_PCI was added after 3.1-RELEASE and 
-hence is not defined. 
+The problem appears to be that overinstall.sh does not update files.i386
+and options.i386, and that AVM_A1_PCI was added after 3.1-RELEASE and
+hence is not defined.
 
-Manually editing these files (using install.sh as a guide) allows the 
+Manually editing these files (using install.sh as a guide) allows the
 kernel to compile cleanly.
 
 
@@ -735,8 +735,8 @@ I suggest using newsyslog(8). Adding a line like:
 
 /var/log/isdn.log               664  100   *    168   Z  /var/run/isdnd.pid
 
-to /etc/newsyslog.conf will do the job (here: once a week, for the next 
-100 weeks) with compression of the old log. 
+to /etc/newsyslog.conf will do the job (here: once a week, for the next
+100 weeks) with compression of the old log.
 
 This is the standard method for other daemons (apache, etc.).
 
@@ -789,7 +789,7 @@ Patch for i4b version 0.71 or older:
   			/* suggest a zero one */
 ! 			p[2] = p[3] = p[4] = p[5] = 0;
   			break;
-  
+
   		case LCP_OPT_MRU:
 --- 2056,2062 ----
   			if (debug)
@@ -797,13 +797,13 @@ Patch for i4b version 0.71 or older:
   			/* suggest a zero one */
 ! 			/* p[2] = p[3] = p[4] = p[5] = 0; */
   			break;
-  
+
   		case LCP_OPT_MRU:
 ***************
 *** 2668,2678 ****
   					addlog("%s [not agreed] ",
   						sppp_dotted_quad(desiredaddr));
-  
+
 - 				p[2] = hisaddr >> 24;
 - 				p[3] = hisaddr >> 16;
 - 				p[4] = hisaddr >> 8;
@@ -815,7 +815,7 @@ Patch for i4b version 0.71 or older:
 --- 2668,2678 ----
   					addlog("%s [not agreed] ",
   						sppp_dotted_quad(desiredaddr));
-  
+
   			}
 + 			p[2] = hisaddr >> 24;
 + 			p[3] = hisaddr >> 16;
@@ -893,7 +893,7 @@ flags have changed from 19 to 20.
 NOTE: this is the procedure used as of end of July 1999, it may change in
       the near future!
 
-Get the current ppp sources from 
+Get the current ppp sources from
 
 	http://www.freebsd.org/~brian
 
@@ -907,7 +907,7 @@ Make and install the result.
 Have a look at the user-ppp directory and the end of etc-isdn/isdnd.rc.sample
 for ppp and i4b sample configurations to get things up and running.
 
-More information to ppp setup can be found at 
+More information to ppp setup can be found at
 
 	http://www.Awfulhak.org/ppp.html
 	http://www.freebsd.org/handbook/ppp-and-slip.html
@@ -967,11 +967,11 @@ sehen, warum das passiert.
 25. How to properly operate isdnd's fullscreen output in a 132x60 vty
 ================================================================================
 
-Q: I'm using allscreens_flags="132x60" in /etc/rc.conf but the vty gets 
-   switched after isdnd is started, so isdnd didn't know about the new 
+Q: I'm using allscreens_flags="132x60" in /etc/rc.conf but the vty gets
+   switched after isdnd is started, so isdnd didn't know about the new
    dimensions of the screen.
 
-A: This one's easy: 
+A: This one's easy:
    In /etc/rc.isdn change
         isdn_ttype=cons25
    to
@@ -1041,7 +1041,7 @@ From: Joost Mulders <dhcp@j-mulders.demon.nl>
 ================================================================================
 
 > Some time I get follow message at console:
-> 
+>
 > i4b-L2 i4b_rxd_ack: ((N(R)-1)=35) != (UA=36) !!!
 
 A layer 2 error occured. These types of errors are automatically
@@ -1070,7 +1070,7 @@ A: i just found out what i did wrong ...
    isdn_fsdev="NO"
    isdn_flags=""
 
-   had to do that if i want to run isdnd as an daemon service, 'cause the 
+   had to do that if i want to run isdnd as an daemon service, 'cause the
    defaults in /etc/defaults/rc.conf are:
 
    isdn_fsdev="/dev/ttyv4"         # Output device for fullscreen mode (or NO for daemon mode).
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 35b97c1..c412b8b 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -29,7 +29,7 @@
 .Nm bpf
 .Nd Berkeley Packet Filter
 .Sh SYNOPSIS
-.Cd pseudo-device bpf
+.Cd device bpf
 .Sh DESCRIPTION
 The Berkeley Packet Filter
 provides a raw interface to data link layers in a protocol
@@ -64,23 +64,23 @@ Associated with each open instance of a
 file is a user-settable packet filter.
 Whenever a packet is received by an interface,
 all file descriptors listening on that interface apply their filter.
-Each descriptor that accepts the packet receives its own copy. 
+Each descriptor that accepts the packet receives its own copy.
 .Pp
 Reads from these files return the next group of packets
-that have matched the filter. 
+that have matched the filter.
 To improve performance, the buffer passed to read must be
 the same size as the buffers used internally by
 .Nm .
 This size is returned by the
 .Dv BIOCGBLEN
-ioctl (see below), and 
+ioctl (see below), and
 can be set with
 .Dv BIOCSBLEN .
 Note that an individual packet larger than this size is necessarily
 truncated.
 .Pp
 The packet filter will support any link level protocol that has fixed length
-headers.  Currently, only Ethernet, 
+headers.  Currently, only Ethernet,
 .Tn SLIP ,
 and
 .Tn PPP
@@ -97,7 +97,7 @@ file descriptor.  The writes are unbuffered, meaning only one
 packet can be processed per write.
 Currently, only writes to Ethernets and
 .Tn SLIP
-links are supported.  
+links are supported.
 .Sh IOCTLS
 The
 .Xr ioctl 2
@@ -109,10 +109,10 @@ these includes:
 	#include <sys/types.h>
 	#include <sys/time.h>
 	#include <sys/ioctl.h>
-	#include <net/bpf.h> 
+	#include <net/bpf.h>
 .Ed
 .Pp
-Additionally, 
+Additionally,
 .Dv BIOCGETIF
 and
 .Dv BIOCSETIF
@@ -146,7 +146,7 @@ with
 .Dv BIOCSETIF .
 If the requested buffer size cannot be accommodated, the closest
 allowable size will be set and returned in the argument.
-A read call will result in 
+A read call will result in
 .Er EIO
 if it is passed a buffer that is not this size.
 .It Dv BIOCGDLT
@@ -164,7 +164,7 @@ All packets, not just those destined for the local host, are processed.
 Since more than one file can be listening on a given interface,
 a listener that opened its interface non-promiscuously may receive
 packets promiscuously.  This problem can be remedied with an
-appropriate filter. 
+appropriate filter.
 .It Dv BIOCFLUSH
 Flushes the buffer of incoming packets,
 and resets the statistics that are returned by BIOCGSTATS.
@@ -185,7 +185,7 @@ The device is indicated by name using the
 field of the
 .Li ifreq
 structure.
-Additionally, performs the actions of 
+Additionally, performs the actions of
 .Dv BIOCFLUSH .
 .It Dv BIOCSRTIMEOUT
 .It Dv BIOCGRTIMEOUT
@@ -212,7 +212,7 @@ The fields are:
 .It Li bs_recv
 the number of packets received by the descriptor since opened or reset
 (including any buffered since the last read call);
-and 
+and
 .It Li bs_drop
 the number of packets which were accepted by the filter but dropped by the
 kernel because of buffer overflows
@@ -229,7 +229,7 @@ becomes full or a timeout occurs.
 This is useful for programs like
 .Xr rarpd 8
 which must respond to messages in real time.
-The default for a new file is off. 
+The default for a new file is off.
 .It Dv BIOCSETF
 .Pq Li "struct bpf_program"
 Sets the filter program used by the kernel to discard uninteresting
@@ -238,13 +238,13 @@ the following structure:
 .Bd -literal
 struct bpf_program {
 	int bf_len;
-	struct bpf_insn *bf_insns; 
+	struct bpf_insn *bf_insns;
 };
 .Ed
 .Pp
 The filter program is pointed to by the
 .Li bf_insns
-field while its length in units of 
+field while its length in units of
 .Sq Li struct bpf_insn
 is given by the
 .Li bf_len
@@ -331,14 +331,14 @@ header, which may not be equal to
 .Fn sizeof "struct bpf_hdr" .
 .El
 .Pp
-The 
+The
 .Li bh_hdrlen
 field exists to account for
 padding between the header and the link level protocol.
 The purpose here is to guarantee proper alignment of the packet
-data structures, which is required on alignment sensitive 
+data structures, which is required on alignment sensitive
 architectures and improves performance on many other architectures.
-The packet filter insures that the 
+The packet filter insures that the
 .Li bpf_hdr
 and the network layer
 header will be word aligned.  Suitable precautions
@@ -367,16 +367,16 @@ will advance it to the next packet:
 .Dl p = (char *)p + BPF_WORDALIGN(p->bh_hdrlen + p->bh_caplen)
 .Pp
 For the alignment mechanisms to work properly, the
-buffer passed to 
+buffer passed to
 .Xr read 2
-must itself be word aligned.  
+must itself be word aligned.
 The
 .Xr malloc 3
 function
 will always return an aligned buffer.
 .Sh FILTER MACHINE
 A filter program is an array of instructions, with all branches forwardly
-directed, terminated by a 
+directed, terminated by a
 .Em return
 instruction.
 Each instruction performs some action on the pseudo-machine state,
@@ -393,18 +393,18 @@ struct bpf_insn {
 };
 .Ed
 .Pp
-The 
+The
 .Li k
-field is used in different ways by different instructions, 
+field is used in different ways by different instructions,
 and the
 .Li jt
-and 
+and
 .Li jf
 fields are used as offsets
 by the branch instructions.
 The opcodes are encoded in a semi-hierarchical fashion.
-There are eight classes of instructions: 
-.Dv BPF_LD , 
+There are eight classes of instructions:
+.Dv BPF_LD ,
 .Dv BPF_LDX ,
 .Dv BPF_ST ,
 .Dv BPF_STX ,
@@ -413,7 +413,7 @@ There are eight classes of instructions:
 .Dv BPF_RET ,
 and
 .Dv BPF_MISC .
-Various other mode and 
+Various other mode and
 operator bits are or'd into the class to give the actual instructions.
 The classes and modes are defined in
 .Aq Pa net/bpf.h .
@@ -429,7 +429,7 @@ in the packet,
 interpreted as a word (n=4),
 unsigned halfword (n=2), or unsigned byte (n=1).
 M[i] gives the i'th word in the scratch memory store, which is only
-addressed in word units.  The memory store is indexed from 0 to 
+addressed in word units.  The memory store is indexed from 0 to
 .Dv BPF_MEMWORDS
 - 1.
 .Li k ,
@@ -456,7 +456,7 @@ the packet length
 .Pq Dv BPF_LEN ,
 or a word in the scratch memory store
 .Pq Dv BPF_MEM .
-For 
+For
 .Dv BPF_IND
 and
 .Dv BPF_ABS ,
@@ -466,7 +466,7 @@ halfword
 .Pq Dv BPF_H ,
 or byte
 .Pq Dv BPF_B .
-The semantics of all the recognized 
+The semantics of all the recognized
 .Dv BPF_LD
 instructions follow.
 .Pp
@@ -526,7 +526,7 @@ M[k] <- X
 .It Dv BPF_ALU
 The alu instructions perform operations between the accumulator and
 index register or constant, and store the result back in the accumulator.
-For binary operations, a source mode is required 
+For binary operations, a source mode is required
 .Po
 .Dv BPF_K
 or
@@ -581,7 +581,7 @@ Jump offsets are encoded in 8 bits so the longest jump is 256 instructions.
 However, the jump always
 .Pq Dv BPF_JA
 opcode uses the 32 bit
-.Li k 
+.Li k
 field as the offset, allowing arbitrarily distant destinations.
 All conditionals use unsigned comparison conventions.
 .Pp
@@ -636,10 +636,10 @@ A <- X
 .Pp
 The
 .Nm
-interface provides the following macros to facilitate 
+interface provides the following macros to facilitate
 array initializers:
 .Fn BPF_STMT opcode operand
-and 
+and
 .Fn BPF_JUMP opcode operand true_offset false_offset .
 .Pp
 .Sh EXAMPLES
@@ -651,7 +651,7 @@ struct bpf_insn insns[] = {
 	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ETHERTYPE_REVARP, 0, 3),
 	BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 20),
 	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, REVARP_REQUEST, 0, 1),
-	BPF_STMT(BPF_RET+BPF_K, sizeof(struct ether_arp) + 
+	BPF_STMT(BPF_RET+BPF_K, sizeof(struct ether_arp) +
 		 sizeof(struct ether_header)),
 	BPF_STMT(BPF_RET+BPF_K, 0),
 };
@@ -676,7 +676,7 @@ struct bpf_insn insns[] = {
 .Ed
 .Pp
 Finally, this filter returns only TCP finger packets.  We must parse
-the IP header to reach the TCP header.  The 
+the IP header to reach the TCP header.  The
 .Dv BPF_JSET
 instruction
 checks that the IP fragment offset is 0 so we are sure
@@ -714,15 +714,15 @@ struct bpf_insn insns[] = {
 the packet filter device
 .El
 .Sh BUGS
-The read buffer must be of a fixed size (returned by the 
+The read buffer must be of a fixed size (returned by the
 .Dv BIOCGBLEN
 ioctl).
 .Pp
 A file that does not request promiscuous mode may receive promiscuously
 received packets as a side effect of another file requesting this
 mode on the same hardware interface.  This could be fixed in the kernel
-with additional processing overhead.  However, we favor the model where 
-all files must assume that the interface is promiscuous, and if 
+with additional processing overhead.  However, we favor the model where
+all files must assume that the interface is promiscuous, and if
 so desired, must utilize a filter to reject foreign packets.
 .Pp
 Data link protocols with variable length headers are not currently supported.
@@ -730,7 +730,7 @@ Data link protocols with variable length headers are not currently supported.
 .Pp
 The Enet packet filter was created in 1980 by Mike Accetta and
 Rick Rashid at Carnegie-Mellon University.  Jeffrey Mogul, at
-Stanford, ported the code to BSD and continued its development from 
+Stanford, ported the code to BSD and continued its development from
 1983 on.  Since then, it has evolved into the Ultrix Packet Filter
 at
 .Tn DEC ,
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index aa74adc..79fbf8e 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -41,7 +41,7 @@
 .Nm ccd
 .Nd Concatenated Disk driver
 .Sh SYNOPSIS
-.Cd "pseudo-device ccd 4"
+.Cd "device ccd 4"
 .Sh DESCRIPTION
 The
 .Nm
@@ -49,7 +49,7 @@ driver provides the capability of combining one or more disks/partitions
 into one virtual disk.
 .Pp
 This document assumes that you're familiar with how to generate kernels,
-how to properly configure disks and pseudo-devices in a kernel
+how to properly configure disks and devices in a kernel
 configuration file, and how to partition disks.
 .Pp
 Note that the
@@ -65,7 +65,7 @@ as shown as
 In order to compile in support for the ccd, you must add a line similar
 to the following to your kernel configuration file:
 .Bd -unfilled -offset indent
-pseudo-device	ccd	4	# concatenated disk devices
+device	ccd	4	# concatenated disk devices
 .Ed
 .Pp
 The count argument is how many
@@ -77,7 +77,7 @@ may be configured.  As of the
 release, you do not need to
 configure your kernel with ccd but may instead use it as a kernel loadable
 module.  Simply running
-.Nm ccdconfig 
+.Nm ccdconfig
 will load the module into the kernel.
 .Pp
 A
@@ -107,7 +107,7 @@ on two Fast-Wide SCSI buses, this translates to about 128 for writes
 and 32 for reads.  A larger interleave tends to work better when the
 disk is taking a multitasking load by localizing the file I/O from
 any given process onto a single disk.  You lose sequential performance when
-you do this, but sequential performance is not usually an issue with a 
+you do this, but sequential performance is not usually an issue with a
 multitasking load.
 .Pp
 An interleave factor must be specified when using a mirroring configuration,
@@ -172,11 +172,11 @@ file system will be lost unless you are mirroring the disks.
 If one of the disks in a mirror is lost, you should still
 be able to backup your data.  If a write error occurs, however, data
 read from that sector may be non-deterministic.  It may return the data
-prior to the write or it may return the data that was written.  When a 
+prior to the write or it may return the data that was written.  When a
 write error occurs, you should recover and regenerate the data as soon
 as possible.
 .Pp
-Changing the interleave or other parameters for a 
+Changing the interleave or other parameters for a
 .Nm
 disk usually destroys whatever data previously existed on that disk.
 .Sh FILES
diff --git a/share/man/man4/ef.4 b/share/man/man4/ef.4
index e92136a..8906983 100644
--- a/share/man/man4/ef.4
+++ b/share/man/man4/ef.4
@@ -30,11 +30,11 @@
 .Os
 .Sh NAME
 .Nm ef
-.Nd "pseudo-device driver provides support for multiple ethernet frame types"
+.Nd "pseudo-device driver providing support for multiple ethernet frame types"
 .Sh SYNOPSIS
 .Cd "kldload if_ef.ko"
 .Sh DESCRIPTION
-The 
+The
 .Nm
 pseudo-device driver clones each ethernet type device with four
 additional interfaces. Each of them capable to send or receive only
@@ -42,7 +42,7 @@ one predefined frame type.
 .Pp
 Names for the new interfaces created by adding
 .Ar fN
-suffix to an existing device name. Where 
+suffix to an existing device name. Where
 .Ar N
 is a device unit which can have one of the following values:
 .Bd -literal -offset indent
@@ -87,7 +87,7 @@ in the
 .Xr rc.conf 5
 file:
 .Dl network_interfaces="ed2 lo0 tun0 ed2f0 ed2f1"
-.Dl ifconfig_ed2f0_ipx="ipx 0x101"     
+.Dl ifconfig_ed2f0_ipx="ipx 0x101"
 .Dl ifconfig_ed2f1_ipx="ipx 0x102"
 .Sh DIAGNOSTICS
 None.
diff --git a/share/man/man4/en.4 b/share/man/man4/en.4
index adf86a7..57c8569 100644
--- a/share/man/man4/en.4
+++ b/share/man/man4/en.4
@@ -8,9 +8,9 @@
 .Nd device driver for Midway-based ATM interfaces
 .Sh SYNOPSIS
 .Cd "device en"
-.Cd "pseudo-device atm"
+.Cd "device atm"
 .Sh DESCRIPTION
-The 
+The
 .Nm
 device driver supports Midway-based ATM interfaces including the
 Efficient Networks, Inc. ENI-155 and Adaptec ANA-59x0.
@@ -24,13 +24,13 @@ To add a PVC to a host you must use the ``route'' command:
 .Dl # route add -iface <remote IP address> -link en0:z.0.x.y
 where x and y are the byte encoding of the VCI to use, and z is the
 byte encoding of the following flags.
-.Dl 0x01 (use AAL5), 
+.Dl 0x01 (use AAL5),
 .Dl 0x02 (if using AAL5, use a LLCSNAP header)
 Thus, parameter 3 means AAL5 and LLC/SNAP encapsulation.
 Note that BPF works only with LLC/SNAP encapsulation.
 .Sh EXAMPLES
 Suppose you have 2 hosts 128.252.200.1 and 128.252.200.2 connected
-by ATM through PVC # 201 (0xc9).    
+by ATM through PVC # 201 (0xc9).
 To enable the link use the following commands:
 .Dl on host 128.252.200.1:
 .Dl	# ifconfig en0 128.252.200.1 netmask 0xffffff00 up
@@ -51,12 +51,12 @@ The driver extensively uses DMA on PCI.
 The first
 generation PCI chipsets do not work or exhibit poor performance.
 .Sh SEE ALSO
-.Xr ifconfig 8 , 
-.Xr pvcsif 8 , 
+.Xr ifconfig 8 ,
+.Xr pvcsif 8 ,
 .Xr pvctxctl 8 ,
 .Xr route 8
 .Sh AUTHORS
 .An Chuck Cranor
 of Washington University implemented EN driver
-in 1996 for 
+in 1996 for
 .Nx .
diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4
index 4fe8c22..4ecc609 100644
--- a/share/man/man4/faith.4
+++ b/share/man/man4/faith.4
@@ -1,6 +1,6 @@
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -12,7 +12,7 @@
 .\" 3. Neither the name of the project nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -37,7 +37,7 @@
 .Tn IPv6-to-IPv4 TCP
 relay capturing interface
 .Sh SYNOPSIS
-.Cd "pseudo-device faith 1"
+.Cd "device faith 1"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index 655bc0e..93495e8 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -17,7 +17,7 @@
 .Pp
 .Fx
 only:
-.Cd "pseudo-device fddi"
+.Cd "device fddi"
 .Sh DESCRIPTION
 The
 .Nm
@@ -30,7 +30,7 @@ controller are supported including the DAS and SAS configurations.
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "fea%d: error: desired IRQ of %d does not match device's actual IRQ (%d)"
-The device probe detected that the DEFEA board is configured for a different 
+The device probe detected that the DEFEA board is configured for a different
 interrupt than the one specified in the kernel configuration file.
 .It "fea%d: error: memory not enabled! ECU reconfiguration required"
 The device probe found that no device memory had been configured on the
@@ -41,7 +41,7 @@ Utility) will need to be run to change the settings.
 .Sh CAVEATS
 Normally, the device driver will not enable the reception of SMT frames.
 However if the IFF_LINK1 flag is set, the device driver will enable the
-reception of SMT frames and pass them up to the Berkeley Packet Filter for 
+reception of SMT frames and pass them up to the Berkeley Packet Filter for
 processing.
 .Pp
 .Sh SEE ALSO
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index 2144e07..a9cba1e 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -35,7 +35,7 @@
 .Nm gif
 .Nd generic tunnel interface
 .Sh SYNOPSIS
-.Cd "pseudo-device gif" Op Ar count
+.Cd "device gif" Op Ar count
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index a156012..deb56cd 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -11,7 +11,7 @@
 .\" no representations about the suitability of this software for any
 .\" purpose.  It is provided "as is" without express or implied
 .\" warranty.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
 .\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
 .\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index fc2854e..84f6146 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -33,7 +33,7 @@
 .Nd introduction to devices and device drivers
 .Sh DESCRIPTION
 This section contains information related to devices, device driver
-and miscellaneous hardware.  
+and miscellaneous hardware.
 .Ss The device abstraction
 Device is a term used mostly for hardware-related stuff that belongs
 to the system, like disks, printers, or a graphics display with its
diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4
index 32e2508..48def16 100644
--- a/share/man/man4/lo.4
+++ b/share/man/man4/lo.4
@@ -39,7 +39,7 @@
 .Nm lo
 .Nd software loopback network interface
 .Sh SYNOPSIS
-.Cd "pseudo-device loop"
+.Cd "device loop"
 .Sh DESCRIPTION
 The
 .Nm loop
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index 36074bf..fb1cf55 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -37,7 +37,7 @@
 .Cd "device ar0 at isa? port 0x300 irq 10 iomem 0xd0000"
 .Cd "device ar1 at isa? port 0x310 irq 11 iomem 0xd0000"
 .Pp
-.Cd "pseudo-device sppp"
+.Cd "device sppp"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index 6cbecd4..a804230 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -10,7 +10,7 @@
 .Sh SYNOPSIS
 .Cd "device cx0 at isa? port 0x240 irq 15 drq 7"
 .Cd "device cx1 at isa? port 0x260 irq 12 drq 6"
-.Cd pseudo-device sppp
+.Cd device sppp
 .Pp
 The base i/o port address should be set by jumpers on the board.
 The DMA i/o channel and interrupt request numbers are configured
@@ -36,23 +36,23 @@ Channels
 0
 .It Cronyx-Sigma-400
 4, 5, 6, 7
-.It Cronyx-Sigma-500       
+.It Cronyx-Sigma-500
 0, 4, 5, 6, 7
-.It Cronyx-Sigma-401       
+.It Cronyx-Sigma-401
 0, 1, 2, 3
-.It Cronyx-Sigma-404       
+.It Cronyx-Sigma-404
 0, 1, 2, 3
-.It Cronyx-Sigma-410       
+.It Cronyx-Sigma-410
 0, 1, 2, 3
-.It Cronyx-Sigma-440       
+.It Cronyx-Sigma-440
 0, 1, 2, 3
-.It Cronyx-Sigma-703       
+.It Cronyx-Sigma-703
 0, 1, 2, 4, 5, 6, 7
-.It Cronyx-Sigma-801       
+.It Cronyx-Sigma-801
 0, 1, 2, 3, 4, 5, 6, 7
-.It Cronyx-Sigma-810       
+.It Cronyx-Sigma-810
 0, 1, 2, 3, 4, 5, 6, 7
-.It Cronyx-Sigma-840       
+.It Cronyx-Sigma-840
 0, 1, 2, 3, 4, 5, 6, 7
 .El
 .Pp
@@ -82,15 +82,15 @@ sh MAKEDEV cronyx ttyx0 ttyx1 ttyy0
 .Ed
 .Sh "Asynchronous driver"
 The asynchronous channel device files have the names:
-.Pa /dev/ttyx# 
-- for adapter cx0, 
-.Pa /dev/ttyy# 
+.Pa /dev/ttyx#
+- for adapter cx0,
+.Pa /dev/ttyy#
 - for adapter cx1,
-.Pa /dev/ttyz# 
+.Pa /dev/ttyz#
 - for cx2.
 Here # is the channel number in hexadecimal form, 0-9-a-f.
 .Pp
-The driver fulfills the following standard ioctl requests (see 
+The driver fulfills the following standard ioctl requests (see
 .Xr ioctl 2 ) :
 .Pp
 .Bl -tag -width TIOCXXXXX -compact
@@ -104,32 +104,32 @@ on the first
 .Xr open 2
 and could be changed by
 .Dv TIOCCDTR ,
-.Dv TIOCSDTR , 
-.Dv TIOCMSET , 
-.Dv TIOCMBIS , 
-.Dv TIOCMBIC 
+.Dv TIOCSDTR ,
+.Dv TIOCMSET ,
+.Dv TIOCMBIS ,
+.Dv TIOCMBIC
 ioctl calls.
 .It TIOCCDTR
 Clear DTR signal (DTR := 0).
 .It TIOCMSET
 Set the given values of DTR and RTS signals (<DTR:RTS> := data).
 The signals DTR and RTS are controlled by
-.Dv TIOCM_DTR 
+.Dv TIOCM_DTR
 and
 .Dv TIOCM_RTS
 bits of the data argument of the ioctl system call.
 .It TIOCMBIS
 Set DTR and RTS signals (<DTR:RTS> |= data).
-The signals DTR and RTS are controlled by 
-.Dv TIOCM_DTR 
-and 
+The signals DTR and RTS are controlled by
+.Dv TIOCM_DTR
+and
 .Dv TIOCM_RTS
 bits of the data argument of the ioctl system call.
 .It TIOCMBIC
 Clear DTR and RTS signals (<DTR:RTS> &= ~data).
-The signals DTR and RTS are controlled by 
+The signals DTR and RTS are controlled by
 .Dv TIOCM_DTR
-and 
+and
 .Dv TIOCM_RTS
 bits of the data argument of the ioctl system call.
 .It TIOCMGET
@@ -137,30 +137,30 @@ Determine the state of the modem signals of the line.
 After the call the data argument contains the following bits:
 .Pp
 .Bl -tag -width TIOCM_XXX -compact
-.It TIOCM_LE 
+.It TIOCM_LE
 always set (Line Enabled)
-.It TIOCM_DSR 
+.It TIOCM_DSR
 Data Set Ready signal received
-.It TIOCM_CTS 
+.It TIOCM_CTS
 Clear To Send signal received
-.It TIOCM_CD  
+.It TIOCM_CD
 Data Carrier Detect signal received
-.It TIOCM_DTR 
+.It TIOCM_DTR
 Data Terminal Ready signal transmitted
-.It TIOCM_RTS 
+.It TIOCM_RTS
 Request To Send signal transmitted
 .El
 .El
 .Sh "Synchronous driver"
 The synchronous channels and universal channels, turned to the synchronous
-mode by the 
+mode by the
 .Xr cxconfig 8
 utility, are accessible as network
 interfaces named ``cx#'' where # is the channel number, 0..47.
-All standard network interface parameters could be set by 
+All standard network interface parameters could be set by
 .Xr ifconfig 8
 utility.
-The 
+The
 .Xr cxconfig 8
 command is used to change some extended channel
 options, and also for setting the high-level software protocol
@@ -168,7 +168,7 @@ options, and also for setting the high-level software protocol
 .Pp
 The universal channels could be used both in asynchronous and synchronous modes.
 By default the asynchronous mode is set.
-The mode could be changed by 
+The mode could be changed by
 .Xr cxconfig 8
 utility.
 The mode is blocked while the channel is busy (an asynchronous channel
@@ -184,14 +184,14 @@ The version of the driver for BSD/386 (BSDI) operating system
 also supports the usage of the general set of synchronous
 protocols, implemented inside the OS.
 The external protocol set could be selected by ``cxconfig ext'' command
-(see 
+(see
 .Xr cxconfig 8 ) .
 .Sh "Channel Options Management"
-The 
+The
 .Xr cxconfig 8
 utility is used for setting the channels options.
 The channel options are generally set at the start of the operating
-system (for example, from the file 
+system (for example, from the file
 .Pa /etc/rc ) .
 Note, that not all options have a sense for every particular
 case, and an attempt to set some of them can hang up the channel or
diff --git a/share/man/man4/man4.i386/en.4 b/share/man/man4/man4.i386/en.4
index adf86a7..57c8569 100644
--- a/share/man/man4/man4.i386/en.4
+++ b/share/man/man4/man4.i386/en.4
@@ -8,9 +8,9 @@
 .Nd device driver for Midway-based ATM interfaces
 .Sh SYNOPSIS
 .Cd "device en"
-.Cd "pseudo-device atm"
+.Cd "device atm"
 .Sh DESCRIPTION
-The 
+The
 .Nm
 device driver supports Midway-based ATM interfaces including the
 Efficient Networks, Inc. ENI-155 and Adaptec ANA-59x0.
@@ -24,13 +24,13 @@ To add a PVC to a host you must use the ``route'' command:
 .Dl # route add -iface <remote IP address> -link en0:z.0.x.y
 where x and y are the byte encoding of the VCI to use, and z is the
 byte encoding of the following flags.
-.Dl 0x01 (use AAL5), 
+.Dl 0x01 (use AAL5),
 .Dl 0x02 (if using AAL5, use a LLCSNAP header)
 Thus, parameter 3 means AAL5 and LLC/SNAP encapsulation.
 Note that BPF works only with LLC/SNAP encapsulation.
 .Sh EXAMPLES
 Suppose you have 2 hosts 128.252.200.1 and 128.252.200.2 connected
-by ATM through PVC # 201 (0xc9).    
+by ATM through PVC # 201 (0xc9).
 To enable the link use the following commands:
 .Dl on host 128.252.200.1:
 .Dl	# ifconfig en0 128.252.200.1 netmask 0xffffff00 up
@@ -51,12 +51,12 @@ The driver extensively uses DMA on PCI.
 The first
 generation PCI chipsets do not work or exhibit poor performance.
 .Sh SEE ALSO
-.Xr ifconfig 8 , 
-.Xr pvcsif 8 , 
+.Xr ifconfig 8 ,
+.Xr pvcsif 8 ,
 .Xr pvctxctl 8 ,
 .Xr route 8
 .Sh AUTHORS
 .An Chuck Cranor
 of Washington University implemented EN driver
-in 1996 for 
+in 1996 for
 .Nx .
diff --git a/share/man/man4/man4.i386/spkr.4 b/share/man/man4/man4.i386/spkr.4
index d83e897..07a4d7b 100644
--- a/share/man/man4/man4.i386/spkr.4
+++ b/share/man/man4/man4.i386/spkr.4
@@ -9,16 +9,16 @@
 .Nm spkr
 .Nd console speaker device driver
 .Sh SYNOPSIS
-.Cd pseudo-device speaker
+.Cd device speaker
 .Fd #include <machine/speaker.h>
 .Sh DESCRIPTION
 The speaker device driver allows applications to control the PC console
-speaker on an 
+speaker on an
 .Tn IBM-PC Ns --compatible
 machine running
 .Fx .
 .Pp
-Only one process may have this device open at any given time; 
+Only one process may have this device open at any given time;
 .Xr open 2
 and
 .Xr close 2
@@ -30,7 +30,7 @@ error
 indication.
 Writes to the device are interpreted as `play strings' in a
 simple ASCII melody notation.
-An 
+An
 .Xr ioctl 2
 request
 for tone generation at arbitrary
@@ -41,10 +41,10 @@ spends most of its time sleeping while the PC hardware is emitting
 tones.
 Other processes may emit beeps while the driver is running.
 .Pp
-Applications may call 
+Applications may call
 .Xr ioctl 2
 on a speaker file descriptor to control the
-speaker driver directly; definitions for the 
+speaker driver directly; definitions for the
 .Xr ioctl 2
 interface are in
 .Pa /usr/include/machine/speaker.h .
@@ -59,7 +59,7 @@ At present there are two such
 calls.
 .Dv SPKRTONE
 accepts a pointer to a
-single tone structure as third argument and plays it. 
+single tone structure as third argument and plays it.
 .Dv SPKRTUNE
 accepts a
 pointer to the first of an array of tone structures and plays them in
@@ -67,7 +67,7 @@ continuous sequence; this array must be terminated by a final member with
 a zero duration.
 .Pp
 The play-string language is modelled on the PLAY statement conventions of
-.Tn IBM 
+.Tn IBM
 Advanced BASIC 2.0.  The
 .Li MB ,
 .Li MF ,
@@ -89,8 +89,8 @@ Play command groups are as follows:
 .Bl -tag -width CDEFGABxx
 .It Li CDEFGAB
 Letters A through G cause the corresponding note to be played in the
-current octave.  A note letter may optionally be followed by an 
-.Dq Em "accidental sign" , 
+current octave.  A note letter may optionally be followed by an
+.Dq Em "accidental sign" ,
 one of # + or -; the first two of these cause it to be sharped one
 half-tone, the last causes it to be flatted one half-tone.  It may
 also be followed by a time value number and by sustain dots (see
@@ -111,7 +111,7 @@ possible jump between notes.
 Thus ``olbc'' will be played as
 ``olb>c'', and ``olcb'' as ``olc<b''.  Octave locking is disabled for
 one letter note following >, < and O[0123456].  (The octave-locking
-feature is not supported in 
+feature is not supported in
 .Tn IBM
 BASIC.)
 .It Li >
@@ -119,13 +119,13 @@ Bump the current octave up one.
 .It Li <
 Drop the current octave down one.
 .It Ns Li N Sy n
-Play note 
+Play note
 .Sy n ,
 .Sy n
 being 1 to 84 or 0 for a rest of current time value.
 May be followed by sustain dots.
 .It Ns Li L Sy n
-Sets the current time value for notes.  The default is 
+Sets the current time value for notes.  The default is
 .Li L4 ,
 quarter or crotchet notes.
 The lowest possible value is 1; values up
@@ -137,9 +137,9 @@ sets half notes,
 .Li L4
 sets quarter notes, etc.
 .It Ns Li P Sy n
-Pause (rest), with 
+Pause (rest), with
 .Sy n
-interpreted as for 
+interpreted as for
 .Li L Sy n .
 May be followed by
 sustain dots.  May also be written
@@ -188,11 +188,11 @@ sustain dots.
 Each dot causes the note's value to be lengthened by one-half
 for each one.
 Thus, a note dotted once is held for 3/2 of its undotted value;
-dotted twice, it is held 9/4, and three times would give 27/8. 
+dotted twice, it is held 9/4, and three times would give 27/8.
 .Pp
 A note and its sustain dots may also be followed by a slur mark (underscore).
 This causes the normal micro-rest after the note to be filled in, slurring it
-to the next one.  (The slur feature is not supported in 
+to the next one.  (The slur feature is not supported in
 .Tn IBM
 BASIC.)
 .Pp
@@ -209,7 +209,7 @@ notation, in which each dot adds half the value of the previous dot
 modifier, not half the value of the note as modified.  Thus, a note dotted
 once is held for 3/2 of its undotted value; dotted twice, it is held 7/4,
 and three times would give 15/8.  The multiply-by-3/2 interpretation,
-however, is specified in the 
+however, is specified in the
 .Tn IBM
 BASIC manual and has been retained for
 compatibility.
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 8f083ed..ca23c7a 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -40,7 +40,7 @@
 .Cd "device sr0 at isa? port 0x300 irq 10 iomem 0xd0000"
 .Cd "device sr1 at isa? port 0x310 irq 11 flags 0x1 iomem 0xd0000"
 .Pp
-.Cd "pseudo-device sppp"
+.Cd "device sppp"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/ppp.4 b/share/man/man4/ppp.4
index 4015ff6..d2a2900 100644
--- a/share/man/man4/ppp.4
+++ b/share/man/man4/ppp.4
@@ -41,7 +41,7 @@
 .Nm ppp
 .Nd point to point protocol network interface
 .Sh SYNOPSIS
-.Cd "pseudo-device ppp" Op Ar count
+.Cd "device ppp" Op Ar count
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4
index bef7fb6..4055897 100644
--- a/share/man/man4/pty.4
+++ b/share/man/man4/pty.4
@@ -39,7 +39,7 @@
 .Nm pty
 .Nd pseudo terminal driver
 .Sh SYNOPSIS
-.Cd "pseudo-device pty"
+.Cd "device pty"
 .Sh DESCRIPTION
 The
 .Nm
@@ -53,7 +53,7 @@ device.  The slave device provides to a process
 an interface identical
 to that described in
 .Xr tty 4 .
-However, whereas all other devices which provide the 
+However, whereas all other devices which provide the
 interface described in
 .Xr tty 4
 have a hardware device of some sort behind them, the slave
@@ -64,7 +64,7 @@ given to the slave device as input and anything written
 on the slave device is presented as input on the master
 device.
 .Pp
-The following 
+The following
 .Xr ioctl 2
 calls apply only to pseudo terminals:
 .Bl -tag -width TIOCREMOTE
@@ -80,12 +80,12 @@ or by typing
 .Ql ^S ) .
 Takes no parameter.
 .It Dv TIOCPKT
-Enable/disable 
+Enable/disable
 .Em packet
 mode.  Packet mode is enabled by specifying (by reference)
 a nonzero parameter and disabled by specifying (by reference)
 a zero parameter.  When applied to the master side of a pseudo
-terminal, each subsequent 
+terminal, each subsequent
 .Xr read 2
 from the terminal will return data written on the slave part of
 the pseudo terminal preceded by a zero byte (symbolically
@@ -105,11 +105,11 @@ whenever output to the terminal is stopped a la
 .It Dv TIOCPKT_START
 whenever output to the terminal is restarted.
 .It Dv TIOCPKT_DOSTOP
-whenever 
+whenever
 .Em t_stopc
 is
 .Ql ^S
-and 
+and
 .Em t_startc
 is
 .Ql ^Q .
@@ -147,7 +147,7 @@ This mode is enabled from the master side of a pseudo terminal
 by specifying (by reference)
 a nonzero parameter and disabled by specifying (by reference)
 a zero parameter.
-Each subsequent 
+Each subsequent
 .Xr read 2
 from the master side will return data written on the slave part of
 the pseudo terminal preceded by a zero byte,
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
index 58f9846..c25ebab 100644
--- a/share/man/man4/sl.4
+++ b/share/man/man4/sl.4
@@ -41,7 +41,7 @@
 .Nm sl
 .Nd slip network interface
 .Sh SYNOPSIS
-.Cd "pseudo-device sl" Op Ar count
+.Cd "device sl" Op Ar count
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4
index d83e897..07a4d7b 100644
--- a/share/man/man4/spkr.4
+++ b/share/man/man4/spkr.4
@@ -9,16 +9,16 @@
 .Nm spkr
 .Nd console speaker device driver
 .Sh SYNOPSIS
-.Cd pseudo-device speaker
+.Cd device speaker
 .Fd #include <machine/speaker.h>
 .Sh DESCRIPTION
 The speaker device driver allows applications to control the PC console
-speaker on an 
+speaker on an
 .Tn IBM-PC Ns --compatible
 machine running
 .Fx .
 .Pp
-Only one process may have this device open at any given time; 
+Only one process may have this device open at any given time;
 .Xr open 2
 and
 .Xr close 2
@@ -30,7 +30,7 @@ error
 indication.
 Writes to the device are interpreted as `play strings' in a
 simple ASCII melody notation.
-An 
+An
 .Xr ioctl 2
 request
 for tone generation at arbitrary
@@ -41,10 +41,10 @@ spends most of its time sleeping while the PC hardware is emitting
 tones.
 Other processes may emit beeps while the driver is running.
 .Pp
-Applications may call 
+Applications may call
 .Xr ioctl 2
 on a speaker file descriptor to control the
-speaker driver directly; definitions for the 
+speaker driver directly; definitions for the
 .Xr ioctl 2
 interface are in
 .Pa /usr/include/machine/speaker.h .
@@ -59,7 +59,7 @@ At present there are two such
 calls.
 .Dv SPKRTONE
 accepts a pointer to a
-single tone structure as third argument and plays it. 
+single tone structure as third argument and plays it.
 .Dv SPKRTUNE
 accepts a
 pointer to the first of an array of tone structures and plays them in
@@ -67,7 +67,7 @@ continuous sequence; this array must be terminated by a final member with
 a zero duration.
 .Pp
 The play-string language is modelled on the PLAY statement conventions of
-.Tn IBM 
+.Tn IBM
 Advanced BASIC 2.0.  The
 .Li MB ,
 .Li MF ,
@@ -89,8 +89,8 @@ Play command groups are as follows:
 .Bl -tag -width CDEFGABxx
 .It Li CDEFGAB
 Letters A through G cause the corresponding note to be played in the
-current octave.  A note letter may optionally be followed by an 
-.Dq Em "accidental sign" , 
+current octave.  A note letter may optionally be followed by an
+.Dq Em "accidental sign" ,
 one of # + or -; the first two of these cause it to be sharped one
 half-tone, the last causes it to be flatted one half-tone.  It may
 also be followed by a time value number and by sustain dots (see
@@ -111,7 +111,7 @@ possible jump between notes.
 Thus ``olbc'' will be played as
 ``olb>c'', and ``olcb'' as ``olc<b''.  Octave locking is disabled for
 one letter note following >, < and O[0123456].  (The octave-locking
-feature is not supported in 
+feature is not supported in
 .Tn IBM
 BASIC.)
 .It Li >
@@ -119,13 +119,13 @@ Bump the current octave up one.
 .It Li <
 Drop the current octave down one.
 .It Ns Li N Sy n
-Play note 
+Play note
 .Sy n ,
 .Sy n
 being 1 to 84 or 0 for a rest of current time value.
 May be followed by sustain dots.
 .It Ns Li L Sy n
-Sets the current time value for notes.  The default is 
+Sets the current time value for notes.  The default is
 .Li L4 ,
 quarter or crotchet notes.
 The lowest possible value is 1; values up
@@ -137,9 +137,9 @@ sets half notes,
 .Li L4
 sets quarter notes, etc.
 .It Ns Li P Sy n
-Pause (rest), with 
+Pause (rest), with
 .Sy n
-interpreted as for 
+interpreted as for
 .Li L Sy n .
 May be followed by
 sustain dots.  May also be written
@@ -188,11 +188,11 @@ sustain dots.
 Each dot causes the note's value to be lengthened by one-half
 for each one.
 Thus, a note dotted once is held for 3/2 of its undotted value;
-dotted twice, it is held 9/4, and three times would give 27/8. 
+dotted twice, it is held 9/4, and three times would give 27/8.
 .Pp
 A note and its sustain dots may also be followed by a slur mark (underscore).
 This causes the normal micro-rest after the note to be filled in, slurring it
-to the next one.  (The slur feature is not supported in 
+to the next one.  (The slur feature is not supported in
 .Tn IBM
 BASIC.)
 .Pp
@@ -209,7 +209,7 @@ notation, in which each dot adds half the value of the previous dot
 modifier, not half the value of the note as modified.  Thus, a note dotted
 once is held for 3/2 of its undotted value; dotted twice, it is held 7/4,
 and three times would give 15/8.  The multiply-by-3/2 interpretation,
-however, is specified in the 
+however, is specified in the
 .Tn IBM
 BASIC manual and has been retained for
 compatibility.
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index 3aa1150..19d36a2 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -33,11 +33,11 @@
 .Nm splash
 .Nd splash screen / screen saver interface
 .Sh SYNOPSIS
-.Cd "pseudo-device splash"
+.Cd "device splash"
 .Sh DESCRIPTION
 The
 .Nm
-pseudo device driver adds support for the splash screen and screen 
+pseudo device driver adds support for the splash screen and screen
 savers to the kernel.
 This driver is required if the splash bitmap image is to be loaded or
 any screen saver is to be used.
@@ -47,12 +47,12 @@ on the screen when the system is about to start.
 This image will remain on the screen
 during kernel initialization process
 until the login prompt appears on the screen
-or until a screen saver is loaded and initialized. 
+or until a screen saver is loaded and initialized.
 The image will also disappear if you hit any key,
 although this may not work immediately
 if the kernel is still probing devices.
 .Pp
-If you specify the  
+If you specify the
 .Fl c
 or
 .Fl v
@@ -116,7 +116,7 @@ Twinkling stars.
 Streaking stars.
 .El
 .Pp
-Screen saver modules can be loaded using 
+Screen saver modules can be loaded using
 .Xr kldload 8 :
 .Pp
 .Dl kldload logo_saver
@@ -132,12 +132,12 @@ variable in the
 to the screen saver of your choice and
 the timeout value to the
 .Ar blanktime
-variable so that the screen saver is automatically loaded 
+variable so that the screen saver is automatically loaded
 and the timeout value is set when the system starts.
 .Pp
 The screen saver may be instantly activated by hitting the
 .Ar saver
-key: the defaults are 
+key: the defaults are
 .Em Shift-Pause
 on the AT enhanced keyboard and
 .Em Shift-Ctrl-NumLock/Pause
@@ -152,7 +152,7 @@ function to a key of your preference.
 .Pp
 The screen saver will not run if the screen is not in text mode.
 .Ss Splash screen as a screen saver
-If you load a splash image but do not load a screen saver, 
+If you load a splash image but do not load a screen saver,
 you can continue using the splash module as a screen saver.
 The screen blanking interval can be specified as described in the
 .Sx Screen saver
@@ -172,10 +172,10 @@ screen saver modules
 the VESA support module
 .El
 .Sh EXAMPLES
-In order to load the splash screen or the screen saver, you must 
+In order to load the splash screen or the screen saver, you must
 have the following line in the kernel configuration file.
 .Pp
-.Dl pseudo-device splash
+.Dl device splash
 .Pp
 Next, edit
 .Pa /boot/loader.conf
@@ -187,7 +187,7 @@ bitmap_load="YES"
 bitmap_name="chuck.bmp"
 .Ed
 .Pp
-In the above example, the file 
+In the above example, the file
 .Pa chuck.bmp
 is loaded.
 In the following example, the VESA module
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 13ada10..504893f 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -32,7 +32,7 @@
 .Nm sppp
 .Nd point to point protocol network layer for synchronous lines
 .Sh SYNOPSIS
-.Cd "pseudo-device sppp"
+.Cd "device sppp"
 .Sh DESCRIPTION
 The
 .Nm
@@ -69,7 +69,7 @@ mode.  This means, the administrative
 event to the LCP layer will be delayed until after the lower layers
 signals an
 .Em Up
-event (rise of 
+event (rise of
 .Dq carrier ) .
 This can be used by lower layers to support
 a dialin connection where the physical layer isn't available
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 208aa93..fdac049 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -37,7 +37,7 @@
 .Tn 6to4
 tunnel interface
 .Sh SYNOPSIS
-.Cd "pseudo-device stf"
+.Cd "device stf"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index d7c44a2..50e6a1f 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -68,7 +68,7 @@ and the video card driver
 .Pq Xr vga 4
 and so requires both of them to be configured in the system.
 .Pp
-There can be only one 
+There can be only one
 .Nm
 device defined in the system.
 .Ss Virtual Terminals
@@ -83,17 +83,17 @@ are placed in the background.
 In order to use virtual terminals, they must be individually
 marked ``on'' in
 .Pa /etc/ttys
-so that 
+so that
 .Xr getty 8
 will recognize them to be active and run
-.Xr login 1 
+.Xr login 1
 to let the user to login to the system.
 By default, only the first eight virtual terminals are activated in
 .Pa /etc/ttys .
 .Pp
 You press the
 .Dv Alt
-key and a switch key to switch between 
+key and a switch key to switch between
 virtual terminals.
 The following table summarizes the correspondence between the switch
 key and the virtual terminal.
@@ -116,7 +116,7 @@ This can be changed by the kernel configuration option
 (see below).
 .Pp
 Note that the X server usually requires a virtual terminal for display
-purposes, so at least one terminal must be left unused by 
+purposes, so at least one terminal must be left unused by
 .Xr getty 8
 so that it can be used by the X server.
 .Ss Key Definitions and Function Key Strings
@@ -136,18 +136,18 @@ for the keymap file.
 .Pp
 You may want to set the
 .Ar keymap
-variable in 
+variable in
 .Pa /etc/rc.conf.local
 to the desired keymap file so that it will be automatically loaded
 when the system starts up.
 .Ss Software Font
 For most modern video cards, e.g. VGA, the
 .Nm
-driver and the video card driver allow the user to change 
+driver and the video card driver allow the user to change
 the font used on the screen.
 The
 .Xr vidcontrol 1
-command can be used to load a font file from 
+command can be used to load a font file from
 .Pa /usr/share/syscons/fonts .
 .Pp
 The font comes in various sizes: 8x8, 8x14 and 8x16.
@@ -158,7 +158,7 @@ It is better to always load these three sizes of the same font.
 .Pp
 You may set
 .Ar font8x8 ,
-.Ar font8x14 
+.Ar font8x14
 and
 .Ar font8x16
 variables in
@@ -186,7 +186,7 @@ and enable the mouse cursor in the virtual terminal via
 .Pp
 Pressing the mouse button 1 (usually the left button) will start selection.
 Releasing the button 1 will end the selection process.
-The selected text will be marked by inverting foreground and 
+The selected text will be marked by inverting foreground and
 background colors.
 You can press the button 3 (usually the right button) to extend
 the selected region.
@@ -208,19 +208,19 @@ The
 driver allows the user to browse the output which has ``scrolled off''
 from the top of the screen.
 .Pp
-Press the ``slock'' key (usually 
-.Dv ScrllLock 
-and/or 
-.Dv Pause 
-keys on many AT Enhanced keyboards) and the terminal is 
+Press the ``slock'' key (usually
+.Dv ScrllLock
+and/or
+.Dv Pause
+keys on many AT Enhanced keyboards) and the terminal is
 in the ``back scrolling'' mode.
-It is indicated by the 
+It is indicated by the
 .Dv Scroll Lock
 LED.
-Use arrow keys, 
-.Dv Page Up/Down 
-keys and 
-.Dv Home/End 
+Use arrow keys,
+.Dv Page Up/Down
+keys and
+.Dv Home/End
 keys to scroll buffered terminal output.
 Press the ``slock'' key again to get back to the normal terminal mode.
 .Pp
@@ -260,21 +260,21 @@ Note that if you use the
 option then you must also use this option if you wish to be able to use
 the mouse.
 .It Dv SC_DISABLE_DDBKEY
-This option disables the ``debug'' key (by default, it is 
+This option disables the ``debug'' key (by default, it is
 .Dv Alt-Esc ,
 or
 .Dv Ctl-PrintScreen
 ).
 It will prevent the user from
-entering the kernel debugger DDB by pressing the key combination.  
-DDB will still be invoked when the kernel panics or hits a break point 
+entering the kernel debugger DDB by pressing the key combination.
+DDB will still be invoked when the kernel panics or hits a break point
 if it is included in the kernel.
 .It Dv SC_DISABLE_REBOOT
-This option disables the ``reboot'' key (by default, it is 
+This option disables the ``reboot'' key (by default, it is
 .Dv Ctl-Alt-Del
 ), so that the casual user may not accidentally reboot the system.
 .It Dv SC_HISTORY_SIZE=N
-Sets the size of back scroll buffer to 
+Sets the size of back scroll buffer to
 .Fa N
 lines.
 The default value is 100.
@@ -284,7 +284,7 @@ Unless the
 option above is specified, the
 The
 .Nm
-driver reserves four consecutive character codes in order to display the 
+driver reserves four consecutive character codes in order to display the
 mouse cursor in the virtual terminals in some systems.
 This option specifies the first character code to
 .Fa C
@@ -300,7 +300,7 @@ See the
 .Dv VESA800X600
 flag below.
 .It Dv SC_TWOBUTTON_MOUSE
-If you have a two button mouse, you may want to add this option 
+If you have a two button mouse, you may want to add this option
 to use the right button of the mouse to paste text.
 See
 .Sx Mouse Support and Copy-and-Paste
@@ -318,7 +318,7 @@ below.
 .It Dv SC_DFLT_FONT
 This option will specify the default font.
 Available fonts are: iso, iso2, koi8-r, cp437, cp850, cp865 and cp866.
-16-line, 14-line and 8-line font data will be compiled in.  
+16-line, 14-line and 8-line font data will be compiled in.
 Without this option, the
 .Nm
 driver will use whatever font already loaded in the video card,
@@ -385,18 +385,18 @@ time
 .\"blinking underline (aka destructive) cursor
 .\".El
 .\".It bit 6 (QUIET_BELL)
-.\"This option suppresses the bell, whether audible or visual, 
+.\"This option suppresses the bell, whether audible or visual,
 .\"if it is rung in a background virtual terminal.
 .It 0x0080 (VESA800X600)
 This option puts the video card in the VESA 800x600 dots, 16 color
 mode.
 It may be useful for laptop computers for which the 800x600 mode
 is otherwise unsupported by the X server.
-Note that in order for this flag to work, the kernel must be 
+Note that in order for this flag to work, the kernel must be
 compiled with the
 .Dv SC_PIXEL_MODE
 option explained above.
-.\"Note also that the ``copy-and-paste'' function is not currently supported 
+.\"Note also that the ``copy-and-paste'' function is not currently supported
 .\"in this mode and the mouse pointer will not be displayed.
 .It 0x0100 (AUTODETECT_KBD)
 This option instructs the syscons driver to periodically scan
@@ -419,7 +419,7 @@ key map files
 screen map files
 .El
 .Sh EXAMPLES
-As the 
+As the
 .Nm
 driver requires the keyboard driver and the video card driver,
 the kernel configuration file should contain the following lines.
@@ -430,7 +430,7 @@ device atkbd0 at atkbdc? irq 1
 device vga0 at isa? conflicts
 device sc0 at isa?
 
-pseudo-device splash
+device splash
 .Ed
 .Pp
 If you do not intend to load the splash image or use the screen saver,
@@ -441,8 +441,8 @@ Note that the keyboard controller driver
 is required by the keyboard driver
 .Nm atkbd .
 .Pp
-The following lines will set the default colors. 
-The normal text will be green on black background. 
+The following lines will set the default colors.
+The normal text will be green on black background.
 The reversed text will be yellow on green background.
 Note that you cannot put any white space inside the quoted string,
 because of the current implementation of
@@ -451,7 +451,7 @@ because of the current implementation of
 .Dl "options SC_NORM_ATTR=(FG_GREEN|BG_BLACK)
 .Dl "options SC_NORM_REV_ATTR=(FG_YELLOW|BG_GREEN)
 .Pp
-The following lines will set the default colors of the kernel message. 
+The following lines will set the default colors of the kernel message.
 The kernel message will be printed bright red on black background.
 The reversed message will be black on red background.
 .Pp
@@ -460,7 +460,7 @@ The reversed message will be black on red background.
 .Pp
 The following example adds the font files
 .Pa cp850-8x16.fnt ,
-.Pa cp850-8x14.font 
+.Pa cp850-8x14.font
 and
 .Pa cp850-8x8.font
 to the kernel.
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index b020349..fecd0a2 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -8,7 +8,7 @@
 .Nm tap
 .Nd Ethernet tunnel software network interface
 .Sh SYNOPSIS
-.Cd pseudo-device tap
+.Cd device tap
 .Sh DESCRIPTION
 The
 .Nm
@@ -49,7 +49,7 @@ and
 and thus can be used with
 .Xr ifconfig 8
 like any other Ethernet interface. When the system chooses to transmit
-an Ethernet frame on the network interface, the frame can be read from 
+an Ethernet frame on the network interface, the frame can be read from
 the control device
 (it appears as
 .Dq input
@@ -72,7 +72,7 @@ if the interface is not
 .Dq ready .
 Once the interface is ready,
 .Fn read
-will return an Ethernet frame if one is available; if not, it will 
+will return an Ethernet frame if one is available; if not, it will
 either block until one is or return
 .Er EWOULDBLOCK ,
 depending on whether non-blocking I/O has been enabled. If the frame
@@ -141,13 +141,13 @@ signals into the argument
 value.
 .It Dv SIOCGIFADDR
 Retrieve the Media Access Control
-.Pq Dv MAC 
+.Pq Dv MAC
 address of the
 .Dq remote
 side. This command is used by the VMware port and expected to be executed on
 descriptor, associated with control device
 (usually
-.Pa /dev/vmnet Ns Sy N 
+.Pa /dev/vmnet Ns Sy N
 or
 .Pa /dev/tap Ns Sy N ) .
 The
@@ -181,14 +181,14 @@ writes are always non-blocking.
 .Pp
 On the last close of the data device, the interface is
 brought down
-(as if with  
+(as if with
 .Dq ifconfig tap Ns Sy N No down )
 unless the devices is a VMnet device.
-All queued frames are thrown away. If the interface is up when the data 
-device is not open, output frames are thrown away rather than 
+All queued frames are thrown away. If the interface is up when the data
+device is not open, output frames are thrown away rather than
 letting them pile up.
 .Pp
-The 
+The
 .Nm
 device is also can be used with the VMware port as a replacement
 for the old VMnet device driver. The driver uses the minor number
@@ -197,24 +197,24 @@ to select between
 and
 .Nm vmnet
 devices. VMnet minor numbers begin at
-.Va 0x10000 
+.Va 0x10000
 +
-.Va N . 
+.Va N .
 Where
-.Va N 
-is a VMnet unit number. In this case control device is expected to be 
+.Va N
+is a VMnet unit number. In this case control device is expected to be
 .Pa /dev/vmnet Ns Sy N ,
 and network interface will be
 .Sy vmnet Ns Ar N .
 Additionally, VMnet devices do not ifconfig themselves down when the
-control device is closed. Everything else is the same. 
+control device is closed. Everything else is the same.
 .Pp
 In addition to mentioned above
 .Xr ioctl 2
 there is one additional one for the VMware port.
 .Bl -tag -width VMIO_SIOCSETMACADDR
 .It Dv VMIO_SIOCSIFFLAGS
-VMware 
+VMware
 .Dv SIOCSIFFLAGS .
 .El
 .Sh SEE ALSO
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 768bc35..227e6cd 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -9,7 +9,7 @@
 .Nm tun
 .Nd tunnel software network interface
 .Sh SYNOPSIS
-.Cd pseudo-device tun
+.Cd device tun
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 0e215c1..6c4446d 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -21,7 +21,7 @@
 .\" 4. Neither the name of the Company nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\"  
+.\"
 .\" This software is provided ``as is'', and any express or implied
 .\" warranties, including, but not limited to, the implied warranties of
 .\" merchantability and fitness for a particular purpose are disclaimed.
@@ -145,7 +145,7 @@ started correctly when the subsystem is enabled.  This is also a significant
 advantage over the Veritas\(tm File System.  This feature regards the presence
 of the volumes.  It does not mean that the volumes will be mounted
 automatically, since the standard startup procedures with
-.Pa /etc/fstab 
+.Pa /etc/fstab
 perform this function.
 .El
 .Sh KERNEL CONFIGURATION
@@ -161,7 +161,7 @@ It is possible to configure
 in the kernel, but this is not recommended.  To do so, add this line to the
 kernel configuration file:
 .Bd -literal -offset indent
-pseudo-device	vinum
+device	vinum
 .Ed
 .Pp
 .Ss DEBUG OPTIONS
@@ -244,7 +244,7 @@ program are active.  Unloading the kld does not harm the data in the volumes.
 Use the
 .Xr vinum 8
 utility to configure and start
-.Nm 
+.Nm
 objects.
 .Sh IOCTL CALLS
 .Pa ioctl
@@ -271,12 +271,12 @@ result, the
 .Fl r
 option of
 .Xr disklabel 8 ,
-which reads the 
-.if t ``raw disk'', 
-.if n "raw disk", 
+which reads the
+.if t ``raw disk'',
+.if n "raw disk",
 will fail.
 .Pp
-In general, 
+In general,
 .Xr disklabel 8
 serves no useful purpose on a vinum volume.  If you run it, it will show you
 three partitions, a, b and c, all the same except for the fstype, for example:
@@ -333,19 +333,19 @@ plexes and subdisks may be up to 64 characters long, and the names of drives may
 up to 32 characters long.  When choosing volume and plex names, bear in mind
 that automatically generated plex and subdisk names are longer than the name
 from which they are derived.
-.Bl -bullet 
+.Bl -bullet
 .It
 When
 .Xr vinum 8
 creates or deletes objects, it creates a directory
 .Pa /dev/vinum ,
-in which it makes device entries for each volume it finds.  It also creates 
+in which it makes device entries for each volume it finds.  It also creates
 subdirectories,
 .Pa /dev/vinum/plex ,
-.Pa /dev/vinum/sd 
-and 
+.Pa /dev/vinum/sd
+and
 .Pa /dev/vinum/rsd ,
-in which it stores device entries for the plexes and subdisks.  
+in which it stores device entries for the plexes and subdisks.
 .Pa /dev/vinum/sd
 contains block device entries, while
 .Pa /dev/vinum/rsd
@@ -366,20 +366,20 @@ and
 .Pa /dev/vinum/control
 is used by
 .Xr vinum 8
-when it has been compiled without the VINUMDEBUG option, 
+when it has been compiled without the VINUMDEBUG option,
 .Pa /dev/vinum/Control
 is used by
 .Xr vinum 8
-when it has been compiled with the VINUMDEBUG option, 
+when it has been compiled with the VINUMDEBUG option,
 and
 .Pa /dev/vinum/controld
-is used by the 
+is used by the
 .Nm
 daemon.  The two control devices for
 .Xr vinum 8
 are used to synchronize the debug status of kernel and user modules.
 .It
-Unlike 
+Unlike
 .Nm UNIX
 drives,
 .Nm
@@ -394,12 +394,12 @@ end in the letters
 to
 .Ar c ,
 you must use the
-.Fl v 
+.Fl v
 flag to
 .Nm newfs
 in order to tell it to ignore this convention.
 .\"
-.It 
+.It
 Plexes do not need to be assigned explicit names.  By default, a plex name is
 the name of the volume followed by the letters \f(CW.p\fR and the number of the
 plex.  For example, the plexes of volume
@@ -421,7 +421,7 @@ are called
 and so on.
 .br
 .It
-By contrast, 
+By contrast,
 .Nm drives
 must be named.  This makes it possible to move a drive to a different location
 and still recognize it automatically.  Drive names may be up to 32 characters
@@ -430,7 +430,7 @@ long.
 .Pp
 EXAMPLE
 .Pp
-Assume the 
+Assume the
 .Nm
 objects described in the section CONFIGURATION FILE in
 .Xr vinum 8 .
@@ -588,14 +588,14 @@ crwxr-xr--  1 root  wheel   91,   4 Mar 30 16:08 rvol5
 .Pp
 In the case of unattached plexes and subdisks, the naming is reversed.  Subdisks
 are named after the disk on which they are located, and plexes are named after
-the subdisk.  
+the subdisk.
 .\" XXX
 .Nm This mapping is still to be determined.
 .Ss OBJECT STATES
 .Pp
 Each
 .Nm
-object has a \fIstate\fR associated with it. 
+object has a \fIstate\fR associated with it.
 .Nm
 uses this state to determine the handling of the object.
 .Pp
@@ -725,7 +725,7 @@ yet implemented.
 The RAID-5 functionality is new in
 .Fx 3.3 .
 Some problems have been
-reported with 
+reported with
 .Nm
 in combination with soft updates, but these are not reproducible on all
 systems.  If you are planning to use
@@ -797,10 +797,10 @@ sd name obj.p1.s3 drive drive4 plex obj.p1 state up len 204800b driveoffset 4098
 .if t .ps
 .Pp
 The first line contains the
-.Nm 
+.Nm
 label and must start with the text
 .Li IN VINO .
-It also contains the name of the system.  The exact definition is contained in 
+It also contains the name of the system.  The exact definition is contained in
 .Pa /usr/src/sys/dev/vinum/vinumvar.h .
 The saved configuration starts in the middle of the line with the text
 .Li volume obj state up
@@ -827,10 +827,10 @@ command if you have this kind of trouble.
 .Pp
 In order to analyse a panic which you suspect comes from
 .Nm
-you will need to build a debug kernel.  See the online handbook at 
-.Pa /usr/share/doc/handbook/kerneldebug.html 
+you will need to build a debug kernel.  See the online handbook at
+.Pa /usr/share/doc/handbook/kerneldebug.html
 (if installed) or
-.Pa http://www.FreeBSD.org/handbook/kerneldebug.html  
+.Pa http://www.FreeBSD.org/handbook/kerneldebug.html
 for more details of how to do this.
 .Pp
 Perform the following steps to analyse a
@@ -842,14 +842,14 @@ Copy the files
 .Pa /usr/src/sys/modules/vinum/.gdbinit.crash ,
 .Pa /usr/src/sys/modules/vinum/.gdbinit.kernel ,
 .Pa /usr/src/sys/modules/vinum/.gdbinit.serial ,
-.Pa /usr/src/sys/modules/vinum/.gdbinit.vinum 
+.Pa /usr/src/sys/modules/vinum/.gdbinit.vinum
 and
 .Pa /usr/src/sys/modules/vinum/.gdbinit.vinum.paths
 to the directory in which you will be performing the analysis, typically
 .Pa /var/crash .
 .It
 Make sure that you build the
-.Nm 
+.Nm
 module with debugging information.  The standard
 .Pa Makefile
 builds a module with debugging symbols by default.  If the version of
@@ -860,8 +860,8 @@ does not contain symbols, you will not get an error message, but the stack trace
 will not show the symbols.  Check the module before starting
 .Nm gdb :
 .Bd -literal
-$ file /modules/vinum.ko 
-/modules/vinum.ko: ELF 32-bit LSB shared object, Intel 80386, 
+$ file /modules/vinum.ko
+/modules/vinum.ko: ELF 32-bit LSB shared object, Intel 80386,
   version 1 (FreeBSD), not stripped
 .Ed
 .Pp
@@ -886,9 +886,9 @@ Either take a dump or use remote serial
 .Cm gdb
 to analyse the problem.  To analyse a dump, say
 .Pa /var/crash/vmcore.5 ,
-link 
+link
 .Pa /var/crash/.gdbinit.crash
-to 
+to
 .Pa /var/crash/.gdbinit
 and enter:
 .Bd -literal
@@ -900,10 +900,10 @@ This example assumes that you have installed the correct debug kernel at
 .Pa /var/crash/kernel.debug .
 If not, substitute the correct name of the debug kernel.
 .Pp
-To perform remote serial debugging, 
-link 
+To perform remote serial debugging,
+link
 .Pa /var/crash/.gdbinit.serial
-to 
+to
 .Pa /var/crash/.gdbinit
 and enter
 .Bd -literal
@@ -911,7 +911,7 @@ and enter
 # gdb -k kernel.debug
 .Ed
 .Pp
-In this case, the 
+In this case, the
 .Pa .gdbinit
 file performs the functions necessary to establish connection.  The remote
 machine must already be in debug mode: enter the kernel debugger and select
@@ -934,24 +934,24 @@ GDB 4.16 (i386-unknown-freebsd), Copyright 1996 Free Software Foundation, Inc.
 Debugger (msg=0xf1093174 "vinum debug") at ../../i386/i386/db_interface.c:318
 318                 in_Debugger = 0;
 #1  0xf108d9bc in vinumioctl (dev=0x40001900, cmd=0xc008464b, data=0xf6dedee0 "",
-    flag=0x3, p=0xf68b7940) at 
+    flag=0x3, p=0xf68b7940) at
     /usr/src/sys/modules/Vinum/../../dev/Vinum/vinumioctl.c:102
 102             Debugger ("vinum debug");
 (kgdb) bt
 #0  Debugger (msg=0xf0f661ac "vinum debug") at ../../i386/i386/db_interface.c:318
-#1  0xf0f60a7c in vinumioctl (dev=0x40001900, cmd=0xc008464b, data=0xf6923ed0 "", 
-      flag=0x3, p=0xf688e6c0) at 
+#1  0xf0f60a7c in vinumioctl (dev=0x40001900, cmd=0xc008464b, data=0xf6923ed0 "",
+      flag=0x3, p=0xf688e6c0) at
       /usr/src/sys/modules/vinum/../../dev/vinum/vinumioctl.c:109
 #2  0xf01833b7 in spec_ioctl (ap=0xf6923e0c) at ../../miscfs/specfs/spec_vnops.c:424
 #3  0xf0182cc9 in spec_vnoperate (ap=0xf6923e0c) at ../../miscfs/specfs/spec_vnops.c:129
 #4  0xf01eb3c1 in ufs_vnoperatespec (ap=0xf6923e0c) at ../../ufs/ufs/ufs_vnops.c:2312
-#5  0xf017dbb1 in vn_ioctl (fp=0xf1007ec0, com=0xc008464b, data=0xf6923ed0 "", 
+#5  0xf017dbb1 in vn_ioctl (fp=0xf1007ec0, com=0xc008464b, data=0xf6923ed0 "",
       p=0xf688e6c0) at vnode_if.h:395
 #6  0xf015dce0 in ioctl (p=0xf688e6c0, uap=0xf6923f84) at ../../kern/sys_generic.c:473
-#7  0xf0214c0b in syscall (frame={tf_es = 0x27, tf_ds = 0x27, tf_edi = 0xefbfcff8, 
-      tf_esi = 0x1, tf_ebp = 0xefbfcf90, tf_isp = 0xf6923fd4, tf_ebx = 0x2, 
+#7  0xf0214c0b in syscall (frame={tf_es = 0x27, tf_ds = 0x27, tf_edi = 0xefbfcff8,
+      tf_esi = 0x1, tf_ebp = 0xefbfcf90, tf_isp = 0xf6923fd4, tf_ebx = 0x2,
       tf_edx = 0x804b614, tf_ecx = 0x8085d10, tf_eax = 0x36, tf_trapno = 0x7,
-      tf_err = 0x2, tf_eip = 0x8060a34, tf_cs = 0x1f, tf_eflags = 0x286, 
+      tf_err = 0x2, tf_eip = 0x8060a34, tf_cs = 0x1f, tf_eflags = 0x286,
       tf_esp = 0xefbfcf78, tf_ss = 0x27}) at ../../i386/i386/trap.c:1100
 #8  0xf020a1fc in Xint0x80_syscall ()
 #9  0x804832d in ?? ()
@@ -1012,7 +1012,7 @@ first appeared in
 .Fx 3.0 .
 The RAID-5 component of
 .Nm
-was developed by Cybernet Inc. 
+was developed by Cybernet Inc.
 .Pa www.cybernet.com
 for its NetMAX product.
 .Sh SEE ALSO