diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 0e57e7f2192f..27b5885240b6 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -39,14 +39,14 @@
 .Op Fl adflpruvw
 .Op Fl F Ar fstab
 .Op Fl o Ar options
-.Op Fl t Cm ufs | Ar external_type
+.Op Fl t Oo Cm no Oc Ns Cm Ar type Ns Op Cm , Ns Ar type ...
 .Nm
 .Op Fl dfpruvw
 .Ar special | node
 .Nm
 .Op Fl dfpruvw
 .Op Fl o Ar options
-.Op Fl t Cm ufs | Ar external_type
+.Op Fl t Oo Cm no Oc Ns Cm Ar type Ns Op Cm , Ns Ar type ...
 .Ar special node
 .Sh DESCRIPTION
 The
@@ -139,9 +139,7 @@ This flag is mutually exclusive with
 .Cm nfsv4acls
 flag.
 .It Cm async
-All
-.Tn I/O
-to the file system should be done asynchronously.
+All I/O to the file system should be done asynchronously.
 This is a
 .Em dangerous
 flag to set, since it does not guarantee that the file system structure
@@ -345,9 +343,7 @@ See
 .Xr chmod 2
 for more information.
 .It Cm sync
-All
-.Tn I/O
-to the file system should be done synchronously.
+All I/O to the file system should be done synchronously.
 .It Cm update
 The same as
 .Fl u ;
@@ -415,7 +411,7 @@ The same as the
 argument to the
 .Fl o
 option.
-.It Fl t Cm ufs | Ar external_type
+.It Fl t Oo Cm no Oc Ns Cm Ar type Ns Op Cm , Ns Ar type ...
 The argument following the
 .Fl t
 is used to indicate the file system type.
@@ -429,7 +425,7 @@ to indicate that the actions should only be taken on
 file systems of the specified type.
 More than one type may be specified in a comma separated list.
 The list of file system types can be prefixed with
-.Dq Li no
+.Cm no
 to specify the file system types for which action should
 .Em not
 be taken.
@@ -440,10 +436,7 @@ command:
 mount -a -t nonfs,nullfs
 .Ed
 .Pp
-mounts all file systems except those of type
-.Tn NFS
-and
-.Tn NULLFS .
+mounts all file systems except those of type NFS and NULLFS.
 .Pp
 The default behavior of
 .Nm
@@ -464,16 +457,18 @@ However, for the following file system types:
 .Cm smbfs ,
 .Cm udf ,
 and
-.Cm unionfs .
+.Cm unionfs
 .Nm
 will not call
 .Xr nmount 2
 directly and will instead attempt to execute a program in
-.Pa /sbin/mount_ Ns Sy XXX
+.Pa /sbin/mount_ Ns Ar type
 where
-.Sy XXX
+.Ar type
 is replaced by the file system type name.
-For example, nfs file systems are mounted by the program
+For example,
+.Cm nfs
+file systems are mounted by the program
 .Pa /sbin/mount_nfs .
 .Pp
 Most file systems will be dynamically loaded by the kernel