16 files changed, 64 insertions, 63 deletions

diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index a74546f01233..c848bf7da418 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -102,7 +102,7 @@ See also system keyword
 If this keyword is omitted the system default is used.
 (optional)
 .It Li add-prefix
-If set to 
+If set to
 .Em on ,
 for incoming numbers, have a look at the "type of number" indicator and
 adjust the number as specified by the
@@ -218,15 +218,15 @@ The supported access rights are:
 In conjunction with the
 .Em add-prefix
 switch (see above), specify the prefix number string for incoming numbers
-with the international number tag. If aliases are used, they have to be 
-adjusted accordingly.
+with the international number tag.
+If aliases are used, they have to be adjusted accordingly.
 (optional)
 .It Li prefix-national
 In conjunction with the
 .Em add-prefix
 switch (see above), specify the prefix number string for incoming numbers
-with the national number tag. If aliases are used, they have to be
-adjusted accordingly.
+with the national number tag.
+If aliases are used, they have to be adjusted accordingly.
 (optional)
 .It Li ratesfile
 Specifies the name of the ratesfile.
@@ -386,9 +386,10 @@ The currently configurable values are:
 .Pp
 .Bl -tag -width Ds -compact
 .It Ar dov
-This connection is a 
+This connection is a
 .Em Dov (Data over Voice)
-connection. The b1protocol keyword must be set to
+connection.
+The b1protocol keyword must be set to
 .Em hdlc .
 This feature is experimental and does work on outgoing calls only.
 .El
diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index 33d207513bd2..ffa431c9d435 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -41,10 +41,11 @@ device driver is used by the
 .Xr isdnd 8
 daemon to exchange messages with the isdn4bsd kernel part for the purpose
 of call establishment, control and disconnection and to access various
-control and status informations. The
+control and status informations.
+The
 .Nm
 device can only be opened by a single process and is not meant to be used
-by user programs. 
+by user programs.
 .Pp
 The messages and message parameters are documented in the include
 file
@@ -106,4 +107,4 @@ Charging information from the kernel.
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/i4bing.4 b/usr.sbin/i4b/man/i4bing.4
index 8ba3619b3c6c..0322088e09eb 100644
--- a/usr.sbin/i4b/man/i4bing.4
+++ b/usr.sbin/i4b/man/i4bing.4
@@ -60,4 +60,4 @@ daemon to establish a connection.
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4
index 3a1821e488a5..6bbc1faea49b 100644
--- a/usr.sbin/i4b/man/i4bipr.4
+++ b/usr.sbin/i4b/man/i4bipr.4
@@ -93,4 +93,4 @@ for
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4
index 5e1f4000bef0..0cc66f801da3 100644
--- a/usr.sbin/i4b/man/i4bisppp.4
+++ b/usr.sbin/i4b/man/i4bisppp.4
@@ -120,4 +120,4 @@ and then added to ISDN4BSD by
 .An Gary Jennejohn Aq gj@FreeBSD.org .
 .Pp
 This manpage was written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/i4bq921.4 b/usr.sbin/i4b/man/i4bq921.4
index 0daef42c717d..4eec2b36f029 100644
--- a/usr.sbin/i4b/man/i4bq921.4
+++ b/usr.sbin/i4b/man/i4bq921.4
@@ -45,4 +45,4 @@ ITU Recommendation Q.920 and Q.921
 The
 .Nm
 driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/i4bq931.4 b/usr.sbin/i4b/man/i4bq931.4
index 85e298f258c9..3bdfd6e08613 100644
--- a/usr.sbin/i4b/man/i4bq931.4
+++ b/usr.sbin/i4b/man/i4bq931.4
@@ -45,4 +45,4 @@ ITU Recommendation Q.930 and Q.931
 The
 .Nm
 driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/i4brbch.4 b/usr.sbin/i4b/man/i4brbch.4
index 05e948f117d0..aaa6044b0349 100644
--- a/usr.sbin/i4b/man/i4brbch.4
+++ b/usr.sbin/i4b/man/i4brbch.4
@@ -37,8 +37,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides an interface to the raw untranslated B-channel. It is
-part of the isdn4bsd package.
+driver provides an interface to the raw untranslated B-channel.
+It is part of the isdn4bsd package.
 .Sh SEE ALSO
 .Xr isdnd.rc 5 ,
 .Xr isdnd 8
@@ -46,4 +46,4 @@ part of the isdn4bsd package.
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4
index 462d4220f73c..ffffee8a84af 100644
--- a/usr.sbin/i4b/man/i4btel.4
+++ b/usr.sbin/i4b/man/i4btel.4
@@ -40,7 +40,8 @@ The
 driver provides an interface to the ISDN B-channel for telephony applications
 and is currently used by the
 .Xr isdnd 8
-for answering machine support. The driver is part of the isdn4bsd package.
+for answering machine support.
+The driver is part of the isdn4bsd package.
 .Pp
 The lower six bits of the drivers's minor number is used to specify a
 unit number, wheras the upper two bits specify a functionality.
@@ -81,8 +82,8 @@ parameters are available:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
 .It Ar CVT_NONE
-do no A-law/u-law audio format conversion. The conversion path looks like
-this:
+do no A-law/u-law audio format conversion.
+The conversion path looks like this:
 .Pp
 USER <--> bitreversing <--> ISDN-line
 .Pp
@@ -129,4 +130,4 @@ A-Law and u-Law are specified in ITU Recommendation G.711.
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index a0579a92c67f..cbd6a7f44cae 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -45,10 +45,10 @@ or
 utilities.
 .Sh SEE ALSO
 .Xr isdnd 8 ,
+.Xr isdndecode 8 ,
 .Xr isdntrace 8
-.Xr isdndecode 8
 .Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/ifpi.4 b/usr.sbin/i4b/man/ifpi.4
index b260e7853f42..aa67b4afad02 100644
--- a/usr.sbin/i4b/man/ifpi.4
+++ b/usr.sbin/i4b/man/ifpi.4
@@ -41,7 +41,7 @@ driver provides D-channel layer 1 support as specified in ITU Recommendation
 I.430 and layer 1 support for the B-channel.
 .Pp
 The driver supports passive PCI ISDN Version 1.0 cards from AVM based on the
-proprietary B-channel controller and PCI interface chip from AVM, Berlin, 
+proprietary B-channel controller and PCI interface chip from AVM, Berlin,
 Germany.
 .Sh CAVEATS
 The driver is still in a somewhat experimental state.
@@ -50,9 +50,9 @@ Always at least one left.
 .Sh STANDARDS
 CCITT Recommendation I.430
 .Sh SEE ALSO
-.Xr ifpi2 4 ,
 .Xr i4bq921 4 ,
-.Xr i4bq931 4
+.Xr i4bq931 4 ,
+.Xr ifpi2 4
 .Sh AUTHORS
 .An -nosplit
 The
@@ -61,4 +61,4 @@ driver was written by
 .An Gary Jennejohn Aq gj@FreeBSD.org .
 .Pp
 This manpage was written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/ifpi2.4 b/usr.sbin/i4b/man/ifpi2.4
index f83a8f27d8c5..474dff85818a 100644
--- a/usr.sbin/i4b/man/ifpi2.4
+++ b/usr.sbin/i4b/man/ifpi2.4
@@ -40,7 +40,7 @@ The
 driver provides D-channel layer 1 support as specified in ITU Recommendation
 I.430 and layer 1 support for the B-channel.
 .Pp
-The driver supports the version 2 passive PCI ISDN cards from AVM based on 
+The driver supports the version 2 passive PCI ISDN cards from AVM based on
 the proprietary B-channel controller and PCI interface chip from AVM, Berlin,
 Germany.
 .Sh CAVEATS
@@ -50,9 +50,9 @@ Always at least one left.
 .Sh STANDARDS
 CCITT Recommendation I.430
 .Sh SEE ALSO
-.Xr ifpi 4 ,
 .Xr i4bq921 4 ,
-.Xr i4bq931 4
+.Xr i4bq931 4 ,
+.Xr ifpi 4
 .Sh AUTHORS
 The
 .Nm
diff --git a/usr.sbin/i4b/man/ifpnp.4 b/usr.sbin/i4b/man/ifpnp.4
index 46239eb8f56f..45cf413b0a25 100644
--- a/usr.sbin/i4b/man/ifpnp.4
+++ b/usr.sbin/i4b/man/ifpnp.4
@@ -62,6 +62,6 @@ driver was written by
 .An Udo Schweigert Aq ust@cert.siemens.de .
 .Pp
 This manpage was written by
-.An Hellmuth Michaelis Aq hm@freebsd.org
+.An Hellmuth Michaelis Aq hm@FreeBSD.org
 and
 .An Udo Schweigert .
diff --git a/usr.sbin/i4b/man/ihfc.4 b/usr.sbin/i4b/man/ihfc.4
index 1b5d7511a39d..d071380f7b18 100644
--- a/usr.sbin/i4b/man/ihfc.4
+++ b/usr.sbin/i4b/man/ihfc.4
@@ -48,8 +48,8 @@ The
 driver provides D-channel layer 1 supports as specified in ITU Recommendation
 I.430 and layer 1 support for the B-channel.
 .Pp
-The driver supports some passive ISA ISDN cards based on the 
-HFC[-S][-SP] 2B[DS0] chips from Cologne Chip, currenly this are the 
+The driver supports some passive ISA ISDN cards based on the
+HFC[-S][-SP] 2B[DS0] chips from Cologne Chip, currenly this are the
 Teles 16.3c ISA PnP, the AcerISDN P10 ISA PnP and the TELEINT ISDN SPEED No.1.
 .Sh CAVEATS
 The driver is still in an experimental state.
diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4
index b242f827a348..01a0148fc093 100644
--- a/usr.sbin/i4b/man/isic.4
+++ b/usr.sbin/i4b/man/isic.4
@@ -40,12 +40,12 @@ The
 driver provides D-channel layer 1 supports as specified in ITU Recommendation
 I.430 and layer 1 support for the B-channel.
 .Pp
-The driver supports several 8 and 16bit passive ISA, ISA PnP and PCI 
-ISDN cards from various manufacturers which are all based upon the 
-popular Siemens ISDN chipset consisting of the ISDN Subscriber Access 
-Controller ISAC (such as the PEB2085 or PSB 2186) and the High-Level 
-Serial Communications Controller Extended HSCX (such as the SAB82525 
-or PSB21525). 
+The driver supports several 8 and 16bit passive ISA, ISA PnP and PCI
+ISDN cards from various manufacturers which are all based upon the
+popular Siemens ISDN chipset consisting of the ISDN Subscriber Access
+Controller ISAC (such as the PEB2085 or PSB 2186) and the High-Level
+Serial Communications Controller Extended HSCX (such as the SAB82525
+or PSB21525).
 The newer IPAC chip (which integrates an ISAC and a HSCX in one chip,
 with the added benefit of larger FIFO buffers) is also supported.
 .Sh SUPPORTED CARDS: ISA bus, NON-PnP
@@ -57,7 +57,7 @@ The required entry in the kernel config file is:
 options TEL_S0_8
 .Ed
 .Pp
-The required entry in 
+The required entry in
 .Xr device.hints 5
 file is:
 .Pp
@@ -84,7 +84,7 @@ The required entry in the kernel config file is:
 options TEL_S0_16
 .Ed
 .Pp
-The required entry in 
+The required entry in
 .Xr device.hints 5
 file is:
 .Pp
@@ -97,14 +97,14 @@ hint.isic.0.flags="2"
 .Ed
 .Pp
 These boards have a jumper which specifies an i/o base address
-(hint.isic.N.port) of either 0xd80, 0xe80 or 0xf80. 
+(hint.isic.N.port) of either 0xd80, 0xe80 or 0xf80.
 The remaining necessary configuration values are then
 programmed at run time by accessing this i/o port.
 .Pp
 Valid interrupts (hint.isic.N.irq) are 2, 3, 4, 5, 10, 11, 12 or 15.
 .Pp
-Valid memory start addresses (hint.isic.N.maddr) are 
-0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000, 0xCE000, 
+Valid memory start addresses (hint.isic.N.maddr) are
+0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000, 0xCE000,
 0xD0000, 0xD2000, 0xD4000, 0xD6000, 0xD8000, 0xDA000, 0xDC000 and
 0xDE000.
 .Pp
@@ -118,7 +118,7 @@ The required entry in the kernel config file is:
 options TEL_S0_16_3
 .Ed
 .Pp
-The required entry in 
+The required entry in
 .Xr device.hints 5
 file is:
 .Pp
@@ -148,12 +148,12 @@ The required entry in the kernel config file is:
 options AVM_A1
 .Ed
 .Pp
-The required entry in 
+The required entry in
 .Xr device.hints 5
 file is:
 .Pp
 .Bd -literal -offset indent
-hint.isic.0.at="isa" 
+hint.isic.0.at="isa"
 hint.isic.0.port="0x340"
 hint.isic.0.irq="5"
 hint.isic.0.flags="4"
@@ -175,24 +175,24 @@ The required entry in the kernel config file is:
 options USR_STI
 .Ed
 .Pp
-The required entry in 
+The required entry in
 .Xr device.hints 5
 file is:
 .Pp
 .Bd -literal -offset indent
-hint.isic.0.at="isa"   
+hint.isic.0.at="isa"
 hint.isic.0.port="0x268"
 hint.isic.0.irq="5"
 hint.isic.0.flags="7"
 .Ed
 .Pp
-Valid i/o port values (hint.isic.N.port) are 0x200, 0x208, 0x210, 0x218, 
-0x220, 0x228, 0x230, 0x238, 0x240, 0x248, 0x250, 0x258, 0x260, 0x268, 
+Valid i/o port values (hint.isic.N.port) are 0x200, 0x208, 0x210, 0x218,
+0x220, 0x228, 0x230, 0x238, 0x240, 0x248, 0x250, 0x258, 0x260, 0x268,
 0x270 and 0x278.
 .Pp
 Valid interrupt (hint.isic.N.irq) values are 5, 7, 10, 11, 12, 14, 15.
 .Pp
-Notice: this card has a strange address decoding scheme resulting in 
+Notice: this card has a strange address decoding scheme resulting in
 occupying 64 windows of some bytes length over the whole i/o address
 range.
 .Pp
@@ -203,15 +203,15 @@ The required entry in the kernel config file is:
 options ITKIX1
 .Ed
 .Pp
-The required entry in 
+The required entry in
 .Xr device.hints 5
 file is:
 .Pp
 .Bd -literal -offset indent
-hint.isic.0.at="isa" 
+hint.isic.0.at="isa"
 hint.isic.0.port="0x398"
 hint.isic.0.irq="10"
-hint.isic.0.flags="18" 
+hint.isic.0.flags="18"
 .Ed
 .Pp
 Valid i/o port values must be in the range (<unknown>).
@@ -225,12 +225,12 @@ The required entry in the kernel config file is:
 options ELSA_PCC16
 .Ed
 .Pp
-The required entry in 
+The required entry in
 .Xr device.hints 5
 file is:
 .Pp
 .Bd -literal -offset indent
-hint.isic.0.at="isa" 
+hint.isic.0.at="isa"
 hint.isic.0.port="0x360"
 hint.isic.0.irq="10"
 hint.isic.0.flags="20"
@@ -351,11 +351,9 @@ CCITT Recommendation I.430
 The
 .Nm
 driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .
 It is based on earlier work of
 .An Arne Helme ,
 .An Andrew Gordon
 and
-.An Gary Jennejohn Aq gj@freebsd.org .
-
-
+.An Gary Jennejohn Aq gj@FreeBSD.org .
diff --git a/usr.sbin/i4b/man/iwic.4 b/usr.sbin/i4b/man/iwic.4
index 3391550bd7d5..8f6674a313eb 100644
--- a/usr.sbin/i4b/man/iwic.4
+++ b/usr.sbin/i4b/man/iwic.4
@@ -65,4 +65,4 @@ driver was written by
 .An Dave Boyce Aq dave@abyss.demon.co.uk .
 .Pp
 This manpage was written by
-.An Hellmuth Michaelis Aq hm@freebsd.org .
+.An Hellmuth Michaelis Aq hm@FreeBSD.org .