6 files changed, 2 insertions, 54 deletions

diff --git a/share/doc/papers/contents/contents.ms b/share/doc/papers/contents/contents.ms
index f2e68f6ee86e..bc57cbbbb2a0 100644
--- a/share/doc/papers/contents/contents.ms
+++ b/share/doc/papers/contents/contents.ms
@@ -144,20 +144,6 @@ Revised February 2, 1989.
 
 .sp
 .IP
-.tl '\fBMemory Based Filesystem''memfs\fP'
-.if \n(.U \{\
-.br
-.>> <a href="memfs.html">memfs.html</a>
-.\}
-.QP
-A Pageable Memory Based Filesystem.
-.sp
-Marshall Kirk McKusick, Michael J. Karels, Keith Bostic.
-.sp
-Revised 1990.
-
-.sp
-.IP
 .tl '\fBFilesystem Interface''fsinterface\fP'
 .if \n(.U \{\
 .br
diff --git a/share/doc/papers/memfs/Makefile b/share/doc/papers/memfs/Makefile
deleted file mode 100644
index 358d543e6a8a..000000000000
--- a/share/doc/papers/memfs/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
-# $FreeBSD$
-
-VOLUME=	papers
-DOC=	memfs
-SRCS=	tmac.srefs paper.t
-MACROS=	-ms
-CLEANFILES=A.gt paper.t ref.bib.i
-SRCDIR=	${.OBJDIR}	# ack!
-
-A.gt: A.t
-	${GRIND} < ${.ALLSRC} > ${.TARGET}
-
-paper.t: 0.t 1.t ref.bib.i A.gt
-	${REFER} -n -e -l -s -p ${.CURDIR}/ref.bib ${.ALLSRC:Nref.bib.i} \
-	    > ${.TARGET}
-
-ref.bib.i: ref.bib
-	${INDXBIB} -c ${.CURDIR}/../../../../contrib/groff/src/utils/indxbib/eign \
-	    -o ref.bib ${.ALLSRC}
-
-.include <bsd.doc.mk>
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 40bd50147553..dcf10e0be2ed 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -86,7 +86,7 @@ The system can support various filesystem types.
 Only the root, /usr, and /tmp filesystems need be statically
 compiled into the kernel; 
 everything else will be automatically loaded at mount
-time.  (Exception: the UFS family - FFS, MFS, and LFS cannot
+time.  (Exception: the UFS family - FFS and LFS cannot
 currently be demand-loaded.)  Some people still prefer to statically
 compile other filesystems as well.
 .Bl -tag -width indent -offset indent
@@ -94,10 +94,6 @@ compile other filesystems as well.
 a local
 .Tn UNIX
 filesystem
-.It Em mfs 
-a local memory-based 
-.Tn UNIX
-filesystem
 .It Em nfs 
 a Sun Microsystems compatible ``Network File System''
 .It Em swap 
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index f68c93dfd161..3a545f2719d2 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -445,13 +445,6 @@ Set to
 if you want to ignore
 .Xr amd 8
 mounts when comparing against yesterdays filesystem mounts.
-.It Va daily_status_security_nomfs
-.Pq Vt bool
-Set to
-.Dq YES
-if you want to ignore
-.Xr mfs 8
-mounts when comparing against yesterdays filesystem mounts.
 .It Va daily_status_mail_rejects_enable
 .Pq Vt bool
 Set to
@@ -616,7 +609,6 @@ is shared or distributed.
 .Xr ac 8 ,
 .Xr chkgrp 8 ,
 .Xr dump 8 ,
-.Xr mfs 8 ,
 .Xr newsyslog 8 ,
 .Xr periodic 8
 .Sh HISTORY
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 2b91e28ae578..e401ccba5407 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -294,10 +294,6 @@ C include files for UFS (The U-word File System)
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa ffs/
 Fast filesystem
-.It Pa mfs/
-memory file system;
-see
-.Xr mount_mfs 8
 .It Pa ufs/
 UFS filesystem
 .El
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index e91a5147e595..9aec55ac83f9 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -50,7 +50,7 @@ enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
  * and should NEVER be inspected by the kernel.
  */
 enum vtagtype	{
-	VT_NON, VT_UFS, VT_NFS, VT_MFS, VT_PC, VT_LFS, VT_LOFS, VT_FDESC,
+	VT_NON, VT_UFS, VT_NFS, VT_UNUSED, VT_PC, VT_LFS, VT_LOFS, VT_FDESC,
 	VT_PORTAL, VT_NULL, VT_UMAP, VT_KERNFS, VT_PROCFS, VT_AFS, VT_ISOFS,
 	VT_UNION, VT_MSDOSFS, VT_DEVFS, VT_TFS, VT_VFS, VT_CODA, VT_NTFS,
 	VT_HPFS, VT_NWFS, VT_PSEUDOFS