15 files changed, 54 insertions, 85 deletions

diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 28495a509c1..78f1841df55 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: csh.1,v 1.64 2010/07/15 20:04:35 schwarze Exp $
+.\"	$OpenBSD: csh.1,v 1.65 2011/05/02 11:14:11 jmc Exp $
 .\"	$NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)csh.1	8.2 (Berkeley) 1/21/94
 .\"
-.Dd $Mdocdate: July 15 2010 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt CSH 1
 .Os
 .Sh NAME
@@ -1364,7 +1364,7 @@ and
 commands.
 The following operators are available:
 .Bd -ragged -offset indent
-\&|\&|  &&  \&| \*(ua  &  ==  !=  =~  !~  <=  >=
+||  &&  | \*(ua  &  ==  !=  =~  !~  <=  >=
 <  > <<  >>  +  \-  *  /  %  !  ~  (  )
 .Ed
 .Pp
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index cc359b98a64..c031274437c 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vis.3,v 1.27 2011/03/14 15:56:48 deraadt Exp $
+.\"	$OpenBSD: vis.3,v 1.28 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 14 2011 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt VIS 3
 .Os
 .Sh NAME
@@ -180,11 +180,7 @@ Also encode tab.
 Also encode newline.
 .It Dv VIS_WHITE
 Synonym for
-.Dv VIS_SP
-\&|
-.Dv VIS_TAB
-\&|
-.Dv VIS_NL .
+.Dv VIS_SP | VIS_TAB | VIS_NL .
 .It Dv VIS_SAFE
 Only encode
 .Dq unsafe
diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3
index be51398d27e..b406da943ba 100644
--- a/lib/libc/stdio/fopen.3
+++ b/lib/libc/stdio/fopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fopen.3,v 1.22 2010/03/26 19:30:41 jmc Exp $
+.\"	$OpenBSD: fopen.3,v 1.23 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 26 2010 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt FOPEN 3
 .Os
 .Sh NAME
@@ -103,17 +103,7 @@ to be forced to the current end-of-file, regardless of intervening
 repositioning of the stream.
 .Pp
 Any created files will have mode
-.Pf \*q Dv S_IRUSR
-\&|
-.Dv S_IWUSR
-\&|
-.Dv S_IRGRP
-\&|
-.Dv S_IWGRP
-\&|
-.Dv S_IROTH
-\&|
-.Dv S_IWOTH Ns \*q
+.Qq Dv S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
 .Pq Li 0666 ,
 as modified by the process'
 umask value (see
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 7077b2b9b46..88dca0cf36f 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tun.4,v 1.38 2010/09/23 01:24:32 matthew Exp $
+.\"	$OpenBSD: tun.4,v 1.39 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Marcus D. Watts  All rights reserved.
 .\"
@@ -26,7 +26,7 @@
 .\" TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 23 2010 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt TUN 4
 .Os
 .Sh NAME
@@ -132,7 +132,7 @@ will not be changed even when given.
 Flags default to
 .Dv IFF_POINTOPOINT
 for layer 3 and to
-.Dv IFF_BROADCAST \&| IFF_MULTICAST
+.Dv IFF_BROADCAST | IFF_MULTICAST
 for layer 2 mode.
 It is an error to set both
 .Dv IFF_POINTOPOINT
diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1
index 00261d81e59..47f586293ef 100644
--- a/usr.bin/awk/awk.1
+++ b/usr.bin/awk/awk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: awk.1,v 1.39 2011/03/22 15:55:43 jmc Exp $
+.\"	$OpenBSD: awk.1,v 1.40 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (C) Lucent Technologies 1997
 .\" All Rights Reserved
@@ -22,7 +22,7 @@
 .\" ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 .\" THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 22 2011 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt AWK 1
 .Os
 .Sh NAME
@@ -88,7 +88,7 @@ Disable file output
 process creation
 .Po
 .Ar cmd | Ic getline ,
-.Ic print No \&| ,
+.Ic print | ,
 .Ic system
 .Pc
 and access to the environment
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 8894e8a3e62..ea856be9696 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctags.1,v 1.24 2010/11/04 14:32:28 jmc Exp $
+.\"	$OpenBSD: ctags.1,v 1.25 2011/05/02 11:14:11 jmc Exp $
 .\"	$NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ctags.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: November 4 2010 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt CTAGS 1
 .Os
 .Sh NAME
@@ -105,8 +105,8 @@ it may be desired to run the output through
 .Xr sort 1 .
 Sample use:
 .Bd -literal -offset indent
-$ ctags \-v files \&| sort \-f > index
-$ vgrind \-x index
+$ ctags -v files | sort -f > index
+$ vgrind -x index
 .Ed
 .It Fl w
 Suppress warning diagnostics.
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 58c2cba25ec..3b6b0c4a0ed 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fstat.1,v 1.45 2009/10/22 15:02:12 sobrado Exp $
+.\"	$OpenBSD: fstat.1,v 1.46 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)fstat.1	8.3 (Berkeley) 2/25/94
 .\"
-.Dd $Mdocdate: October 22 2009 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt FSTAT 1
 .Os
 .Sh NAME
@@ -165,7 +165,7 @@ the letter
 indicates open for writing.
 This field is useful when trying to find the processes that are
 preventing a file system from being downgraded to read-only.
-.It Li SZ\&|DV
+.It Li SZ | DV
 If the file is not a character or block special file, prints the size of
 the file in bytes.
 Otherwise, if the
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 2ce8fa8c47b..2bfd640d86c 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: head.1,v 1.17 2010/09/03 11:09:29 jmc Exp $
+.\"	$OpenBSD: head.1,v 1.18 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)head.1	6.6 (Berkeley) 7/24/91
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt HEAD 1
 .Os
 .Sh NAME
@@ -37,10 +37,7 @@
 .Nd display first few lines of files
 .Sh SYNOPSIS
 .Nm head
-.Oo
-.Fl Ns Ar count No \&|
-.Fl n Ar count
-.Oc
+.Op Fl Ns Ar count | Fl n Ar count
 .Op Ar
 .Sh DESCRIPTION
 The
@@ -59,9 +56,7 @@ is omitted, it defaults to 10.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Xo Fl Ns Ar count No \&|
-.Fl n Ar count
-.Xc
+.It Fl Ns Ar count | Fl n Ar count
 Copy the first
 .Ar count
 lines of each input file to the standard output.
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index 8b9adef5b9c..87b241c2bf6 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: less.1,v 1.21 2011/02/03 22:11:22 jmc Exp $
+.\"	$OpenBSD: less.1,v 1.22 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (C) 2002  Mark Nudelman
 .\"
@@ -23,7 +23,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 3 2011 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt LESS 1
 .Os
 .Sh NAME
@@ -114,11 +114,7 @@ Like SPACE, but if N is specified, it becomes the new window size.
 .It Ic ESC-SPACE
 Like SPACE, but scrolls a full screensful, even if it reaches
 end-of-file in the process.
-.It Xo
-.Ic RETURN No \&| Ic ^N No \&|
-.Ic e No \&| Ic ^E No \&|
-.Ic j No \&| Ic ^J
-.Xc
+.It Ic RETURN | ^N | e | ^E | j | ^J
 Scroll forward N lines, default 1.
 The entire N lines are displayed, even if N is more than the screen size.
 .It Ic d | ^D
@@ -129,11 +125,7 @@ Scroll backward N lines, default one window (see option -z below).
 If N is more than the screen size, only the final screenful is displayed.
 .It Ic w
 Like ESC-v, but if N is specified, it becomes the new window size.
-.It Xo
-.Ic y No \&| Ic ^Y No \&|
-.Ic ^P No \&| Ic k No \&|
-.Ic ^K
-.Xc
+.It Ic y | ^Y | ^P | k | ^K
 Scroll backward N lines, default 1.
 The entire N lines are displayed, even if N is more than the screen size.
 Warning: some systems use ^Y as a special job control character.
@@ -404,11 +396,7 @@ to initially display each file starting at the end rather than the beginning.
 Prints the version number of
 .Nm
 being run.
-.It Xo
-.Ic q No \&| Ic Q No \&|
-.Ic :q No \&| Ic :Q No \&|
-.Ic ZZ
-.Xc
+.It Ic q | Q | :q | :Q | ZZ
 Exits
 .Nm less .
 .El
@@ -445,7 +433,7 @@ The shell is taken from the environment variable
 .Ev SHELL ,
 or defaults to "sh".
 .\" On MS-DOS and OS/2 systems, the shell is the normal command processor.
-.It Ic \&| <m> Ar shell-command
+.It Ic | <m> Ar shell-command
 <m> represents any mark letter.
 Pipes a section of the input file to the given shell command.
 The section of the file to be piped is between the first line on
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 08d6ad5ea46..a438994b4f1 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.91 2011/01/23 20:43:55 schwarze Exp $
+.\"	$OpenBSD: make.1,v 1.92 2011/05/02 11:14:11 jmc Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: January 23 2011 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -991,13 +991,13 @@ The
 .Ar operator
 may be any one of the following:
 .Bl -tag -width "Cm XX"
-.It Cm \&|\&|
+.It Cm ||
 logical OR
 .It Cm \&&&
 Logical
 .Tn AND ;
 of higher precedence than
-.Dq \&|\&| .
+.Cm || .
 .El
 .Pp
 As in C,
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 5cceab54a18..a4016e5bb26 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shar.1,v 1.11 2008/06/03 19:51:02 jmc Exp $
+.\"	$OpenBSD: shar.1,v 1.12 2011/05/02 11:14:11 jmc Exp $
 .\"	$NetBSD: shar.1,v 1.4 1995/08/18 14:55:40 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: June 3 2008 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt SHAR 1
 .Os
 .Sh NAME
@@ -61,7 +61,7 @@ To create a shell archive of the program
 and mail it to Rick:
 .Bd -literal -offset indent
 $ cd ls
-$ shar `find . -print` \&| mail -s "ls source" rick
+$ shar `find . -print` | mail -s "ls source" rick
 .Ed
 .Pp
 To recreate the program directory:
diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 90aee0eb668..11b77314469 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.51 2011/04/12 18:08:00 jmc Exp $
+.\"	$OpenBSD: vi.1,v 1.52 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -14,7 +14,7 @@
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.Dd $Mdocdate: April 12 2011 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt VI 1
 .Os
 .Sh NAME
@@ -1458,9 +1458,9 @@ Delete the lines from the file.
 .Pp
 .It Xo
 .Cm di Ns Op Cm splay
-.Cm b Ns Oo Cm uffers Oc \&|
-.Cm c Ns Oo Cm onnections Oc \&|
-.Cm s Ns Oo Cm creens Oc \&|
+.Cm b Ns Oo Cm uffers Oc |
+.Cm c Ns Oo Cm onnections Oc |
+.Cm s Ns Oo Cm creens Oc |
 .Cm t Ns Op Cm ags
 .Xc
 Display buffers, Cscope connections, screens or tags.
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index fce27c16014..cab54a36424 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpr.1,v 1.13 2010/10/28 21:51:02 jmc Exp $
+.\"	$OpenBSD: lpr.1,v 1.14 2011/05/02 11:14:11 jmc Exp $
 .\"	$NetBSD: lpr.1,v 1.10 2002/01/19 03:23:26 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)lpr.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: October 28 2010 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt LPR 1
 .Os
 .Sh NAME
@@ -141,14 +141,14 @@ The quantity
 is the number of copies desired of each file named.
 For example,
 .Bd -literal -offset indent
-$ lpr \-#3 foo.c bar.c more.c
+$ lpr -#3 foo.c bar.c more.c
 .Ed
 .Pp
 would result in 3 copies of the file foo.c, followed by 3 copies
 of the file bar.c, etc.
 On the other hand,
 .Bd -literal -offset indent
-$ cat foo.c bar.c more.c \&| lpr \-#3
+$ cat foo.c bar.c more.c | lpr -#3
 .Ed
 .Pp
 will give three copies of the concatenation of the files.
diff --git a/usr.sbin/ppp/pppctl/pppctl.8 b/usr.sbin/ppp/pppctl/pppctl.8
index 64a6b4566d4..6c9bc3f6e98 100644
--- a/usr.sbin/ppp/pppctl/pppctl.8
+++ b/usr.sbin/ppp/pppctl/pppctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pppctl.8,v 1.16 2010/03/26 19:30:40 jmc Exp $
+.\"	$OpenBSD: pppctl.8,v 1.17 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 26 2010 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt PPPCTL 8
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Op Fl p Ar passwd
 .Op Fl t Ar n
 .Xo
-.Oo Ar host : Oc Ar port No \&|
+.Oo Ar host : Oc Ar port |
 .Ar LocalSocket
 .Xc
 .Op Ar command Op ; Ns Ar command ...
diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index 75a7b414308..94db164c2cb 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timed.8,v 1.16 2010/04/01 17:06:55 jmc Exp $
+.\"	$OpenBSD: timed.8,v 1.17 2011/05/02 11:14:11 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)timed.8	6.7 (Berkeley) 5/11/93
 .\"
-.Dd $Mdocdate: April 1 2010 $
+.Dd $Mdocdate: May 2 2011 $
 .Dt TIMED 8
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Op Fl F Ar host ...
 .Op Fl G Ar netgroup
 .Xo
-.Oo Fl i Ar network No \&|
+.Oo Fl i Ar network |
 .Fl n Ar network Oc
 .Xc
 .Sh DESCRIPTION