21 files changed, 71 insertions, 71 deletions

diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1
index 3efd3453b09..87c56b656df 100644
--- a/usr.bin/awk/awk.1
+++ b/usr.bin/awk/awk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: awk.1,v 1.13 2003/06/30 23:59:00 millert Exp $
+.\"	$OpenBSD: awk.1,v 1.14 2003/09/02 18:50:06 jmc Exp $
 .\" EX/EE is a Bd
 .\"
 .\" Copyright (C) Lucent Technologies 1997
@@ -195,7 +195,7 @@ and are built using the operators
 .Ic + \- * / % ^
 (exponentiation), and concatenation (indicated by whitespace).
 The operators
-.Ic ! ++ \-\- += \-= *= /= %= ^= > >= < <= == != ?:
+.Ic \&! ++ \-\- += \-= *= /= %= ^= > >= < <= == != ?:
 are also available in expressions.
 Variables may be scalars, array elements
 (denoted
@@ -385,7 +385,7 @@ returns 1 for a successful input,
 .Pp
 Patterns are arbitrary Boolean combinations
 (with
-.Ic "! || &&" )
+.Ic "\&! || &&" )
 of regular expressions and
 relational expressions.
 Regular expressions are as in
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 5f91b8dbbb0..fefa79ed351 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: find.1,v 1.39 2003/06/12 04:30:07 millert Exp $
+.\"	$OpenBSD: find.1,v 1.40 2003/09/02 18:50:06 jmc Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -284,7 +284,7 @@ Special shell pattern matching characters
 .Ql \&] ,
 .Ql * ,
 and
-.Ql ? )
+.Ql \&? )
 may be used as part of
 .Ar pattern .
 These characters may be matched explicitly by escaping them with a
@@ -320,7 +320,7 @@ Special shell pattern matching characters
 .Ql \&] ,
 .Ql * ,
 and
-.Ql ? )
+.Ql \&? )
 may be used as part of
 .Ar pattern .
 These characters may be matched explicitly by escaping them with a
@@ -613,10 +613,10 @@ In particular, the characters
 .Ql * ,
 .Ql [ ,
 .Ql \&] ,
-.Ql ? ,
+.Ql \&? ,
 .Ql ( ,
 .Ql \&) ,
-.Ql ! ,
+.Ql \&! ,
 .Ql \e ,
 and
 .Ql \&;
@@ -628,7 +628,7 @@ names and the
 it is difficult to specify files named
 .Dq -xdev
 or
-.Dq ! .
+.Dq \&! .
 These problems are handled by the
 .Fl f
 option and the
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 8674fbde9ef..62d0634dc97 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: ftp.1,v 1.40 2003/07/15 10:53:02 jmc Exp $
+.\" 	$OpenBSD: ftp.1,v 1.41 2003/09/02 18:50:06 jmc Exp $
 .\" 	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -828,7 +828,7 @@ command should be an
 .Ic open ,
 to establish the secondary control connection.
 Enter the command
-.Ic proxy ?
+.Ic proxy ?\&
 to see other ftp commands executable on the
 secondary connection.
 The following commands behave differently when prefaced by
@@ -1088,7 +1088,7 @@ if verbose is on, when a file transfer completes, statistics
 regarding the efficiency of the transfer are reported.
 By default,
 verbose is on.
-.It Ic ? Op Ar command
+.It Ic \&? Op Ar command
 A synonym for
 .Ic help .
 .El
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index 2583cac6fc9..89fae96c599 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: less.1,v 1.5 2003/08/18 17:19:38 millert Exp $
+.\"	$OpenBSD: less.1,v 1.6 2003/09/02 18:50:06 jmc Exp $
 .\"
 .\" Copyright (C) 2002  Mark Nudelman
 .\"
@@ -31,7 +31,7 @@
 .Nd view files on a crt
 .Sh SYNOPSIS
 .Nm less No | Nm more
-.Fl ?
+.Fl \&?
 .Nm less No | Nm more
 .Fl -help
 .Nm less No | Nm more
@@ -231,7 +231,7 @@ The search starts at the second line displayed
 Certain characters are special if entered at the beginning of the pattern;
 they modify the type of search rather than become part of the pattern:
 .Bl -tag -width Ds
-.It Ic ^N | !
+.It Ic ^N | \&!
 Search for lines which do NOT match the pattern.
 .It Ic ^E | *
 Search multiple files.
@@ -256,7 +256,7 @@ The search starts at the line immediately before the top line displayed.
 .Pp
 Certain characters are special, as in the / command:
 .Bl -tag -width Ds
-.It Ic ^N | !
+.It Ic ^N | \&!
 Search for lines which do NOT match the pattern.
 .It Ic ^E | *
 Search multiple files.
@@ -436,7 +436,7 @@ is defined.
 See also the discussion of LESSEDIT under the section on
 .Sx PROMPTS
 below.
-.It Ic ! Ar shell-command
+.It Ic \&! Ar shell-command
 Invokes a shell to run the shell-command given.
 A percent sign (%) in the command is replaced by the name of the current file.
 A pound sign (#) is replaced by the name of the previously examined file.
@@ -515,7 +515,7 @@ with dollar sign between them:
 .Pp
 .Dl LESS="-Ps--More--$-C -e"
 .Bl -tag -width XXXX
-.It Fl ? | -help
+.It Fl \&? | -help
 This option displays a summary of the commands accepted by
 .Nm
 (the same as the h command).
@@ -1537,7 +1537,7 @@ is set to 1,
 runs in a "secure" mode.
 This means these features are disabled:
 .Bl -tag -width Ds
-.It !
+.It \&!
 The shell command.
 .It |
 The pipe command.
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index e5a02ff72e6..438c7acc0d4 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.1,v 1.19 2003/06/03 02:56:10 millert Exp $
+.\"	$OpenBSD: locate.1,v 1.20 2003/09/02 18:50:06 jmc Exp $
 .\"
 .\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" Copyright (c) 1990, 1993
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.19 2003/06/03 02:56:10 millert Exp $
+.\"	$Id: locate.1,v 1.20 2003/09/02 18:50:06 jmc Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
@@ -54,7 +54,7 @@ of all files which are publicly accessible.
 .Pp
 Shell globbing and quoting characters
 .Pf ( Ql * ,
-.Ql ? ,
+.Ql \&? ,
 .Ql \e ,
 .Ql [ ,
 and
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 4d92649b5d2..5468af01fb2 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.54 2003/07/14 12:29:22 jmc Exp $
+.\"	$OpenBSD: make.1,v 1.55 2003/09/02 18:50:06 jmc Exp $
 .\"	$OpenPackages$
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
@@ -304,13 +304,13 @@ operator is a BSD extension.
 .Pp
 As an extension, targets and sources may contain the shell wildcard
 expressions
-.Ql ? ,
+.Ql \&? ,
 .Ql * ,
 .Ql []
 and
 .Ql {} .
 The expressions
-.Ql ? ,
+.Ql \&? ,
 .Ql *
 and
 .Ql []
@@ -669,7 +669,7 @@ Replaces each word in the variable with its upper case equivalent.
 Select only those words that match the rest of the modifier.
 The standard shell wildcard characters
 .Pf ( Ql * ,
-.Ql ? ,
+.Ql \&? ,
 and
 .Ql [] )
 may
diff --git a/usr.bin/mg/mg.1 b/usr.bin/mg/mg.1
index bcf07122785..830e1d9bc1a 100644
--- a/usr.bin/mg/mg.1
+++ b/usr.bin/mg/mg.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mg.1,v 1.18 2003/06/10 09:12:11 jmc Exp $
+.\"	$OpenBSD: mg.1,v 1.19 2003/09/02 18:50:06 jmc Exp $
 .\"
 .Dd February 25, 2000
 .Dt MG 1
@@ -112,7 +112,7 @@ However, you can rebind keys and change some parameters.
 There are no limits to line length or format.
 Command, buffer, and file name completion and listing can
 be done using the spacebar and
-.Ql ? ,
+.Ql \&? ,
 respectively.
 .Pp
 Amongst other major differences, the
@@ -171,7 +171,7 @@ terminal-specific startup file
 .Xr vi 1
 .Sh BUGS
 When you type
-.Ql ?
+.Ql \&?
 to list possible file names, buffer names, etc.,
 a help buffer is created for the possibilities.
 In Gnu Emacs,
diff --git a/usr.bin/oldrdist/oldrdist.1 b/usr.bin/oldrdist/oldrdist.1
index b61ba978b95..169b1fef3e6 100644
--- a/usr.bin/oldrdist/oldrdist.1
+++ b/usr.bin/oldrdist/oldrdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: oldrdist.1,v 1.12 2003/07/14 12:47:37 jmc Exp $
+.\"	$OpenBSD: oldrdist.1,v 1.13 2003/09/02 18:50:06 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -250,7 +250,7 @@ The shell meta-characters
 .Ql } ,
 .Ql * ,
 and
-.Ql ?
+.Ql \&?
 are recognized and expanded (on the local host only) in the same way as
 .Xr csh 1 .
 They can be escaped with a backslash.
diff --git a/usr.bin/sectok/sectok.1 b/usr.bin/sectok/sectok.1
index 992045d89c6..bb0b3bcf9d8 100644
--- a/usr.bin/sectok/sectok.1
+++ b/usr.bin/sectok/sectok.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sectok.1,v 1.11 2003/06/10 09:12:11 jmc Exp $
+.\"	$OpenBSD: sectok.1,v 1.12 2003/09/02 18:50:06 jmc Exp $
 .\"
 .\" Copyright (C) 2001, Jakob Schlyter. All rights reserved.
 .\"
@@ -72,7 +72,7 @@ List all commands.
 Show help for
 .Ar command .
 .It Xo
-.Cm ?
+.Cm \&?
 .Op command
 .Xc
 Show help for
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index d8853164ab7..88dac2467c9 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sed.1,v 1.17 2003/06/03 02:56:16 millert Exp $
+.\"	$OpenBSD: sed.1,v 1.18 2003/09/02 18:50:06 jmc Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -146,7 +146,7 @@ starts looking again for the first address.
 .Pp
 Editing commands can be applied to non-selected pattern spaces by use
 of the exclamation character
-.Pq Ql !
+.Pq Ql \&!
 function.
 .Sh "Sed Regular Expressions"
 The
@@ -224,7 +224,7 @@ The
 .Sq t ,
 .Sq w ,
 .Sq y ,
-.Ql ! ,
+.Ql \&! ,
 and
 .Ql \&:
 functions all accept additional arguments.
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index 547a0fd412d..753a4f2b981 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.44 2003/05/20 12:03:35 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.45 2003/09/02 18:50:06 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -43,16 +43,16 @@
 .Ar host
 .Ek
 .Nm sftp
-.Oo Oo Ar user Ns No @ Oc Ns
+.Oo Oo Ar user Ns @ Oc Ns
 .Ar host Ns Oo : Ns Ar file Oo
 .Ar file Oc Oc Oc
 .Nm sftp
-.Oo Oo Ar user Ns No @ Oc Ns
+.Oo Oo Ar user Ns @ Oc Ns
 .Ar host Ns Oo : Ns Ar dir Ns
 .Oo Ar / Oc Oc Oc
 .Nm sftp
 .Fl b Ar batchfile
-.Oo Ar user Ns No @ Oc Ns Ar host Ns
+.Oo Ar user Ns @ Oc Ns Ar host
 .Sh DESCRIPTION
 .Nm
 is an interactive file transfer program, similar to
@@ -295,13 +295,13 @@ to
 Display the
 .Nm
 protocol version.
-.It Ic ! Ar command
+.It Ic \&! Ar command
 Execute
 .Ar command
 in local shell.
-.It Ic !
+.It Ic \&!
 Escape to local shell.
-.It Ic ?
+.It Ic \&?
 Synonym for help.
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index b20452ce23e..7a435a90e03 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.19 2003/08/28 12:54:34 markus Exp $
+.\" $OpenBSD: ssh_config.5,v 1.20 2003/09/02 18:50:06 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -104,7 +104,7 @@ keyword) to be only for those hosts that match one of the patterns
 given after the keyword.
 .Ql \&*
 and
-.Ql ?
+.Ql \&?
 can be used as wildcards in the
 patterns.
 A single
@@ -335,7 +335,7 @@ host key database instead of
 Specifies whether authentication based on GSSAPI may be used, either using
 the result of a successful key exchange, or using GSSAPI user
 authentication.
-The default is 
+The default is
 .Dq yes .
 Note that this option applies to protocol version 2 only.
 .It Cm GSSAPIDelegateCredentials
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 1f87835a606..e338626fcbc 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: systat.1,v 1.29 2003/07/25 06:52:07 jmc Exp $
+.\"	$OpenBSD: systat.1,v 1.30 2003/09/02 18:50:06 jmc Exp $
 .\"	$NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -426,7 +426,7 @@ may be names or numbers.
 Show, on the command line, the currently selected protocols,
 hosts, and ports.
 Hosts and ports which are being ignored are prefixed with a
-.Ql ! .
+.Ql \&! .
 If
 .Ar ports
 or
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index 03d1b54e512..a329c51804d 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tip.1,v 1.25 2003/06/10 09:12:12 jmc Exp $
+.\"	$OpenBSD: tip.1,v 1.26 2003/09/02 18:50:07 jmc Exp $
 .\"	$NetBSD: tip.1,v 1.7 1994/12/08 09:31:05 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -390,7 +390,7 @@ as an argument to the set command displays all variables readable by
 the user.
 Alternatively, the user may request display of a particular variable
 by attaching a
-.Ql ?
+.Ql \&?
 to the end.
 For example,
 .Dq escape?
@@ -399,7 +399,7 @@ displays the current escape character.
 Variables are numeric, string, character, or boolean values.
 Boolean variables are set merely by specifying their name; they may be
 reset by prepending a
-.Ql !
+.Ql \&!
 to the name.
 Other variable types are set by concatenating an
 .Ql =
diff --git a/usr.bin/top/top.1 b/usr.bin/top/top.1
index e0d0e3da3f5..e57615b0106 100644
--- a/usr.bin/top/top.1
+++ b/usr.bin/top/top.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: top.1,v 1.21 2003/06/10 09:12:12 jmc Exp $
+.\"	$OpenBSD: top.1,v 1.22 2003/09/02 18:50:07 jmc Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -233,7 +233,7 @@ These commands are currently recognized (^L refers to control-L):
 .Bl -tag -width XxXXXX
 .It ^L
 Redraw the screen.
-.It h or ?
+.It h or \&?
 Display a summary of the commands (help screen).
 .It q
 Quit
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index d7a9800239f..a0881631205 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tset.1,v 1.13 2003/06/10 09:12:12 jmc Exp $
+.\"	$OpenBSD: tset.1,v 1.14 2003/09/02 18:50:07 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -81,7 +81,7 @@ If the terminal type was not specified on the command line, the
 .Fl m
 option mappings are then applied (see below for more information).
 Then, if the terminal type begins with a question mark
-.Pq Ql ? ,
+.Pq Ql \&? ,
 the user is prompted for confirmation of the terminal type.
 An empty response confirms the type, or another type can be entered to
 specify a new type.
@@ -270,7 +270,7 @@ The operator may be any combination of:
 .Ql < ,
 .Ql @ ,
 and
-.Ql ! ;
+.Ql \&! ;
 .Ql >
 means greater than,
 .Ql <
@@ -278,7 +278,7 @@ means less than,
 .Ql @
 means equal to,
 and
-.Ql !
+.Ql \&!
 inverts the sense of the test.
 The baud rate is specified as a number and is compared with the speed
 of the standard error output (which should be the control terminal).
@@ -330,7 +330,7 @@ option argument be placed within single quote characters, and that
 users insert a backslash character
 .Pq Ql \e
 before any exclamation marks
-.Pq Ql ! .
+.Pq Ql \&! .
 .Sh ENVIRONMENT
 The
 .Nm tset
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index fe574f35a24..c4add8ad5d0 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: units.1,v 1.15 2003/06/10 09:12:12 jmc Exp $
+.\" $OpenBSD: units.1,v 1.16 2003/09/02 18:50:07 jmc Exp $
 .\" converted to new format by deraadt@openbsd.org
 .\"
 .\" Copyright (c) 1993 by Adrian Mariano (adrian@cam.cornell.edu)
@@ -170,7 +170,7 @@ giving its name and an equivalence.
 One should be careful to define
 new units in terms of old ones so that a reduction leads to the
 primitive units which are marked with
-.Ql !
+.Ql \&!
 characters.
 The units program will not detect infinite loops that could be caused
 by careless unit definitions.
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 08517b109af..2e658148fe6 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgrindefs.5,v 1.11 2003/06/03 02:56:21 millert Exp $
+.\"	$OpenBSD: vgrindefs.5,v 1.12 2003/09/02 18:50:07 jmc Exp $
 .\"	$NetBSD: vgrindefs.5,v 1.3 1994/11/17 08:28:07 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -134,7 +134,7 @@ that matches this symbol is used as the procedure name.
 Grouping.
 .It \&|
 Alternation.
-.It ?
+.It \&?
 Last item is optional.
 .It \ee
 Preceding any string means that the string will not match an
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 8d75bf91738..78ae87a4060 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: who.1,v 1.17 2003/06/03 02:56:23 millert Exp $
+.\"	$OpenBSD: who.1,v 1.18 2003/09/02 18:50:07 jmc Exp $
 .\"	$NetBSD: who.1,v 1.5 1994/12/07 04:28:47 jtc Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -70,7 +70,7 @@ if the terminal is writable;
 .Sq \-
 if it is not;
 and
-.Sq ?
+.Sq \&?
 if a bad line is encountered.
 .It Fl u
 Print the idle time for each user.
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 45c26ead2fb..b6bc17511fb 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whois.1,v 1.21 2003/06/10 09:12:13 jmc Exp $
+.\"	$OpenBSD: whois.1,v 1.22 2003/09/02 18:50:07 jmc Exp $
 .\"	$NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -145,9 +145,9 @@ For details, see
 (Hint: Contact information, identified by the term
 .Em handle ,
 can be looked up by prefixing
-.Qq Li "!"
+.Qq Li \&!
 or
-.Qq Li "handle\ "
+.Qq Li handle\ \&
 to the
 .Tn NIC
 handle in the query.)
@@ -218,7 +218,7 @@ the special name
 .Dq help .
 .Ss Special cases
 Queries beginning with an exclamation point
-.Ql !
+.Ql \&!
 are assumed to be
 .Tn NSI
 contact handles.
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 9d2124f8e5d..934f02d0fd8 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: window.1,v 1.16 2003/06/10 09:12:13 jmc Exp $
+.\"	$OpenBSD: window.1,v 1.17 2003/09/02 18:50:07 jmc Exp $
 .\"	$NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -249,7 +249,7 @@ escape is changed to some other character, that
 character takes the place of
 .Ic ^P
 here.
-.It Ic ?
+.It Ic \&?
 List a short summary of commands.
 .It Ic ^L
 Refresh the screen.
@@ -486,7 +486,7 @@ Returns the value of
 .Aq Va expr2 .
 .It Xo
 .Aq Va expr1
-.Ic ?
+.Ic \&?
 .Aq Va expr2
 .Ic :
 .Aq Va expr3