improve markup quality in the cases found by the new "--" style message

17 files changed, 73 insertions, 74 deletions

diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 2550b46fed1..7286602d752 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: echo.1,v 1.23 2016/08/16 18:51:25 schwarze Exp $
+.\"	$OpenBSD: echo.1,v 1.24 2018/03/16 16:58:26 schwarze Exp $
 .\"	$NetBSD: echo.1,v 1.7 1995/03/21 09:04:26 cgd Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
 .\"
-.Dd $Mdocdate: August 16 2016 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt ECHO 1
 .Os
 .Sh NAME
@@ -54,7 +54,9 @@ character, to the standard
 output.
 .Pp
 When no operands are given, only the newline is written.
-The -- operand,
+The
+.Fl \-
+operand,
 which generally denotes an end to option processing,
 is treated as part of
 .Ar string .
diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1
index 1fc0e0e2f04..c70656b0c4f 100644
--- a/bin/ksh/sh.1
+++ b/bin/ksh/sh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sh.1,v 1.146 2017/12/30 07:32:09 jmc Exp $
+.\"	$OpenBSD: sh.1,v 1.147 2018/03/16 16:58:26 schwarze Exp $
 .\"
 .\" Copyright (c) 2015 Jason McIntyre <jmc@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 30 2017 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt SH 1
 .Os
 .Sh NAME
@@ -700,10 +700,10 @@ display the names and values of all shell variables.
 The options are described in the options description
 at the beginning of this manual.
 The sequence
-.Qq set -o
+.Ql set -o
 displays the current option settings;
 the sequence
-.Qq set +o
+.Ql set +o
 displays,
 in a format suitable to be reinput to the shell,
 a command suitable to achieve the current option settings.
@@ -713,10 +713,10 @@ with the special parameter
 .Sq #
 set to the number of positional parameters.
 The sequence
-.Qq set --
+.Ql set --
 indicates an end to option processing
 (i.e. only arguments follow);
-.Qq set --
+.Ql set --
 by itself unsets all positional parameters
 and sets
 .Sq #
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index 08ee3b519b5..da67fb38cf2 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vis.3,v 1.35 2015/07/20 01:52:28 millert Exp $
+.\"	$OpenBSD: vis.3,v 1.36 2018/03/16 16:58:26 schwarze 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: July 20 2015 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt VIS 3
 .Os
 .Sh NAME
@@ -187,9 +187,8 @@ Only encode
 characters.
 These are control characters which may cause common terminals to perform
 unexpected functions.
-Currently this form allows space,
-tab, newline, backspace, bell, and return -- in addition
-to all graphic characters -- unencoded.
+Currently this form allows space, tab, newline, backspace, bell,
+and return \(em in addition to all graphic characters \(em unencoded.
 .El
 .Pp
 There are three forms of encoding.
diff --git a/lib/libc/time/tzset.3 b/lib/libc/time/tzset.3
index 33bb84b2a87..e9f8e47dfe0 100644
--- a/lib/libc/time/tzset.3
+++ b/lib/libc/time/tzset.3
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: tzset.3,v 1.22 2015/11/10 20:58:20 millert Exp $
-.Dd $Mdocdate: November 10 2015 $
+.\"	$OpenBSD: tzset.3,v 1.23 2018/03/16 16:58:26 schwarze Exp $
+.Dd $Mdocdate: March 16 2018 $
 .Dt TZSET 3
 .Os
 .Sh NAME
@@ -96,10 +96,7 @@ minus
 .Pq Sq \&- ,
 plus
 .Pq Sq \&+ ,
-and
-.Tn ASCII
-.Tn NUL
-are allowed.
+and ASCII NUL are allowed.
 .It Ar offset
 Indicates the value one must add to the local time to arrive at
 Coordinated Universal Time.
@@ -129,7 +126,7 @@ summer time is assumed to be one hour ahead of standard time.
 One or more digits may be used; the value is always interpreted as a
 decimal number.
 The hour must be between zero and 24, and the minutes (and
-seconds) -- if present -- between zero and 59.
+seconds) \(em if present \(em between zero and 59.
 If preceded by a
 .Dq \&- ,
 the time zone shall be east of the Prime Meridian; otherwise it shall be
@@ -161,8 +158,8 @@ is one of the following:
 The Julian day
 .Ar n
 .Pq 1 <= Ar n No <= 365 .
-Leap days are not counted; that is, in all years -- including leap
-years -- February 28 is day 59 and March 1 is day 60.
+Leap days are not counted; that is, in all years \(em including leap
+years \(em February 28 is day 59 and March 1 is day 60.
 It is impossible to explicitly refer to the occasional February 29.
 .It Ar n
 The zero-based Julian day
diff --git a/lib/libm/man/fegetenv.3 b/lib/libm/man/fegetenv.3
index 2340b401f86..418eeec193c 100644
--- a/lib/libm/man/fegetenv.3
+++ b/lib/libm/man/fegetenv.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fegetenv.3,v 1.3 2013/06/05 03:40:26 tedu Exp $
+.\"	$OpenBSD: fegetenv.3,v 1.4 2018/03/16 16:58:26 schwarze Exp $
 .\"
 .\" Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt FEGETENV 3
 .Os
 .Sh NAME
@@ -34,14 +34,14 @@
 .Ft int
 .Fn feupdateenv "const fenv_t *envp"
 .Sh DESCRIPTION
-These functions manage the floating-point environment -- status
-flags, rounding direction modes and exception masks -- as one entity.
+These functions manage the floating-point environment \(em status
+flags, rounding direction modes and exception masks \(em as one entity.
 The
 .Fa envp
 input argument is an object representing the floating-point environment.
 The macro
 .Dv FE_DFL_ENV
-represents the default floating-point environment -- the one installed
+represents the default floating-point environment \(em the one installed
 at program startup.
 .Pp
 The
diff --git a/lib/libz/compress.3 b/lib/libz/compress.3
index bd6aa8902f3..cfac9217c79 100644
--- a/lib/libz/compress.3
+++ b/lib/libz/compress.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compress.3,v 1.18 2017/06/11 16:43:18 schwarze Exp $
+.\"	$OpenBSD: compress.3,v 1.19 2018/03/16 16:58:26 schwarze Exp $
 .\"
 .\"  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
 .\"
@@ -23,7 +23,7 @@
 .\"
 .\" This page corresponds to zlib version 1.2.3
 .\"
-.Dd $Mdocdate: June 11 2017 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt COMPRESS 3
 .Os
 .Sh NAME
@@ -1903,9 +1903,9 @@ One-time table building
 .Pp
 .Bl -tag -width Ds -offset indent -compact
 .It 12
-BUILDFIXED -- build static block decoding tables when needed
+BUILDFIXED \(em build static block decoding tables when needed
 .It 13
-DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+DYNAMIC_CRC_TABLE \(em build CRC calculation tables when needed
 .It 14,15
 0
 .Pq reserved
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 8635b18bcfb..21415124332 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: exports.5,v 1.23 2016/01/08 20:26:54 zhuk Exp $
+.\"	$OpenBSD: exports.5,v 1.24 2018/03/16 16:58:26 schwarze Exp $
 .\"	$NetBSD: exports.5,v 1.9 1996/02/18 11:57:50 fvdl Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
 .\"
-.Dd $Mdocdate: January 8 2016 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt EXPORTS 5
 .Os
 .Sh NAME
@@ -271,7 +271,7 @@ Regarding
 .Fl alldirs ,
 because NFS mount filehandles are filesystem wide the
 .Fl alldirs
-option applies to exports of the entire filesystem -- even mountpoints
+option applies to exports of the entire filesystem \(em even mountpoints
 that are higher up elsewhere in the directory hierarchy.
 Hence if the server has a filesystem
 .Pa /export
diff --git a/share/man/man4/cz.4 b/share/man/man4/cz.4
index c28369039ce..e2029f7be4f 100644
--- a/share/man/man4/cz.4
+++ b/share/man/man4/cz.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cz.4,v 1.12 2013/07/16 16:05:48 schwarze Exp $
+.\"	$OpenBSD: cz.4,v 1.13 2018/03/16 16:58:26 schwarze Exp $
 .\"	$NetBSD: cz.4,v 1.3 2001/06/12 14:46:11 wiz Exp $
 .\"
 .\" Copyright (c) 2000 Zembu Labs, Inc.
@@ -32,7 +32,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.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt CZ 4
 .Os
 .Sh NAME
@@ -61,13 +61,13 @@ in board local RAM or host RAM.
 The Cyclades-Z comes in three basic flavors:
 .Bl -bullet -offset indent
 .It
-Cyclades-8Zo rev. 1 -- This is an older 8-port board with no FPGA.
+Cyclades-8Zo rev. 1 \(em This is an older 8-port board with no FPGA.
 The serial ports are provided by an octopus cable.
 .It
-Cyclades-8Zo rev. 2 -- This is the newer 8-port board.
+Cyclades-8Zo rev. 2 \(em This is the newer 8-port board.
 The serial ports are provided by an octopus cable.
 .It
-Cyclades-Ze -- This is the expandable version of the Cyclades-Z.
+Cyclades-Ze \(em This is the expandable version of the Cyclades-Z.
 It uses an HD-50 SCSI cable to connect the board to a 1U rack mountable serial
 expansion box.
 Each box has 16 RJ45 serial ports, and up to 4 boxes may be chained together,
diff --git a/share/man/man4/man4.hppa/pdc.4 b/share/man/man4/man4.hppa/pdc.4
index 88a0ba862d0..d122ed11016 100644
--- a/share/man/man4/man4.hppa/pdc.4
+++ b/share/man/man4/man4.hppa/pdc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pdc.4,v 1.9 2013/01/17 21:54:18 jmc Exp $
+.\" $OpenBSD: pdc.4,v 1.10 2018/03/16 16:58:26 schwarze Exp $
 .\"
 .\" Copyright (c) 2004 Michael Shalayeff
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 17 2013 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt PDC 4 hppa
 .Os
 .Sh NAME
@@ -158,7 +158,8 @@ The cache configuration word is formatted as follows:
 .It Sy "bit" Ta Sy "len" Ta Sy "contents"
 .It "0" Ta "12" Ta "reserved"
 .It "13" Ta "3" Ta "set 1 if coherent operation supported"
-.It "16" Ta "2" Ta "flush mode: 0 -- fdc & fic; 1 -- fdc; 2 -- fic; 3 -- either"
+.It "16" Ta "2" Ta "flush mode: 0 \(em fdc & fic; 1 \(em fdc;\
+ 2 \(em fic; 3 \(em either"
 .It "18" Ta "1" Ta "write-thru D-cache if set"
 .It "19" Ta "2" Ta "reserved"
 .It "21" Ta "3" Ta "cache line size"
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index def706b29dd..9ef493cf6d0 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.256 2018/03/02 09:53:20 jmc Exp $
+.\"	$OpenBSD: options.4,v 1.257 2018/03/16 16:58:26 schwarze Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -34,7 +34,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: March 2 2018 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -263,8 +263,8 @@ Processors with a small kernel address space, such as the sun4 and sun4c, do
 not have enough kernel memory to support soft updates.
 Attempts to use this option with these CPUs will cause a kernel hang or panic
 after a short period of use as the kernel will quickly run out of memory.
-This is not related to the amount of physical memory present in the machine --
-it is a limitation of the CPU architecture itself.
+This is not related to the amount of physical memory present in the
+machine \(em it is a limitation of the CPU architecture itself.
 .It Cd option FIFO
 Adds support for
 .At V
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index 3c032ae81e2..798cec772b0 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: at.1,v 1.54 2018/01/31 16:46:13 millert Exp $
+.\" $OpenBSD: at.1,v 1.55 2018/03/16 16:58:26 schwarze Exp $
 .\"
 .\" Copyright (C) 1993, 1994  Thomas Koenig
 .\" Copyright (C) 1993  David Parsons
@@ -24,7 +24,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.
 .\"
-.Dd $Mdocdate: January 31 2018 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt AT 1
 .Os
 .Sh NAME
@@ -196,7 +196,7 @@ or
 .Pp
 The year may be given as two or four digits.
 If the year is given as two digits, it is taken to occur as soon as
-possible in the future, which may be in the next century --
+possible in the future, which may be in the next century \(em
 unless it's last year, in which case it's considered to be
 a typo.
 .Pp
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 2aa5df2b619..edd3d90390c 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fstat.1,v 1.55 2017/05/10 09:09:45 sthen Exp $
+.\"	$OpenBSD: fstat.1,v 1.56 2018/03/16 16:58:26 schwarze 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: May 10 2017 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt FSTAT 1
 .Os
 .Sh NAME
@@ -131,7 +131,7 @@ If the file number is followed by an asterisk
 .Pq Ql * ,
 the file is not an inode, but rather a socket, or there is an error.
 In this case the remainder of the line doesn't
-correspond to the remaining headers -- the format of the line
+correspond to the remaining headers \(em the format of the line
 is described later under
 .Sx SOCKETS .
 .It Li MOUNT
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index ca72056c05e..74cd0b459fa 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: getopt.1,v 1.18 2014/01/19 09:15:08 schwarze Exp $
+.\"	$OpenBSD: getopt.1,v 1.19 2018/03/16 16:58:26 schwarze Exp $
 .\"
 .\" This material, written by Henry Spencer, was released by him
 .\" into the public domain and is thus not subject to any copyright.
 .\"
-.Dd $Mdocdate: January 19 2014 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt GETOPT 1
 .Os
 .Sh NAME
@@ -92,7 +92,9 @@ Written by Henry Spencer, working from a Bell Labs manual page.
 Behavior believed identical to the Bell version.
 .Sh CAVEATS
 Note that the construction
-.Sy set -- `getopt optstring $*`
+.Pp
+.Dl set -- `getopt optstring $*`
+.Pp
 is not recommended, as the exit value from
 .Sy set
 will prevent the exit value from
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 54a34f77ca0..9ce35065463 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail.1,v 1.78 2017/05/29 12:50:33 jmc Exp $
+.\"	$OpenBSD: mail.1,v 1.79 2018/03/16 16:58:26 schwarze Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)mail.1	8.8 (Berkeley) 4/28/95
 .\"
-.Dd $Mdocdate: May 29 2017 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt MAIL 1
 .Os
 .Sh NAME
@@ -358,7 +358,7 @@ the recipient is treated as a local or network mail address.
 Each command is typed on a line by itself, and may take arguments
 following the command word.
 The command need not be typed in its
-entirety -- the first command which matches the typed prefix is used.
+entirety \(em the first command which matches the typed prefix is used.
 For commands which take message lists as arguments, if no message
 list is given, then the next message forward which satisfies the
 command's requirements is used.
@@ -559,8 +559,7 @@ Takes a message list and invokes the pager on that list.
 .Pq Ic n
 (like
 .Ic +
-or
-.Tn CR )
+or CR)
 Goes to the next message in sequence and types it.
 With an argument list, types the next matching message.
 .It Ic preserve
diff --git a/usr.bin/rcs/rcs.1 b/usr.bin/rcs/rcs.1
index 8c15f31fc4a..12d312f55d7 100644
--- a/usr.bin/rcs/rcs.1
+++ b/usr.bin/rcs/rcs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcs.1,v 1.60 2017/10/17 22:47:58 schwarze Exp $
+.\"	$OpenBSD: rcs.1,v 1.61 2018/03/16 16:58:26 schwarze Exp $
 .\"
 .\" Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
 .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
@@ -24,7 +24,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 17 2017 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt RCS 1
 .Os
 .Sh NAME
@@ -448,8 +448,8 @@ for more information.
 .Xr rlog 1
 .Rs
 .%A Tichy, Walter F.
-.%T "RCS -- a system for version control"
-.%J "Software--Practice & Experience"
+.%T "RCS \(em a system for version control"
+.%J "Software \(em Practice & Experience"
 .%V 15:7
 .%D July, 1985
 .%P pp. 637-654
diff --git a/usr.bin/stat/stat.1 b/usr.bin/stat/stat.1
index 94b9172f39f..a1100da673f 100644
--- a/usr.bin/stat/stat.1
+++ b/usr.bin/stat/stat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stat.1,v 1.22 2014/11/15 14:41:02 bentley Exp $
+.\"	$OpenBSD: stat.1,v 1.23 2018/03/16 16:58:26 schwarze Exp $
 .\"	$NetBSD: stat.1,v 1.11 2003/05/08 13:07:10 wiz Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 15 2014 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt STAT 1
 .Os
 .Sh NAME
@@ -256,7 +256,7 @@ output formats.
 It can be one of the following:
 .Bl -tag -width Ds
 .It Cm H
-High -- specifies the major number for devices from
+High \(em specifies the major number for devices from
 .Cm r
 or
 .Cm d ,
@@ -267,7 +267,7 @@ the file type bits from the numeric forms of
 and the long output form of
 .Cm T .
 .It Cm L
-Low -- specifies the minor number for devices from
+Low \(em specifies the minor number for devices from
 .Cm r
 or
 .Cm d ,
@@ -283,7 +283,7 @@ style output character for file type when used with
 .Cm L
 for this is optional).
 .It Cm M
-Middle -- specifies the group bits for permissions from the
+Middle \(em specifies the group bits for permissions from the
 string output form of
 .Cm p ,
 or the
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 0e813580e41..910ea79b3a1 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnet.1,v 1.62 2015/11/13 21:09:18 jmc Exp $
+.\"	$OpenBSD: telnet.1,v 1.63 2018/03/16 16:58:26 schwarze Exp $
 .\"	$NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)telnet.1	8.4 (Berkeley) 2/3/94
 .\"
-.Dd $Mdocdate: November 13 2015 $
+.Dd $Mdocdate: March 16 2018 $
 .Dt TELNET 1
 .Os
 .Sh NAME
@@ -611,8 +611,7 @@ This sequence causes the remote system to discard all previously typed
 This sequence is sent as TCP urgent
 data (and may not work if the remote system is a
 .Bx 4.2
-system -- if
-it doesn't work, a lower case
+system \(em if it doesn't work, a lower case
 .Sq r
 may be echoed on the terminal).
 .It Ic do Ar cmd