8 files changed, 69 insertions, 19 deletions
diff --git a/share/man/man5/ar.5 b/share/man/man5/ar.5
index 1c1d79b..ca9f96d 100644
--- a/share/man/man5/ar.5
+++ b/share/man/man5/ar.5
@@ -70,7 +70,7 @@ file attributes associated with the member.
 An archive header describes the file attributes for the archive member that
 follows it.
 The
-.Xr ar 5
+.Nm
 format only supports a limited number of attributes: the file name,
 the file creation time stamp, the uid and gid of the creator, the file
 mode and the file size.
diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index b8016db..ca62377 100644
--- a/share/man/man5/devfs.rules.5
+++ b/share/man/man5/devfs.rules.5
@@ -90,7 +90,8 @@ configuration file.
 .It Pa /etc/devfs.rules
 Local
 .Nm
-configuration file. Rulesets in here override those in
+configuration file.
+Rulesets in here override those in
 .Pa /etc/defaults/devfs.rules
 with the same ruleset number, otherwise the two files are effectively merged.
 .El
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index a72eed6..42e6b2c 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -1308,5 +1308,5 @@ This manual page was written by
 .An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 with inspiration from BSDi's
 .Bsx
-.Xr elf 5
+.Nm
 manpage.
diff --git a/share/man/man5/nandfs.5 b/share/man/man5/nandfs.5
index 230989e..7e89599 100644
--- a/share/man/man5/nandfs.5
+++ b/share/man/man5/nandfs.5
@@ -109,7 +109,8 @@ partition at the specified mount point during system boot.
 .Xr umount_nandfs 8
 .Sh HISTORY
 The NAND FS concepts are based on NILFS principles and initial implementation
-was derived from early read-only NILFS NetBSD code. Since then the NAND FS
+was derived from early read-only NILFS NetBSD code.
+Since then the NAND FS
 code diverged significantly and is by no means compatible with NILFS.
 .Pp
 The NAND Flash file system first appeared in
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index b1fbbd4..ec5d94c 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -33,7 +33,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 25, 2013
+.Dd June 6, 2016
 .Dt NSSWITCH.CONF 5
 .Os
 .Sh NAME
@@ -148,7 +148,9 @@ The following databases are used by the following C library functions:
 .Xr getprotoent 3
 .It netgroup
 .Xr getnetgrent 3 ,
+.Xr getnetgrent_r 3 ,
 .Xr setnetgrent 3 ,
+.Xr endnetgrent 3 ,
 .Xr innetgr 3
 .El
 .Ss Status codes
@@ -221,7 +223,7 @@ and continue on anything else (i.e,
 You can enable caching for the particular database by specifying
 .Dq cache
 as the first source in the
-.Xr nsswitch.conf 5
+.Nm
 file.
 You should also enable caching for this database in
 .Xr nscd.conf 5 .
diff --git a/share/man/man5/quota.user.5 b/share/man/man5/quota.user.5
index c314b65..0bcc591 100644
--- a/share/man/man5/quota.user.5
+++ b/share/man/man5/quota.user.5
@@ -98,7 +98,8 @@ utility will truncate the data files to the minimum size needed
 to store the highest id with either non-zero file usage or
 non-zero quota limits.
 .Pp
-The data record for id 0 has special meaning.  If the
+The data record for id 0 has special meaning.
+If the
 .Dq Dv dqb_btime
 or
 .Dq Dv dbq_itime
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index ae4972e..2ce3a0e 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 30, 2016
+.Dd June 8, 2016
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -189,7 +189,8 @@ to this directory before running the service.
 Run the service under this user account.
 .It Ao Ar name Ac Ns Va _group
 .Pq Vt str
-Run the chrooted service under this system group. Unlike the _user
+Run the chrooted service under this system group.
+Unlike the _user
 setting, this setting has no effect if the service is not chrooted.
 .It Ao Ar name Ac Ns Va _fib
 .Pq Vt int
@@ -944,7 +945,8 @@ interface is desired,
 .Va pflog_instances
 is set to the list of
 .Xr pflogd 8
-instances that should be started at system boot time. If
+instances that should be started at system boot time.
+If
 .Va pflog_instances
 is set, for each whitespace-seperated
 .Ar element
@@ -983,11 +985,13 @@ This variable contains additional flags passed to the
 program.
 .It Va ftpproxy_instances
 .Pq Vt str
-Empty by default. If multiple instances of
+Empty by default.
+If multiple instances of
 .Xr ftp-proxy 8
 are desired at boot time,
 .Va ftpproxy_instances
-should contain a whitespace-seperated list of instance names. For each
+should contain a whitespace-seperated list of instance names.
+For each
 .Ar element
 in the list, a variable named
 .Ao Ar element Ac Ns Va _flags
@@ -1203,12 +1207,12 @@ Note that the maximum number of the generated addresses from a range
 specification is limited to an integer value specified in
 .Va netif_ipexpand_max
 in
-.Xr rc.conf 5
+.Nm
 because a small typo can unexpectedly generate a large number of addresses.
 The default value is
 .Li 2048 .
 It can be increased by adding the following line into
-.Xr rc.conf 5 :
+.Nm :
 .Bd -literal
 netif_ipexpand_max="4096"
 .Ed
@@ -2559,6 +2563,22 @@ is set to
 these are the flags to pass to the
 .Xr ypbind 8
 service.
+.It Va nis_ypldap_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+run the
+.Xr ypldap 8
+daemon at system boot time.
+.It Va nis_ypldap_flags
+.Pq Vt str
+If
+.Va nis.ypldap_enable
+is set to
+.Dq Li YES ,
+these are the flags to pass to the
+.Xr ypldap 8
+daemon.
 .It Va nis_ypset_enable
 .Pq Vt bool
 If set to
@@ -3880,7 +3900,7 @@ all configured jails in
 are stopped in reverse order.
 .It Va jail_* variables
 Note that older releases supported per-jail configuration via
-.Xr rc.conf 5
+.Nm
 variables.
 For example,
 hostname of a jail named
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 2e5dfce..c88f9a0 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 292283 2015-12-15 18:42:30Z bdrewery
 .\" $FreeBSD$
-.Dd June 5, 2016
+.Dd June 14, 2016
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -190,6 +190,24 @@ as part of the bootstrap process.
 .Pp
 It is a default setting on
 amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+.It Va WITHOUT_BLACKLIST
+.\" from FreeBSD: head/tools/build/options/WITHOUT_BLACKLIST 301554 2016-06-07 16:35:55Z lidl
+Set this if you do not want to build blacklistd / blacklistctl.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_BLACKLIST_SUPPORT
+.El
+.It Va WITHOUT_BLACKLIST_SUPPORT
+.\" from FreeBSD: head/tools/build/options/WITHOUT_BLACKLIST_SUPPORT 301554 2016-06-07 16:35:55Z lidl
+Set to build some programs without blacklistd support, like
+.Xr fingerd 8 ,
+.Xr ftpd 8 ,
+.Xr rlogind 8 ,
+.Xr rshd 8 ,
+and
+.Xr sshd 8 .
 .It Va WITHOUT_BLUETOOTH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru
 Set to not build Bluetooth related kernel modules, programs and libraries.
@@ -1062,7 +1080,7 @@ Set to not build utilities for manual pages,
 .Xr manctl 8 ,
 and related support files.
 .It Va WITH_META_MODE
-.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 301474 2016-06-05 23:14:06Z bdrewery
+.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 301889 2016-06-14 16:20:25Z bdrewery
 Creates
 .Xr make 1
 meta files when building, which can provide a reliable incremental build when
@@ -1071,9 +1089,13 @@ using
 The meta file is created in the OBJDIR as
 .Pa target.meta .
 These meta files track the command ran, its output, and the current directory.
-When the
+The
 .Xr filemon 4
-module is loaded, any files used by the commands executed will be tracked as
+module is required unless
+.Va NO_FILEMON
+is defined.
+When the module is loaded, any files used by the commands executed will be
+tracked as
 dependencies for the target in its meta file.
 The target will be considered out-of-date and rebuilt if any of the following
 are true compared to the last build:
@@ -1101,6 +1123,9 @@ The meta files can also be useful for debugging.
 The build will hide commands ran unless
 .Va NO_SILENT
 is defined.
+Errors will cause
+.Xr make 1
+to show some of its environment for further debugging.
 .Pp
 The build operates as it normally would otherwise.
 This option originally invoked a different build system but that was renamed