Module Name: src
Committed By: wiz
Date: Sun Apr 8 22:00:42 UTC 2012
Modified Files:
src/sbin/dump_lfs: dump_lfs.8
src/sbin/fdisk: fdisk.8
src/sbin/mount_nfs: mount_nfs.8
src/sbin/ping6: ping6.8
src/sbin/tunefs: tunefs.8
src/usr.bin/crunch/crunchgen: crunchgen.1
src/usr.bin/crunch/crunchide: crunchide.1
src/usr.bin/fdformat: fdformat.1
src/usr.bin/ftp: ftp.1
src/usr.bin/grep: grep.1
src/usr.bin/hexdump: hexdump.1 od.1
src/usr.bin/indent: indent.1
src/usr.bin/ipcs: ipcs.1
src/usr.bin/join: join.1
src/usr.bin/jot: jot.1
src/usr.bin/m4: m4.1
src/usr.bin/make: make.1
src/usr.bin/nl: nl.1
src/usr.bin/patch: patch.1
src/usr.bin/pr: pr.1
src/usr.bin/telnet: telnet.1
src/usr.bin/vgrind: vgrind.1
src/usr.bin/xinstall: install.1
src/usr.sbin/apm: apm.8
src/usr.sbin/apmd: apmd.8
src/usr.sbin/lpr/lp: lp.1
src/usr.sbin/lpr/lpc: lpc.8
src/usr.sbin/lpr/lpr: lpr.1
src/usr.sbin/lpr/lprm: lprm.1
src/usr.sbin/lpr/pac: pac.8
src/usr.sbin/route6d: route6d.8
src/usr.sbin/syslogd: syslogd.8
src/usr.sbin/tpctl: tpctl.8
src/usr.sbin/vipw: vipw.8
src/usr.sbin/ypserv/makedbm: makedbm.8
src/usr.sbin/ypserv/mknetid: mknetid.8
src/usr.sbin/ypserv/revnetgroup: revnetgroup.8
src/usr.sbin/ypserv/yppush: yppush.8
src/usr.sbin/ypserv/ypxfr: ypxfr.8
Log Message:
Remove unnecessary Bk/Ek pairs from SYNOPSIS.
No effective change except where I used the opportunity to sort options
and/or option descriptions.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/dump_lfs/dump_lfs.8
cvs rdiff -u -r1.76 -r1.77 src/sbin/fdisk/fdisk.8
cvs rdiff -u -r1.41 -r1.42 src/sbin/mount_nfs/mount_nfs.8
cvs rdiff -u -r1.27 -r1.28 src/sbin/ping6/ping6.8
cvs rdiff -u -r1.40 -r1.41 src/sbin/tunefs/tunefs.8
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/crunch/crunchgen/crunchgen.1
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/crunch/crunchide/crunchide.1
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/fdformat/fdformat.1
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/ftp/ftp.1
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/grep/grep.1
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/hexdump/hexdump.1
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/hexdump/od.1
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/indent/indent.1
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/ipcs/ipcs.1
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/join/join.1
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/jot/jot.1
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/m4/m4.1
cvs rdiff -u -r1.201 -r1.202 src/usr.bin/make/make.1
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/nl/nl.1
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/patch/patch.1
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/pr/pr.1
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/telnet/telnet.1
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/vgrind/vgrind.1
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/xinstall/install.1
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/apm/apm.8
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/apmd/apmd.8
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/lpr/lp/lp.1
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/lpr/lpc/lpc.8
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/lpr/lpr/lpr.1
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/lpr/lprm/lprm.1
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/lpr/pac/pac.8
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/route6d/route6d.8
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/syslogd/syslogd.8
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/tpctl/tpctl.8
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/vipw/vipw.8
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/ypserv/makedbm/makedbm.8
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/ypserv/mknetid/mknetid.8
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/ypserv/revnetgroup/revnetgroup.8
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/ypserv/yppush/yppush.8
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/ypserv/ypxfr/ypxfr.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump_lfs/dump_lfs.8
diff -u src/sbin/dump_lfs/dump_lfs.8:1.15 src/sbin/dump_lfs/dump_lfs.8:1.16
--- src/sbin/dump_lfs/dump_lfs.8:1.15 Fri Jan 30 11:55:04 2009
+++ src/sbin/dump_lfs/dump_lfs.8 Sun Apr 8 22:00:37 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: dump_lfs.8,v 1.15 2009/01/30 11:55:04 enami Exp $
+.\" $NetBSD: dump_lfs.8,v 1.16 2012/04/08 22:00:37 wiz Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" Regents of the University of California.
@@ -40,42 +40,18 @@
.Sh SYNOPSIS
.Nm
.Op Fl 0123456789aceFnStuX
-.Bk -words
.Op Fl B Ar records
-.Ek
-.Bk -words
.Op Fl b Ar blocksize
-.Ek
-.Bk -words
.Op Fl d Ar density
-.Ek
-.Bk -words
.Op Fl f Ar file
-.Ek
-.Bk -words
.Op Fl h Ar level
-.Ek
-.Bk -words
.Op Fl k Ar read-blocksize
-.Ek
-.Bk -words
.Op Fl L Ar label
-.Ek
-.Bk -words
.Op Fl l Ar timeout
-.Ek
-.Bk -words
.Op Fl r Ar cachesize
-.Ek
-.Bk -words
.Op Fl s Ar feet
-.Ek
-.Bk -words
.Op Fl T Ar date
-.Ek
-.Bk -words
.Op Fl x Ar snap-backup
-.Ek
.Ar files-to-dump
.Nm
.Op Fl W Li \&| Fl w
Index: src/sbin/fdisk/fdisk.8
diff -u src/sbin/fdisk/fdisk.8:1.76 src/sbin/fdisk/fdisk.8:1.77
--- src/sbin/fdisk/fdisk.8:1.76 Fri Apr 6 20:09:26 2012
+++ src/sbin/fdisk/fdisk.8 Sun Apr 8 22:00:37 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: fdisk.8,v 1.76 2012/04/06 20:09:26 christos Exp $
+.\" $NetBSD: fdisk.8,v 1.77 2012/04/08 22:00:37 wiz Exp $
.\"
.Dd April 6, 2012
.Dt FDISK 8
@@ -9,36 +9,18 @@
.Sh SYNOPSIS
.Nm
.Op Fl aBFfIiSuv
-.Bk -words
.Oo
.Fl 0 | 1 | 2 | 3 | E Ar number
.Op Fl s Ar id/start/size Ns Bq Ar /bootmenu
.Oc
-.Ek
-.Bk -words
.Op Fl r Ar file | Fl w Ar file
-.Ek
-.Bk -words
.Op Fl A Ar ptn_alignment Ns Bq Ar /ptn_0_offset
-.Ek
-.Bk -words
.Op Fl b Ar cylinders/heads/sectors
-.Ek
-.Bk -words
.Op Fl c Ar bootcode
-.Ek
-.Bk -words
.Op Fl T Ar disktype
-.Ek
-.Bk -words
.Op Fl t Ar disktab
-.Ek
-.Bk -words
.Op Fl z Ar sectorsize
-.Ek
-.Bk -words
.Op Ar device
-.Ek
.Nm
.Fl l
.Sh DESCRIPTION
Index: src/sbin/mount_nfs/mount_nfs.8
diff -u src/sbin/mount_nfs/mount_nfs.8:1.41 src/sbin/mount_nfs/mount_nfs.8:1.42
--- src/sbin/mount_nfs/mount_nfs.8:1.41 Mon Apr 2 07:27:43 2012
+++ src/sbin/mount_nfs/mount_nfs.8 Sun Apr 8 22:00:37 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_nfs.8,v 1.41 2012/04/02 07:27:43 njoly Exp $
+.\" $NetBSD: mount_nfs.8,v 1.42 2012/04/08 22:00:37 wiz Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994, 1995
.\" The Regents of the University of California. All rights reserved.
@@ -37,42 +37,18 @@
.Nd mount NFS file systems
.Sh SYNOPSIS
.Nm
-.Bk -words
.Op Fl 23bCcdilPpqsTUX
-.Ek
-.Bk -words
.Op Fl a Ar maxreadahead
-.Ek
-.Bk -words
.Op Fl D Ar deadthresh
-.Ek
-.Bk -words
.Op Fl g Ar maxgroups
-.Ek
-.Bk -words
.Op Fl I Ar readdirsize
-.Ek
-.Bk -words
.Op Fl L Ar leaseterm
-.Ek
-.Bk -words
.Op Fl o Ar options
-.Ek
-.Bk -words
.Op Fl R Ar retrycnt
-.Ek
-.Bk -words
.Op Fl r Ar readsize
-.Ek
-.Bk -words
.Op Fl t Ar timeout
-.Ek
-.Bk -words
.Op Fl w Ar writesize
-.Ek
-.Bk -words
.Op Fl x Ar retrans
-.Ek
.Ar rhost:path node
.Sh DESCRIPTION
The
Index: src/sbin/ping6/ping6.8
diff -u src/sbin/ping6/ping6.8:1.27 src/sbin/ping6/ping6.8:1.28
--- src/sbin/ping6/ping6.8:1.27 Thu May 18 00:50:08 2006
+++ src/sbin/ping6/ping6.8 Sun Apr 8 22:00:37 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: ping6.8,v 1.27 2006/05/18 00:50:08 rpaulo Exp $
+.\" $NetBSD: ping6.8,v 1.28 2012/04/08 22:00:37 wiz Exp $
.\" $KAME: ping6.8,v 1.57 2002/05/26 13:18:25 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -42,49 +42,21 @@ packets to network hosts
.Op Fl dfHmnNqRtvwW
.\" old IPsec
.\" .Op Fl AdEfnNqRtvwW
-.Bk -words
.Op Fl a Ar addrtype
-.Ek
-.Bk -words
.Op Fl b Ar bufsiz
-.Ek
-.Bk -words
.Op Fl c Ar count
-.Ek
-.Bk -words
.Op Fl g Ar gateway
-.Ek
-.Bk -words
.Op Fl h Ar hoplimit
-.Ek
-.Bk -words
.Op Fl I Ar interface
-.Ek
-.Bk -words
.Op Fl i Ar wait
-.Ek
-.Bk -words
.Op Fl l Ar preload
-.Ek
-.Bk -words
.Op Fl p Ar pattern
-.Ek
-.Bk -words
.\" new IPsec
.Op Fl P Ar policy
-.Ek
-.Bk -words
.Op Fl S Ar sourceaddr
-.Ek
-.Bk -words
.Op Fl s Ar packetsize
-.Ek
-.Bk -words
.Op Ar hops ...
-.Ek
-.Bk -words
.Ar host
-.Ek
.Sh DESCRIPTION
.Nm
uses the
Index: src/sbin/tunefs/tunefs.8
diff -u src/sbin/tunefs/tunefs.8:1.40 src/sbin/tunefs/tunefs.8:1.41
--- src/sbin/tunefs/tunefs.8:1.40 Sun Mar 6 17:21:08 2011
+++ src/sbin/tunefs/tunefs.8 Sun Apr 8 22:00:37 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: tunefs.8,v 1.40 2011/03/06 17:21:08 wiz Exp $
+.\" $NetBSD: tunefs.8,v 1.41 2012/04/08 22:00:37 wiz Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -43,10 +43,8 @@
.Op Fl h Ar avgfpdir
.Op Fl l Ar logsize
.Op Fl m Ar minfree
-.Bk -words
.Op Fl o Ar optimize_preference
.Op Fl q Ar quota
-.Ek
.Ar special | Ar filesys
.Sh DESCRIPTION
.Nm
Index: src/usr.bin/crunch/crunchgen/crunchgen.1
diff -u src/usr.bin/crunch/crunchgen/crunchgen.1:1.28 src/usr.bin/crunch/crunchgen/crunchgen.1:1.29
--- src/usr.bin/crunch/crunchgen/crunchgen.1:1.28 Thu Mar 12 12:36:48 2009
+++ src/usr.bin/crunch/crunchgen/crunchgen.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: crunchgen.1,v 1.28 2009/03/12 12:36:48 joerg Exp $
+.\" $NetBSD: crunchgen.1,v 1.29 2012/04/08 22:00:38 wiz Exp $
.\"
.\" Copyright (c) 1994 University of Maryland
.\" All Rights Reserved.
@@ -33,27 +33,13 @@
.Sh SYNOPSIS
.Nm
.Op Fl fOoq
-.Bk -words
.Op Fl c Ar c-file-name
-.Ek
-.Bk -words
.Op Fl D Ar src-root
-.Ek
-.Bk -words
.Op Fl d Ar build-options
-.Ek
-.Bk -words
.Op Fl e Ar exec-file-name
-.Ek
-.Bk -words
.Op Fl L Ar lib-dir
-.Ek
-.Bk -words
.Op Fl m Ar makefile-name
-.Ek
-.Bk -words
.Op Fl v Ar var-spec
-.Ek
.Ar conf-file
.Sh DESCRIPTION
A crunched binary is a program made up of many other programs linked
Index: src/usr.bin/crunch/crunchide/crunchide.1
diff -u src/usr.bin/crunch/crunchide/crunchide.1:1.14 src/usr.bin/crunch/crunchide/crunchide.1:1.15
--- src/usr.bin/crunch/crunchide/crunchide.1:1.14 Tue Aug 24 12:11:44 2004
+++ src/usr.bin/crunch/crunchide/crunchide.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: crunchide.1,v 1.14 2004/08/24 12:11:44 wiz Exp $
+.\" $NetBSD: crunchide.1,v 1.15 2012/04/08 22:00:38 wiz Exp $
.\"
.\" Copyright (c) 1994 University of Maryland
.\" All Rights Reserved.
@@ -32,12 +32,8 @@
.Nd hides symbol names from ld, for crunching programs together
.Sh SYNOPSIS
.Nm
-.Bk -words
.Op Fl f Ar keep-list-file
-.Ek
-.Bk -words
.Op Fl k Ar keep-symbol
-.Ek
.Ar object-file
.Op Ar object-file ...
.Sh DESCRIPTION
Index: src/usr.bin/fdformat/fdformat.1
diff -u src/usr.bin/fdformat/fdformat.1:1.17 src/usr.bin/fdformat/fdformat.1:1.18
--- src/usr.bin/fdformat/fdformat.1:1.17 Wed Apr 30 13:11:00 2008
+++ src/usr.bin/fdformat/fdformat.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: fdformat.1,v 1.17 2008/04/30 13:11:00 martin Exp $
+.\" $NetBSD: fdformat.1,v 1.18 2012/04/08 22:00:38 wiz Exp $
.\"
.\" Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -35,40 +35,18 @@
.Nd format a floppy diskette
.Sh SYNOPSIS
.Nm
-.Bk -words
-.Op Fl f Ar device
-.Ek
-.Bk -words
-.Op Fl t Ar type
-.Ek
.Op Fl n
-.Bk -words
.Op Fl B Ar nbps
-.Ek
-.Bk -words
-.Op Fl S Ar nspt
-.Ek
-.Bk -words
-.Op Fl T Ar ntrk
-.Ek
-.Bk -words
.Op Fl C Ar ncyl
-.Ek
-.Bk -words
-.Op Fl P Ar stepspercyl
-.Ek
-.Bk -words
-.Op Fl G Ar gaplen
-.Ek
-.Bk -words
.Op Fl F Ar fillbyte
-.Ek
-.Bk -words
-.Op Fl X Ar xfer_rate
-.Ek
-.Bk -words
+.Op Fl f Ar device
+.Op Fl G Ar gaplen
.Op Fl I Ar interleave
-.Ek
+.Op Fl P Ar stepspercyl
+.Op Fl S Ar nspt
+.Op Fl T Ar ntrk
+.Op Fl t Ar type
+.Op Fl X Ar xfer_rate
.Sh DESCRIPTION
The
.Nm
Index: src/usr.bin/ftp/ftp.1
diff -u src/usr.bin/ftp/ftp.1:1.132 src/usr.bin/ftp/ftp.1:1.133
--- src/usr.bin/ftp/ftp.1:1.132 Thu Mar 22 07:58:18 2012
+++ src/usr.bin/ftp/ftp.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.132 2012/03/22 07:58:18 wiz Exp $
+.\" $NetBSD: ftp.1,v 1.133 2012/04/08 22:00:38 wiz Exp $
.\"
.\" Copyright (c) 1996-2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -66,21 +66,11 @@
.Sh SYNOPSIS
.Nm
.Op Fl 46AadefginpRtVv
-.Bk -words
.Op Fl N Ar netrc
-.Ek
-.Bk -words
.Op Fl o Ar output
-.Ek
-.Bk -words
.Op Fl P Ar port
-.Ek
-.Bk -words
.Op Fl q Ar quittime
-.Ek
-.Bk -words
.Op Fl r Ar retry
-.Ek
.Op Fl s Ar srcaddr
.Bk -words
.\" [-T dir,max[,inc]]
Index: src/usr.bin/grep/grep.1
diff -u src/usr.bin/grep/grep.1:1.3 src/usr.bin/grep/grep.1:1.4
--- src/usr.bin/grep/grep.1:1.3 Mon Apr 18 22:46:48 2011
+++ src/usr.bin/grep/grep.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: grep.1,v 1.3 2011/04/18 22:46:48 joerg Exp $
+.\" $NetBSD: grep.1,v 1.4 2012/04/08 22:00:38 wiz Exp $
.\" $FreeBSD: head/usr.bin/grep/grep.1 210652 2010-07-30 14:05:20Z joel $
.\" $OpenBSD: grep.1,v 1.38 2010/04/05 06:30:59 jmc Exp $
.\" Copyright (c) 1980, 1990, 1993
@@ -39,7 +39,6 @@
.Nd file pattern searcher
.Sh SYNOPSIS
.Nm grep
-.Bk -words
.Op Fl abcdDEFGHhIiJLlmnOopqRSsUVvwxZz
.Op Fl A Ar num
.Op Fl B Ar num
@@ -55,7 +54,6 @@
.Op Fl Fl line-buffered
.Op Ar pattern
.Op Ar
-.Ek
.Sh DESCRIPTION
The
.Nm grep
Index: src/usr.bin/hexdump/hexdump.1
diff -u src/usr.bin/hexdump/hexdump.1:1.21 src/usr.bin/hexdump/hexdump.1:1.22
--- src/usr.bin/hexdump/hexdump.1:1.21 Sat Dec 18 14:22:42 2010
+++ src/usr.bin/hexdump/hexdump.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: hexdump.1,v 1.21 2010/12/18 14:22:42 wiz Exp $
+.\" $NetBSD: hexdump.1,v 1.22 2012/04/08 22:00:38 wiz Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,18 +38,10 @@
.Sh SYNOPSIS
.Nm
.Op Fl bcCdovx
-.Bk -words
.Op Fl e Ar format_string
-.Ek
-.Bk -words
.Op Fl f Ar format_file
-.Ek
-.Bk -words
.Op Fl n Ar length
-.Ek
-.Bk -words
.Op Fl s Ar skip
-.Ek
.Ar file ...
.Sh DESCRIPTION
The hexdump utility is a filter which displays the specified files, or
Index: src/usr.bin/hexdump/od.1
diff -u src/usr.bin/hexdump/od.1:1.25 src/usr.bin/hexdump/od.1:1.26
--- src/usr.bin/hexdump/od.1:1.25 Tue Feb 9 14:25:39 2010
+++ src/usr.bin/hexdump/od.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: od.1,v 1.25 2010/02/09 14:25:39 wiz Exp $
+.\" $NetBSD: od.1,v 1.26 2012/04/08 22:00:38 wiz Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -36,16 +36,10 @@
.Sh SYNOPSIS
.Nm
.Op Fl aBbcDdeFfHhIiLlOovXx
-.Bk -words
.Op Fl A Ar base
.Op Fl j Ar skip
-.Ek
-.Bk -words
.Op Fl N Ar length
-.Ek
-.Bk -words
.Op Fl t Ar type_string
-.Ek
.Sm off
.Oo
.Op Cm \&+
Index: src/usr.bin/indent/indent.1
diff -u src/usr.bin/indent/indent.1:1.20 src/usr.bin/indent/indent.1:1.21
--- src/usr.bin/indent/indent.1:1.20 Wed Jan 12 06:17:52 2011
+++ src/usr.bin/indent/indent.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: indent.1,v 1.20 2011/01/12 06:17:52 wiz Exp $
+.\" $NetBSD: indent.1,v 1.21 2012/04/08 22:00:38 wiz Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -69,68 +69,36 @@
.Nd indent and format C program source
.Sh SYNOPSIS
.Nm
-.Bk -words
.Op Ar input-file Op Ar output-file
-.Ek
-.Bk -words
.Op Fl bacc | Fl nbacc
-.Ek
-.Bk -words
.Op Fl bad | Fl nbad
-.Ek
-.Bk -words
.Op Fl bap | Fl nbap
-.Ek
-.Bk -words
.Op Fl bbb | Fl nbbb
-.Ek
-.Bk -words
.Op Fl \&bc | Fl nbc
-.Ek
.Op Fl \&bl
.Op Fl \&br
.Op Fl c Ns Ar n
.Op Fl \&cd Ns Ar n
-.Bk -words
.Op Fl cdb | Fl ncdb
-.Ek
-.Bk -words
.Op Fl \&ce | Fl nce
-.Ek
.Op Fl \&ci Ns Ar n
.Op Fl cli Ns Ar n
.Op Fl d Ns Ar n
.Op Fl \&di Ns Ar n
-.Bk -words
.Op Fl fc1 | Fl nfc1
-.Ek
.Op Fl i Ns Ar n
-.Bk -words
.Op Fl \&ip | Fl nip
-.Ek
.Op Fl l Ns Ar n
.Op Fl \&lc Ns Ar n
-.Bk -words
.Op Fl \&lp | Fl nlp
-.Ek
.Op Fl npro
-.Bk -words
.Op Fl pcs | Fl npcs
-.Ek
-.Bk -words
.Op Fl psl | Fl npsl
-.Ek
-.Bk -words
.Op Fl \&sc | Fl nsc
-.Ek
-.Bk -words
.Op Fl sob | Fl nsob
-.Ek
.Op Fl \&st
.Op Fl troff
-.Bk -words
.Op Fl v | Fl \&nv
-.Ek
.Sh DESCRIPTION
.Nm
is a
Index: src/usr.bin/ipcs/ipcs.1
diff -u src/usr.bin/ipcs/ipcs.1:1.16 src/usr.bin/ipcs/ipcs.1:1.17
--- src/usr.bin/ipcs/ipcs.1:1.16 Wed Sep 15 19:45:17 2004
+++ src/usr.bin/ipcs/ipcs.1 Sun Apr 8 22:00:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: ipcs.1,v 1.16 2004/09/15 19:45:17 hubertf Exp $
+.\" $NetBSD: ipcs.1,v 1.17 2012/04/08 22:00:38 wiz Exp $
.\"
.\" Copyright (c) 1994 SigmaSoft, Th. Lockert
.\" All rights reserved.
@@ -32,12 +32,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl abcmopqstMQST
-.Bk -words
.Op Fl C Ar system
-.Ek
-.Bk -words
.Op Fl N Ar core
-.Ek
.Sh DESCRIPTION
The
.Nm
Index: src/usr.bin/join/join.1
diff -u src/usr.bin/join/join.1:1.12 src/usr.bin/join/join.1:1.13
--- src/usr.bin/join/join.1:1.12 Thu Aug 7 11:14:10 2003
+++ src/usr.bin/join/join.1 Sun Apr 8 22:00:39 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: join.1,v 1.12 2003/08/07 11:14:10 agc Exp $
+.\" $NetBSD: join.1,v 1.13 2012/04/08 22:00:39 wiz Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -31,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)join.1 8.3 (Berkeley) 4/28/95
-.\" $NetBSD: join.1,v 1.12 2003/08/07 11:14:10 agc Exp $
+.\" $NetBSD: join.1,v 1.13 2012/04/08 22:00:39 wiz Exp $
.\"
.Dd April 28, 1995
.Dt JOIN 1
@@ -41,20 +41,10 @@
.Nd relational database operator
.Sh SYNOPSIS
.Nm
-.Bk -words
-.Oo
-.Fl a Ar file_number | Fl v Ar file_number
-.Oc
-.Ek
-.Bk -words
+.Op Fl a Ar file_number | Fl v Ar file_number
.Op Fl e Ar string
-.Ek
-.Bk -words
.Op Fl j Ar file_number field
-.Ek
-.Bk -words
.Op Fl o Ar list
-.Ek
.Op Fl t Ar char
.Op Fl \&1 Ar field
.Op Fl \&2 Ar field
Index: src/usr.bin/jot/jot.1
diff -u src/usr.bin/jot/jot.1:1.11 src/usr.bin/jot/jot.1:1.12
--- src/usr.bin/jot/jot.1:1.11 Wed Jan 5 19:59:48 2011
+++ src/usr.bin/jot/jot.1 Sun Apr 8 22:00:39 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: jot.1,v 1.11 2011/01/05 19:59:48 apb Exp $
+.\" $NetBSD: jot.1,v 1.12 2012/04/08 22:00:39 wiz Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,18 +38,10 @@
.Sh SYNOPSIS
.Nm
.Op Fl cnr
-.Bk -words
.Op Fl b Ar word
-.Ek
-.Bk -words
.Op Fl p Ar precision
-.Ek
-.Bk -words
.Op Fl s Ar string
-.Ek
-.Bk -words
.Op Fl w Ar word
-.Ek
.Oo Ar reps
.Oo Ar begin
.Oo Ar end
Index: src/usr.bin/m4/m4.1
diff -u src/usr.bin/m4/m4.1:1.22 src/usr.bin/m4/m4.1:1.23
--- src/usr.bin/m4/m4.1:1.22 Fri May 14 17:14:28 2010
+++ src/usr.bin/m4/m4.1 Sun Apr 8 22:00:39 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: m4.1,v 1.22 2010/05/14 17:14:28 joerg Exp $
+.\" $NetBSD: m4.1,v 1.23 2012/04/08 22:00:39 wiz Exp $
.\" @(#) $OpenBSD: m4.1,v 1.56 2009/10/14 17:19:47 sthen Exp $
.\"
.\" Copyright (c) 1989, 1993
@@ -48,11 +48,9 @@
.Op Fl d Ar flags
.Op Fl I Ar dirname
.Op Fl o Ar filename
-.Bk -words
.Op Fl t Ar macro
.Op Fl U Ns Ar name
.Op Ar
-.Ek
.Sh DESCRIPTION
The
.Nm m4
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.201 src/usr.bin/make/make.1:1.202
--- src/usr.bin/make/make.1:1.201 Sat Mar 31 14:46:16 2012
+++ src/usr.bin/make/make.1 Sun Apr 8 22:00:39 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.201 2012/03/31 14:46:16 christos Exp $
+.\" $NetBSD: make.1,v 1.202 2012/04/08 22:00:39 wiz Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,40 +38,18 @@
.Sh SYNOPSIS
.Nm
.Op Fl BeikNnqrstWX
-.Bk -words
.Op Fl C Ar directory
-.Ek
-.Bk -words
.Op Fl D Ar variable
-.Ek
-.Bk -words
.Op Fl d Ar flags
-.Ek
-.Bk -words
.Op Fl f Ar makefile
-.Ek
-.Bk -words
.Op Fl I Ar directory
-.Ek
-.Bk -words
.Op Fl J Ar private
-.Ek
-.Bk -words
.Op Fl j Ar max_jobs
-.Ek
-.Bk -words
.Op Fl m Ar directory
-.Ek
-.Bk -words
.Op Fl T Ar file
-.Ek
-.Bk -words
.Op Fl V Ar variable
-.Ek
.Op Ar variable=value
-.Bk -words
.Op Ar target ...
-.Ek
.Sh DESCRIPTION
.Nm
is a program designed to simplify the maintenance of other programs.
Index: src/usr.bin/nl/nl.1
diff -u src/usr.bin/nl/nl.1:1.11 src/usr.bin/nl/nl.1:1.12
--- src/usr.bin/nl/nl.1:1.11 Mon Jan 2 00:36:41 2012
+++ src/usr.bin/nl/nl.1 Sun Apr 8 22:00:39 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: nl.1,v 1.11 2012/01/02 00:36:41 wiz Exp $
+.\" $NetBSD: nl.1,v 1.12 2012/04/08 22:00:39 wiz Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -36,36 +36,16 @@
.Sh SYNOPSIS
.Nm
.Op Fl p
-.Bk -words
.Op Fl b Ar type
-.Ek
-.Bk -words
.Op Fl d Ar delim
-.Ek
-.Bk -words
.Op Fl f Ar type
-.Ek
-.Bk -words
.Op Fl h Ar type
-.Ek
-.Bk -words
.Op Fl i Ar incr
-.Ek
-.Bk -words
.Op Fl l Ar num
-.Ek
-.Bk -words
.Op Fl n Ar format
-.Ek
-.Bk -words
.Op Fl s Ar sep
-.Ek
-.Bk -words
.Op Fl v Ar startnum
-.Ek
-.Bk -words
.Op Fl w Ar width
-.Ek
.Op Ar file
.Sh DESCRIPTION
The
Index: src/usr.bin/patch/patch.1
diff -u src/usr.bin/patch/patch.1:1.14 src/usr.bin/patch/patch.1:1.15
--- src/usr.bin/patch/patch.1:1.14 Tue Mar 10 13:57:08 2009
+++ src/usr.bin/patch/patch.1 Sun Apr 8 22:00:39 2012
@@ -1,6 +1,6 @@
.\" $OpenBSD: patch.1,v 1.22 2008/06/06 20:44:00 jmc Exp $
.\" $DragonFly: src/usr.bin/patch/patch.1,v 1.10 2008/08/18 19:15:55 joerg Exp $
-.\" $NetBSD: patch.1,v 1.14 2009/03/10 13:57:08 joerg Exp $
+.\" $NetBSD: patch.1,v 1.15 2012/04/08 22:00:39 wiz Exp $
.\" Copyright 1986, Larry Wall
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,6 @@
.Nd apply a diff file to an original
.Sh SYNOPSIS
.Nm
-.Bk -words
.Op Fl bCcEeflNnRstuv
.Op Fl B Ar backup-prefix
.Op Fl D Ar symbol
@@ -44,7 +43,6 @@
.Op Fl z Ar backup-ext
.Op Fl Fl posix
.Op Ar origfile Op Ar patchfile
-.Ek
.Nm
.Pf \*(Lt Ar patchfile
.Sh DESCRIPTION
Index: src/usr.bin/pr/pr.1
diff -u src/usr.bin/pr/pr.1:1.17 src/usr.bin/pr/pr.1:1.18
--- src/usr.bin/pr/pr.1:1.17 Wed Mar 11 13:57:11 2009
+++ src/usr.bin/pr/pr.1 Sun Apr 8 22:00:39 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: pr.1,v 1.17 2009/03/11 13:57:11 joerg Exp $
+.\" $NetBSD: pr.1,v 1.18 2012/04/08 22:00:39 wiz Exp $
.\"
.\" Copyright (c) 1991 Keith Muller.
.\" Copyright (c) 1993
@@ -32,7 +32,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)pr.1 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: pr.1,v 1.17 2009/03/11 13:57:11 joerg Exp $
+.\" $NetBSD: pr.1,v 1.18 2012/04/08 22:00:39 wiz Exp $
.\"
.Dd June 6, 1993
.Dt PR 1
@@ -42,55 +42,33 @@
.Nd print files
.Sh SYNOPSIS
.Nm
-.Bk -words
.Op Ar \&+page
-.Ek
-.Bk -words
.Op Fl Ar column
-.Ek
.Op Fl adFmrt
-.Bk -words
.Oo
.Op Fl e
.Op Ar char
.Op Ar gap
.Oc
-.Ek
-.Bk -words
.Op Fl h Ar header
-.Ek
-.Bk -words
.Oo
.Op Fl i
.Op Ar char
.Op Ar gap
.Oc
-.Ek
-.Bk -words
.Op Fl l Ar lines
-.Ek
-.Bk -words
.Op Fl o Ar offset
-.Ek
-.Bk -words
.Oo
.Op Fl s
.Op Ar char
.Oc
-.Ek
-.Bk -words
.Op Fl T Ar timefmt
-.Ek
-.Bk -words
.Oo
.Op Fl n
.Op Ar char
.Op Ar width
.Oc
-.Ek
-.Bk -words
.Op Fl w Ar width
-.Ek
.Op -
.Op Ar file ...
.Sh DESCRIPTION
Index: src/usr.bin/telnet/telnet.1
diff -u src/usr.bin/telnet/telnet.1:1.32 src/usr.bin/telnet/telnet.1:1.33
--- src/usr.bin/telnet/telnet.1:1.32 Thu Mar 22 07:58:20 2012
+++ src/usr.bin/telnet/telnet.1 Sun Apr 8 22:00:39 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: telnet.1,v 1.32 2012/03/22 07:58:20 wiz Exp $
+.\" $NetBSD: telnet.1,v 1.33 2012/04/08 22:00:39 wiz Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -39,41 +39,14 @@
protocol
.Sh SYNOPSIS
.Nm
-.Op Fl 4
-.Op Fl 6
-.Op Fl 8
-.Op Fl E
-.Op Fl F
-.Op Fl K
-.Op Fl L
-.Op Fl N
-.Bk -words
-.Op Fl S Ar tos
-.Ek
-.Bk -words
-.Op Fl X Ar authtype
-.Ek
-.Op Fl a
-.Op Fl c
-.Op Fl d
-.Bk -words
+.Op Fl 468acdEFfKLNrx
.Op Fl e Ar escapechar
-.Ek
-.Op Fl f
-.Bk -words
.Op Fl k Ar realm
-.Ek
-.Bk -words
.Op Fl l Ar user
-.Ek
-.Bk -words
.Op Fl n Ar tracefile
-.Ek
-.Bk -words
.Op Fl P Ar policy
-.Ek
-.Op Fl r
-.Op Fl x
+.Op Fl S Ar tos
+.Op Fl X Ar authtype
.Oo
.Ar host
.Op Ar port
Index: src/usr.bin/vgrind/vgrind.1
diff -u src/usr.bin/vgrind/vgrind.1:1.14 src/usr.bin/vgrind/vgrind.1:1.15
--- src/usr.bin/vgrind/vgrind.1:1.14 Mon Aug 18 15:02:16 2003
+++ src/usr.bin/vgrind/vgrind.1 Sun Apr 8 22:00:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: vgrind.1,v 1.14 2003/08/18 15:02:16 pooka Exp $
+.\" $NetBSD: vgrind.1,v 1.15 2012/04/08 22:00:40 wiz Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -37,22 +37,12 @@
.Nd grind nice listings of programs
.Sh SYNOPSIS
.Nm
-.Op Fl
-.Op Fl W
-.Bk -words
+.Op Fl fntWx
.Op Fl d Ar file
-.Ek
-.Op Fl f
-.Bk -words
.Op Fl h Ar header
-.Ek
-.Bk -words
.Op Fl l Ar language
-.Ek
-.Op Fl n
-.Op Fl sn
-.Op Fl t
-.Op Fl x
+.Op Fl s Ns Ar n
+.Op Fl
.Ar
.Sh DESCRIPTION
.Nm
@@ -107,9 +97,6 @@ The options are:
forces input to be taken from standard input (default if
.Fl f
is specified )
-.It Fl W
-forces output to the (wide) Versatec printer rather than the (narrow)
-Varian
.It Fl d Ar file
specifies an alternative language definitions
file (default is
@@ -146,13 +133,18 @@ and
.Pq Fl l Ns Ar I .
.It Fl n
forces no keyword bolding
-.It Fl s
-specifies a point size to use on output (exactly the same as the argument
+.It Fl s Ns Ar n
+specifies a point size
+.Ar n
+to use on output (exactly the same as the argument
of a .ps)
.It Fl t
similar to the same option in
.Xr troff 1
causing formatted text to go to the standard output
+.It Fl W
+forces output to the (wide) Versatec printer rather than the (narrow)
+Varian
.It Fl x
outputs the index file in a ``pretty'' format.
The index file itself is produced whenever
Index: src/usr.bin/xinstall/install.1
diff -u src/usr.bin/xinstall/install.1:1.46 src/usr.bin/xinstall/install.1:1.47
--- src/usr.bin/xinstall/install.1:1.46 Thu Mar 22 07:58:20 2012
+++ src/usr.bin/xinstall/install.1 Sun Apr 8 22:00:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: install.1,v 1.46 2012/03/22 07:58:20 wiz Exp $
+.\" $NetBSD: install.1,v 1.47 2012/04/08 22:00:40 wiz Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -37,117 +37,49 @@
.Nd install binaries
.Sh SYNOPSIS
.Nm
-.Op Fl Ubcprs
-.Bk -words
+.Op Fl bcprsU
+.Op Fl a Ar command
.Op Fl B Ar suffix
-.Ek
-.Bk -words
.Op Fl D Ar destdir
-.Ek
-.Bk -words
.Op Fl f Ar flags
-.Ek
-.Bk -words
+.Op Fl g Ar group
+.Op Fl h Ar hash
+.Op Fl l Ar linkflags
.Op Fl M Ar metalog
-.Ek
-.Bk -words
-.Op Fl T Ar tags
-.Ek
-.Bk -words
-.Op Fl a Ar command
-.Ek
-.Bk -words
.Op Fl m Ar mode
-.Ek
-.Bk -words
.Op Fl N Ar dbdir
-.Ek
-.Bk -words
.Op Fl o Ar owner
-.Ek
-.Bk -words
-.Op Fl g Ar group
-.Ek
-.Bk -words
-.Op Fl l Ar linkflags
-.Ek
-.Bk -words
-.Op Fl h Ar hash
-.Ek
-.Bk -words
.Op Fl S Ar stripflag
-.Ek
+.Op Fl T Ar tags
.Ar file1 file2
.Nm
-.Op Fl Ubcprs
-.Bk -words
+.Op Fl bcprsU
+.Op Fl a Ar command
.Op Fl B Ar suffix
-.Ek
-.Bk -words
.Op Fl D Ar destdir
-.Ek
-.Bk -words
.Op Fl f Ar flags
-.Ek
-.Bk -words
+.Op Fl g Ar group
+.Op Fl h Ar hash
+.Op Fl l Ar linkflags
.Op Fl M Ar metalog
-.Ek
-.Bk -words
-.Op Fl T Ar tags
-.Ek
-.Bk -words
-.Op Fl a Ar command
-.Ek
-.Bk -words
.Op Fl m Ar mode
-.Ek
-.Bk -words
.Op Fl N Ar dbdir
-.Ek
-.Bk -words
.Op Fl o Ar owner
-.Ek
-.Bk -words
-.Op Fl g Ar group
-.Ek
-.Bk -words
-.Op Fl l Ar linkflags
-.Ek
-.Bk -words
-.Op Fl h Ar hash
-.Ek
-.Bk -words
.Op Fl S Ar stripflag
-.Ek
+.Op Fl T Ar tags
.Ar file1 ...\&
.Ar fileN directory
.Nm
.Fl d
-.Op Fl Up
-.Bk -words
+.Op Fl pU
+.Op Fl a Ar command
.Op Fl D Ar destdir
-.Ek
-.Bk -words
+.Op Fl g Ar group
.Op Fl M Ar metalog
-.Ek
-.Bk -words
-.Op Fl T Ar tags
-.Ek
-.Bk -words
-.Op Fl a Ar command
-.Ek
-.Bk -words
.Op Fl m Ar mode
-.Ek
-.Bk -words
.Op Fl N Ar dbdir
-.Ek
-.Bk -words
.Op Fl o Ar owner
-.Ek
-.Bk -words
-.Op Fl g Ar group
-.Ek
+.Op Fl T Ar tags
.Ar directory ...\&
.Sh DESCRIPTION
The file(s) are copied
@@ -170,7 +102,7 @@ if permissions allow; an alternate backu
.Fl B
option's argument.
.Pp
-.Bl -tag -width Ds
+.Bl -tag -width XsXXstripflagsXX
.It Fl a Ar command
Run
.Ar command
@@ -188,12 +120,6 @@ shell, allowing a single
argument be to specified to
.Nm
which the shell can then tokenize.
-.It Fl b
-Backup any existing files before overwriting them by renaming
-them to
-.Ar file.old . See
-.Fl B
-for specifying a different backup suffix.
.It Fl B Ar suffix
Use
.Ar suffix
@@ -208,13 +134,16 @@ contains a '%' sign, a numbered backup w
given an integer counter as the backup number.
The counter used starts from 0, and the first available name resulting
from the expansion is used.
+.It Fl b
+Backup any existing files before overwriting them by renaming
+them to
+.Ar file.old . See
+.Fl B
+for specifying a different backup suffix.
.It Fl c
Copy the file.
This is the default behavior; the flag is maintained for backwards
compatibility only.
-.It Fl d
-Create directories.
-Missing parent directories are created as required.
.It Fl D Ar destdir
Specify the
.Ev DESTDIR
@@ -226,6 +155,9 @@ is in use, a leading string of
will be removed from the file names logged to the
.Ar metalog .
This option does not affect where the actual files are installed.
+.It Fl d
+Create directories.
+Missing parent directories are created as required.
.It Fl f Ar flags
Specify the target's file flags.
(See
@@ -319,17 +251,6 @@ Install to a temporary file and then ren
name.
This can be used for precious files, to avoid truncation of the original
when error conditions (filesystem full etc.) occur.
-.It Fl s
-.Nm
-exec's the command
-.Xr strip 1
-to strip binaries so that install can be portable over a large
-number of systems and binary types.
-If the environment variable
-.Ev STRIP
-is set, it is used as the
-.Xr strip 1
-program.
.It Fl S Ar stripflags
.Nm
passes
@@ -354,6 +275,17 @@ invokes
directly.
This flag implies
.Fl s .
+.It Fl s
+.Nm
+exec's the command
+.Xr strip 1
+to strip binaries so that install can be portable over a large
+number of systems and binary types.
+If the environment variable
+.Ev STRIP
+is set, it is used as the
+.Xr strip 1
+program.
.It Fl T Ar tags
Specify the
.Xr mtree 8
Index: src/usr.sbin/apm/apm.8
diff -u src/usr.sbin/apm/apm.8:1.20 src/usr.sbin/apm/apm.8:1.21
--- src/usr.sbin/apm/apm.8:1.20 Sat Mar 20 07:59:44 2010
+++ src/usr.sbin/apm/apm.8 Sun Apr 8 22:00:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: apm.8,v 1.20 2010/03/20 07:59:44 jruoho Exp $
+.\" $NetBSD: apm.8,v 1.21 2012/04/08 22:00:40 wiz Exp $
.\"
.\" Copyright (c) 1996, 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -36,15 +36,11 @@
.Nd Advanced Power Management control program
.Sh SYNOPSIS
.Nm
-.Op Fl abdlmsSvz
-.Bk -words
+.Op Fl abdlmSsvz
.Op Fl f Ar sockname
-.Ek
.Nm zzz
.Op Fl Sz
-.Bk -words
.Op Fl f Ar sockname
-.Ek
.Sh DESCRIPTION
The
.Nm
@@ -64,33 +60,33 @@ displays the current power management st
.Pp
Available command-line flags are:
.Bl -tag -width "-f sockname" -compact
-.It Fl z
-Put the system into suspend (deep sleep) mode.
-.It Fl S
-Put the system into stand-by (light sleep) mode.
-.It Fl l
-Display the estimated battery lifetime in percent.
-.It Fl m
-Display the estimated battery lifetime in minutes.
+.It Fl a
+Display the external charger (A/C status): 0 means disconnected, 1
+means connected, 2 means backup power source, and 255 means unknown.
.It Fl b
Display the battery status:
0 means high, 1 means low, 2 means critical, 3 means charging,
4 means absent, and 255 means unknown.
-.It Fl a
-Display the external charger (A/C status): 0 means disconnected, 1
-means connected, 2 means backup power source, and 255 means unknown.
-.It Fl s
-Display if power management is enabled.
-.It Fl v
-Request more verbose description of the displayed states.
+.It Fl d
+Do not communicate with the APM daemon; attempt instead to manipulate
+the APM control device directly.
.It Fl f Ar sockname
Set the name of the socket via which to contact
.Xr apmd 8
to
.Pa sockname .
-.It Fl d
-Do not communicate with the APM daemon; attempt instead to manipulate
-the APM control device directly.
+.It Fl l
+Display the estimated battery lifetime in percent.
+.It Fl m
+Display the estimated battery lifetime in minutes.
+.It Fl S
+Put the system into stand-by (light sleep) mode.
+.It Fl s
+Display if power management is enabled.
+.It Fl v
+Request more verbose description of the displayed states.
+.It Fl z
+Put the system into suspend (deep sleep) mode.
.El
.Pp
The
Index: src/usr.sbin/apmd/apmd.8
diff -u src/usr.sbin/apmd/apmd.8:1.21 src/usr.sbin/apmd/apmd.8:1.22
--- src/usr.sbin/apmd/apmd.8:1.21 Sat Mar 20 09:22:37 2010
+++ src/usr.sbin/apmd/apmd.8 Sun Apr 8 22:00:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: apmd.8,v 1.21 2010/03/20 09:22:37 jruoho Exp $
+.\" $NetBSD: apmd.8,v 1.22 2012/04/08 22:00:40 wiz Exp $
.\"
.\" Copyright (c) 1996, 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -36,21 +36,11 @@
.Sh SYNOPSIS
.Nm
.Op Fl adlqsv
-.Bk -words
-.Op Fl t Ar rate
-.Ek
-.Bk -words
-.Op Fl S Ar sockname
-.Ek
-.Bk -words
+.Op Fl f Ar devname
.Op Fl m Ar sockmode
-.Ek
-.Bk -words
.Op Fl o Ar sockowner:sockgroup
-.Ek
-.Bk -words
-.Op Fl f Ar devname
-.Ek
+.Op Fl S Ar sockname
+.Op Fl t Ar rate
.Sh DESCRIPTION
The
.Nm
@@ -140,15 +130,15 @@ for the owner/group of
.Pa /var/run/apmdev .
.It Fl q
Do not announce suspend and standby requests on the speaker.
-.It Fl s
-The current battery statistics are reported via
-.Xr syslog 3
-and exit without monitoring the APM status.
.It Fl S Ar sockname
Specify an alternate socket name (used by
.Xr apm 8
to communicate with
.Nm ) .
+.It Fl s
+The current battery statistics are reported via
+.Xr syslog 3
+and exit without monitoring the APM status.
.It Fl t Ar rate
Change the polling rate from 600 seconds to
.Ar rate
Index: src/usr.sbin/lpr/lp/lp.1
diff -u src/usr.sbin/lpr/lp/lp.1:1.10 src/usr.sbin/lpr/lp/lp.1:1.11
--- src/usr.sbin/lpr/lp/lp.1:1.10 Sun Apr 12 19:39:52 2009
+++ src/usr.sbin/lpr/lp/lp.1 Sun Apr 8 22:00:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: lp.1,v 1.10 2009/04/12 19:39:52 wiz Exp $
+.\" $NetBSD: lp.1,v 1.11 2012/04/08 22:00:40 wiz Exp $
.\"
.\" Copyright (c) 1995 Joerg Wunsch
.\"
@@ -43,15 +43,9 @@
.Sh SYNOPSIS
.Nm
.Op Fl cs
-.Bk -words
-.Op Fl o Ar option
-.Ek
-.Bk -words
.Op Fl d Ar printer
-.Ek
-.Bk -words
.Op Fl n Ar num
-.Ek
+.Op Fl o Ar option
.Op Ar
.Sh DESCRIPTION
.Nm
@@ -72,7 +66,7 @@ command exit only after further access t
longer required.
The application can then safely delete or modify the files without
affecting the output operation.
-.It Fl d Ar dest
+.It Fl d Ar printer
Specify a particular printer.
If no
.Fl d
@@ -87,11 +81,11 @@ are taken as the destination printer.
Specify that
.Ar num
copies of each of the named files shall be printed.
-.It Fl s
-Silent operation.
-.It Fl o
+.It Fl o Ar option
Printer specific options.
Not supported, provided only as a compatibility option for SVR4.
+.It Fl s
+Silent operation.
.El
.Sh ENVIRONMENT
As described above, the variables
Index: src/usr.sbin/lpr/lpc/lpc.8
diff -u src/usr.sbin/lpr/lpc/lpc.8:1.17 src/usr.sbin/lpr/lpc/lpc.8:1.18
--- src/usr.sbin/lpr/lpc/lpc.8:1.17 Sat Dec 6 02:28:58 2008
+++ src/usr.sbin/lpr/lpc/lpc.8 Sun Apr 8 22:00:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: lpc.8,v 1.17 2008/12/06 02:28:58 jnemeth Exp $
+.\" $NetBSD: lpc.8,v 1.18 2012/04/08 22:00:40 wiz Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -37,12 +37,7 @@
.Nd line printer control program
.Sh SYNOPSIS
.Nm
-.Bk -words
-.Oo
-.Ar command
-.Op Ar argument ...
-.Oc
-.Ek
+.Op Ar command Op Ar argument ...
.Sh DESCRIPTION
.Nm
is used by the system administrator to control the
Index: src/usr.sbin/lpr/lpr/lpr.1
diff -u src/usr.sbin/lpr/lpr/lpr.1:1.19 src/usr.sbin/lpr/lpr/lpr.1:1.20
--- src/usr.sbin/lpr/lpr/lpr.1:1.19 Tue Mar 10 13:34:45 2009
+++ src/usr.sbin/lpr/lpr/lpr.1 Sun Apr 8 22:00:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: lpr.1,v 1.19 2009/03/10 13:34:45 joerg Exp $
+.\" $NetBSD: lpr.1,v 1.20 2012/04/08 22:00:40 wiz Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,33 +38,15 @@
.Sh SYNOPSIS
.Nm
.Op Fl cdfghlmnopqRrstv
-.Bk -words
.Op Fl 1234 Ar font
-.Ek
-.Bk -words
.Op Fl \&# Ar num
-.Ek
-.Bk -words
.Op Fl C Ar class
-.Ek
-.Bk -words
.Op Fl i Ar numcols
-.Ek
-.Bk -words
.Op Fl J Ar job
-.Ek
-.Bk -words
.Op Fl P Ar printer
-.Ek
-.Bk -words
.Op Fl T Ar title
-.Ek
-.Bk -words
.Op Fl U Ar user
-.Ek
-.Bk -words
.Op Fl w Ar num
-.Ek
.Op Ar name ...
.Sh DESCRIPTION
.Nm
Index: src/usr.sbin/lpr/lprm/lprm.1
diff -u src/usr.sbin/lpr/lprm/lprm.1:1.16 src/usr.sbin/lpr/lprm/lprm.1:1.17
--- src/usr.sbin/lpr/lprm/lprm.1:1.16 Thu Mar 22 07:58:20 2012
+++ src/usr.sbin/lpr/lprm/lprm.1 Sun Apr 8 22:00:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: lprm.1,v 1.16 2012/03/22 07:58:20 wiz Exp $
+.\" $NetBSD: lprm.1,v 1.17 2012/04/08 22:00:40 wiz Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,12 +38,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl
-.Bk -words
.Op Fl P Ar printer
-.Ek
-.Bk -words
.Op Fl w Ar maxwait
-.Ek
.Op Ar job# ...
.Op Ar user ...
.Sh DESCRIPTION
Index: src/usr.sbin/lpr/pac/pac.8
diff -u src/usr.sbin/lpr/pac/pac.8:1.11 src/usr.sbin/lpr/pac/pac.8:1.12
--- src/usr.sbin/lpr/pac/pac.8:1.11 Thu Aug 7 11:25:32 2003
+++ src/usr.sbin/lpr/pac/pac.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: pac.8,v 1.11 2003/08/07 11:25:32 agc Exp $
+.\" $NetBSD: pac.8,v 1.12 2012/04/08 22:00:41 wiz Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,12 +38,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl cmrs
-.Bk -words
.Op Fl P Ar printer
-.Ek
-.Bk -words
.Op Fl p Ar price
-.Ek
.Op Ar name ...
.Sh DESCRIPTION
.Nm
Index: src/usr.sbin/route6d/route6d.8
diff -u src/usr.sbin/route6d/route6d.8:1.13 src/usr.sbin/route6d/route6d.8:1.14
--- src/usr.sbin/route6d/route6d.8:1.13 Thu May 25 02:21:59 2006
+++ src/usr.sbin/route6d/route6d.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: route6d.8,v 1.13 2006/05/25 02:21:59 rpaulo Exp $
+.\" $NetBSD: route6d.8,v 1.14 2012/04/08 22:00:41 wiz Exp $
.\" $KAME: route6d.8,v 1.11 2002/06/02 15:00:30 itojun Exp $
.\"
.\" Copyright (c) 1996 WIDE Project. All rights reserved.
@@ -22,28 +22,14 @@
.Nd RIP6 routing daemon
.Sh SYNOPSIS
.Nm route6d
-.Op Fl adDhlnqsS
-.Bk -words
-.Op Fl R Ar routelog
-.Ek
-.Bk -words
+.Op Fl aDdhlnqSs
.Op Fl A Ar prefix/preflen,if1[,if2...]
-.Ek
-.Bk -words
.Op Fl L Ar prefix/preflen,if1[,if2...]
-.Ek
-.Bk -words
.Op Fl N Ar if1[,if2...]
-.Ek
-.Bk -words
.Op Fl O Ar prefix/preflen,if1[,if2...]
-.Ek
-.Bk -words
+.Op Fl R Ar routelog
.Op Fl T Ar if1[,if2...]
-.Ek
-.Bk -words
.Op Fl t Ar tag
-.Ek
.\"
.Sh DESCRIPTION
The
Index: src/usr.sbin/syslogd/syslogd.8
diff -u src/usr.sbin/syslogd/syslogd.8:1.50 src/usr.sbin/syslogd/syslogd.8:1.51
--- src/usr.sbin/syslogd/syslogd.8:1.50 Wed Mar 28 17:39:33 2012
+++ src/usr.sbin/syslogd/syslogd.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: syslogd.8,v 1.50 2012/03/28 17:39:33 christos Exp $
+.\" $NetBSD: syslogd.8,v 1.51 2012/04/08 22:00:41 wiz Exp $
.\"
.\" Copyright (c) 1983, 1986, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,36 +38,18 @@
.Sh SYNOPSIS
.Nm
.Op Fl dnrSsTUv
-.Bk -words
.Op Fl b Ar bind_address
-.Ek
-.Bk -words
.Op Fl f Ar config_file
-.Ek
-.Bk -words
.Op Fl g Ar group
-.Ek
-.Bk -words
.Op Fl m Ar mark_interval
-.Ek
-.Bk -words
.Op Fl o Ar output_format
-.Ek
-.Bk -words
.Op Fl P Ar file_list
-.Ek
-.Bk -words
.Oo
.Fl p Ar log_socket
.Op Fl p Ar log_socket2 ...
.Oc
-.Ek
-.Bk -words
.Op Fl t Ar chroot_dir
-.Ek
-.Bk -words
.Op Fl u Ar user
-.Ek
.Sh DESCRIPTION
.Nm
reads and logs messages to the system console, log files, other
Index: src/usr.sbin/tpctl/tpctl.8
diff -u src/usr.sbin/tpctl/tpctl.8:1.4 src/usr.sbin/tpctl/tpctl.8:1.5
--- src/usr.sbin/tpctl/tpctl.8:1.4 Wed Apr 30 13:11:03 2008
+++ src/usr.sbin/tpctl/tpctl.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: tpctl.8,v 1.4 2008/04/30 13:11:03 martin Exp $
+.\" $NetBSD: tpctl.8,v 1.5 2012/04/08 22:00:41 wiz Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -32,16 +32,10 @@
.Nd touch panel calibration utility
.Sh SYNOPSIS
.Nm
-.Bk -words
+.Op Fl hnuv
.Op Fl D Ar dispdevname
-.Ek
-.Bk -words
.Op Fl d Ar devname
-.Ek
-.Bk -words
.Op Fl f Ar filename
-.Ek
-.Op Fl hnuv
.Sh DESCRIPTION
.Nm
is a touch panel calibration utility.
Index: src/usr.sbin/vipw/vipw.8
diff -u src/usr.sbin/vipw/vipw.8:1.15 src/usr.sbin/vipw/vipw.8:1.16
--- src/usr.sbin/vipw/vipw.8:1.15 Mon Sep 5 03:37:15 2005
+++ src/usr.sbin/vipw/vipw.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: vipw.8,v 1.15 2005/09/05 03:37:15 hubertf Exp $
+.\" $NetBSD: vipw.8,v 1.16 2012/04/08 22:00:41 wiz Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -37,9 +37,7 @@
.Nd edit the password file
.Sh SYNOPSIS
.Nm
-.Bk -words
.Op Fl d Ar directory
-.Ek
.Sh DESCRIPTION
.Nm
edits the password file after setting the appropriate locks,
Index: src/usr.sbin/ypserv/makedbm/makedbm.8
diff -u src/usr.sbin/ypserv/makedbm/makedbm.8:1.13 src/usr.sbin/ypserv/makedbm/makedbm.8:1.14
--- src/usr.sbin/ypserv/makedbm/makedbm.8:1.13 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/ypserv/makedbm/makedbm.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: makedbm.8,v 1.13 2009/10/20 00:51:14 snj Exp $
+.\" $NetBSD: makedbm.8,v 1.14 2012/04/08 22:00:41 wiz Exp $
.\"
.\" Copyright (c) 1994 Mats O Jansson <m...@stacken.kth.se>
.\" All rights reserved.
@@ -32,23 +32,13 @@
.Nd create a NIS database
.Sh SYNOPSIS
.Nm
-.Bk -words
.Fl u Ar dbfile
-.Ek
.Nm makedbm
.Op Fl bls
-.Bk -words
.Op Fl d Ar yp_domain_name
-.Ek
-.Bk -words
.Op Fl i Ar yp_input_file
-.Ek
-.Bk -words
.Op Fl m Ar yp_master_name
-.Ek
-.Bk -words
.Op Fl o Ar yp_output_file
-.Ek
.Ar infile outfile
.Sh DESCRIPTION
.Nm
Index: src/usr.sbin/ypserv/mknetid/mknetid.8
diff -u src/usr.sbin/ypserv/mknetid/mknetid.8:1.11 src/usr.sbin/ypserv/mknetid/mknetid.8:1.12
--- src/usr.sbin/ypserv/mknetid/mknetid.8:1.11 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/ypserv/mknetid/mknetid.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: mknetid.8,v 1.11 2009/10/20 00:51:14 snj Exp $
+.\" $NetBSD: mknetid.8,v 1.12 2012/04/08 22:00:41 wiz Exp $
.\"
.\" Copyright (c) 1996 Mats O Jansson <m...@stacken.kth.se>
.\" All rights reserved.
@@ -33,21 +33,11 @@
.Sh SYNOPSIS
.Nm
.Op Fl q
-.Bk -words
.Op Fl d Ar domain
-.Ek
-.Bk -words
-.Op Fl p Ar passwdfile
-.Ek
-.Bk -words
.Op Fl g Ar groupfile
-.Ek
-.Bk -words
.Op Fl h Ar hostfile
-.Ek
-.Bk -words
.Op Fl m Ar netidfile
-.Ek
+.Op Fl p Ar passwdfile
.Sh DESCRIPTION
.Nm
is used to create a map named
Index: src/usr.sbin/ypserv/revnetgroup/revnetgroup.8
diff -u src/usr.sbin/ypserv/revnetgroup/revnetgroup.8:1.10 src/usr.sbin/ypserv/revnetgroup/revnetgroup.8:1.11
--- src/usr.sbin/ypserv/revnetgroup/revnetgroup.8:1.10 Sat Feb 26 16:32:21 2005
+++ src/usr.sbin/ypserv/revnetgroup/revnetgroup.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: revnetgroup.8,v 1.10 2005/02/26 16:32:21 wiz Exp $
+.\" $NetBSD: revnetgroup.8,v 1.11 2012/04/08 22:00:41 wiz Exp $
.\"
.\" Copyright (c) 1995
.\" Bill Paul <wp...@ctr.columbia.edu>. All rights reserved.
@@ -38,10 +38,8 @@
.Nd generate reverse netgroup data
.Sh SYNOPSIS
.Nm
-.Op Fl uh
-.Bk -words
+.Op Fl hu
.Op Fl f Ar netgroup_file
-.Ek
.Sh DESCRIPTION
.Nm
processes the contents of a file in
Index: src/usr.sbin/ypserv/yppush/yppush.8
diff -u src/usr.sbin/ypserv/yppush/yppush.8:1.12 src/usr.sbin/ypserv/yppush/yppush.8:1.13
--- src/usr.sbin/ypserv/yppush/yppush.8:1.12 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/ypserv/yppush/yppush.8 Sun Apr 8 22:00:41 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: yppush.8,v 1.12 2009/10/20 00:51:14 snj Exp $
+.\" $NetBSD: yppush.8,v 1.13 2012/04/08 22:00:41 wiz Exp $
.\"
.\" Copyright (c) 1995 Mats O Jansson <m...@stacken.kth.se>
.\" All rights reserved.
@@ -33,12 +33,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl v
-.Bk -words
.Op Fl d Ar domainname
-.Ek
-.Bk -words
.Op Fl h Ar hostname
-.Ek
.Ar mapname
.Sh DESCRIPTION
.Nm
Index: src/usr.sbin/ypserv/ypxfr/ypxfr.8
diff -u src/usr.sbin/ypserv/ypxfr/ypxfr.8:1.13 src/usr.sbin/ypserv/ypxfr/ypxfr.8:1.14
--- src/usr.sbin/ypserv/ypxfr/ypxfr.8:1.13 Mon Apr 25 22:49:06 2011
+++ src/usr.sbin/ypserv/ypxfr/ypxfr.8 Sun Apr 8 22:00:42 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: ypxfr.8,v 1.13 2011/04/25 22:49:06 wiz Exp $
+.\" $NetBSD: ypxfr.8,v 1.14 2012/04/08 22:00:42 wiz Exp $
.\"
.\" Copyright (c) 1994 Mats O Jansson <m...@stacken.kth.se>
.\" All rights reserved.
@@ -33,18 +33,10 @@
.Sh SYNOPSIS
.Nm
.Op Fl cf
-.Bk -words
.Op Fl C Ar tid prog ipadd port
-.Ek
-.Bk -words
.Op Fl d Ar domain
-.Ek
-.Bk -words
.Op Fl h Ar host
-.Ek
-.Bk -words
.Op Fl s Ar domain
-.Ek
.Ar mapname
.Sh DESCRIPTION
.Nm
