CVS commit: src/doc

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Wed Sep 13 23:06:17 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
Note veriexec(4) supported fingerprint algorithms change


To generate a diff of this commit:
cvs rdiff -u -r1.2313 -r1.2314 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2313 src/doc/CHANGES:1.2314
--- src/doc/CHANGES:1.2313	Tue Sep 12 10:05:37 2017
+++ src/doc/CHANGES	Wed Sep 13 23:06:17 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2313 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2314 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -58,3 +58,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	tcpdump(8): Import 4.9.2. [christos 20170908]
 	veriexecgen(8): drop support for MD5, SHA1, RMD160. [sevan 20170909]
 	itesio(4): Add support IT8728GF and IT877[12]E [hauke 20170814]
+	veriexec(4): drop support for VERIFIED_EXEC_FP_MD5, VERIFIED_EXEC_FP_SHA1,
+		and VERIFIED_EXEC_FP_RMD160 options. [sevan 20170913]

CVS commit: src

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Wed Sep 13 22:24:46 UTC 2017

Modified Files:
src/share/man/man4: options.4
src/share/man/man8: veriexec.8
src/sys/arch/acorn26/conf: GENERIC
src/sys/arch/acorn32/conf: GENERIC
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL
src/sys/arch/amigappc/conf: GENERIC NULL
src/sys/arch/arc/conf: GENERIC
src/sys/arch/bebox/conf: GENERIC
src/sys/arch/cats/conf: GENERIC
src/sys/arch/cesfic/conf: GENERIC
src/sys/arch/cobalt/conf: GENERIC
src/sys/arch/dreamcast/conf: G1IDE GENERIC
src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 CUBOX CUBOX-I DUOVERO
GENERIC.common GUMSTIX HPT5325 IMX6UL-STARTER MARVELL_NAS
MMNET_GENERIC MPCSA_GENERIC MV2120 NITROGEN6X OPENBLOCKS_A6
OPENBLOCKS_AX3 OVERO PEPPER SHEEVAPLUG
src/sys/arch/evbarm64/conf: A64EMUL
src/sys/arch/evbmips/conf: GDIUM LOONGSON SBMIPS
src/sys/arch/ews4800mips/conf: GENERIC
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcmips/conf: GENERIC
src/sys/arch/hpcsh/conf: GENERIC
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC
src/sys/arch/ibmnws/conf: GENERIC
src/sys/arch/iyonix/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/luna68k/conf: GENERIC INSTALL
src/sys/arch/mac68k/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC GENERIC_601
src/sys/arch/mipsco/conf: GENERIC
src/sys/arch/mmeye/conf: GENERIC MMEYE_WLF
src/sys/arch/mvme68k/conf: GENERIC
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/news68k/conf: GENERIC
src/sys/arch/newsmips/conf: GENERIC
src/sys/arch/next68k/conf: GENERIC
src/sys/arch/ofppc/conf: GENERIC
src/sys/arch/playstation2/conf: GENERIC
src/sys/arch/pmax/conf: GENERIC GENERIC64
src/sys/arch/prep/conf: GENERIC
src/sys/arch/rs6000/conf: GENERIC
src/sys/arch/sandpoint/conf: GENERIC
src/sys/arch/sbmips/conf: GENERIC
src/sys/arch/sgimips/conf: GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x
src/sys/arch/shark/conf: GENERIC
src/sys/arch/sparc/conf: GENERIC KRUPS
src/sys/arch/sparc64/conf: GENERIC
src/sys/arch/sun2/conf: GENERIC
src/sys/arch/sun3/conf: GENERIC GENERIC3X
src/sys/arch/vax/conf: GENERIC VAX780
src/sys/arch/x68k/conf: GENERIC
src/sys/conf: files
src/sys/kern: kern_veriexec.c

Log Message:
Remove support for VERIFIED_EXEC_FP_RMD160, VERIFIED_EXEC_FP_SHA1, and 
VERIFIED_EXEC_FP_MD5 options.
These algorithms are either broken or on their way to being broken.

Discussed on tech-security
http://mail-index.netbsd.org/tech-security/2017/08/21/msg000936.html

ok riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.473 -r1.474 src/share/man/man4/options.4
cvs rdiff -u -r1.6 -r1.7 src/share/man/man8/veriexec.8
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/acorn26/conf/GENERIC
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.376 -r1.377 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.464 -r1.465 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.316 -r1.317 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/amiga/conf/INSTALL
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/cesfic/conf/GENERIC
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/dreamcast/conf/G1IDE
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/CUBOX
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/DUOVERO
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/IMX6UL-STARTER
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.11 -r

CVS commit: src/share/man/man8

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Wed Sep 13 22:15:25 UTC 2017

Modified Files:
src/share/man/man8: veriexec.8

Log Message:
Add missing VERIFIED_EXEC_FP_SHA384 option.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man8/veriexec.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man8/veriexec.8
diff -u src/share/man/man8/veriexec.8:1.5 src/share/man/man8/veriexec.8:1.6
--- src/share/man/man8/veriexec.8:1.5	Sun Aug 27 23:20:54 2017
+++ src/share/man/man8/veriexec.8	Wed Sep 13 22:15:25 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: veriexec.8,v 1.5 2017/08/27 23:20:54 sevan Exp $
+.\" $NetBSD: veriexec.8,v 1.6 2017/09/13 22:15:25 sevan Exp $
 .\"
 .\" Copyright (c) 2008 Elad Efrat 
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 28, 2017
+.Dd September 13, 2017
 .Dt VERIEXEC 8
 .Os
 .Sh NAME
@@ -73,6 +73,7 @@ pseudo-device veriexec
 Additionally, one or more options for digital fingerprint algorithm support:
 .Bd -literal -offset indent
 options VERIFIED_EXEC_FP_SHA256
+options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
 .Ed
 .Pp

CVS commit: src/sys/dev/i2c

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Sep 13 21:15:12 UTC 2017

Modified Files:
src/sys/dev/i2c: adm1021.c

Log Message:
MAX6642 does not have lower limit registers


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/i2c/adm1021.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/i2c/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.13 src/sys/dev/i2c/adm1021.c:1.14
--- src/sys/dev/i2c/adm1021.c:1.13	Fri Sep  1 20:11:59 2017
+++ src/sys/dev/i2c/adm1021.c	Wed Sep 13 21:15:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: adm1021.c,v 1.13 2017/09/01 20:11:59 macallan Exp $ */
+/*	$NetBSD: adm1021.c,v 1.14 2017/09/13 21:15:11 macallan Exp $ */
 /*	$OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $	*/
 
 /*
@@ -27,7 +27,7 @@
  *   company/revision reg  XX   X   X XX
  *   no negative temps XX   X   X 
  *   11-bit remote temp X   X   X  X
- *   no low limits   X
+ *   no low limits   X X
  *   therm (high) limitsX   X  X
  *
  * Registers 0x00 to 0x0f have separate read/write addresses, but
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.13 2017/09/01 20:11:59 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.14 2017/09/13 21:15:11 macallan Exp $");
 
 #include 
 #include 
@@ -236,6 +236,7 @@ admtemp_setflags(struct admtemp_softc *s
 		}
 		if (strcmp("max6642", ia->ia_compat[i]) == 0) {
 			sc->sc_noneg = 0;
+			sc->sc_nolow = 1;
 			strlcpy(name, "MAX6642", ADMTEMP_NAMELEN);
 			return;
 		}
@@ -263,7 +264,7 @@ admtemp_setflags(struct admtemp_softc *s
 		 */
 		if (*comp == *rev) {		
 			sc->sc_therm = 0;	/* */
-			sc->sc_ext11 = 1;
+			sc->sc_nolow = 1;
 			strlcpy(name, "MAX6642", ADMTEMP_NAMELEN);
 		} else {
 			strlcpy(name, "MAX1617A", ADMTEMP_NAMELEN);

CVS commit: [jdolecek-ncq] src/sys/dev/ata

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Sep 13 19:55:12 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq

Log Message:
two more - mvsata MVSATA_WITHOUTDMA seems to be broken, and latest channel lock
changes introduced panic in mi_switch() on code paths which kpause/tsleep


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/sys/dev/ata/TODO.ncq

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.40 src/sys/dev/ata/TODO.ncq:1.1.2.41
--- src/sys/dev/ata/TODO.ncq:1.1.2.40	Mon Sep 11 22:31:42 2017
+++ src/sys/dev/ata/TODO.ncq	Wed Sep 13 19:55:12 2017
@@ -2,6 +2,12 @@ Bugs
 
 test wd* at umass?, confirm the ata_channel kludge works
 
+mvsata - resest MVSATA_WITHOUTDMA
+
+the changes to lock channel lock cause now mi_switch() with spinlock held
+when invoking ata_delay() (which calls kpause()) or on tsleep, need
+to refactor
+
 Other random notes (do outside the NCQ branch):
 -
 do biodone() in wddone() starting the dump to not leak bufs when dumping from

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Sep 13 15:43:04 UTC 2017

Modified Files:
src/doc: 3RDPARTY

Log Message:
gdb-8.0.1 out.


To generate a diff of this commit:
cvs rdiff -u -r1.1470 -r1.1471 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1470 src/doc/3RDPARTY:1.1471
--- src/doc/3RDPARTY:1.1470	Fri Sep  8 14:01:46 2017
+++ src/doc/3RDPARTY	Wed Sep 13 15:43:04 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1470 2017/09/08 14:01:46 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1471 2017/09/13 15:43:04 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -483,7 +483,7 @@ Before importing a new version of extern
 
 Package:	gdb
 Version:	7.12
-Current Vers:	8.0
+Current Vers:	8.0.1
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gdb/
 Home Page:	http://www.gnu.org/software/gdb/

CVS commit: src/sys/arch/m68k/include

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Wed Sep 13 09:55:35 UTC 2017

Modified Files:
src/sys/arch/m68k/include: fenv.h

Log Message:
The __fgetenv() macro operates on a fenv_t, not on a fenv_t *.
Fixes a segfault in fegetenv() and feholdexcept().


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/include/fenv.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/m68k/include/fenv.h
diff -u src/sys/arch/m68k/include/fenv.h:1.6 src/sys/arch/m68k/include/fenv.h:1.7
--- src/sys/arch/m68k/include/fenv.h:1.6	Wed Mar 22 23:11:09 2017
+++ src/sys/arch/m68k/include/fenv.h	Wed Sep 13 09:55:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: fenv.h,v 1.6 2017/03/22 23:11:09 chs Exp $	*/
+/*	$NetBSD: fenv.h,v 1.7 2017/09/13 09:55:35 phx Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -210,7 +210,7 @@ fesetround(int __round)
 __fenv_static inline int
 fegetenv(fenv_t *__envp)
 {
-	__fgetenv(__envp);
+	__fgetenv(*__envp);
 
 	return 0;
 }
@@ -220,7 +220,7 @@ feholdexcept(fenv_t *__envp)
 {
 	fexcept_t __fpcr, __fpsr;
 
-	__fgetenv(__envp);
+	__fgetenv(*__envp);
 	__fpsr = __envp->fpsr & ~FE_ALL_EXCEPT;
 	__set_fpsr(__fpsr);	/* clear all */
 	__fpcr = __envp->fpcr & ~(FE_ALL_EXCEPT << 6);

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Sep 13 08:26:38 UTC 2017

Modified Files:
src/share/man/man4: options.4

Log Message:
Improve wording.


To generate a diff of this commit:
cvs rdiff -u -r1.472 -r1.473 src/share/man/man4/options.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.472 src/share/man/man4/options.4:1.473
--- src/share/man/man4/options.4:1.472	Wed Sep 13 08:24:23 2017
+++ src/share/man/man4/options.4	Wed Sep 13 08:26:38 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.472 2017/09/13 08:24:23 wiz Exp $
+.\"	$NetBSD: options.4,v 1.473 2017/09/13 08:26:38 wiz Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -175,7 +175,7 @@ instances.
 .Ss Compatibility Options
 Note that compatibility options for older
 .Nx
-releases includes on the support for newer releases as well.
+releases includes support for newer releases as well.
 This means that typically only one of these is necessary, with the
 .Cd COMPAT_09
 option enabling all
@@ -337,7 +337,7 @@ Enable binary compatibility with
 This allows the use of old
 .Xr ptrace 2
 calls for the SH3 platform.
-It also enables old
+It also enables the old
 .Xr mount 2
 system call that did not include the data length parameter.
 The power_event_t structure's pev_switch is filled in.

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Sep 13 08:24:24 UTC 2017

Modified Files:
src/share/man/man4: options.4

Log Message:
Remove Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.471 -r1.472 src/share/man/man4/options.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.471 src/share/man/man4/options.4:1.472
--- src/share/man/man4/options.4:1.471	Wed Sep 13 00:34:48 2017
+++ src/share/man/man4/options.4	Wed Sep 13 08:24:23 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.471 2017/09/13 00:34:48 mrg Exp $
+.\"	$NetBSD: options.4,v 1.472 2017/09/13 08:24:23 wiz Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -241,9 +241,7 @@ read/write.
 This functionality was replaced by
 .Xr i386_iopl 2
 post 1.1.
-On the
-.Tn Atari
-port, the location of the disk label was moved after 1.1.
+On the Atari port, the location of the disk label was moved after 1.1.
 When the
 .Em COMPAT_11
 option is set, the kernel will read (pre) 1.1 style disk labels as a
@@ -381,7 +379,7 @@ and
 types as 32 bit, and all the associated kernel interface changes.
 It also enables old
 .Xr gpio 4
-and 
+and
 .Xr rnd 4
 interfaces.
 .It Cd options COMPAT_60
@@ -432,18 +430,14 @@ compatibility with 32 bit Linux binaries
 For now this is limited to running i386 ELF Linux binaries on amd64.
 .It Cd options COMPAT_SUNOS
 On those architectures that support it, this enables binary
-compatibility with
-.Tn SunOS 4.1
-applications built for the same architecture.
+compatibility with SunOS 4.1 applications built for the same architecture.
 This currently includes the sparc, sparc64 and most or all m68k ports.
 Note that the sparc64 requires the
 .Em COMPAT_NETBSD32
 option for 64-bit kernels, in addition to this option.
 .It Cd options COMPAT_ULTRIX
 On those architectures that support it, this enables binary
-compatibility with
-.Tn ULTRIX
-applications built for the same architecture.
+compatibility with ULTRIX applications built for the same architecture.
 This currently is limited to the pmax.
 The functionality of this option is unknown.
 .It Cd options COMPAT_FREEBSD
@@ -458,13 +452,9 @@ compatibility with iBCS2 or SVR3 applica
 This is currently limited to the i386 and vax ports.
 .It Cd options COMPAT_OSF1
 On those architectures that support it, this enables binary
-compatibility with
-.Tn Digital
+compatibility with Digital
 .Ux
-.Po
-formerly
-.Tn OSF/1
-.Pc
+(formerly OSF/1)
 applications built for the same architecture.
 This is currently limited to the alpha port.
 .It Cd options COMPAT_NOMID
@@ -490,10 +480,10 @@ This is currently limited to the sparc64
 .It Cd options COMPAT_AOUT_M68K
 On m68k architectures which have switched to ELF,
 this enables binary compatibility with
-.Nx Ns Tn /m68k
+.Nx Ns /m68k
 .Xr a.out 5
 executables on
-.Nx Ns Tn /m68k
+.Nx Ns /m68k
 ELF kernels.
 This handles alignment incompatibility of m68k ABI between
 a.out and ELF which causes the structure padding differences.
@@ -828,37 +818,26 @@ See
 .Xr mount_mfs 8
 for details.
 .It Cd file-system NFS
-Include the client side of the Network File System
-.Pq Tn NFS
+Include the client side of the Network File System (NFS)
 remote file sharing protocol.
-Although the bulk of the code implementing
-.Tn NFS
+Although the bulk of the code implementing NFS
 is kernel based, several user level daemons are needed for it to work.
 See
 .Xr mount_nfs 8
 for details.
 .It Cd file-system CD9660
-Includes code for the
-.Tn ISO
-9660 + Rock Ridge file system, which is the standard file system on many
-.Tn CD-ROM
-discs.
-Useful primarily if you have a
-.Tn CD-ROM
-drive.
+Includes code for the ISO 9660 + Rock Ridge file system, which is
+the standard file system on many CD-ROM discs.
+Useful primarily if you have a CD-ROM drive.
 See
 .Xr mount_cd9660 8
 for details.
 .It Cd file-system MSDOSFS
-Includes the
-.Tn MS-DOS
-FAT file system, which is reportedly still used
+Includes the MS-DOS FAT file system, which is reportedly still used
 by unfortunate people who have not heard about
 .Nx .
-Also implements the
-.Tn Windows 95
-extensions to the same, which permit the use of longer, mixed case
-file names.
+Also implements the Windows 95 extensions to the same, which permit
+the use of longer, mixed case file names.
 See
 .Xr mount_msdos 8
 and
@@ -866,9 +845,7 @@ and
 for details.
 .It Cd file-system NTFS
 .Bq Em EXPERIMENTAL
-Includes code for the
-.Tn Microsoft Windows NT
-file system.
+Includes code for the Microsoft Windows NT file system.
 See
 .Xr mount_ntfs 8
 for details.
@@ -957,9 +934,9 @@ for details.
 Includes code for the union file system, which permits directories to
 be mounted on top of each other in such a way that both file systems
 remain visible -- this permits tricks like allowing writing (and the
-deleting of files) on a read-