Finish merging from head, messed up in previous attempt

5 files changed, 76 insertions, 79 deletions

diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 3f54f89..3ea88a1 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -28,7 +28,7 @@
 .\"     @(#)core.5	8.3 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd March 8, 2015
+.Dd September 2, 2015
 .Dt CORE 5
 .Os
 .Sh NAME
@@ -120,6 +120,16 @@ Compressed core files will have a suffix of
 .Ql .gz
 appended to them.
 .El
+.Sh NOTES
+Corefiles are written with open file descriptor information as an ELF note.
+By default, file paths are packed to only use as much space as needed.
+However, file paths can change at any time, including during core dump,
+and this can result in truncated file descriptor data.
+.Pp
+All file descriptor information can be preserved by disabling packing.
+This potentially wastes up to PATH_MAX bytes per open fd.
+Packing is disabled with
+.Dl sysctl kern.coredump_pack_fileinfo=0 .
 .Sh EXAMPLES
 In order to store all core images in per-user private areas under
 .Pa /var/coredumps ,
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index f6c3ffb..062ab60 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -242,6 +242,7 @@ The
 .Dq ealgo ,
 .Dq aalgo ,
 .Dq keylen ,
+.Dq notrim ,
 and
 .Dq sectorsize
 options may be passed to control those
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 4ed941c..2d74a8d 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -28,7 +28,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 29, 2012
+.Dd July 25, 2015
 .Dt PF.CONF 5
 .Os
 .Sh NAME
@@ -666,33 +666,6 @@ packet, and only the completed packet is passed on to the filter.
 The advantage is that filter rules have to deal only with complete
 packets, and can ignore fragments.
 The drawback of caching fragments is the additional memory cost.
-But the full reassembly method is the only method that currently works
-with NAT.
-This is the default behavior of a
-.Ar scrub
-rule if no fragmentation modifier is supplied.
-.It Ar fragment crop
-The default fragment reassembly method is expensive, hence the option
-to crop is provided.
-In this case,
-.Xr pf 4
-will track the fragments and cache a small range descriptor.
-Duplicate fragments are dropped and overlaps are cropped.
-Thus data will only occur once on the wire with ambiguities resolving to
-the first occurrence.
-Unlike the
-.Ar fragment reassemble
-modifier, fragments are not buffered, they are passed as soon as they
-are received.
-The
-.Ar fragment crop
-reassembly mechanism does not yet work with NAT.
-.It Ar fragment drop-ovl
-This option is similar to the
-.Ar fragment crop
-modifier except that all overlapping or duplicate fragments will be
-dropped, and all further corresponding fragments will be
-dropped as well.
 .It Ar reassemble tcp
 Statefully normalizes TCP connections.
 .Ar scrub reassemble tcp
@@ -2381,8 +2354,10 @@ Once this limit is reached, fragments that would have to be cached
 are dropped until other entries time out.
 The timeout value can also be adjusted.
 .Pp
-Currently, only IPv4 fragments are supported and IPv6 fragments
-are blocked unconditionally.
+When forwarding reassembled IPv6 packets, pf refragments them with
+the original maximum fragment size.
+This allows the sender to determine the optimal fragment size by
+path MTU discovery.
 .Sh ANCHORS
 Besides the main ruleset,
 .Xr pfctl 8
@@ -2985,8 +2960,7 @@ state-opt      = ( "max" number | "no-sync" | timeout | "sloppy" | "pflow" |
                  "overload" "\*(Lt" string "\*(Gt" [ "flush" ] |
                  "if-bound" | "floating" )
 
-fragmentation  = [ "fragment reassemble" | "fragment crop" |
-                 "fragment drop-ovl" ]
+fragmentation  = [ "fragment reassemble" ]
 
 timeout-list   = timeout [ [ "," ] timeout-list ]
 timeout        = ( "tcp.first" | "tcp.opening" | "tcp.established" |
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index ccbd9ef..5799c22 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 20, 2015
+.Dd August 23, 2015
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -4442,9 +4442,9 @@ polled at a 1-second interval.
 The default is 30.
 .It Va rctl_enable
 .Pq Vt bool
-Set to
-.Dq Li YES
-to load
+If set to
+.Dq Li YES ,
+load
 .Xr rctl 8
 rules from the defined ruleset.
 The kernel must be built with
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 90885e7..ee339cf 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 255964 2013-10-01 07:22:04Z des
+.\" from FreeBSD: head/tools/build/options/makeman 284708 2015-06-22 20:21:57Z sjg
 .\" $FreeBSD$
-.Dd June 22, 2015
+.Dd August 16, 2015
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -127,7 +127,7 @@ Set to not build
 .Xr autofs 4
 related programs, libraries, and kernel modules.
 .It Va WITH_AUTO_OBJ
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_AUTO_OBJ 284708 2015-06-22 20:21:57Z sjg
 Enable automatic creation of objdirs.
 .It Va WITHOUT_BHYVE
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BHYVE 277727 2015-01-26 06:44:48Z ngie
@@ -137,11 +137,13 @@ associated utilities, and examples.
 .Pp
 This option only affects amd64/amd64.
 .It Va WITHOUT_BINUTILS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 266158 2014-05-15 16:51:45Z brooks
-Set to not build or install binutils (as, c++-filt, gconv,
-ld, nm, objcopy, objdump, readelf, size and strip) as part
+.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 286332 2015-08-05 18:30:00Z emaste
+Set to not build or install binutils (as, ld, objcopy, and objdump ) as part
 of the normal system build.
 The resulting system cannot build programs from source.
+.Pp
+It is a default setting on
+arm64/aarch64.
 .It Va WITHOUT_BINUTILS_BOOTSTRAP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp
 Set to not build binutils (as, c++-filt, gconv,
@@ -151,6 +153,9 @@ as part of the bootstrap process.
 The option does not work for build targets unless some alternative
 toolchain is provided.
 .Ef
+.Pp
+It is a default setting on
+arm64/aarch64.
 .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.
@@ -243,7 +248,7 @@ When set, it also enforces the following options:
 Set to build the Clang C/C++ compiler during the normal phase of the build.
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, arm64/aarch64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64.
 .It Va WITHOUT_CLANG_BOOTSTRAP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 273177 2014-10-16 18:28:11Z skreuzer
 Set to not build the Clang C/C++ compiler during the bootstrap phase of the build.
@@ -258,7 +263,7 @@ mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerp
 Set to build the Clang C/C++ compiler during the bootstrap phase of the build.
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, arm64/aarch64, i386/i386 and pc98/i386.
 .It Va WITH_CLANG_EXTRAS
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim
 Set to build additional clang and llvm tools, such as bugpoint.
@@ -268,14 +273,14 @@ Set to avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of
 the Clang C/C++ compiler.
 .Pp
 It is a default setting on
-arm/arm, arm/armeb, arm/armv6, arm/armv6hf, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
 .It Va WITH_CLANG_FULL
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim
 Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the
 Clang C/C++ compiler.
 .Pp
 It is a default setting on
-amd64/amd64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, arm64/aarch64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64.
 .It Va WITHOUT_CLANG_IS_CC
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG_IS_CC 242629 2012-11-05 21:53:23Z brooks
 Set to install the GCC compiler as
@@ -295,7 +300,7 @@ and
 .Pa /usr/bin/cpp .
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, arm64/aarch64, i386/i386 and pc98/i386.
 .It Va WITHOUT_CPP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru
 Set to not build
@@ -396,7 +401,7 @@ and are located automatically by
 .\" from FreeBSD: head/tools/build/options/WITHOUT_DICT 156932 2006-03-21 07:50:50Z ru
 Set to not build the Webster dictionary files.
 .It Va WITH_DIRDEPS_CACHE
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_DIRDEPS_CACHE 284708 2015-06-22 20:21:57Z sjg
 Cache result of dirdeps.mk which can save significant time
 for subsequent builds.
 Depends on
@@ -408,6 +413,12 @@ Set to not build dma Mail Transport Agent
 .\" from FreeBSD: head/tools/build/options/WITHOUT_DOCCOMPRESS 266752 2014-05-27 15:52:27Z gjb
 Set to not to install compressed system documentation.
 Only the uncompressed version will be installed.
+.It Va WITH_DTRACE_TESTS
+.\" from FreeBSD: head/tools/build/options/WITH_DTRACE_TESTS 286174 2015-08-02 00:37:33Z markj
+Set to build and install the DTrace test suite in
+.Pa /usr/tests/cddl/usr.sbin/dtrace .
+This test suite is considered experimental on architectures other than
+amd64/amd64 and running it may cause system instability.
 .It Va WITHOUT_DYNAMICROOT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_DYNAMICROOT 156932 2006-03-21 07:50:50Z ru
 Set this if you do not want to link
@@ -429,16 +440,22 @@ and related programs.
 .It Va WITH_EISA
 .\" from FreeBSD: head/tools/build/options/WITH_EISA 264654 2014-04-18 16:53:06Z imp
 Set to build EISA kernel modules.
-.It Va WITHOUT_ELFTOOLCHAIN_TOOLS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS 276796 2015-01-07 22:02:37Z emaste
-Set to use
-.Xr addr2line 1 ,
-.Xr nm 1 ,
-.Xr size 1 ,
-.Xr strings 1 ,
-and
-.Xr strip 1
-from GNU binutils instead of the ELF Tool Chain project.
+.It Va WITHOUT_ELFCOPY_AS_OBJCOPY
+.\" from FreeBSD: head/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY 286030 2015-07-29 18:45:38Z emaste
+Set to build and install
+.Xr objcopy 1
+from GNU Binutils, instead of the one from ELF Tool Chain.
+.Pp
+It is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+.It Va WITH_ELFCOPY_AS_OBJCOPY
+.\" from FreeBSD: head/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY 286030 2015-07-29 18:45:38Z emaste
+Set to build and install ELF Tool Chain's elfcopy as
+.Xr objcopy 1 ,
+instead of the one from GNU Binutils.
+.Pp
+It is a default setting on
+arm64/aarch64.
 .It Va WITHOUT_EXAMPLES
 .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru
 Set to avoid installing examples to
@@ -462,11 +479,6 @@ and
 .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru
 Set to not build or install programs
 for operating floppy disk driver.
-.It Va WITH_FMAKE
-.\" from FreeBSD: head/tools/build/options/WITH_FMAKE 275138 2014-11-26 20:43:09Z gjb
-Causes the old FreeBSD
-.Xr make 1
-program to be built and installed as fmake.
 .It Va WITHOUT_FMTREE
 .\" from FreeBSD: head/tools/build/options/WITHOUT_FMTREE 261299 2014-01-30 21:37:43Z brooks
 Set to not build and install
@@ -503,7 +515,7 @@ Set to not build games.
 Set to not build and install gcc and g++ as part of the normal build process.
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, arm64/aarch64, i386/i386 and pc98/i386.
 .It Va WITH_GCC
 .\" from FreeBSD: head/tools/build/options/WITH_GCC 255326 2013-09-06 20:49:48Z zeising
 Set to build and install gcc and g++.
@@ -518,7 +530,7 @@ unless an alternative compiler is provided via
 XCC.
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, arm64/aarch64, i386/i386 and pc98/i386.
 .It Va WITH_GCC_BOOTSTRAP
 .\" from FreeBSD: head/tools/build/options/WITH_GCC_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp
 Set to build gcc and g++ as part of the bootstrap process.
@@ -534,6 +546,9 @@ tool.
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GDB 156932 2006-03-21 07:50:50Z ru
 Set to not build
 .Xr gdb 1 .
+.Pp
+It is a default setting on
+arm64/aarch64.
 .It Va WITHOUT_GNU
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU 174550 2007-12-12 16:43:17Z ru
 Set to not build contributed GNU software as a part of the base system.
@@ -554,7 +569,7 @@ Do not build the GNU C++ stack (g++, libstdc++).
 This is the default on platforms where clang is the system compiler.
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, arm64/aarch64, i386/i386 and pc98/i386.
 .It Va WITH_GNUCXX
 .\" from FreeBSD: head/tools/build/options/WITH_GNUCXX 255321 2013-09-06 20:08:03Z theraven
 Build the GNU C++ stack (g++, libstdc++).
@@ -861,11 +876,11 @@ Set to not build utilities for manual pages,
 .Xr manctl 8 ,
 and related support files.
 .It Va WITH_META_FILES
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_META_FILES 284708 2015-06-22 20:21:57Z sjg
 Create meta files during non META_MODE build.
 The meta files can be useful for debugging.
 .It Va WITH_META_MODE
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 284708 2015-06-22 20:21:57Z sjg
 Enable building in meta mode.
 .Pp
 The build is driven by dirdeps.mk using DIRDEPS stored in
@@ -1153,7 +1168,7 @@ Set to not build kernel modules that include sourceless microcode.
 .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru
 Set to not build world with propolice stack smashing protection.
 .It Va WITH_STAGING
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_STAGING 284708 2015-06-22 20:21:57Z sjg
 Enable staging of files to a stage tree.
 This can be best thought of as auto-install to
 .Va DESTDIR
@@ -1173,13 +1188,13 @@ is set explicitly)
 is set explicitly)
 .El
 .It Va WITH_STAGING_MAN
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_STAGING_MAN 284708 2015-06-22 20:21:57Z sjg
 Enable staging of MAN pages to stage tree.
 .It Va WITH_STAGING_PROG
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_STAGING_PROG 284708 2015-06-22 20:21:57Z sjg
 Enable staging of PROGs to stage tree.
 .It Va WITH_STALE_STAGED
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_STALE_STAGED 284708 2015-06-22 20:21:57Z sjg
 Check staged files are not stale.
 .It Va WITH_SVN
 .\" from FreeBSD: head/tools/build/options/WITH_SVN 252561 2013-07-03 12:36:47Z zeising
@@ -1200,13 +1215,8 @@ Set to disable symbol versioning when building shared libraries.
 Set to not build
 .Xr syscons 4
 support files such as keyboard maps, fonts, and screen output maps.
-.It Va WITHOUT_SYSINSTALL
-.\" from FreeBSD: head/tools/build/options/WITHOUT_SYSINSTALL 183242 2008-09-21 22:02:26Z sam
-Set to not build
-.Xr sysinstall 8
-and related programs.
 .It Va WITH_SYSROOT
-.\" $FreeBSD$
+.\" from FreeBSD: head/tools/build/options/WITH_SYSROOT 284708 2015-06-22 20:21:57Z sjg
 Enable use of sysroot during build.
 Depends on
 .Va WITH_META_MODE .
@@ -1246,6 +1256,8 @@ When set, it also enforces the following options:
 .Pp
 .Bl -item -compact
 .It
+.Va WITHOUT_DTRACE_TESTS
+.It
 .Va WITHOUT_TESTS_SUPPORT
 .El
 .It Va WITHOUT_TESTS_SUPPORT