Merge from CheriBSD:

commit 70b8f0c127db6b80411789d237b403cc64a93573
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date:   Mon Jan 27 22:53:57 2014 +0000

    Move mtree.5 to usr.sbin/nmtree.
    Remove note that mtree 2.0 format files aren't supported.

MFC after:	4 weeks
Sponsored by:	DARPA, AFRL

3 files changed, 2 insertions, 9 deletions

diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 7b08b7e..e73815a 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -6,7 +6,7 @@
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
 PROG=	fmtree
-MAN=	fmtree.8 mtree.5
+MAN=	fmtree.8
 SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
 SRCS+=	specspec.c
 
diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile
index f5c38b5..9d24c0c 100644
--- a/usr.sbin/nmtree/Makefile
+++ b/usr.sbin/nmtree/Makefile
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../contrib/mtree
 
 PROG=		mtree
-MAN=		mtree.8
+MAN=		mtree.5 mtree.8
 SRCS=		compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
 		only.c spec.c specspec.c verify.c
 LDADD+=		-lmd -lutil
diff --git a/usr.sbin/mtree/mtree.5 b/usr.sbin/nmtree/mtree.5
index 92bf3f8..afcdae8 100644
--- a/usr.sbin/mtree/mtree.5
+++ b/usr.sbin/nmtree/mtree.5
@@ -259,13 +259,6 @@ The
 entry format was added by
 .Nx .
 .Sh BUGS
-The
-.Fx
-implementation of mtree does not currently support
-the
-.Nm
-2.0
-format.
 The requirement for a
 .Dq #mtree
 signature line is new and not yet widely implemented.