More correction of section 3 layout. directory->opendir, fts->fts_open,

getcap->cgetent.  pwcache->user_from_uid. And then repair references.
ok jmc

24 files changed, 99 insertions, 122 deletions

diff --git a/bin/chmod/chflags.1 b/bin/chmod/chflags.1
index 7f14b9510bf..1046154f153 100644
--- a/bin/chmod/chflags.1
+++ b/bin/chmod/chflags.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chflags.1,v 1.18 2018/08/25 15:18:34 anton Exp $
+.\"	$OpenBSD: chflags.1,v 1.19 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: chflags.1,v 1.4 1995/08/31 22:50:22 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
 .\"
-.Dd $Mdocdate: August 25 2018 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -173,7 +173,7 @@ command's actions are determined by the last one specified.
 .Xr ls 1 ,
 .Xr chflags 2 ,
 .Xr stat 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr securelevel 7 ,
 .Xr symlink 7 ,
 .Xr dump 8
diff --git a/bin/chmod/chgrp.1 b/bin/chmod/chgrp.1
index 2b0a5ecd0c8..47363ad7f33 100644
--- a/bin/chmod/chgrp.1
+++ b/bin/chmod/chgrp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chgrp.1,v 1.17 2015/12/31 23:38:16 guenther Exp $
+.\"	$OpenBSD: chgrp.1,v 1.18 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"     from: @(#)chgrp.1	8.3 (Berkeley) 3/31/94
 .\"
-.Dd $Mdocdate: December 31 2015 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt CHGRP 1
 .Os
 .Sh NAME
@@ -127,7 +127,7 @@ group ID file
 .Ex -std chgrp
 .Sh SEE ALSO
 .Xr chown 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr group 5 ,
 .Xr passwd 5 ,
 .Xr symlink 7 ,
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index c0bfa378967..64cdd1f1d62 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chmod.1,v 1.42 2017/06/07 09:41:57 jmc Exp $
+.\"	$OpenBSD: chmod.1,v 1.43 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: chmod.1,v 1.8 1995/03/21 09:02:07 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
 .\"
-.Dd $Mdocdate: June 7 2017 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt CHMOD 1
 .Os
 .Sh NAME
@@ -354,7 +354,7 @@ Set the group bits equal to the user bits, but clear the group write bit:
 .Xr chmod 2 ,
 .Xr stat 2 ,
 .Xr umask 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr setmode 3 ,
 .Xr symlink 7 ,
 .Xr chown 8 ,
diff --git a/bin/chmod/chown.8 b/bin/chmod/chown.8
index d7ff3056c47..b66c8bcaf9d 100644
--- a/bin/chmod/chown.8
+++ b/bin/chmod/chown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.8,v 1.21 2017/05/28 08:03:36 awolk Exp $
+.\"	$OpenBSD: chown.8,v 1.22 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)chown.8	8.3 (Berkeley) 3/31/94
 .\"
-.Dd $Mdocdate: May 28 2017 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt CHOWN 8
 .Os
 .Sh NAME
@@ -141,7 +141,7 @@ Only the superuser is permitted to change the owner of a file.
 .Xr chgrp 1 ,
 .Xr find 1 ,
 .Xr chown 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr symlink 7
 .Sh STANDARDS
 The
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 9565ad49108..367301ff43e 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cp.1,v 1.40 2019/01/28 18:58:42 jca Exp $
+.\"	$OpenBSD: cp.1,v 1.41 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: cp.1,v 1.9 1995/07/25 19:36:45 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: January 28 2019 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt CP 1
 .Os
 .Sh NAME
@@ -232,7 +232,7 @@ directory:
 .Sh SEE ALSO
 .Xr mv 1 ,
 .Xr umask 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr symlink 7
 .Sh STANDARDS
 The
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index 40314d3688e..4578bb42912 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: symlink.7,v 1.20 2018/12/07 23:21:31 schwarze Exp $
+.\"	$OpenBSD: symlink.7,v 1.21 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: symlink.7,v 1.4 1996/04/25 15:44:56 mycroft Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
 .\"
-.Dd $Mdocdate: December 7 2018 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt SYMLINK 7
 .Os
 .Sh NAME
@@ -458,6 +458,6 @@ options.
 .Xr rename 2 ,
 .Xr symlink 2 ,
 .Xr unlink 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr remove 3 ,
 .Xr chown 8
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index e57059e3ec1..a2526a36392 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rm.1,v 1.43 2018/03/31 20:49:12 schwarze Exp $
+.\"	$OpenBSD: rm.1,v 1.44 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: rm.1,v 1.8 1995/07/25 19:37:30 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\"
-.Dd $Mdocdate: March 31 2018 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt RM 1
 .Os
 .Sh NAME
@@ -140,7 +140,7 @@ $ rm ./-f
 .Xr rmdir 1 ,
 .\" .Xr undelete 2 ,
 .Xr unlink 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr symlink 7
 .Sh STANDARDS
 The
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 9c16943ac3c..cf36ead40e9 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.81 2019/08/11 15:48:08 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.82 2019/09/02 21:18:40 deraadt Exp $
 
 # gen sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/gen ${LIBCSRCDIR}/gen
@@ -36,9 +36,9 @@ SRCS+=  alarm.c assert.c auth_subr.c authenticate.c \
 
 MAN+=	__tfork_thread.3 alarm.3 auth_subr.3 authenticate.3 basename.3 clock.3 \
 	clock_getcpuclockid.3 confstr.3 \
-	ctermid.3 daemon.3 devname.3 directory.3 dirname.3 err.3 \
-	execv.3 fabs.3 fnmatch.3 fpclassify.3 fpgetmask.3 frexp.3 ftok.3 fts.3 \
-	ftw.3 getbsize.3 getcap.3 getcwd.3 getdomainname.3 getdiskbyname.3 \
+	ctermid.3 daemon.3 devname.3 opendir.3 dirname.3 err.3 \
+	execv.3 fabs.3 fnmatch.3 fpclassify.3 fpgetmask.3 frexp.3 ftok.3 fts_open.3 \
+	ftw.3 getbsize.3 cgetent.3 getcwd.3 getdomainname.3 getdiskbyname.3 \
 	getfsent.3 getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \
 	getmntinfo.3 getnetgrent.3 getpagesize.3 getpass.3 getprogname.3 \
 	getpwent.3 getpwnam.3 \
@@ -49,7 +49,7 @@ MAN+=	__tfork_thread.3 alarm.3 auth_subr.3 authenticate.3 basename.3 clock.3 \
 	popen.3 posix_spawn.3 posix_spawn_file_actions_addopen.3 \
 	posix_spawn_file_actions_init.3 posix_spawnattr_getflags.3 \
 	posix_spawnattr_getpgroup.3 posix_spawnattr_init.3 \
-	psignal.3 pw_dup.3 pwcache.3 raise.3 readpassphrase.3 \
+	psignal.3 pw_dup.3 user_from_uid.3 raise.3 readpassphrase.3 \
 	scandir.3 setjmp.3 setmode.3 setproctitle.3 shm_open.3 \
 	siginterrupt.3 signal.3 \
 	sigaddset.3 sigwait.3 sleep.3 statvfs.3 sysconf.3 strtofflags.3 \
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/cgetent.3
index d1db1e887e4..212241e1333 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/cgetent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcap.3,v 1.38 2015/11/10 23:48:18 jmc Exp $
+.\"	$OpenBSD: cgetent.3,v 1.1 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 10 2015 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt CGETENT 3
 .Os
 .Sh NAME
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts_open.3
index 2c7d8061455..4b03a613eef 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts_open.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fts.3,v 1.36 2016/06/28 17:25:08 millert Exp $
+.\"	$OpenBSD: fts_open.3,v 1.1 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
 .\"
-.Dd $Mdocdate: June 28 2016 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt FTS_OPEN 3
 .Os
 .Sh NAME
@@ -54,8 +54,7 @@
 .Ft int
 .Fn fts_close "FTS *ftsp"
 .Sh DESCRIPTION
-The
-.Nm fts
+These
 functions are provided for traversing
 .Ux
 file hierarchies.
@@ -64,9 +63,7 @@ The
 function returns a
 .Dq handle
 on a file hierarchy, which is then supplied to
-the other
-.Nm fts
-functions.
+the other functions.
 The function
 .Fn fts_read
 returns a pointer to a structure describing one of the files in the file
@@ -249,9 +246,7 @@ Note that while
 .Fa fts_level
 cannot hold a number of levels greater than
 .Dv FTS_MAXLEVEL ,
-the
-.Nm fts
-functions themselves are not limited to a fixed number
+the functions themselves are not limited to a fixed number
 of levels.
 Application code that inspects
 .Fa fts_level
@@ -280,15 +275,11 @@ Otherwise, the contents of the
 field are undefined.
 .It Fa fts_number
 This field is provided for the use of the application program and is
-not modified by the
-.Nm fts
-functions.
+not modified by the functions.
 It is initialized to 0.
 .It Fa fts_pointer
 This field is provided for the use of the application program and is
-not modified by the
-.Nm fts
-functions.
+not modified by the functions.
 It is initialized to
 .Dv NULL .
 .It Fa fts_parent
@@ -384,9 +375,7 @@ followed immediately whether or not
 .Dv FTS_LOGICAL
 is also specified.
 .It Dv FTS_LOGICAL
-This option causes the
-.Nm fts
-routines to return
+This option causes the routines to return
 .Li FTSENT
 structures for the targets of symbolic links
 instead of the symbolic links themselves.
@@ -403,16 +392,14 @@ be provided to the
 .Fn fts_open
 function.
 .It Dv FTS_NOCHDIR
-As a performance optimization, the
-.Nm fts
-functions change directories as they walk the file hierarchy.
+As a performance optimization, the functions change directories as they walk
+the file hierarchy.
 This has the side-effect that an application cannot rely on being
 in any particular directory during the traversal.
 The
 .Dv FTS_NOCHDIR
-option turns off this optimization, and the
-.Nm fts
-functions will not change the current directory.
+option turns off this optimization, and the functions will not change
+the current directory.
 Note that applications should not themselves change their current directory
 and try to access files unless
 .Dv FTS_NOCHDIR
@@ -426,9 +413,7 @@ structures reference file characteristic information (the
 .Fa statp
 field) for each file visited.
 This option relaxes that requirement as a performance optimization,
-allowing the
-.Nm fts
-functions to set the
+allowing the functions to set the
 .Fa fts_info
 field to
 .Dv FTS_NSOK
@@ -436,9 +421,7 @@ and leave the contents of the
 .Fa statp
 field undefined.
 .It Dv FTS_PHYSICAL
-This option causes the
-.Nm fts
-routines to return
+This option causes the routines to return
 .Li FTSENT
 structures for symbolic links themselves instead
 of the target files they point to.
@@ -462,16 +445,12 @@ any files named
 or
 .Dq ..
 encountered in the file hierarchy are ignored.
-This option causes the
-.Nm fts
-routines to return
+This option causes the routines to return
 .Li FTSENT
 structures for them.
 .It Dv FTS_XDEV
-This option prevents
-.Nm fts
-from descending into directories that have a different device number
-than the file from which the descent began.
+This option prevents from descending into directories that have
+a different device number than the file from which the descent began.
 .El
 .Pp
 The
@@ -772,9 +751,7 @@ is empty.
 .Xr stat 2 ,
 .Xr qsort 3
 .Sh HISTORY
-The
-.Nm fts
-functions first appeared in
+These functions first appeared in
 .Bx 4.3 Reno .
 The interface was revised in
 .Bx 4.4 .
diff --git a/lib/libc/gen/ftw.3 b/lib/libc/gen/ftw.3
index 3548b035ebd..6c344a31827 100644
--- a/lib/libc/gen/ftw.3
+++ b/lib/libc/gen/ftw.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftw.3,v 1.13 2019/01/25 00:19:25 millert Exp $
+.\"	$OpenBSD: ftw.3,v 1.14 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 2003 Todd C. Miller <millert@openbsd.org>
 .\"
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: January 25 2019 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt FTW 3
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .Bf -symbolic
 These functions are provided for compatibility with legacy code.
 New code should use the
-.Xr fts 3
+.Xr fts_open 3
 functions.
 .Ef
 .Pp
@@ -195,7 +195,7 @@ only, greater than
 .Xr close 2 ,
 .Xr open 2 ,
 .Xr stat 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr malloc 3 ,
 .Xr opendir 3 ,
 .Xr readdir 3
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/opendir.3
index f892c4a9b88..1b5ac656782 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/opendir.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: directory.3,v 1.25 2017/09/18 15:57:02 millert Exp $
+.\"	$OpenBSD: opendir.3,v 1.1 2019/09/02 21:18:41 deraadt 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: September 18 2017 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt OPENDIR 3
 .Os
 .Sh NAME
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index ae26b417ddb..13f58e2b9b7 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scandir.3,v 1.14 2015/02/28 21:51:57 bentley Exp $
+.\"	$OpenBSD: scandir.3,v 1.15 2019/09/02 21:18:41 deraadt 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: February 28 2015 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt SCANDIR 3
 .Os
 .Sh NAME
@@ -96,8 +96,8 @@ Returns \-1 if the directory cannot be opened for reading or if
 .Xr malloc 3
 cannot allocate enough memory to hold all the data structures.
 .Sh SEE ALSO
-.Xr directory 3 ,
 .Xr malloc 3 ,
+.Xr opendir 3 ,
 .Xr qsort 3 ,
 .Xr dir 5
 .Sh STANDARDS
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/user_from_uid.3
index 1f37c035560..88c6a09d0f5 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/user_from_uid.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwcache.3,v 1.15 2018/09/13 16:50:54 jmc Exp $
+.\"	$OpenBSD: user_from_uid.3,v 1.1 2019/09/02 21:18:41 deraadt 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: September 13 2018 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt USER_FROM_UID 3
 .Os
 .Sh NAME
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index a757a20bfa1..5b45675a958 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dump.8,v 1.52 2018/06/07 11:37:21 jmc Exp $
+.\"	$OpenBSD: dump.8,v 1.53 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)dump.8	8.1 (Berkeley) 6/16/93
 .\"
-.Dd $Mdocdate: June 7 2018 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt DUMP 8
 .Os
 .Sh NAME
@@ -436,7 +436,7 @@ Many, and verbose.
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr stty 1 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr rcmd 3 ,
 .Xr st 4 ,
 .Xr fstab 5 ,
@@ -472,7 +472,7 @@ even if listed in
 .Pp
 When dumping a list of files or subdirectories, access privileges are
 required to scan the directory (as this is done via the
-.Xr fts 3
+.Xr fts_open 3
 routines rather than directly accessing the filesystem).
 .Pp
 It would be nice if
diff --git a/share/man/man5/login.conf.5 b/share/man/man5/login.conf.5
index 54b8b58bee7..e45c2984e06 100644
--- a/share/man/man5/login.conf.5
+++ b/share/man/man5/login.conf.5
@@ -30,10 +30,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: login.conf.5,v 1.65 2019/01/06 17:34:08 jmc Exp $
+.\" $OpenBSD: login.conf.5,v 1.66 2019/09/02 21:18:41 deraadt Exp $
 .\" BSDI $From: login.conf.5,v 2.20 2000/06/26 14:50:38 prb Exp $
 .\"
-.Dd $Mdocdate: January 6 2019 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt LOGIN.CONF 5
 .Os
 .Sh NAME
@@ -82,7 +82,7 @@ must be run after each edit of
 to keep the database version in sync with the plain file.
 .Sh CAPABILITIES
 Refer to
-.Xr getcap 3
+.Xr cgetent 3
 for a description of the file layout.
 All entries in the
 .Nm
@@ -291,7 +291,7 @@ environment variable will contain the shell specified in the password file.
 Interpolate/expands records from corresponding
 .Pa login.conf .
 See
-.Xr getcap 3 .
+.Xr cgetent 3 .
 .\"
 .Pp
 .It term Ta string Ta Dv su Ta
@@ -917,7 +917,7 @@ Login class capability database.
 .Xr login 1 ,
 .Xr auth_subr 3 ,
 .Xr authenticate 3 ,
-.Xr getcap 3 ,
+.Xr cgetent 3 ,
 .Xr login_cap 3 ,
 .Xr passwd 5 ,
 .Xr ttys 5 ,
diff --git a/share/man/man5/spamd.conf.5 b/share/man/man5/spamd.conf.5
index db7742afc8d..9274b29d74f 100644
--- a/share/man/man5/spamd.conf.5
+++ b/share/man/man5/spamd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamd.conf.5,v 1.22 2018/07/22 17:09:43 jmc Exp $
+.\"	$OpenBSD: spamd.conf.5,v 1.23 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" Copyright (c) 2003 Bob Beck
@@ -24,7 +24,7 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 22 2018 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt SPAMD.CONF 5
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@ and tarpitted.
 .Pp
 .Nm
 follows the syntax of configuration databases as documented in
-.Xr getcap 3 .
+.Xr cgetent 3 .
 Here is an example:
 .Bd -literal -offset indent
 all:\e
@@ -172,7 +172,7 @@ If the
 .Ar msg
 string is enclosed in double quotes, the characters in the quoted string
 are escaped as specified in
-.Xr getcap 3
+.Xr cgetent 3
 with the exception that a colon (:) is allowed in the quoted string.
 The resulting string is used as the message.
 Alternatively, if the
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 3fe6fa093d2..9db0e94cc55 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cap_mkdb.1,v 1.20 2015/12/04 19:15:54 jmc Exp $
+.\"	$OpenBSD: cap_mkdb.1,v 1.21 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: cap_mkdb.1,v 1.4 1995/03/26 03:59:36 glass Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)cap_mkdb.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: December 4 2015 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt CAP_MKDB 1
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@
 .Sh DESCRIPTION
 .Nm
 builds a hashed database out of the
-.Xr getcap 3
+.Xr cgetent 3
 logical database constructed by the concatenation of the specified
 files.
 .Pp
@@ -53,7 +53,7 @@ The database is named by the basename of the first file argument and
 the string
 .Dq .db .
 The
-.Xr getcap 3
+.Xr cgetent 3
 routines can access the database in this form much more quickly
 than they can the original text file(s).
 .Pp
@@ -96,6 +96,6 @@ name.
 .Sh EXIT STATUS
 .Ex -std cap_mkdb
 .Sh SEE ALSO
+.Xr cgetent 3 ,
 .Xr dbopen 3 ,
-.Xr getcap 3 ,
 .Xr termcap 5
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 61f20c99112..5df49530d4d 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: du.1,v 1.34 2014/10/19 18:24:58 jmc Exp $
+.\"	$OpenBSD: du.1,v 1.35 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: du.1,v 1.6 1996/10/18 07:20:31 thorpej Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
 .\"
-.Dd $Mdocdate: October 19 2014 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt DU 1
 .Os
 .Sh NAME
@@ -149,7 +149,7 @@ option is specified.
 .Ex -std du
 .Sh SEE ALSO
 .Xr df 1 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr symlink 7 ,
 .Xr quot 8
 .Sh STANDARDS
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index fb8385291f7..2b7d87a567d 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: find.1,v 1.97 2019/08/23 12:48:14 kn Exp $
+.\"	$OpenBSD: find.1,v 1.98 2019/09/02 21:18:41 deraadt Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\"	from: @(#)find.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: August 23 2019 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt FIND 1
 .Os
 .Sh NAME
@@ -593,7 +593,7 @@ or
 .Xr which 1 ,
 .Xr xargs 1 ,
 .Xr stat 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr glob 7 ,
 .Xr symlink 7
 .Sh STANDARDS
diff --git a/usr.bin/getcap/getcap.1 b/usr.bin/getcap/getcap.1
index 307e3a81edc..338829bbb84 100644
--- a/usr.bin/getcap/getcap.1
+++ b/usr.bin/getcap/getcap.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcap.1,v 1.5 2019/01/25 00:19:26 millert Exp $
+.\"	$OpenBSD: getcap.1,v 1.6 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 2005 Todd C. Miller <millert@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: January 25 2019 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt GETCAP 1
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@ utility provides a simple method for querying a capability database such as
 or
 .Pa /etc/printcap
 and as described by
-.Xr getcap 3 .
+.Xr cgetent 3 .
 .Pp
 The following query types are supported:
 .Bl -tag -width "capability"
@@ -55,7 +55,7 @@ query instead.
 .It string
 A string capability (key=value).
 Note that the value printed has escape sequences expanded: see
-.Xr getcap 3
+.Xr cgetent 3
 for a list of valid escape sequences.
 To print the string exactly as it is listed in the
 capabilities database, use a
@@ -90,7 +90,7 @@ which must include the type as the last character, e.g.\&
 for the string
 .Sq foo .
 See
-.Xr getcap 3
+.Xr cgetent 3
 for more information on capability types.
 .It Fl f Ar path
 A colon-separated list of database filenames to be searched for records.
@@ -164,7 +164,7 @@ as a boolean flag instead of a key/value pair.
 .Dl "$ getcap -f /etc/printcap -a -b lp=/dev/lp"
 .Sh SEE ALSO
 .Xr cap_mkdb 1 ,
-.Xr getcap 3 ,
+.Xr cgetent 3 ,
 .Xr login.conf 5 ,
 .Xr printcap 5 ,
 .Xr termcap 5
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index e58da5a253e..2a245780bff 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mtree.8,v 1.40 2019/08/30 23:15:49 jmc Exp $
+.\"	$OpenBSD: mtree.8,v 1.41 2019/09/02 21:18:41 deraadt Exp $
 .\"	$NetBSD: mtree.8,v 1.4 1995/03/07 21:26:25 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mtree.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: August 30 2019 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt MTREE 8
 .Os
 .Sh NAME
@@ -338,7 +338,7 @@ distribution.
 .Xr cksum 1 ,
 .Xr md5 1 ,
 .Xr stat 2 ,
-.Xr fts 3 ,
+.Xr fts_open 3 ,
 .Xr MD5Init 3 ,
 .Xr RMD160Init 3 ,
 .Xr SHA1Init 3 ,
diff --git a/usr.sbin/npppd/npppd/npppd-users.5 b/usr.sbin/npppd/npppd/npppd-users.5
index 0b7a00b4c4a..e79472ff91b 100644
--- a/usr.sbin/npppd/npppd/npppd-users.5
+++ b/usr.sbin/npppd/npppd/npppd-users.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: npppd-users.5,v 1.8 2019/02/20 17:47:12 denis Exp $
+.\"	$OpenBSD: npppd-users.5,v 1.9 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
 .\"
@@ -15,7 +15,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" The following requests are required for all man pages.
 .\"
-.Dd $Mdocdate: February 20 2019 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt NPPPD-USERS 5
 .Os
 .Sh NAME
@@ -27,7 +27,7 @@ The
 file describes
 the various attributes of users.
 Refer to
-.Xr getcap 3
+.Xr cgetent 3
 for a description of the file layout.
 Each entry in the database is used to describe one user.
 The record name is the username.
@@ -38,7 +38,7 @@ The following attributes can be specified:
 User's password.
 Some characters are needed to be represented by the escape sequence.
 See
-.Xr getcap 3
+.Xr cgetent 3
 for the escape sequence.
 .It framed-ip-address Ta
 IPv4 address to be assigned for the user.
@@ -63,7 +63,7 @@ hana:\\
     :framed-ip-address=192.168.0.102:
 .Ed
 .Sh SEE ALSO
-.Xr getcap 3 ,
+.Xr cgetent 3 ,
 .Xr npppd.conf 5 ,
 .Xr npppd 8
 .Sh BUGS
diff --git a/usr.sbin/sensorsd/sensorsd.conf.5 b/usr.sbin/sensorsd/sensorsd.conf.5
index 84e4053abcc..897fbc4d594 100644
--- a/usr.sbin/sensorsd/sensorsd.conf.5
+++ b/usr.sbin/sensorsd/sensorsd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sensorsd.conf.5,v 1.27 2018/01/12 04:36:45 deraadt Exp $
+.\"	$OpenBSD: sensorsd.conf.5,v 1.28 2019/09/02 21:18:41 deraadt Exp $
 .\"
 .\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
 .\" Copyright (c) 2005 Matthew Gream <matthew.gream@pobox.com>
@@ -16,7 +16,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: January 12 2018 $
+.Dd $Mdocdate: September 2 2019 $
 .Dt SENSORSD.CONF 5
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@ executed.
 .Pp
 .Nm
 follows the syntax of configuration databases as documented in
-.Xr getcap 3 .
+.Xr cgetent 3 .
 Sensors may be specified by their full
 .Va hw.sensors
 .Xr sysctl 8
@@ -171,7 +171,7 @@ drive:command=/etc/sensorsd/drive %n
 timedelta:istatus	#ignore status changes for timedelta
 .Ed
 .Sh SEE ALSO
-.Xr getcap 3 ,
+.Xr cgetent 3 ,
 .Xr bio 4 ,
 .Xr ipmi 4 ,
 .Xr sensorsd 8 ,