diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 8d478e5065e7..25315e6773bd 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getcap.3,v 1.16 2003/05/03 19:43:00 wiz Exp $
+.\"	$NetBSD: getcap.3,v 1.17 2003/06/30 19:12:33 wiz Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -452,20 +452,19 @@ Two types are predefined by
 and
 .Fn cgetstr :
 .Bl -column "nameXnumber"
-.Sm off
-.It Em name No \&# Em number Ta numeric
+.It Em name Ns \&# Ns Em number Ta numeric
 capability
 .Em name
 has value
 .Em number
-.It Em name No = Em string Ta "string capability"
+.It Em name Ns = Ns Em string Ta "string capability"
 .Em name
 has value
 .Em string
-.It Em name No \&#@ Ta "the numeric capability"
+.It Em name Ns \&#@ Ns Ta "the numeric capability"
 .Em name
 does not exist
-.It Em name No \&=@ Ta "the string capability"
+.It Em name Ns \&=@ Ns Ta "the string capability"
 .Em name
 does not exist
 .El
diff --git a/share/man/man8/man8.macppc/ofwboot.8 b/share/man/man8/man8.macppc/ofwboot.8
index 0841eeecb28f..e57134366e2b 100644
--- a/share/man/man8/man8.macppc/ofwboot.8
+++ b/share/man/man8/man8.macppc/ofwboot.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ofwboot.8,v 1.5 2003/02/10 13:36:00 grant Exp $
+.\"	$NetBSD: ofwboot.8,v 1.6 2003/06/30 19:12:33 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -126,7 +126,7 @@ if Open Firmware does not know where to find the kernel.
 The default is to load the file named
 .Nm netbsd
 on partition
-.Pa Dq a
+.Dq Pa a
 from the device used to load the primary bootloader.
 .Pp
 For systems with
@@ -214,7 +214,7 @@ location on the disk, partition
 .Dq zero .
 For example, the following command might be used to boot from a SCSI device
 with ID 2:
-.Ic "0 \*[Gt]boot Ar scsi-int/sd@2:0" .
+.Ic "0 \*[Gt]boot scsi-int/sd@2:0" .
 .It ofwboot.xcf
 .Nm ofwboot.xcf
 is in XCOFF format.
@@ -274,7 +274,7 @@ Usually located at
 Boot an Open Firmware 3 system, with
 .Ar netbsd
 installed on partition
-.Pa Dq a :
+.Dq Pa a :
 .Bd -unfilled
 0 \*[Gt] boot hd:,ofwboot.xcf
 .Ed
@@ -376,7 +376,7 @@ and hangs: See the real-base part in the FAQ.
 .br
 .Pa http://www.netbsd.org/Documentation/network/netboot/
 .Sh STANDARDS
-IEEE 1275 for OpenFirmware
+.St -ieee1275-94
 .Sh BUGS
 .Nm
 can only boot from devices recognized by Open Firmware.
diff --git a/share/man/man9/cardbus.9 b/share/man/man9/cardbus.9
index 65e9b656622a..beae7d6be6c9 100644
--- a/share/man/man9/cardbus.9
+++ b/share/man/man9/cardbus.9
@@ -1,4 +1,4 @@
-.\"     $NetBSD: cardbus.9,v 1.9 2003/04/16 13:35:25 wiz Exp $
+.\"     $NetBSD: cardbus.9,v 1.10 2003/06/30 19:12:33 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -201,10 +201,7 @@ Disables device function
 .Fa function
 on the card.
 When no device functions are enabled, the turn is turned off.
-.It Fo cardbus_mapreg_map
-.Fa "csc" "cf" "reg" "type" "busflags"
-.Fa "tagp" "handlep" "basep" "sizep"
-.Fc
+.It Fn cardbus_mapreg_map "csc" "cf" "reg" "type" "busflags" "tagp" "handlep" "basep" "sizep"
 Maps bus-space on the value of Base Address Register (BAR) indexed by
 .Fa reg
 for device function
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
index 70a31d80adfe..67633b6a04d5 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -1,4 +1,4 @@
-.\"     $NetBSD: pci.9,v 1.12 2003/04/16 13:35:31 wiz Exp $
+.\"     $NetBSD: pci.9,v 1.13 2003/06/30 19:12:34 wiz Exp $
 .\"
 .\" Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -288,10 +288,7 @@ The argument
 .Fa tag
 is the PCI tag for the current device attached to PCI chipset
 .Fa pc .
-.It Fo pci_mapreg_map
-.Fa "pa" "reg" "type"  "busflags" "tagp" "handlep"
-.Fa "basep" "sizep"
-.Fc
+.It Fn pci_mapreg_map "pa" "reg" "type"  "busflags" "tagp" "handlep" "basep" "sizep"
 Maps the register windows for the device into kernel virtual address
 space.
 This function is generally only called during the driver attach step
diff --git a/share/man/man9/uvm.9 b/share/man/man9/uvm.9
index f8b896e0f709..2731a92cf2b7 100644
--- a/share/man/man9/uvm.9
+++ b/share/man/man9/uvm.9
@@ -1,4 +1,4 @@
-.\"	$NetBSD: uvm.9,v 1.44 2003/05/14 11:59:15 wiz Exp $
+.\"	$NetBSD: uvm.9,v 1.45 2003/06/30 19:12:34 wiz Exp $
 .\"
 .\" Copyright (c) 1998 Matthew R. Green
 .\" All rights reserved.
@@ -26,9 +26,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" XXX this manual sets nS to 1 or 0 in the description, to obtain
-.\" synopsis-like function prototypes.  any better way?
-.\"
 .Dd September 27, 2002
 .Dt UVM 9
 .Os
@@ -73,17 +70,21 @@ out, if there is room.
 .Pp
 There are also several miscellaneous functions.
 .Sh INITIALISATION
-.nr nS 1
+.Ft void
+.br
+.Fn uvm_init "void" ;
 .Pp
 .Ft void
-.Fn uvm_init "void"
+.br
+.Fn uvm_init_limits "struct proc *p" ;
+.Pp
 .Ft void
-.Fn uvm_init_limits "struct proc *p"
+.br
+.Fn uvm_setpagesize "void" ;
+.Pp
 .Ft void
-.Fn uvm_setpagesize "void"
-.Ft void
-.Fn uvm_swap_init "void"
-.nr nS 0
+.br
+.Fn uvm_swap_init "void" ;
 .Pp
 .Fn uvm_init
 sets up the UVM system at system boot time, after the
@@ -109,35 +110,57 @@ call (see
 .Fn uvm_swap_init
 initialises the swap sub-system.
 .Sh VIRTUAL ADDRESS SPACE MANAGEMENT
-.nr nS 1
 .Ft int
-.Fn uvm_map "struct vm_map *map" "vaddr_t *startp" "vsize_t size" "struct uvm_object *uobj" "voff_t uoffset" "uvm_flag_t flags"
+.br
+.Fn uvm_map "struct vm_map *map" "vaddr_t *startp" "vsize_t size" "struct uvm_object *uobj" "voff_t uoffset" "uvm_flag_t flags" ;
+.Pp
 .Ft int
-.Fn uvm_map_pageable "struct vm_map *map" "vaddr_t start" "vaddr_t end" "boolean_t new_pageable" "int lockflags"
+.br
+.Fn uvm_map_pageable "struct vm_map *map" "vaddr_t start" "vaddr_t end" "boolean_t new_pageable" "int lockflags" ;
+.Pp
 .Ft boolean_t
-.Fn uvm_map_checkprot "struct vm_map *map" "vaddr_t start" "vaddr_t end" "vm_prot_t protection"
+.br
+.Fn uvm_map_checkprot "struct vm_map *map" "vaddr_t start" "vaddr_t end" "vm_prot_t protection" ;
+.Pp
 .Ft int
-.Fn uvm_map_protect "struct vm_map *map" "vaddr_t start" "vaddr_t end" "vm_prot_t new_prot" "boolean_t set_max"
+.br
+.Fn uvm_map_protect "struct vm_map *map" "vaddr_t start" "vaddr_t end" "vm_prot_t new_prot" "boolean_t set_max" ;
+.Pp
 .Ft int
-.Fn uvm_deallocate "struct vm_map *map" "vaddr_t start" "vsize_t size"
+.br
+.Fn uvm_deallocate "struct vm_map *map" "vaddr_t start" "vsize_t size" ;
 .Pp
 .Ft struct vmspace *
-.Fn uvmspace_alloc "vaddr_t min" "vaddr_t max" "int pageable"
+.br
+.Fn uvmspace_alloc "vaddr_t min" "vaddr_t max" "int pageable" ;
+.Pp
 .Ft void
-.Fn uvmspace_exec "struct proc *p" "vaddr_t start" "vaddr_t end"
+.br
+.Fn uvmspace_exec "struct proc *p" "vaddr_t start" "vaddr_t end" ;
+.Pp
 .Ft struct vmspace *
-.Fn uvmspace_fork "struct vmspace *vm"
+.br
+.Fn uvmspace_fork "struct vmspace *vm" ;
+.Pp
 .Ft void
-.Fn uvmspace_free "struct vmspace *vm1"
+.br
+.Fn uvmspace_free "struct vmspace *vm1" ;
+.Pp
 .Ft void
-.Fn uvmspace_share "struct proc *p1" "struct proc *p2"
+.br
+.Fn uvmspace_share "struct proc *p1" "struct proc *p2" ;
+.Pp
 .Ft void
-.Fn uvmspace_unshare "struct proc *p"
+.br
+.Fn uvmspace_unshare "struct proc *p" ;
+.Pp
 .Ft boolean_t
-.Fn uvm_uarea_alloc "vaddr_t *uaddrp"
+.br
+.Fn uvm_uarea_alloc "vaddr_t *uaddrp" ;
+.Pp
 .Ft void
-.Fn uvm_uarea_free "vaddr_t uaddr"
-.nr nS 0
+.br
+.Fn uvm_uarea_free "vaddr_t uaddr" ;
 .Pp
 .Fn uvm_map
 establishes a valid mapping in map
@@ -372,10 +395,9 @@ frees a u-area allocated with
 freeing both the virtual space and any physical pages which may have been
 allocated to back that virtual space later.
 .Sh PAGE FAULT HANDLING
-.nr nS 1
 .Ft int
-.Fn uvm_fault "struct vm_map *orig_map" "vaddr_t vaddr" "vm_fault_t fault_type" "vm_prot_t access_type"
-.nr nS 0
+.br
+.Fn uvm_fault "struct vm_map *orig_map" "vaddr_t vaddr" "vm_fault_t fault_type" "vm_prot_t access_type" ;
 .Pp
 .Fn uvm_fault
 is the main entry point for faults.
@@ -391,16 +413,21 @@ describing the type of access requested.
 .Fn uvm_fault
 returns a standard UVM return value.
 .Sh MEMORY MAPPING FILES AND DEVICES
-.nr nS 1
 .Ft struct uvm_object *
-.Fn uvn_attach "void *arg" "vm_prot_t accessprot"
+.br
+.Fn uvn_attach "void *arg" "vm_prot_t accessprot" ;
+.Pp
 .Ft void
-.Fn uvm_vnp_setsize "struct vnode *vp" "voff_t newsize"
+.br
+.Fn uvm_vnp_setsize "struct vnode *vp" "voff_t newsize" ;
+.Pp
 .Ft void *
-.Fn ubc_alloc "struct uvm_object *uobj" "voff_t offset" "vsize_t *lenp" "int flags"
+.br
+.Fn ubc_alloc "struct uvm_object *uobj" "voff_t offset" "vsize_t *lenp" "int flags" ;
+.Pp
 .Ft void
-.Fn ubc_release "void *va" "int flags"
-.nr nS 0
+.br
+.Fn ubc_release "void *va" "int flags" ;
 .Pp
 .Fn uvn_attach
 attaches a UVM object to vnode
@@ -452,10 +479,9 @@ The mapping may be cached to speed future accesses to the same region
 of the object.
 The flags are currently unused.
 .Sh VIRTUAL MEMORY I/O
-.nr nS 1
 .Ft int
-.Fn uvm_io "struct vm_map *map" "struct uio *uio"
-.nr nS 0
+.br
+.Fn uvm_io "struct vm_map *map" "struct uio *uio" ;
 .Pp
 .Fn uvm_io
 performs the I/O described in
@@ -463,26 +489,41 @@ performs the I/O described in
 on the memory described in
 .Fa map .
 .Sh ALLOCATION OF KERNEL MEMORY
-.nr nS 1
 .Ft vaddr_t
-.Fn uvm_km_alloc "struct vm_map *map" "vsize_t size"
+.br
+.Fn uvm_km_alloc "struct vm_map *map" "vsize_t size" ;
+.Pp
 .Ft vaddr_t
-.Fn uvm_km_zalloc "struct vm_map *map" "vsize_t size"
+.br
+.Fn uvm_km_zalloc "struct vm_map *map" "vsize_t size" ;
+.Pp
 .Ft vaddr_t
-.Fn uvm_km_alloc1 "struct vm_map *map" "vsize_t size" "boolean_t zeroit"
+.br
+.Fn uvm_km_alloc1 "struct vm_map *map" "vsize_t size" "boolean_t zeroit" ;
+.Pp
 .Ft vaddr_t
-.Fn uvm_km_kmemalloc "struct vm_map *map" "struct uvm_object *obj" "vsize_t size" "int flags"
+.br
+.Fn uvm_km_kmemalloc "struct vm_map *map" "struct uvm_object *obj" "vsize_t size" "int flags" ;
+.Pp
 .Ft vaddr_t
-.Fn uvm_km_valloc "struct vm_map *map" "vsize_t size"
+.br
+.Fn uvm_km_valloc "struct vm_map *map" "vsize_t size" ;
+.Pp
 .Ft vaddr_t
-.Fn uvm_km_valloc_wait "struct vm_map *map" "vsize_t size"
+.br
+.Fn uvm_km_valloc_wait "struct vm_map *map" "vsize_t size" ;
+.Pp
 .Ft struct vm_map *
-.Fn uvm_km_suballoc "struct vm_map *map" "vaddr_t *min" "vaddr_t *max " "vsize_t size" "boolean_t pageable" "boolean_t fixed" "struct vm_map *submap"
+.br
+.Fn uvm_km_suballoc "struct vm_map *map" "vaddr_t *min" "vaddr_t *max " "vsize_t size" "boolean_t pageable" "boolean_t fixed" "struct vm_map *submap" ;
+.Pp
 .Ft void
-.Fn uvm_km_free "struct vm_map *map" "vaddr_t addr" "vsize_t size"
+.br
+.Fn uvm_km_free "struct vm_map *map" "vaddr_t addr" "vsize_t size" ;
+.Pp
 .Ft void
-.Fn uvm_km_free_wakeup "struct vm_map *map" "vaddr_t addr" "vsize_t size"
-.nr nS 0
+.br
+.Fn uvm_km_free_wakeup "struct vm_map *map" "vaddr_t addr" "vsize_t size" ;
 .Pp
 .Fn uvm_km_alloc
 and
@@ -592,20 +633,29 @@ If
 .Fa pageable
 is non-zero, entries in the map may be paged out.
 .Sh ALLOCATION OF PHYSICAL MEMORY
-.nr nS 1
 .Ft struct vm_page *
-.Fn uvm_pagealloc "struct uvm_object *uobj" "voff_t off" "struct vm_anon *anon" "int flags"
+.br
+.Fn uvm_pagealloc "struct uvm_object *uobj" "voff_t off" "struct vm_anon *anon" "int flags" ;
+.Pp
 .Ft void
-.Fn uvm_pagerealloc "struct vm_page *pg" "struct uvm_object *newobj" "voff_t newoff"
+.br
+.Fn uvm_pagerealloc "struct vm_page *pg" "struct uvm_object *newobj" "voff_t newoff" ;
+.Pp
 .Ft void
-.Fn uvm_pagefree "struct vm_page *pg"
+.br
+.Fn uvm_pagefree "struct vm_page *pg" ;
+.Pp
 .Ft int
-.Fn uvm_pglistalloc "psize_t size" "paddr_t low" "paddr_t high" "paddr_t alignment" "paddr_t boundary" "struct pglist *rlist" "int nsegs" "int waitok"
+.br
+.Fn uvm_pglistalloc "psize_t size" "paddr_t low" "paddr_t high" "paddr_t alignment" "paddr_t boundary" "struct pglist *rlist" "int nsegs" "int waitok" ;
+.Pp
 .Ft void
-.Fn uvm_pglistfree "struct pglist *list"
+.br
+.Fn uvm_pglistfree "struct pglist *list" ;
+.Pp
 .Ft void
-.Fn uvm_page_physload "vaddr_t start" "vaddr_t end" "vaddr_t avail_start" "vaddr_t avail_end" "int free_list"
-.nr nS 0
+.br
+.Fn uvm_page_physload "vaddr_t start" "vaddr_t end" "vaddr_t avail_start" "vaddr_t avail_end" "int free_list" ;
 .Pp
 .Fn uvm_pagealloc
 allocates a page of memory at virtual address
@@ -701,14 +751,17 @@ of the physical addresses of the segment, and the available start and end
 addresses of pages not already in use.
 .\" XXX expand on "system boot time"!
 .Sh PROCESSES
-.nr nS 1
 .Ft void
-.Fn uvm_pageout "void"
+.br
+.Fn uvm_pageout "void" ;
+.Pp
 .Ft void
-.Fn uvm_scheduler "void"
+.br
+.Fn uvm_scheduler "void" ;
+.Pp
 .Ft void
-.Fn uvm_swapin "struct proc *p"
-.nr nS 0
+.br
+.Fn uvm_swapin "struct proc *p" ;
 .Pp
 .Fn uvm_pageout
 is the main loop for the page daemon.
@@ -722,12 +775,13 @@ order.
 .Fn uvm_swapin
 swaps in the named process.
 .Sh PAGE LOAN
-.nr nS 1
 .Ft int
-.Fn uvm_loan "struct vm_map *map" "vaddr_t start" "vsize_t len" "void *v" "int flags"
+.br
+.Fn uvm_loan "struct vm_map *map" "vaddr_t start" "vsize_t len" "void *v" "int flags" ;
+.Pp
 .Ft void
-.Fn uvm_unloan "void *v" "int npages" "int flags"
-.nr nS 0
+.br
+.Fn uvm_unloan "void *v" "int npages" "int flags" ;
 .Pp
 .Fn uvm_loan
 loans pages in a map out to anons or to the kernel.
@@ -778,45 +832,65 @@ should be one of
 and should match what was used for previous call to
 .Fn uvm_loan .
 .Sh MISCELLANEOUS FUNCTIONS
-.nr nS 1
 .Ft struct uvm_object *
-.Fn uao_create "vsize_t size" "int flags"
+.br
+.Fn uao_create "vsize_t size" "int flags" ;
+.Pp
 .Ft void
-.Fn uao_detach "struct uvm_object *uobj"
+.br
+.Fn uao_detach "struct uvm_object *uobj" ;
+.Pp
 .Ft void
-.Fn uao_reference "struct uvm_object *uobj"
+.br
+.Fn uao_reference "struct uvm_object *uobj" ;
 .Pp
 .Ft boolean_t
-.Fn uvm_chgkprot "caddr_t addr" "size_t len" "int rw"
+.br
+.Fn uvm_chgkprot "caddr_t addr" "size_t len" "int rw" ;
+.Pp
 .Ft void
-.Fn uvm_kernacc "caddr_t addr" "size_t len" "int rw"
+.br
+.Fn uvm_kernacc "caddr_t addr" "size_t len" "int rw" ;
+.Pp
 .Ft boolean_t
-.Fn uvm_useracc "caddr_t addr" "size_t len" "int rw"
+.br
+.Fn uvm_useracc "caddr_t addr" "size_t len" "int rw" ;
 .Pp
 .Ft int
-.Fn uvm_vslock "struct proc *p" "caddr_t addr" "size_t len" "vm_prot_t prot"
-.Ft void
-.Fn uvm_vsunlock "struct proc *p" "caddr_t addr" "size_t len"
+.br
+.Fn uvm_vslock "struct proc *p" "caddr_t addr" "size_t len" "vm_prot_t prot" ;
 .Pp
 .Ft void
-.Fn uvm_meter "void"
+.br
+.Fn uvm_vsunlock "struct proc *p" "caddr_t addr" "size_t len" ;
+.Pp
+.Ft void
+.br
+.Fn uvm_meter "void" ;
+.Pp
 .Ft int
-.Fn uvm_sysctl "int *name" "u_int namelen" "void *oldp" "size_t *oldlenp" "void *newp " "size_t newlen" "struct proc *p"
+.br
+.Fn uvm_sysctl "int *name" "u_int namelen" "void *oldp" "size_t *oldlenp" "void *newp " "size_t newlen" "struct proc *p" ;
 .Pp
 .Ft void
-.Fn uvm_fork "struct proc *p1" "struct proc *p2" "boolean_t shared"
+.br
+.Fn uvm_fork "struct proc *p1" "struct proc *p2" "boolean_t shared" ;
+.Pp
 .Ft int
-.Fn uvm_grow "struct proc *p" "vaddr_t sp"
+.br
+.Fn uvm_grow "struct proc *p" "vaddr_t sp" ;
+.Pp
 .Ft int
-.Fn uvm_coredump "struct proc *p" "struct vnode *vp" "struct ucred *cred" "struct core *chdr"
+.br
+.Fn uvm_coredump "struct proc *p" "struct vnode *vp" "struct ucred *cred" "struct core *chdr" ;
 .Pp
 .Ft void
-.Fn uvn_findpages "struct uvm_object *uobj" "voff_t offset" "int *npagesp" "struct vm_page **pps" "int flags"
+.br
+.Fn uvn_findpages "struct uvm_object *uobj" "voff_t offset" "int *npagesp" "struct vm_page **pps" "int flags" ;
 .Pp
 .Ft void
-.Fn uvm_swap_stats "int cmd" "struct swapent *sep" "int sec" "register_t *retval"
-.Pp
-.nr nS 0
+.br
+.Fn uvm_swap_stats "int cmd" "struct swapent *sep" "int sec" "register_t *retval" ;
 .Pp
 The
 .Fn uao_create ,
diff --git a/share/man/man9/vme.9 b/share/man/man9/vme.9
index 9982950ecd57..eea9da9142e3 100644
--- a/share/man/man9/vme.9
+++ b/share/man/man9/vme.9
@@ -1,4 +1,4 @@
-.\"     $NetBSD: vme.9,v 1.9 2003/04/16 13:35:35 wiz Exp $
+.\"     $NetBSD: vme.9,v 1.10 2003/06/30 19:12:34 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -189,9 +189,7 @@ is called with the argument
 and the bus-space tag and bus-space handle for accessing the VME space
 mapping and should return a nonzero positive integer for a positive
 device match.
-.It Fo vme_space_map
-.Fa "vc" "vmeaddr" "len" "am" "datasize" "swap" "tag" "handle" "resc"
-.Fc
+.It Fn vme_space_map "vc" "vmeaddr" "len" "am" "datasize" "swap" "tag" "handle" "resc"
 Maps the VME space managed by controller
 .Fa vc
 at address
@@ -253,10 +251,7 @@ is the value returned by
 .It Fn vme_intr_evcnt "vc" "handle"
 Increment the interrupt event counter for the interrupt specified by
 .Fa handle .
-.It Fo vme_dmamap_create
-.Fa "vc" "size" "am" "datasize" "swap" "nsegs" "segsz" "bound"
-.Fa "flags" "map"
-.Fc
+.It Fn vme_dmamap_create "vc" "size" "am" "datasize" "swap" "nsegs" "segsz" "bound" "flags" "map"
 Allocates a DMA handle and initializes it according to the parameters
 provided.
 The VME-specific parameters describe the address-space modifiers
@@ -271,9 +266,7 @@ The remaining parameters are described in
 Frees all resources associated with a given DMA handle.
 The parameters are described in
 .Xr bus_dma 9 .
-.It Fo vme_dmamem_alloc
-.Fa "vc" "size" "am" "datasize" "swap" "segs" "nsegs" "rsegs" "flags"
-.Fc
+.It Fn vme_dmamem_alloc "vc" "size" "am" "datasize" "swap" "segs" "nsegs" "rsegs" "flags"
 Allocates memory that is
 .Do
 DMA safe
diff --git a/share/man/man9/vnodeops.9 b/share/man/man9/vnodeops.9
index e3dd7b541bd4..8f876a01500a 100644
--- a/share/man/man9/vnodeops.9
+++ b/share/man/man9/vnodeops.9
@@ -1,4 +1,4 @@
-.\"     $NetBSD: vnodeops.9,v 1.24 2003/06/19 14:36:14 yamt Exp $
+.\"     $NetBSD: vnodeops.9,v 1.25 2003/06/30 19:12:34 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1382,9 +1382,7 @@ Whiteout pathname component in directory with vnode
 The argument
 .Fa cnp
 specifies the pathname component to whiteout.
-.It Fo VOP_GETPAGES
-.Fa "vp" "offset" "m" "count" "centeridx"
-.Fa "access_type" "advice" "flags"
+.It Fn VOP_GETPAGES "vp" "offset" "m" "count" "centeridx" "access_type" "advice" "flags"
 .Fc
 Read VM pages from file.
 The argument
diff --git a/share/man/man9/vnsubr.9 b/share/man/man9/vnsubr.9
index 9912d03b66ca..3d8ecd4b8c4d 100644
--- a/share/man/man9/vnsubr.9
+++ b/share/man/man9/vnsubr.9
@@ -1,4 +1,4 @@
-.\"     $NetBSD: vnsubr.9,v 1.15 2003/04/16 13:35:35 wiz Exp $
+.\"     $NetBSD: vnsubr.9,v 1.16 2003/06/30 19:12:34 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -193,10 +193,7 @@ or
 vnode operations.
 If the operation is successful zero is returned,
 otherwise an appropriate error code is returned.
-.It Fo vn_rdwr
-.Fa "rw" "vp" "base" "len" "offset" "segflg" "ioflg"
-.Fa "cred" "aresid" "p"
-.Fc
+.It Fn vn_rdwr "rw" "vp" "base" "len" "offset" "segflg" "ioflg" "cred" "aresid" "p"
 Common code to package up an I/O request on a vnode into a uio and
 then perform the I/O.
 The argument
@@ -213,10 +210,7 @@ are the calling process and its credentials.
 The remaining arguments specify the uio parameters.
 For further information on these parameters see
 .Xr uiomove 9 .
-.It Fo vn_readdir
-.Fa "fp" "buf" "segflg" "count" "done" "p" "cookies"
-.Fa "ncookies"
-.Fc
+.It Fn vn_readdir "fp" "buf" "segflg" "count" "done" "p" "cookies" "ncookies"
 Common code for reading the contents of a directory.
 The argument
 .Fa fp
diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1
index 04861792bea0..da83e602010a 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cal.1,v 1.15 2003/06/05 00:21:20 atatat Exp $
+.\"	$NetBSD: cal.1,v 1.16 2003/06/30 19:12:31 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -47,7 +47,7 @@
 .Op Fl hjy3
 .Op Fl A Ar after
 .Op Fl B Ar before
-.Op Oo Ar month Oc Ar \ year
+.Op Oo Ar month Oc Ar year
 .Sh DESCRIPTION
 .Nm
 displays a simple calendar.
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 47556b45fa3e..80da75a47aa5 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$NetBSD: ftp.1,v 1.96 2003/06/26 17:48:37 wiz Exp $
+.\" 	$NetBSD: ftp.1,v 1.97 2003/06/30 19:12:32 wiz Exp $
 .\"
 .\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -2092,9 +2092,8 @@ The current remote working directory.
 .It Xo
 .Sm off
 .Li \&%c
-.Op Oo Li 0 Oc Ar n
+.Op Oo Li 0 Oc Ar n Ns ,
 .Sm on
-.No ,
 .Sm off
 .Li \&%.
 .Op Oo Li 0 Oc Ar n
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index f402ac906d0f..7d17be609eee 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hexdump.1,v 1.16 2003/02/25 10:35:43 wiz Exp $
+.\"	$NetBSD: hexdump.1,v 1.17 2003/06/30 19:12:33 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -256,13 +256,11 @@ are as follows:
 .It Li \&%_c , \&%_p , \&%_u , \&%c
 One byte counts only.
 .It Xo
-.Li \&%d , \&%i , \&%o ,
-.Li \&%u , \&%X , \&%x
+.Li \&%d , \&%i , \&%o , \&%u , \&%X , \&%x
 .Xc
 Four byte default, one, two, four and eight byte counts supported.
 .It Xo
-.Li \&%E , \&%e , \&%f ,
-.Li \&%G , \&%g
+.Li \&%E , \&%e , \&%f , \&%G , \&%g
 .Xc
 Eight byte default, four byte counts supported.
 .El