6 files changed, 36 insertions, 25 deletions
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index c2714e6799a..ae26b417ddb 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scandir.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
+.\"	$OpenBSD: scandir.3,v 1.14 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1983, 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: June 5 2013 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SCANDIR 3
 .Os
 .Sh NAME
@@ -38,7 +38,12 @@
 .In sys/types.h
 .In dirent.h
 .Ft int
-.Fn scandir "const char *dirname" "struct dirent ***namelist" "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" "int \*(lp*compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp"
+.Fo scandir
+.Fa "const char *dirname"
+.Fa "struct dirent ***namelist"
+.Fa "int (*select)(const struct dirent *)"
+.Fa "int (*compar)(const struct dirent **, const struct dirent **)"
+.Fc
 .Ft int
 .Fn alphasort "const struct dirent **d1" "const struct dirent **d2"
 .Sh DESCRIPTION
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index 0d8ce59a8b8..36f0942715f 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: re_format.7,v 1.20 2014/12/09 15:37:14 schwarze Exp $
+.\"	$OpenBSD: re_format.7,v 1.21 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)re_format.7	8.3 (Berkeley) 3/20/94
 .\"
-.Dd $Mdocdate: December 9 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt RE_FORMAT 7
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ and then discusses differences between them and basic regular expressions.
 An ERE is one** or more non-empty**
 .Em branches ,
 separated by
-.Sq \*(Ba .
+.Sq | .
 It matches anything that matches one of the branches.
 .Pp
 A branch is one** or more
@@ -510,11 +510,11 @@ times.
 If the comma is also omitted, then it matches exactly
 .Ar n
 times.
-.It \*(Ba
+.It |
 Used to separate patterns.
 For example,
 the pattern
-.Sq cat\*(Badog
+.Sq cat|dog
 matches either
 .Sq cat
 or
@@ -524,7 +524,7 @@ or
 Basic regular expressions differ in several respects:
 .Bl -bullet -offset 3n
 .It
-.Sq \*(Ba ,
+.Sq | ,
 .Sq + ,
 and
 .Sq ?\&
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 10e4a2cd9db..76a260f78ea 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.3,v 1.71 2015/01/13 14:02:30 schwarze Exp $
+.\"	$OpenBSD: printf.3,v 1.72 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: January 13 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt PRINTF 3
 .Os
 .Sh NAME
@@ -451,7 +451,7 @@ The
 .Li double
 argument is rounded and converted in the style
 .Sm off
-.Pf [\-]d Cm \&. No ddd Cm e No \*(Pmdd
+.Pf [\-]d Cm \&. No ddd Cm e No \(+-dd
 .Sm on
 where there is one digit before the
 decimal-point character
@@ -542,7 +542,7 @@ The
 .Li double
 argument is rounded and converted to hexadecimal notation in the style
 .Sm off
-.Pf [\-]0xh Cm \&. No hhh Cm p No [\*(Pm]d
+.Pf [\-]0xh Cm \&. No hhh Cm p No [\(+-]d
 .Sm on
 where the number of digits after the hexadecimal-point character
 is equal to the precision specification.
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index 29d151a683a..ab969a9a61f 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tmpnam.3,v 1.20 2015/01/13 14:02:30 schwarze Exp $
+.\"	$OpenBSD: tmpnam.3,v 1.21 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1988, 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: January 13 2015 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt TMPFILE 3
 .Os
 .Sh NAME
@@ -60,7 +60,7 @@ reference to it is closed.
 Since
 .Xr mkstemp 3
 creates the file with mode
-.Dv S_IRUSR \*(Ba S_IWUSR ,
+.Dv S_IRUSR | S_IWUSR ,
 after the unlink,
 .Xr fchown 2
 and
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index 6eaa1b3363e..aeaf5c9d124 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getrusage.2,v 1.16 2014/12/10 07:16:58 guenther Exp $
+.\"	$OpenBSD: getrusage.2,v 1.17 2015/02/28 21:51:57 bentley Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt GETRUSAGE 2
 .Os
 .Sh NAME
@@ -88,7 +88,9 @@ of the process(es).
 .It Fa ru_maxrss
 the maximum resident set size utilized (in kilobytes).
 .It Fa ru_ixrss
-an \*(lqintegral\*(rq value indicating the amount of memory used
+an
+.Dq integral
+value indicating the amount of memory used
 by the text segment
 that was also shared among other processes.
 This value is expressed in units of kilobytes * ticks-of-execution.
@@ -102,13 +104,16 @@ stack segment of a process (expressed in units of
 kilobytes * ticks-of-execution).
 .It Fa ru_minflt
 the number of page faults serviced without any I/O activity; here
-I/O activity is avoided by \*(lqreclaiming\*(rq a page frame from
+I/O activity is avoided by
+.Dq reclaiming
+a page frame from
 the list of pages awaiting reallocation.
 .It Fa ru_majflt
 the number of page faults serviced that required I/O activity.
 .It Fa ru_nswap
-the number of times a process was \*(lqswapped\*(rq out of main
-memory.
+the number of times a process was
+.Dq swapped
+out of main memory.
 .It Fa ru_inblock
 the number of times the file system had to perform input.
 .It Fa ru_oublock
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 10f48fe68a7..cb62cb4c5f6 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: socket.2,v 1.38 2014/08/31 01:42:36 guenther Exp $
+.\"	$OpenBSD: socket.2,v 1.39 2015/02/28 21:51:57 bentley Exp $
 .\"	$NetBSD: socket.2,v 1.5 1995/02/27 12:37:53 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)socket.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: August 31 2014 $
+.Dd $Mdocdate: February 28 2015 $
 .Dt SOCKET 2
 .Os
 .Sh NAME
@@ -114,7 +114,8 @@ Normally only a single protocol exists to support a particular
 socket type within a given protocol family.
 However, it is possible that many protocols may exist,
 in which case a particular protocol must be specified in this manner.
-The protocol number to use is particular to the \*(lqcommunication domain\*(rq
+The protocol number to use is particular to the
+.Dq communication domain
 in which communication is to take place; see
 .Xr protocols 5 .
 A value of 0 for