9 files changed, 40 insertions, 41 deletions

diff --git a/contrib/bsnmp/gensnmpdef/gensnmpdef.1 b/contrib/bsnmp/gensnmpdef/gensnmpdef.1
index 806203180676..678e345ac815 100644
--- a/contrib/bsnmp/gensnmpdef/gensnmpdef.1
+++ b/contrib/bsnmp/gensnmpdef/gensnmpdef.1
@@ -3,7 +3,7 @@
 .\"	Hartmut Brandt.
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -78,7 +78,7 @@ file by hand.
 .Sh SEE ALSO
 .Xr snmpd 1
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
 .Sh BUGS
 The utility is by no means bullet-proof and may fail for complex
 or non-standard MIBs.
diff --git a/contrib/bsnmp/gensnmptree/gensnmptree.1 b/contrib/bsnmp/gensnmptree/gensnmptree.1
index 930f4269456c..f9d8d5321fce 100644
--- a/contrib/bsnmp/gensnmptree/gensnmptree.1
+++ b/contrib/bsnmp/gensnmptree/gensnmptree.1
@@ -6,7 +6,7 @@
 .\"	Hartmut Brandt
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -58,7 +58,7 @@ If none of the options
 .Fl e ,
 .Fl E
 or
-.FL t
+.Fl t
 are used
 .Nm
 reads a MIB description from its standard input and creates two files: a
@@ -243,4 +243,4 @@ typedef AdminStatus ENUM (
 .Sh SEE ALSO
 .Xr bsnmpd 1
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/bsnmp/lib/asn1.3 b/contrib/bsnmp/lib/asn1.3
index caa26af9a2f5..419a929aada1 100644
--- a/contrib/bsnmp/lib/asn1.3
+++ b/contrib/bsnmp/lib/asn1.3
@@ -6,7 +6,7 @@
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
 .\" 
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -489,4 +489,4 @@ followed by the error message and an optional dump of the buffer.
 This implementation conforms to the applicable IETF RFCs and ITU-T
 recommendations.
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/bsnmp/lib/bsnmpagent.3 b/contrib/bsnmp/lib/bsnmpagent.3
index 6e77635b43fb..6b9c7198c30e 100644
--- a/contrib/bsnmp/lib/bsnmpagent.3
+++ b/contrib/bsnmp/lib/bsnmpagent.3
@@ -6,7 +6,7 @@
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -441,4 +441,4 @@ Additionally the functions may call snmp_error on unexpected errors.
 This implementation conforms to the applicable IETF RFCs and ITU-T
 recommendations.
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/bsnmp/lib/bsnmpclient.3 b/contrib/bsnmp/lib/bsnmpclient.3
index ffcce83409f4..870f5464fa43 100644
--- a/contrib/bsnmp/lib/bsnmpclient.3
+++ b/contrib/bsnmp/lib/bsnmpclient.3
@@ -6,7 +6,7 @@
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -654,5 +654,5 @@ filed of
 This implementation conforms to the applicable IETF RFCs and ITU-T
 recommendations.
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
 .An Kendy Kutzner Aq kutzner@fokus.gmd.de
diff --git a/contrib/bsnmp/lib/bsnmplib.3 b/contrib/bsnmp/lib/bsnmplib.3
index 4a1d1403395d..4512b8cd9581 100644
--- a/contrib/bsnmp/lib/bsnmplib.3
+++ b/contrib/bsnmp/lib/bsnmplib.3
@@ -6,7 +6,7 @@
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -302,4 +302,4 @@ Encoding failed.
 This implementation conforms to the applicable IETF RFCs and ITU-T
 recommendations.
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.3 b/contrib/bsnmp/snmp_mibII/snmp_mibII.3
index ff05de431e59..d1b5ec310533 100644
--- a/contrib/bsnmp/snmp_mibII/snmp_mibII.3
+++ b/contrib/bsnmp/snmp_mibII/snmp_mibII.3
@@ -6,7 +6,7 @@
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -363,4 +363,4 @@ The various internet MIBs.
 .Sh STANDARDS
 This implementation conforms to the applicable IETF RFCs.
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/bsnmp/snmpd/bsnmpd.1 b/contrib/bsnmp/snmpd/bsnmpd.1
index 18c46d2af67c..06966f06ae60 100644
--- a/contrib/bsnmp/snmpd/bsnmpd.1
+++ b/contrib/bsnmp/snmpd/bsnmpd.1
@@ -6,7 +6,7 @@
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
 .\"
 .\" $Begemot: bsnmp/snmpd/bsnmpd.1,v 1.12 2006/02/27 09:50:03 brandt_h Exp $
 .\"
-.Dd February 27, 2006
+.Dd August 16, 2010
 .Dt BSNMPD 1
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-daemon server the internet SNMP (Simple Network Management Protocol).
+daemon serves the internet SNMP (Simple Network Management Protocol).
 It is intended to serve only the absolute basic MIBs and implement all other
 MIBs through loadable modules.
 In this way the
@@ -59,11 +59,10 @@ can be used in unexpected ways.
 The options are as follows:
 .Bl -tag -width ".It Fl D Ar options"
 .It Fl d
-This option is used for debugging
-.Nm
-and causes it not to daemonize itself.
+Do not daemonize.
+Used for debugging.
 .It Fl h
-This option prints a short usage message.
+Print a short usage message.
 .It Fl c Ar file
 Use
 .Ar file
@@ -75,33 +74,32 @@ flag followed by a comma separated string of options.
 The following options are available.
 .Bl -tag -width ".It Cm trace Ns Cm = Ns Cm level"
 .It Cm dump
-This option causes all sent and received PDUs to be dumped to the terminal.
+Dump all sent and received PDUs to the terminal.
 .It Cm events
-This causes the debugging level of the event library (see
+Set the debugging level of the event library (see
 .Xr eventlib 3 )
-to be set to 10.
+to 10.
 .It Cm trace Ns Cm = Ns Cm level
-This option causes the snmp library trace flag to be set to the specified
+Set the snmp library trace flag to the specified
 value.
 The value can be specified in the usual C-syntax for numbers.
 .El
 .It Fl I Ar paths
-This option specifies a colon separated list of directories to search for
-configuration include files.
+Specify a colon separated list of directories to search for configuration
+include files.
 The default is
 .Pa /etc:/usr/etc/:/usr/local/etc .
 These paths are only searched for include specified within <> parentheses.
 .It Fl l Ar prefix
-The
+Use
 .Ar prefix
-is used as the default basename for the pid and the configuration files.
+as the default basename for the pid and the configuration files.
 .It Fl m Ar variable Ns Op = Ns Ar value
 Define a configuration variable.
 .It Fl p Ar file
 Specify an alternate pid file instead of the default one.
 .El
 .Sh CONFIGURATION
-The
 .Nm
 reads its configuration from either the default or the user specified
 configuration file.
@@ -218,7 +216,7 @@ If the
 element is a hostname, the IP address of the host is looked up and the four
 elements of the IP address are appended to the oid.
 .Pp
-For example a oid of
+For example, an oid of
 .Bd -unfilled -offset indent
 myvariable.27.foooll.[localhost]."&^!"
 .Ed
@@ -253,13 +251,13 @@ is
 .It Pa /var/run/ Ns Ao Ar prefix Ac Ns \&.pid
 Default pid file.
 .It Pa /etc:/usr/etc/:/usr/local/etc
-This is the default search path for system include files.
+Default search path for system include files.
 .It Pa @MIBSPATH@FOKUS-MIB.txt
 .It Pa @MIBSPATH@BEGEMOT-MIB.txt
 .It Pa @MIBSPATH@BEGEMOT-SNMPD.txt
-The definitions for the MIBs implemented in the daemon.
+Definitions for the MIBs implemented in the daemon.
 .It Pa /etc/hosts.allow, /etc/hosts.deny
-Access controls that should be enforced by TCP wrappers should be defined here.
+Access controls that should be enforced by TCP wrappers are defined here.
 Further details are described in
 .Xr hosts_access 5 .
 .El
@@ -271,6 +269,6 @@ The
 .Nm
 conforms to the applicable IETF RFCs.
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
 .Sh BUGS
 Sure.
diff --git a/contrib/bsnmp/snmpd/snmpmod.3 b/contrib/bsnmp/snmpd/snmpmod.3
index 3ca067add0e6..6bea4031010a 100644
--- a/contrib/bsnmp/snmpd/snmpmod.3
+++ b/contrib/bsnmp/snmpd/snmpmod.3
@@ -6,7 +6,7 @@
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -558,7 +558,7 @@ For modules that implement SNMP client functions besides SNMP agent functions
 it may be necessary to identify SNMP requests by their identifier to allow
 easier routing of responses to the correct sub-system.
 Request id ranges
-provide a way to aquire globally non-overlapping sub-ranges of the entire
+provide a way to acquire globally non-overlapping sub-ranges of the entire
 31-bit id range.
 .Pp
 A request id range is allocated with
@@ -586,7 +586,7 @@ The function
 .Fn reqid_istype
 checks whether the request id
 .Fa reqid
-is withing the range identified by
+is within the range identified by
 .Fa type .
 The function
 .Fn reqid_type
@@ -777,7 +777,8 @@ is used for GET or GETNEXT.
 The function
 .It Fn string_get_max
 can be used instead of
-.Nf stringto ensure that the returned string has a certain maximum length.
+.Fn string_get
+to ensure that the returned string has a certain maximum length.
 If
 .Fa len
 is -1, the length is computed via
@@ -925,4 +926,4 @@ beginning at position
 This implementation conforms to the applicable IETF RFCs and ITU-T
 recommendations.
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org