diff --git a/sh.1tbl b/sh.1tbl
index b564117..dd30524 100644
--- a/sh.1tbl
+++ b/sh.1tbl
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sh.1tbl,v 1.34 2003/07/07 14:11:58 jmc Exp $
+.\"	$OpenBSD: sh.1tbl,v 1.36 2003/09/04 14:21:43 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -275,7 +275,7 @@ shell and must be quoted if they are to represent themselves:
 .Ql { ,
 .Ql } ,
 .Ql * ,
-.Ql ? ,
+.Ql \&? ,
 and
 .Ql [ .
 The first three of these are the above mentioned quoting characters (see
@@ -308,7 +308,7 @@ style alterations (see
 below);
 and finally,
 .Ql * ,
-.Ql ? ,
+.Ql \&? ,
 and
 .Ql [
 are used in file name generation (see
@@ -364,7 +364,7 @@ last is piped (see
 to the standard input of the following command.
 The exit status of a pipeline is that of its last command.
 A pipeline may be prefixed by the
-.Ql !
+.Ql \&!
 reversed word which causes the exit status of the pipeline to be logically
 complemented: if the original status was 0 the complemented status will be 1;
 if the original status was not 0, the complemented status will be 0.
@@ -1076,7 +1076,7 @@ command below for list of options).
 .It Ev \&?
 The exit status of the last non-asynchronous command executed.
 If the last command was killed by a signal,
-.Ic \&$\&?
+.Ic \&$?\&
 is set to 128 plus the signal number.
 .It Ev 0
 The name the shell was invoked with (i.e.,
@@ -1324,7 +1324,7 @@ command may be used to list, change, and add to this cache (e.g.,
 .Ic alias -d fac=/usr/local/facilities; cd ~fac/bin ) .
 .Ss File name patterns
 A file name pattern is a word containing one or more unquoted
-.Ql ?
+.Ql \&?
 or
 .Ql *
 characters or
@@ -1357,7 +1357,7 @@ Similarly, a
 must be quoted or the first character in the list if it is to represent itself
 instead of the end of the list.
 Also, a
-.Ql !
+.Ql \&!
 appearing at the start of the list has special meaning (see below), so to
 represent itself it must be quoted or appear later in the list.
 .It Ic \&[\&! Ns No .. Ns Ic \&]
@@ -2017,7 +2017,7 @@ command substitutions performed in generating the
 .Ic set
 command.
 For example,
-.Ic set \&-\&- `false`; echo $?
+.Ic set \&-\&- `false`; echo $?\&
 prints 0 in
 .Tn POSIX
 mode, 1 in
@@ -2408,7 +2408,7 @@ The shell exits with the specified exit status.
 If
 .Ar status
 is not specified, the exit status is the current value of the
-.Ic \&?
+.Ic ?\&
 parameter.
 .It Xo Ic export Op Fl p
 .Op Ar parameter Ns Op \&= Ns Ar value
@@ -3066,7 +3066,7 @@ is set (see
 .Ic set
 command above for a list of options).
 As a non-standard extension, if the option starts with a
-.Ql ! ,
+.Ql \&! ,
 the test is negated; the test always fails if
 .Ar option
 doesn't exist (thus
@@ -3168,15 +3168,15 @@ arguments to
 or
 .Ic \&[ ... \&]
 is less than five; if leading
-.Ql !
+.Ql \&!
 arguments can be stripped such that only one argument remains then a string
 length test is performed (again, even if the argument is a unary operator); if
 leading
-.Ql !
+.Ql \&!
 arguments can be stripped such that three arguments remain and the second
 argument is a binary operator, then the binary operation is performed (even
 if the first argument is a unary operator, including an unstripped
-.Ql ! ) .
+.Ql \&! ) .
 .Pp
 .Sy Note:
 A common mistake is to use
diff --git a/tests/th b/tests/th
index a8ef7a9..6484286 100644
--- a/tests/th
+++ b/tests/th
@@ -1,5 +1,5 @@
-#!/usr/local/bin/perl
-#	$OpenBSD: th,v 1.9 2003/03/10 03:48:16 david Exp $
+#!/usr/bin/perl
+#	$OpenBSD: th,v 1.10 2003/09/01 05:16:46 fgsch Exp $
 
 
 #