some small fixes for snmp stuff;

3 files changed, 35 insertions, 33 deletions

diff --git a/usr.sbin/snmpctl/snmpctl.8 b/usr.sbin/snmpctl/snmpctl.8
index f229fe966f8..7de6da6f19d 100644
--- a/usr.sbin/snmpctl/snmpctl.8
+++ b/usr.sbin/snmpctl/snmpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpctl.8,v 1.6 2008/01/30 10:13:19 reyk Exp $
+.\" $OpenBSD: snmpctl.8,v 1.7 2008/01/31 19:40:38 jmc Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 30 2008 $
+.Dd $Mdocdate: January 31 2008 $
 .Dt SNMPCTL 8
 .Os
 .Sh NAME
@@ -48,9 +48,9 @@ subsystems and engines.
 Dump the tree of compiled-in MIB objects.
 .It Xo
 .Cm trap send Ar oid-string
-.Op Cm oid Ar oid-string Ar type value ... Oc
+.Op Cm oid Ar oid-string Ar type value ...
 .Xc
-Send a SNMP trap via
+Send an SNMP trap via
 .Xr snmpd 8
 to the registered trap receivers.
 The command takes one
@@ -66,23 +66,23 @@ The following types are supported:
 .It Cm ip Ar value
 An IPv4 address.
 .It Cm counter Ar value
-A 32 bit counter.
+A 32-bit counter.
 .It Cm gauge Ar value
-A 32 bit gauge.
+A 32-bit gauge.
 .It Cm unsigned Ar value
-A 32 bit unsigned integer.
+A 32-bit unsigned integer.
 .It Cm ticks Ar value
-A 32 bit timeticks integer value.
+A 32-bit timeticks integer value.
 .It Cm opaque Ar value
-A 32 bit opaque.
+A 32-bit opaque.
 .It Cm nsap Ar value
-A 32 bit NSAP address.
+A 32-bit NSAP address.
 .It Cm counter64 Ar value
-A 64 bit counter.
+A 64-bit counter.
 .It Cm uint Ar value
-A 32 bit unsigned integer.
+A 32-bit unsigned integer.
 .It Cm int Ar value
-A 32 bit integer.
+A 32-bit integer.
 .It Cm bitstring Ar string
 A bit string.
 .It Cm string Ar string
@@ -90,7 +90,7 @@ An octet string.
 .It Cm null
 This type takes no argument.
 .It Cm oid Ar oid-string
-An string describing a Object ID, for example
+An string describing an Object ID, for example
 .Ar 1.3.6.1.4.1.30155 .
 .El
 .El
diff --git a/usr.sbin/snmpd/snmpd.8 b/usr.sbin/snmpd/snmpd.8
index 97e7443dc13..a84cecc9e34 100644
--- a/usr.sbin/snmpd/snmpd.8
+++ b/usr.sbin/snmpd/snmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpd.8,v 1.4 2008/01/16 09:51:15 reyk Exp $
+.\" $OpenBSD: snmpd.8,v 1.5 2008/01/31 19:40:38 jmc Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 16 2008 $
+.Dd $Mdocdate: January 31 2008 $
 .Dt SNMPD 8
 .Os
 .Sh NAME
@@ -66,7 +66,7 @@ default
 configuration file
 .El
 .Sh SEE ALSO
-.Xr snmpd.conf 5 ,
+.Xr snmpd.conf 5
 .Rs
 .%R RFC 1157
 .%T A Simple Network Management Protocol (SNMP)
@@ -93,6 +93,5 @@ The
 program was written by
 .An Reyk Floeter Aq reyk@vantronix.net .
 .Sh CAVEATS
-The
 .Nm
 does not fully work yet.
diff --git a/usr.sbin/snmpd/snmpd.conf.5 b/usr.sbin/snmpd/snmpd.conf.5
index b70c90629cf..2ed41ce8daa 100644
--- a/usr.sbin/snmpd/snmpd.conf.5
+++ b/usr.sbin/snmpd/snmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpd.conf.5,v 1.5 2008/01/17 17:35:06 reyk Exp $
+.\" $OpenBSD: snmpd.conf.5,v 1.6 2008/01/31 19:40:38 jmc Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 17 2008 $
+.Dd $Mdocdate: January 31 2008 $
 .Dt SNMPD.CONF 5
 .Os
 .Sh NAME
@@ -97,7 +97,7 @@ Specify a description of the local system.
 The default value is the operating system identification as printed by the
 .Xr uname 1
 command using the
-.Ar -a
+.Fl a
 flag:
 .Bd -literal -offset indent
 OpenBSD myhost.example.com 4.2 GENERIC#595 i386
@@ -118,7 +118,9 @@ Specify the authoritative identification of the local system.
 The default value is
 .Ar 1.3.6.1.4.1.30155.23.1
 .Pq iso.org.dod.internet.private.enterprises.openbsd.23.1
-indentifying a common OpenBSD system.
+indentifying a common
+.Ox
+system.
 .Pp
 .It Ic system services Ar number
 Specify a magic value which indicates the set of services that the local
@@ -141,7 +143,7 @@ The default value is
 Specify the address or FQDN of a remote trap receiver for outgoing traps
 sent by
 .Xr snmpd 8 .
-This option may be specified for multiple times.
+This option may be specified multiple times.
 The daemon will send outgoing traps using the revised SNMPv2 format and the
 configured trap community.
 The default community is specified by the global
@@ -160,19 +162,25 @@ It is possible to specify user-defined OIDs in the configuration file:
 .Op Ar type
 .Ar value
 .Xc
-Return the specified value to the client for this OID, the
+Return the specified value to the client for this OID.
+The
 .Ic read-write
 option may allow the client to override it,
 and the type is is either
 .Ic string
 or
 .Ic integer .
+.El
+.Sh FILES
+.Bl -tag -width "/etc/snmpd.conf" -compact
+.It Pa /etc/snmpd.conf
+Default location of the configuration file.
+.El
 .Sh EXAMPLES
 The following example will tell
-.Nm
+.Xr snmpd 8
 to listen on localhost, override the default system OID, set the
-magic services value and some custom OID values:
-.Pp
+magic services value and provides some custom OID values:
 .Bd -literal -offset indent
 listen on 127.0.0.1
 
@@ -181,12 +189,7 @@ system services 74
 
 oid 1.3.6.1.4.1.30155.42.1 name myName read-only string "humppa"
 oid 1.3.6.1.4.1.30155.42.2 name myStatus read-only integer 1
-.El
-.Sh FILES
-.Bl -tag -width "/etc/snmpd.conf" -compact
-.It Pa /etc/snmpd.conf
-Default location of the configuration file.
-.El
+.Ed
 .Sh SEE ALSO
 .Xr snmpd 8
 .Sh HISTORY