Uniformly refer to a file system as "file system".

Approved by:	re

89 files changed, 418 insertions, 418 deletions

diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index 37a2d5e..019c1da 100644
--- a/share/man/man3/sysexits.3
+++ b/share/man/man3/sysexits.3
@@ -104,7 +104,7 @@ The remote system returned something that was
 during a protocol exchange.
 .It Sy EX_NOPERM Pq 77
 You did not have sufficient permission to perform the operation.  This
-is not intended for filesystem problems, which should use
+is not intended for file system problems, which should use
 .Sy EX_NOINPUT
 or
 .Sy EX_CANTCREAT ,
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 0a0f0a6..b385af9 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -175,7 +175,7 @@ Note that a one-disk
 .Nm
 is not the same as the original partition.
 In particular, this means
-if you have a filesystem on a two-disk mirrored
+if you have a file system on a two-disk mirrored
 .Nm
 and one of the disks fail, you cannot mount and use the remaining
 partition as itself; you have to configure it as a one-disk
@@ -188,7 +188,7 @@ then restoring the partition.
 If just one (or more) of the disks in a
 .Nm
 fails, the entire
-filesystem will be lost unless you are mirroring the disks.
+file system will be lost unless you are mirroring the disks.
 .Pp
 If one of the disks in a mirror is lost, you should still
 be able to back up your data.
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index a11cfed..d337ee1 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -67,7 +67,7 @@ partitioning scheme,
 .Xr disklabel 5 ,
 which is used to subdivide the
 .Fx
-slices into areas for individual filesystems and swap spaces.
+slices into areas for individual file systems and swap spaces.
 For more information, see
 .Xr fdisk 8
 and
@@ -105,7 +105,7 @@ and allows the device to reorganize writes to increase efficiency and
 performance.  This performance gain comes at a price.  Should the device
 lose power while its cache contains uncommitted write operations, these
 writes will be lost.  The effect of a loss of write transactions on
-a filesystem is non-deterministic and can cause corruption.  Most
+a file system is non-deterministic and can cause corruption.  Most
 devices age write transactions to limit vulnerability to a few transactions
 recently reported as complete, but it is none-the-less recommended that
 systems with write cache enabled devices reside on an Uninterruptible
diff --git a/share/man/man4/gbde.4 b/share/man/man4/gbde.4
index c851484..97f8fe6 100644
--- a/share/man/man4/gbde.4
+++ b/share/man/man4/gbde.4
@@ -225,7 +225,7 @@ some kind of structure or identifying byte sequences.
 .Pp
 Certain file formats like ELF contain multiple distinct sections, and it
 would be possible to locate things just right in such a way that a device
-contains a partition with a filesystem with a large executable,
+contains a partition with a file system with a large executable,
 .Pq Dq "a backup copy of my kernel"
 where a non-loaded ELF section is laid out
 consecutively on the device and thereby could be used to contain a
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index 5b5d4fb..03e58e1 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -236,7 +236,7 @@ to be instantiated between a consumer and a provider attached to
 each other and to remove it again.
 .Pp
 To understand the utility of this, imagine a provider with
-being mounted as a filesystem.
+being mounted as a file system.
 Between the DEVFS geoms consumer and its provider we insert
 a mirror module which configures itself with one mirror
 copy and consequently is transparent to the I/O requests
@@ -244,7 +244,7 @@ on the path.
 We can now configure yet a mirror copy on the mirror geom,
 request a synchronization, and finally drop the first mirror
 copy.
-We have now in essence moved a mounted filesystem from one
+We have now in essence moved a mounted file system from one
 disk to another while it was being used.
 At this point the mirror geom can be deleted from the path
 again, it has served its purpose.
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index 56cb049..8912544 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -71,7 +71,7 @@ sometimes also called
 .Em special files .
 They are usually located under the directory
 .Pa /dev
-in the filesystem hierarchy
+in the file system hierarchy
 (see also
 .Xr hier 7 ) .
 .Pp
@@ -106,7 +106,7 @@ and
 as the file type identification in the output of
 .Ql ls -l .
 Buffered devices are being accessed through the buffer cache of the
-operating system, and they are solely intended to layer a filesystem
+operating system, and they are solely intended to layer a file system
 on top of them.  They are normally implemented for disks and disk-like
 devices only and, for historical reasons, for tape devices.
 .Pp
@@ -121,7 +121,7 @@ denotes the raw device for the first SCSI disk, while
 is the corresponding device node for the buffered device.
 .Pp
 Unbuffered devices should be used for all actions that are not related
-to filesystem operations, even if the device in question is a disk
+to file system operations, even if the device in question is a disk
 device.  This includes making backups of entire disk partitions, or
 to
 .Em raw
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index 2714cb0..0aec4f9 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -52,7 +52,7 @@ unloading.
 The
 .Fx
 system makes extensive use of loadable kernel modules, and provides loadable
-versions of most filesystems, the
+versions of most file systems, the
 .Tn NFS
 client and server, all the screen-savers, and the
 .Tn iBCS2
diff --git a/share/man/man4/lomac.4 b/share/man/man4/lomac.4
index fcadb5e..fa6403e 100644
--- a/share/man/man4/lomac.4
+++ b/share/man/man4/lomac.4
@@ -61,7 +61,7 @@ or
 .Dq low
 security level, attached to it,
 and these labels of integrity will be managed with a system cognizant
-of IPC (signals, debugging, sockets, pipes), path-based filesystem
+of IPC (signals, debugging, sockets, pipes), path-based file system
 labels, virtual memory objects, and privileged system calls.
 A process (or set of vmspace-sharing processes) will initially inherit
 the integrity level of its parent, which, at the point of
@@ -84,8 +84,8 @@ operation performed after it has been initialized.
 Pre-existing jail or chroot environments may not necessarily work
 completely.
 .Nm Ns 's
-filesystem should correctly respect the caching behavior of any of the
-system's filesystems, and so work for any
+file system should correctly respect the caching behavior of any of the
+system's file systems, and so work for any
 .Dq normal
 or
 .Dq synthetic
@@ -99,7 +99,7 @@ See
 .Pa /sys/security/lomac/policy_plm.h
 for specific information on exactly how
 .Nm
-has been compiled to control access to the filesystem.
+has been compiled to control access to the file system.
 .Sh COMPATIBILITY
 Some programs, for example
 .Xr syslogd 8 ,
diff --git a/share/man/man4/man4.alpha/linux.4 b/share/man/man4/man4.alpha/linux.4
index 591553f..9ff8a0d 100644
--- a/share/man/man4/man4.alpha/linux.4
+++ b/share/man/man4/man4.alpha/linux.4
@@ -113,7 +113,7 @@ or loaded as a module.
 .It Pa /compat/linux
 minimal Linux run-time environment
 .It Pa /compat/linux/proc
-limited Linux process filesystem
+limited Linux process file system
 .El
 .Sh SEE ALSO
 .Xr brandelf 1 ,
diff --git a/share/man/man4/man4.i386/linux.4 b/share/man/man4/man4.i386/linux.4
index 5f08ac1c..926b4ab 100644
--- a/share/man/man4/man4.i386/linux.4
+++ b/share/man/man4/man4.i386/linux.4
@@ -113,7 +113,7 @@ or loaded as a module.
 .It Pa /compat/linux
 minimal Linux run-time environment
 .It Pa /compat/linux/proc
-limited Linux process filesystem
+limited Linux process file system
 .El
 .Sh SEE ALSO
 .Xr brandelf 1 ,
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 09fede1..8793083 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -132,7 +132,7 @@ accesses
 .Bx
 partition on the disc.
 Normally, there is only
-one filesystem on a CD-ROM disc.
+one file system on a CD-ROM disc.
 .It Pa /dev/(r)mcd0c
 accesses raw device.
 .El
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index eff4b15..ad8456d 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -52,7 +52,7 @@ accesses
 .Bx
 partition on the disc.
 Normally, there is only
-one filesystem on a CDROM disc.
+one file system on a CDROM disc.
 .It Pa /dev/[r]scd0c
 accesses the raw device.
 .El
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index fe1edbf..0e966ff 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -44,7 +44,7 @@ For backwards compatibility the type
 is also recognized.
 If the kernel is created with option
 .Dv MD_ROOT
-the first preloaded image found will become the root filesystem.
+the first preloaded image found will become the root file system.
 .It Cm vnode
 A regular file is used as backing store.
 This allows for mounting ISO images without the tedious
diff --git a/share/man/man4/raid.4 b/share/man/man4/raid.4
index 54c8b77..dd5cfb8 100644
--- a/share/man/man4/raid.4
+++ b/share/man/man4/raid.4
@@ -136,21 +136,21 @@ will configure normally.
 Component labels are also used to support the auto-detection and
 auto-configuration of RAID sets.  A RAID set can be flagged as
 auto-configurable, in which case it will be configured automatically
-during the kernel boot process.  RAID filesystems which are
-automatically configured are also eligible to be the root filesystem.
+during the kernel boot process.  RAID file systems which are
+automatically configured are also eligible to be the root file system.
 There is currently only limited support (alpha and pmax architectures)
 for booting a kernel directly from a RAID 1 set, and no support for
 booting from any other RAID sets.  To use a RAID set as the root
-filesystem, a kernel is usually obtained from a small non-RAID
+file system, a kernel is usually obtained from a small non-RAID
 partition, after which any auto-configuring RAID set can be used for the
-root filesystem.  See
+root file system.  See
 .Xr raidctl 8
 for more information on auto-configuration of RAID sets.
 .Pp
 The driver supports 
 .Sq hot spares , 
 disks which are on-line, but are not
-actively used in an existing filesystem.  Should a disk fail, the
+actively used in an existing file system.  Should a disk fail, the
 driver is capable of reconstructing the failed disk onto a hot spare
 or back onto a replacement drive.
 If the components are hot swapable, the failed disk can then be
@@ -185,10 +185,10 @@ before doing a
 .Xr fsck 8
 or a
 .Xr newfs 8 ,
-filesystem integrity and parity integrity can be ensured.  It bears
+file system integrity and parity integrity can be ensured.  It bears
 repeating again that parity recomputation is 
 .Ar required
-before any filesystems are created or used on the RAID device.  If the
+before any file systems are created or used on the RAID device.  If the
 parity is not correct, then missing data cannot be correctly recovered.
 .Pp
 RAID levels may be combined in a hierarchical fashion.  For example, a RAID 0 
@@ -259,7 +259,7 @@ result in data loss.
 Certain RAID levels (1, 4, 5, 6, and others) can protect against some
 data loss due to component failure.  However the loss of two
 components of a RAID 4 or 5 system, or the loss of a single component
-of a RAID 0 system, will result in the entire filesystems on that RAID
+of a RAID 0 system, will result in the entire file systems on that RAID
 device being lost.
 RAID is 
 .Ar NOT
diff --git a/share/man/man4/syncer.4 b/share/man/man4/syncer.4
index ee425f1..bff7a77 100644
--- a/share/man/man4/syncer.4
+++ b/share/man/man4/syncer.4
@@ -29,14 +29,14 @@
 .Os
 .Sh NAME
 .Nm syncer
-.Nd filesystem synchronizer kernel process
+.Nd file system synchronizer kernel process
 .Sh SYNOPSIS
 .Nm
 .Sh DESCRIPTION
 The
 .Nm
 kernel process helps protect the integrity of disk volumes
-by flushing volatile cached filesystem data to disk.
+by flushing volatile cached file system data to disk.
 .Pp
 The kernel places all
 .Xr vnode 9 Ns 's
@@ -87,5 +87,5 @@ process first appeared in
 It is possible on some systems that a
 .Xr sync 2
 occurring simultaneously with a crash may cause
-filesystem damage.  See
+file system damage.  See
 .Xr fsck 8 .
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index 7c1a2e4..9673cd7 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -98,11 +98,11 @@ Write a disklabel to the Zip drive (see
 .Nm vpo
 for the
 .Nm disktab
-entry), creates the filesystem and mounts the new filesystem on /mnt.
+entry), creates the file system and mounts the new file system on /mnt.
 .Pp
 .Dl newfs_msdos /dev/da0
 .Pp
-Create a new FAT type filesystem.
+Create a new FAT type file system.
 .Sh SEE ALSO
 .Xr ohci 4 ,
 .Xr uhci 4 ,
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index c6d227b..a2e9356 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -56,10 +56,10 @@ family supports the
 and
 .Dv SOCK_DGRAM
 socket types and uses
-filesystem pathnames for addressing.
+file system pathnames for addressing.
 .Sh ADDRESSING
 .Ux Ns -domain
-addresses are variable-length filesystem pathnames of
+addresses are variable-length file system pathnames of
 at most 104 characters.
 The include file
 .Aq Pa sys/un.h
@@ -76,7 +76,7 @@ Binding a name to a
 .Ux Ns -domain
 socket with
 .Xr bind 2
-causes a socket file to be created in the filesystem.
+causes a socket file to be created in the file system.
 This file is
 .Em not
 removed when the socket is closed \(em
@@ -93,7 +93,7 @@ All addresses are absolute- or relative-pathnames
 of other
 .Ux Ns -domain
 sockets.
-Normal filesystem access-control mechanisms are also
+Normal file system access-control mechanisms are also
 applied when referencing pathnames; e.g., the destination
 of a
 .Xr connect 2
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index c43048d..c5fadfc 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -85,10 +85,10 @@ By attaching an
 additional plex and subsequently detaching one of the older plexes, data can be
 moved on-line without compromising access.
 .It
-An additional plex can be used to obtain a consistent dump of a filesystem.
+An additional plex can be used to obtain a consistent dump of a file system.
 By
 attaching an additional plex and detaching at a specific time, the detached plex
-becomes an accurate snapshot of the filesystem at the time of detachment.
+becomes an accurate snapshot of the file system at the time of detachment.
 .\" Make sure to flush!
 .El
 .It
@@ -163,7 +163,7 @@ devices.
 offers automatic startup.
 Unlike
 .Ux
-filesystems,
+file systems,
 .Nm
 volumes contain all the configuration information needed to ensure that they are
 started correctly when the subsystem is enabled.
@@ -385,7 +385,7 @@ flag to
 .Xr newfs 8 .
 For example, if you have a volume
 .Pa concat ,
-use the following command to create a UFS filesystem on it:
+use the following command to create a UFS file system on it:
 .Pp
 .Dl "newfs -v /dev/vinum/concat"
 .Sh OBJECT NAMING
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index 36385d0..f156f69 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -51,11 +51,11 @@ transferring data.
 .Pp
 DOS and
 .Fx
-filesystems are supported.
-When mounting a DOS filesystem or
+file systems are supported.
+When mounting a DOS file system or
 formating a
 .Fx
-filesystem, check the slice of the disk with the
+file system, check the slice of the disk with the
 .Xr fdisk 8
 utility.
 .Pp
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 077eff6..fe43d66 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -43,18 +43,18 @@
 .Os
 .Sh NAME
 .Nm devfs
-.Nd device filesystem
+.Nd device file system
 .Sh SYNOPSIS
 devfs	/dev	devfs rw 0 0
 .Sh DESCRIPTION
-The device filesystem, or
+The device file system, or
 .Nm ,
 provides access to kernel's device
-namespace in the global filesystem namespace.
+namespace in the global file system namespace.
 The conventional mount point is
 .Pa /dev .
 .Pp
-The filesystem includes several directories, links, symbolic links
+The file system includes several directories, links, symbolic links
 and devices, some of which can also be written.  In a chroot'ed
 environment,
 .Nm
@@ -73,7 +73,7 @@ mount point.
 .Sh HISTORY
 The
 .Nm
-filesystem first appeared in
+file system first appeared in
 .Fx 2.0 .
 The
 .Nm
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index 5f6599f..02b37e2 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -54,7 +54,7 @@ Directory entries may contain other directories
 as well as plain files; such nested directories are referred to as
 subdirectories.
 A hierarchy of directories and files is formed in this manner
-and is called a filesystem (or referred to as a filesystem tree).
+and is called a file system (or referred to as a file system tree).
 .\" An entry in this tree,
 .\" nested or not nested,
 .\" is a pathname.
@@ -72,7 +72,7 @@ the system root directory
 has no parent and dot-dot points to itself like dot.
 .Pp
 File system nodes are ordinary directory files on which has
-been grafted a filesystem object, such as a physical disk or a
+been grafted a file system object, such as a physical disk or a
 partitioned area of such a disk.
 (See
 .Xr mount 2
@@ -152,7 +152,7 @@ struct dirent {
 .Sh BUGS
 The usage of the member d_type of struct dirent is unportable as it is
 .Fx Ns -specific .
-It also may fail on certain filesystems, for example the cd9660 filesystem.
+It also may fail on certain file systems, for example the cd9660 file system.
 .Sh HISTORY
 A
 .Nm
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index 5a71efd..3481885 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -118,7 +118,7 @@ default
 .It "\&ph	num	Size of partition `h' in sectors"
 .It "\&ta	str	Partition type of partition `a'"
 .Pf ( Bx 4.2
-filesystem, swap, etc)
+file system, swap, etc)
 .It "\&tb	str	Partition type of partition `b'"
 .It "\&tc	str	Partition type of partition `c'"
 .It "\&td	str	Partition type of partition `d'"
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index b595c66..8ae3de7 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -43,18 +43,18 @@
 .Os
 .Sh NAME
 .Nm fdescfs
-.Nd file-descriptor filesystem
+.Nd file-descriptor file system
 .Sh SYNOPSIS
 fdescfs	/dev/fd	fdescfs rw 0 0
 .Sh DESCRIPTION
-The file-descriptor filesystem, or
+The file-descriptor file system, or
 .Nm ,
 provides access to the per-process file descriptor
-namespace in the global filesystem namespace.
+namespace in the global file system namespace.
 The conventional mount point is
 .Pa /dev/fd .
 .Pp
-The filesystem's contents
+The file system's contents
 appear as a list of numbered files
 which correspond to the open files of the process reading the
 directory.
@@ -95,7 +95,7 @@ are ignored.
 .Sh HISTORY
 The
 .Nm
-filesystem first appeared in
+file system first appeared in
 .Bx 4.4 .
 The
 .Nm
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index d421d54..52ac33d 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -38,7 +38,7 @@
 .Sh NAME
 .Nm fs ,
 .Nm inode
-.Nd format of filesystem volume
+.Nd format of file system volume
 .Sh SYNOPSIS
 .In sys/param.h
 .In ufs/ffs/fs.h
@@ -54,10 +54,10 @@ and
 .Aq Pa inode.h
 declare several structures, defined variables and macros
 which are used to create and manage the underlying format of
-filesystem objects on random access devices (disks).
+file system objects on random access devices (disks).
 .Pp
 The block size and number of blocks which
-comprise a filesystem are parameters of the filesystem.
+comprise a file system are parameters of the file system.
 Sectors beginning at
 .Dv BBLOCK
 and continuing for
@@ -66,7 +66,7 @@ are used
 for a disklabel and for some hardware primary
 and secondary bootstrapping programs.
 .Pp
-The actual filesystem begins at sector
+The actual file system begins at sector
 .Dv SBLOCK
 with the
 .Em super-block
@@ -77,10 +77,10 @@ from the file
 .Aq Pa ufs/ffs/fs.h :
 .Bd -literal
 /*
- * Super block for an FFS filesystem.
+ * Super block for an FFS file system.
  */
 struct fs {
-	int32_t	 fs_firstfield;	/* historic filesystem linked list, */
+	int32_t	 fs_firstfield;	/* historic file system linked list, */
 	int32_t	 fs_unused_1;	/*     used for incore super blocks */
 	ufs_daddr_t fs_sblkno;	/* addr of super-block in filesys */
 	ufs_daddr_t fs_cblkno;	/* offset of cyl-block in filesys */
@@ -123,7 +123,7 @@ struct fs {
 	int32_t	 fs_interleave;	/* hardware sector interleave */
 	int32_t	 fs_trackskew;	/* sector 0 skew, per track */
 /* fs_id takes the space of the unused fs_headswitch and fs_trkseek fields */
-	int32_t	fs_id[2];	/* unique filesystem id*/
+	int32_t	fs_id[2];	/* unique file system id*/
 /* sizes determined by number of cylinder groups and their sizes */
 	ufs_daddr_t fs_csaddr;	/* blk addr of cyl grp summary area */
 	int32_t	 fs_cssize;	/* size of cyl grp summary area */
@@ -133,7 +133,7 @@ struct fs {
 	int32_t	 fs_nsect;	/* sectors per track */
 	int32_t  fs_spc;	/* sectors per cylinder */
 /* this comes from the disk driver partitioning */
-	int32_t	 fs_ncyl;	/* cylinders in filesystem */
+	int32_t	 fs_ncyl;	/* cylinders in file system */
 /* these fields can be computed from the others */
 	int32_t	 fs_cpg;	/* cylinders per group */
 	int32_t	 fs_ipg;	/* inodes per group */
@@ -142,7 +142,7 @@ struct fs {
 	struct	csum fs_cstotal;/* cylinder summary information */
 /* these fields are cleared at mount time */
 	int8_t   fs_fmod;	/* super block modified flag */
-	int8_t   fs_clean;	/* filesystem is clean flag */
+	int8_t   fs_clean;	/* file system is clean flag */
 	int8_t 	 fs_ronly;	/* mounted read-only flag */
 	int8_t   fs_flags;	/* currently unused flag */
 	u_char	 fs_fsmnt[MAXMNTLEN];	/* name mounted on */
@@ -170,9 +170,9 @@ struct fs {
 };
 
 /*
- * Filesystem identification
+ * File system identification
  */
-#define	FS_MAGIC	0x011954   /* the fast filesystem magic number */
+#define	FS_MAGIC	0x011954   /* the fast file system magic number */
 #define	FS_OKAY		0x7c269d38 /* superblock checksum */
 #define FS_42INODEFMT	-1	   /* 4.2BSD inode format */
 #define FS_44INODEFMT	2	   /* 4.4BSD inode format */
@@ -189,14 +189,14 @@ struct fs {
 #define FS_DYNAMICPOSTBLFMT	1   /* dynamic rotational table format */
 .Ed
 .Pp
-Each disk drive contains some number of filesystems.
-A filesystem consists of a number of cylinder groups.
+Each disk drive contains some number of file systems.
+A file system consists of a number of cylinder groups.
 Each cylinder group has inodes and data.
 .Pp
-A filesystem is described by its super-block, which in turn
+A file system is described by its super-block, which in turn
 describes the cylinder groups.  The super-block is critical
 data and is replicated in each cylinder group to protect against
-catastrophic loss.  This is done at filesystem creation
+catastrophic loss.  This is done at file system creation
 time and the critical
 super-block data does not change, so the copies need not be
 referenced further unless disaster strikes.
@@ -216,17 +216,17 @@ unit.
 Large files consist of exclusively large data blocks.  To avoid
 undue wasted disk space, the last data block of a small file is
 allocated as only as many fragments of a large block as are
-necessary.  The filesystem format retains only a single pointer
+necessary.  The file system format retains only a single pointer
 to such a fragment, which is a piece of a single large block that
 has been divided.  The size of such a fragment is determinable from
 information in the inode, using the
 .Fn blksize fs ip lbn
 macro.
 .Pp
-The filesystem records space availability at the fragment level;
+The file system records space availability at the fragment level;
 to determine block availability, aligned fragments are examined.
 .Pp
-The root inode is the root of the filesystem.
+The root inode is the root of the file system.
 Inode 0 can't be used for normal purposes and
 historically bad blocks were linked to inode 1,
 thus the root inode is 2 (inode 1 is no longer used for
@@ -235,7 +235,7 @@ assumption, so we are stuck with it).
 .Pp
 The
 .Fa fs_minfree
-element gives the minimum acceptable percentage of filesystem
+element gives the minimum acceptable percentage of file system
 blocks that may be free.
 If the freelist drops below this level
 only the super-user may continue to allocate blocks.
@@ -244,7 +244,7 @@ The
 element
 may be set to 0 if no reserve of free blocks is deemed necessary,
 however severe performance degradations will be observed if the
-filesystem is run at greater than 90% full; thus the default
+file system is run at greater than 90% full; thus the default
 value of
 .Fa fs_minfree
 is 10%.
@@ -256,15 +256,15 @@ of the block size.
 .Pp
 The element
 .Fa fs_optim
-specifies whether the filesystem should try to minimize the time spent
+specifies whether the file system should try to minimize the time spent
 allocating blocks, or if it should attempt to minimize the space
 fragmentation on the disk.
 If the value of fs_minfree (see above) is less than 10%,
-then the filesystem defaults to optimizing for space to avoid
+then the file system defaults to optimizing for space to avoid
 running out of full sized blocks.
 If the value of minfree is greater than or equal to 10%,
 fragmentation is unlikely to be problematical, and
-the filesystem defaults to optimizing for time.
+the file system defaults to optimizing for time.
 .Pp
 .Em Cylinder group related limits :
 Each cylinder keeps track of the availability of blocks at different
@@ -284,7 +284,7 @@ the default value for
 .Fa fs_rotdelay
 is 2ms.
 .Pp
-Each filesystem has a statically allocated number of inodes.
+Each file system has a statically allocated number of inodes.
 An inode is allocated for each
 .Dv NBPI
 bytes of disk space.
@@ -306,12 +306,12 @@ must keep its size within
 Note that super-blocks are never more than size
 .Dv SBSIZE .
 .Pp
-The path name on which the filesystem is mounted is maintained in
+The path name on which the file system is mounted is maintained in
 .Fa fs_fsmnt .
 .Dv MAXMNTLEN
 defines the amount of space allocated in
 the super-block for this name.
-The limit on the amount of summary information per filesystem
+The limit on the amount of summary information per file system
 is defined by
 .Dv MAXCSBUFS .
 For a 4096 byte block size, it is currently parameterized for a
@@ -333,14 +333,14 @@ the
 macro to work.
 .Pp
 The
-.Em "Super-block for a filesystem" :
+.Em "Super-block for a file system" :
 The size of the rotational layout tables
 is limited by the fact that the super-block is of size
 .Dv SBSIZE .
 The size of these tables is
 .Em inversely
 proportional to the block
-size of the filesystem.
+size of the file system.
 The size of the tables is
 increased when sector sizes are not powers of two,
 as this increases the number of cylinders
@@ -361,7 +361,7 @@ The
 .Em Inode :
 The inode is the focus of all file activity in the
 .Ux
-filesystem.
+file system.
 There is a unique inode allocated
 for each active file,
 each current directory, each mounted-on file,
@@ -372,6 +372,6 @@ For further information, see the include file
 .Sh HISTORY
 A super-block structure named filsys appeared in
 .At v6 .
-The filesystem described in this manual appeared
+The file system described in this manual appeared
 in
 .Bx 4.2 .
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index e96a8dc..e2a90ad 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm fstab
-.Nd static information about the filesystems
+.Nd static information about the file systems
 .Sh SYNOPSIS
 .In fstab.h
 .Sh DESCRIPTION
@@ -49,7 +49,7 @@ systems.
 is only read by programs, and not written;
 it is the duty of the system administrator to properly create
 and maintain this file.
-Each filesystem is described on a separate line;
+Each file system is described on a separate line;
 fields on each line are separated by tabs or spaces.
 The order of records in
 .Nm
@@ -65,8 +65,8 @@ doing their thing.
 The first field,
 .Pq Fa fs_spec ,
 describes the block special device or
-remote filesystem to be mounted.
-For filesystems of type
+remote file system to be mounted.
+For file systems of type
 .Em ufs ,
 the special file name is the block special file name,
 and not the character special file name.
@@ -76,46 +76,46 @@ last ``/'' in the special file name.
 .Pp
 The second field,
 .Pq Fa fs_file ,
-describes the mount point for the filesystem.
+describes the mount point for the file system.
 For swap partitions, this field should be specified as ``none''.
 .Pp
 The third field,
 .Pq Fa fs_vfstype ,
-describes the type of the filesystem.
-The system can support various filesystem types.
-Only the root, /usr, and /tmp filesystems need be statically
+describes the type of the file system.
+The system can support various file system types.
+Only the root, /usr, and /tmp file systems need be statically
 compiled into the kernel;
 everything else will be automatically loaded at mount
 time.  (Exception: the UFS family - FFS and LFS cannot
 currently be demand-loaded.)  Some people still prefer to statically
-compile other filesystems as well.
+compile other file systems as well.
 .Pp
 The fourth field,
 .Pq Fa fs_mntops ,
-describes the mount options associated with the filesystem.
+describes the mount options associated with the file system.
 It is formatted as a comma separated list of options.
 It contains at least the type of mount (see
 .Fa fs_type
 below) plus any additional options
-appropriate to the filesystem type.  See the options flag
+appropriate to the file system type.  See the options flag
 .Pq Fl o
 in the
 .Xr mount 8
-page and the filesystem specific page, such as
+page and the file system specific page, such as
 .Xr mount_nfs 8 ,
 for additional options that may be specified.
 .Pp
 If the options ``userquota'' and/or ``groupquota'' are specified,
-the filesystem is automatically processed by the
+the file system is automatically processed by the
 .Xr quotacheck 8
 command, and user and/or group disk quotas are enabled with
 .Xr quotaon 8 .
 By default,
-filesystem quotas are maintained in files named
+file system quotas are maintained in files named
 .Pa quota.user
 and
 .Pa quota.group
-which are located at the root of the associated filesystem.
+which are located at the root of the associated file system.
 These defaults may be overridden by putting an equal sign
 and an alternative absolute pathname following the quota option.
 Thus, if the user quota file for
@@ -127,9 +127,9 @@ this location can be specified as:
 userquota=/var/quotas/tmp.user
 .Ed
 .Pp
-If the option ``noauto'' is specified, the filesystem will not be automatically
+If the option ``noauto'' is specified, the file system will not be automatically
 mounted at system startup.
-Note that, for network filesystems
+Note that, for network file systems
 of third party types
 (i.e. types supported by additional software
 not included in the base system)
@@ -139,7 +139,7 @@ the
 .Xr rc.conf 5
 variable must be used to extend the
 .Xr rc 8
-startup script's list of network filesystem types.
+startup script's list of network file system types.
 .Pp
 The type of the mount is extracted from the
 .Fa fs_mntops
@@ -150,7 +150,7 @@ field (it is not deleted from the
 field).
 If
 .Fa fs_type
-is ``rw'' or ``ro'' then the filesystem whose name is given in the
+is ``rw'' or ``ro'' then the file system whose name is given in the
 .Fa fs_file
 field is normally mounted read-write or read-only on the
 specified special file.
@@ -172,31 +172,31 @@ This is useful to show disk partitions which are currently unused.
 .Pp
 The fifth field,
 .Pq Fa fs_freq ,
-is used for these filesystems by the
+is used for these file systems by the
 .Xr dump 8
-command to determine which filesystems need to be dumped.
+command to determine which file systems need to be dumped.
 If the fifth field is not present, a value of zero is returned and
 .Nm dump
-will assume that the filesystem does not need to be dumped.
+will assume that the file system does not need to be dumped.
 .Pp
 The sixth field,
 .Pq Fa fs_passno ,
 is used by the
 .Xr fsck 8
-program to determine the order in which filesystem checks are done
+program to determine the order in which file system checks are done
 at reboot time.
-The root filesystem should be specified with a
+The root file system should be specified with a
 .Fa fs_passno
-of 1, and other filesystems should have a
+of 1, and other file systems should have a
 .Fa fs_passno
 of 2.
-Filesystems within a drive will be checked sequentially,
-but filesystems on different drives will be checked at the
+File systems within a drive will be checked sequentially,
+but file systems on different drives will be checked at the
 same time to utilize parallelism available in the hardware.
 If the sixth field is not present or is zero,
 a value of zero is returned and
 .Xr fsck 8
-will assume that the filesystem does not need to be checked.
+will assume that the file system does not need to be checked.
 .Bd -literal
 #define	FSTAB_RW	"rw"	/* read/write device */
 #define	FSTAB_RQ	"rq"	/* read/write with quotas */
@@ -206,7 +206,7 @@ will assume that the filesystem does not need to be checked.
 
 struct fstab {
 	char	*fs_spec;	/* block special device name */
-	char	*fs_file;	/* filesystem path prefix */
+	char	*fs_file;	/* file system path prefix */
 	char	*fs_vfstype;	/* File system type, ufs, nfs */
 	char	*fs_mntops;	/* Mount options ala -o */
 	char	*fs_type;	/* FSTAB_* from fs_mntops */
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index ee9d039..167163e 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -530,7 +530,7 @@ structures define the layout of the library hints, normally found in
 which is used by
 .Nm ld.so
 to quickly locate the shared object images in the
-filesystem.
+file system.
 The organization of the hints file is not unlike that of an
 .Dq a.out
 object file, in that it contains a header determining the offset and size
diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5
index 47a3c69..f72418f 100644
--- a/share/man/man5/linprocfs.5
+++ b/share/man/man5/linprocfs.5
@@ -7,15 +7,15 @@
 .Os
 .Sh NAME
 .Nm linprocfs
-.Nd Linux process filesystem
+.Nd Linux process file system
 .Sh SYNOPSIS
 .Bd -literal
 linproc		/compat/linux/proc	linprocfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
-The Linux process filesystem, or
+The Linux process file system, or
 .Nm ,
-emulates a subset of Linux' process filesystem and is required for
+emulates a subset of Linux' process file system and is required for
 the complete operation of some Linux binaries.
 .Pp
 The
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index e917929..888a7b4 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -449,14 +449,14 @@ the previous day's values.
 .Pq Vt bool
 Set to
 .Dq YES
-to check for changes mounted filesystems to the previous day's values.
+to check for changes mounted file systems to the previous day's values.
 .It Va daily_status_security_noamd
 .Pq Vt bool
 Set to
 .Dq YES
 if you want to ignore
 .Xr amd 8
-mounts when comparing against yesterdays filesystem mounts in the
+mounts when comparing against yesterdays file system mounts in the
 .Va daily_status_security_chkmounts_enable
 check.
 .It Va daily_status_security_chkuid0_enable
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 2ebedfb..f4adad2 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -7,15 +7,15 @@
 .Os
 .Sh NAME
 .Nm procfs
-.Nd process filesystem
+.Nd process file system
 .Sh SYNOPSIS
 .Bd -literal
 proc		/proc	procfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
-The process filesystem, or
+The process file system, or
 .Nm ,
-implements a view of the system process table inside the filesystem.
+implements a view of the system process table inside the file system.
 It is normally mounted on
 .Pa /proc ,
 and is required for the complete operation of programs such as
diff --git a/share/man/man5/quota.user.5 b/share/man/man5/quota.user.5
index 4c328aa..6d713bb 100644
--- a/share/man/man5/quota.user.5
+++ b/share/man/man5/quota.user.5
@@ -28,13 +28,13 @@
 .Os
 .Sh NAME
 .Nm quota.user , quota.group
-.Nd per-filesystem quota database
+.Nd per file system quota database
 .Sh DESCRIPTION
-Each filesystem with active quotas should contain a
+Each file system with active quotas should contain a
 .Pa quota.user
 and
 .Pa quota.group
-file in the filesystem root.
+file in the file system root.
 These files are created by
 .Xr quotacheck 8 ,
 and should be edited with
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index b2d716f..fb758f9 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -726,7 +726,7 @@ If set to
 will be run with the
 .Fl y
 flag if the initial preen
-of the filesystems fails.
+of the file systems fails.
 .It Va background_fsck
 .Pq Vt bool
 If set to
@@ -739,19 +739,19 @@ in the background where possible.
 If set to something other than
 .Dq Li NO
 (the default),
-this variable extends the list of filesystem types
+this variable extends the list of file system types
 for which automatic mounting at startup by
 .Xr rc 8
 should be delayed until the network is initialized.
 It should contain
-a whitespace-separated list of network filesystem descriptor pairs,
-each consisting of a filesystem type as passed to
+a whitespace-separated list of network file system descriptor pairs,
+each consisting of a file system type as passed to
 .Xr mount 8
 and a human-readable, one-word description,
 joined with a colon
 .Pq Ql \&: .
 Extending the default list in this way is only necessary
-when third party filesystem types are used.
+when third party file system types are used.
 .It Va syslogd_enable
 .Pq Vt bool
 If set to
diff --git a/share/man/man7/ffs.7 b/share/man/man7/ffs.7
index bf3acb9..34d083e 100644
--- a/share/man/man7/ffs.7
+++ b/share/man/man7/ffs.7
@@ -35,7 +35,7 @@
 .Os
 .Sh NAME
 .Nm ffs
-.Nd Berkeley fast filesystem
+.Nd Berkeley fast file system
 .Sh SYNOPSIS
 In the kernel configuration file:
 .Cd "options FFS"
@@ -53,21 +53,21 @@ In
 /dev/disk0a	/mnt ufs rw 1 1
 .Ed
 .Sh DESCRIPTION
-The Berkeley fast filesystem
-provides facilities to store filesystem data onto a disk device.
+The Berkeley fast file system
+provides facilities to store file system data onto a disk device.
 .Nm
 has been optimized over the years
 for speed and reliability
 and is the default
 .Fx
-filesystem.
+file system.
 .Ss Quotas
 .Bl -tag -width 2n
 .It Cd "options QUOTA"
 This option allows system administrators
 to set limits on disk usage
 on a per-user basis.
-Quotas can be used only on filesystems
+Quotas can be used only on file systems
 mounted with the
 .Cm quota
 option;
@@ -82,11 +82,11 @@ and
 The soft updates feature tracks writes to the disk
 and enforces metadata update dependencies
 (e.g., updating free block maps)
-to ensure that the filesystem remains consistent.
+to ensure that the file system remains consistent.
 .Pp
 To enable soft updates on an
 .Em unmounted
-filesystem, use the following command:
+file system, use the following command:
 .Pp
 .D1 Nm tunefs Fl n Cm enable Ar fs
 .Pp
@@ -108,7 +108,7 @@ on networks including
 and
 .Tn "Apple Macintosh"
 computers,
-this option allows files on filesystems
+this option allows files on file systems
 mounted with the
 .Cm suiddir
 option
@@ -127,7 +127,7 @@ This option requires the presence of the
 option, and it is recommended that
 .Dv UFS_EXTATTR_AUTOSTART
 is included as well,
-so that ACLs are enabled atomically upon mounting the filesystem.
+so that ACLs are enabled atomically upon mounting the file system.
 .El
 .Pp
 In order to enable support for ACLs,
@@ -139,11 +139,11 @@ which holds the access ACL,
 and
 .Pa posix1e.acl_default ,
 which holds the default ACL for directories.
-If you are using filesystem extended attributes,
+If you are using file system extended attributes,
 the following commands may be used to
 allocate space for and create the necessary EA backing files
-for ACLs in the root of each filesystem.
-In these examples, the root filesystem is used;
+for ACLs in the root of each file system.
+In these examples, the root file system is used;
 see
 .Sx "Extended Attributes"
 for more details.
@@ -154,7 +154,7 @@ extattrctl initattr -p / 388 posix1e.acl_access
 extattrctl initattr -p / 388 posix1e.acl_default
 .Ed
 .Pp
-On the next mount of the root filesystem,
+On the next mount of the root file system,
 the attributes will be automatically started
 (if
 .Dv UFS_EXTATTR_AUTOSTART
@@ -179,9 +179,9 @@ If this option is defined,
 .Nm
 will search for a
 .Pa .attribute
-subdirectory of the filesystem root during the mount operation.
+subdirectory of the file system root during the mount operation.
 If found, extended attribute support will be
-automatically started for that filesystem.
+automatically started for that file system.
 .El
 .Pp
 The following
@@ -191,7 +191,7 @@ MIBs are defined for use with
 .Bl -hang -width ".Va vfs.ffs.doreallocblk"
 .It Va vfs.ffs.doasyncfree
 Asynchronously write out modified i-node and indirect blocks
-upon reallocating filesystem blocks to be contiguous.
+upon reallocating file system blocks to be contiguous.
 (Default: 1.)
 .It Va vfs.ffs.doreallocblks
 Enable support for the rearrangement of blocks
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 1b6dc79..f07c9f3 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -37,12 +37,12 @@
 .Os
 .Sh NAME
 .Nm hier
-.Nd layout of filesystems
+.Nd layout of file systems
 .Sh DESCRIPTION
-A sketch of the filesystem hierarchy.
+A sketch of the file system hierarchy.
 .Bl -tag -width "/stand/"
 .It Pa /
-root directory of the filesystem
+root directory of the file system
 .It Pa /bin/
 user utilities fundamental to both single-user and multi-user environments
 .It Pa /boot/
@@ -143,7 +143,7 @@ OpenSSL configuration files
 empty directory commonly used by
 system administrators as a temporary mount point
 .It Pa /proc/
-process filesystem;
+process file system;
 see
 .Xr procfs 5 ,
 .Xr mount_procfs 8
@@ -208,28 +208,28 @@ WaveLAN driver
 .It Pa fs/
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa fdescfs/
-per-process file descriptors filesystem
+per-process file descriptors file system
 .It Pa fifofs/
 .St -p1003.1
-FIFOs filesystem
+FIFOs file system
 .It Pa msdosfs/
-MS-DOS filesystem
+MS-DOS file system
 .It Pa ntfs/
-NTFS filesystem
+NTFS file system
 .It Pa nullfs/
-loopback filesystem
+loopback file system
 .It Pa nwfs/
-NetWare filesystem
+NetWare file system
 .It Pa portalfs/
-portal filesystem
+portal file system
 .It Pa procfs/
-process filesystem
+process file system
 .It Pa smbfs/
-SMB/CIFS filesystem
+SMB/CIFS file system
 .It Pa umapfs/
-alternate uid/gid mappings filesystem
+alternate uid/gid mappings file system
 .It Pa unionfs
-union filesystem
+union file system
 .El
 .It Pa g++/
 GNU C++ include files
@@ -242,7 +242,7 @@ ISC utility library libisc include files
 .It Pa isofs/
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa cd9660/
-iso9660 filesystem
+iso9660 file system
 .El
 .It Pa kerberosIV/
 C include files for kerberos authentication package;
@@ -327,9 +327,9 @@ system C include files (kernel data structures)
 C include files for UFS (The U-word File System)
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa ffs/
-Fast filesystem
+Fast file system
 .It Pa ufs/
-UFS filesystem
+UFS file system
 .El
 .It Pa vm/
 virtual memory;
@@ -719,7 +719,7 @@ system messages database;
 see
 .Xr msgs 1
 .It Pa quotas/
-filesystem quota information files
+file system quota information files
 .It Pa run/
 system information files describing various info about
 system since it was booted
@@ -779,7 +779,7 @@ the NIS maps
 .Sh NOTES
 This manual page documents the default
 .Fx
-filesystem layout, but
+file system layout, but
 the actual hierarchy on a given system is defined at the system
 administrator's discretion.
 A well-maintained installation will include a customized version of
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 46cee45..36ab440 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -79,7 +79,7 @@ Uses
 .Dq Li "make installworld"
 to install a clean system into a
 .Xr chroot 8
-environment on the filesystem.
+environment on the file system.
 Checks out the specified version of the source code and then rebuilds
 the entire system in the clean environment with
 .Dq Li "make world" .
@@ -153,7 +153,7 @@ Sets up a suitable area to build CD-ROM images in
 .It Cm iso.1
 Builds two ISO images (installation and
 .Dq live
-filesystem) from the CD-ROM release area
+file system) from the CD-ROM release area
 (disabled by default, see
 .Va MAKE_ISOS
 below).
@@ -189,7 +189,7 @@ environment for the entire release build.
 .\" XXX: "we don't know how much space you'll need, but make sure you have
 .\" XXX: at least 3 GB to be safe" (I know i'm still hardcoding a number,
 .\" XXX: but at least it looks less like a decree and more like an estimate.
-This filesystem should have at least 2.3 gigabytes of free space on the
+This file system should have at least 2.3 gigabytes of free space on the
 i386 architecture.
 .It Va CVSROOT
 The location of the
@@ -440,7 +440,7 @@ used a manual checklist, compiled by
 .An Rod Grimes ,
 to produce a release.
 Apart from being incomplete, the list put a lot of specific demands on
-available filesystems and was quite torturous to execute.
+available file systems and was quite torturous to execute.
 .Pp
 As part of the
 .Fx 2.0
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index 27e1636..6c963e7 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -122,7 +122,7 @@ Securing user accounts
 .It
 Securing the password file
 .It
-Securing the kernel core, raw devices, and filesystems
+Securing the kernel core, raw devices, and file systems
 .It
 Quick detection of inappropriate changes made to the system
 .It
@@ -319,7 +319,7 @@ the password file
 (see
 .Sq Checking file integrity
 below).
-.Sh SECURING THE KERNEL CORE, RAW DEVICES, AND FILESYSTEMS
+.Sh SECURING THE KERNEL CORE, RAW DEVICES, AND FILE SYSTEMS
 If an attacker breaks root he can do just about anything, but there
 are certain conveniences.  For example, most modern kernels have a
 packet sniffing device driver built in.  Under
@@ -384,7 +384,7 @@ limited-access box significant access to the other machines in the business,
 usually either by doing a read-only NFS export of the other machines to the
 limited-access box, or by setting up ssh keypairs to allow the limit-access
 box to ssh to the other machines.  Except for its network traffic, NFS is
-the least visible method - allowing you to monitor the filesystems on each
+the least visible method - allowing you to monitor the file systems on each
 client box virtually undetected.  If your
 limited-access server is connected to the client boxes through a switch,
 the NFS method is often the better choice.  If your limited-access server
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 70c4e28..092658b 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -15,13 +15,13 @@ When using
 .Xr disklabel 8
 or
 .Xr sysinstall 8
-to lay out your filesystems on a hard disk it is important to remember
+to lay out your file systems on a hard disk it is important to remember
 that hard drives can transfer data much more quickly from outer tracks
 than they can from inner tracks.
 To take advantage of this you should
-try to pack your smaller filesystems and swap closer to the outer tracks,
-follow with the larger filesystems, and end with the largest filesystems.
-It is also important to size system standard filesystems such that you
+try to pack your smaller file systems and swap closer to the outer tracks,
+follow with the larger file systems, and end with the largest file systems.
+It is also important to size system standard file systems such that you
 will not be forced to resize them later as you scale the machine up.
 I usually create, in order, a 128M root, 1G swap, 128M
 .Pa /var ,
@@ -85,7 +85,7 @@ Also note that sysinstall will create a
 .Pa /tmp
 directory.
 Dedicating a partition for temporary file storage is important for
-two reasons: first, it reduces the possibility of filesystem corruption
+two reasons: first, it reduces the possibility of file system corruption
 in a crash, and second it reduces the chance of a runaway process that
 fills up
 .Oo Pa /var Oc Ns Pa /tmp
@@ -155,7 +155,7 @@ Then I do not have to worry about undersizing things!
 Well, there are several reasons this is not a good idea.
 First,
 each partition has different operational characteristics and separating them
-allows the filesystem to tune itself to those characteristics.
+allows the file system to tune itself to those characteristics.
 For example,
 the root and
 .Pa /usr
@@ -198,8 +198,8 @@ and
 .Em cylinders/group .
 .Pp
 .Fx
-performs best when using 8K or 16K filesystem block sizes.
-The default filesystem block size is 16K,
+performs best when using 8K or 16K file system block sizes.
+The default file system block size is 16K,
 which provides best performance for most applications,
 with the exception of those that perform random access on large files
 (such as database server software).
@@ -211,9 +211,9 @@ can cause fragmentation of the buffer cache and
 lead to lower performance.
 .Pp
 The defaults may be unsuitable
-for a filesystem that requires a very large number of i-nodes
+for a file system that requires a very large number of i-nodes
 or is intended to hold a large number of very small files.
-Such a filesystem should be created with an 8K or 4K block size.
+Such a file system should be created with an 8K or 4K block size.
 This also requires you to specify a smaller
 fragment size.
 We recommend always using a fragment size that is 1/8
@@ -229,12 +229,12 @@ as database files, you can increase the
 ratio which reduces the number of i-nodes (maximum number of files and
 directories that can be created) for that partition.
 Decreasing the number
-of i-nodes in a filesystem can greatly reduce
+of i-nodes in a file system can greatly reduce
 .Xr fsck 8
 recovery times after a crash.
 Do not use this option
 unless you are actually storing large files on the partition, because if you
-overcompensate you can wind up with a filesystem that has lots of free
+overcompensate you can wind up with a file system that has lots of free
 space remaining but cannot accommodate any more files.
 Using 32768, 65536, or 262144 bytes/i-node is recommended.
 You can go higher but
@@ -245,13 +245,13 @@ For example,
 .Dq Li "newfs -i 32768 ..." .
 .Pp
 .Xr tunefs 8
-may be used to further tune a filesystem.
+may be used to further tune a file system.
 This command can be run in
-single-user mode without having to reformat the filesystem.
+single-user mode without having to reformat the file system.
 However, this is possibly the most abused program in the system.
 Many people attempt to
-increase available filesystem space by setting the min-free percentage to 0.
-This can lead to severe filesystem fragmentation and we do not recommend
+increase available file system space by setting the min-free percentage to 0.
+This can lead to severe file system fragmentation and we do not recommend
 that you do this.
 Really the only
 .Xr tunefs 8
@@ -267,27 +267,27 @@ option to
 .Xr newfs 8 ,
 and
 .Xr sysinstall 8
-will typically enable softupdates automatically for non-root filesystems).
+will typically enable softupdates automatically for non-root file systems).
 Softupdates drastically improves meta-data performance, mainly file
 creation and deletion.
-We recommend enabling softupdates on most filesystems; however, there
+We recommend enabling softupdates on most file systems; however, there
 are two limitations to softupdates that you should be aware of when
-determining whether to use it on a filesystem.
-First, softupdates guarantees filesystem consistency in the
+determining whether to use it on a file system.
+First, softupdates guarantees file system consistency in the
 case of a crash but could very easily be several seconds (even a minute!\&)
 behind on pending write to the physical disk.
 If you crash you may lose more work
 than otherwise.
-Secondly, softupdates delays the freeing of filesystem
+Secondly, softupdates delays the freeing of file system
 blocks.
-If you have a filesystem (such as the root filesystem) which is
+If you have a file system (such as the root file system) which is
 close to full, doing a major update of it, e.g.\&
 .Dq Li "make installworld" ,
 can run it out of space and cause the update to fail.
-For this reason, softupdates will not be enabled on the root filesystem
+For this reason, softupdates will not be enabled on the root file system
 during a typical install.
 There is no loss of performance since the root
-filesystem is rarely written to.
+file system is rarely written to.
 .Pp
 A number of run-time
 .Xr mount 8
@@ -301,7 +301,7 @@ useful
 option is called
 .Cm noatime .
 .Ux
-filesystems normally update the last-accessed time of a file or
+file systems normally update the last-accessed time of a file or
 directory whenever it is accessed.
 This operation is handled in
 .Fx
@@ -318,7 +318,7 @@ However, you should not gratuitously turn off atime
 updates everywhere.
 For example, the
 .Pa /var
-filesystem customarily
+file system customarily
 holds mailboxes, and atime (in combination with mtime) is used to
 determine whether a mailbox has new mail.
 You might as well leave
@@ -335,13 +335,13 @@ use the atime field for reporting.
 In larger systems you can stripe partitions from several drives together
 to create a much larger overall partition.
 Striping can also improve
-the performance of a filesystem by splitting I/O operations across two
+the performance of a file system by splitting I/O operations across two
 or more disks.
 The
 .Xr vinum 8
 and
 .Xr ccdconfig 8
-utilities may be used to create simple striped filesystems.
+utilities may be used to create simple striped file systems.
 Generally
 speaking, striping smaller partitions such as the root and
 .Pa /var/tmp ,
@@ -354,7 +354,7 @@ typically
 or custom partitions used to hold databases and web pages.
 Choosing the proper stripe size is also
 important.
-Filesystems tend to store meta-data on power-of-2 boundaries
+File systems tend to store meta-data on power-of-2 boundaries
 and you usually want to reduce seeking rather than increase seeking.
 This
 means you want to use a large off-center stripe size such as 1152 sectors
@@ -400,7 +400,7 @@ sysctl defaults to 1 (on).
 This parameter controls how directories are cached
 by the system.
 Most directories are small and use but a single fragment
-(typically 1K) in the filesystem and even less (typically 512 bytes) in
+(typically 1K) in the file system and even less (typically 512 bytes) in
 the buffer cache.
 However, when operating in the default mode the buffer
 cache will only cache a fixed number of directories even if you have a huge
@@ -422,7 +422,7 @@ wasted memory but you should experiment to find out.
 The
 .Va vfs.write_behind
 sysctl defaults to 1 (on).
-This tells the filesystem to issue media
+This tells the file system to issue media
 writes as full clusters are collected, which typically occurs when writing
 large sequential files.
 The idea is to avoid saturating the buffer
@@ -749,7 +749,7 @@ More and more programs are using the
 system call to transmit files over the network.
 The
 .Va kern.ipc.nsfbufs
-sysctl controls the number of filesystem buffers
+sysctl controls the number of file system buffers
 .Xr sendfile 2
 is allowed to use to perform its work.
 This parameter nominally scales
@@ -818,7 +818,7 @@ With IDE write caching turned
 on, IDE hard drives will not only write data to disk out of order, they
 will sometimes delay some of the blocks indefinitely under heavy disk
 load.
-A crash or power failure can result in serious filesystem
+A crash or power failure can result in serious file system
 corruption.
 So our default was changed to be safe.
 Unfortunately, the
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index fc902f6..03d125a 100644
--- a/share/man/man8/crash.8
+++ b/share/man/man8/crash.8
@@ -58,7 +58,7 @@ and then invokes an automatic reboot procedure as
 described in
 .Xr reboot 8 .
 Unless some unexpected inconsistency is encountered in the state
-of the filesystems due to hardware or software failure, the system
+of the file systems due to hardware or software failure, the system
 will then resume multi-user operations.
 .Pp
 The system has a large number of internal consistency checks; if one
@@ -78,12 +78,12 @@ error produced the message in some unexpected way.
 .Pp
 .Bl -diag -compact
 .It "cannot mount root"
-This panic message results from a failure to mount the root filesystem
+This panic message results from a failure to mount the root file system
 during the bootstrap process.
-Either the root filesystem has been corrupted,
-or the system is attempting to use the wrong device as root filesystem.
+Either the root file system has been corrupted,
+or the system is attempting to use the wrong device as root file system.
 Usually, an alternate copy of the system binary or an alternate root
-filesystem can be used to bring up the system to investigate.
+file system can be used to bring up the system to investigate.
 Most often
 this is done by the use of the boot floppy you used to install the system,
 and then using the
@@ -95,7 +95,7 @@ This is not a panic message, as reboots are likely to be futile.
 Late in the bootstrap procedure, the system was unable to locate
 and execute the initialization process,
 .Xr init 8 .
-The root filesystem is incorrect or has been corrupted, or the mode
+The root file system is incorrect or has been corrupted, or the mode
 or type of
 .Pa /sbin/init
 forbids execution or is totally missing.
@@ -108,11 +108,11 @@ forbids execution or is totally missing.
 .It "blkfree: freeing free frag"
 .It "ifree: freeing free inode"
 These panic messages are among those that may be produced
-when filesystem inconsistencies are detected.
-The problem generally results from a failure to repair damaged filesystems
+when file system inconsistencies are detected.
+The problem generally results from a failure to repair damaged file systems
 after a crash, hardware failures, or other condition that should not
 normally occur.
-A filesystem check will normally correct the problem.
+A file system check will normally correct the problem.
 .Pp
 .It "timeout table full"
 This really should not be a panic, but until the data structure
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 63edc70..e6a49f1 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -38,7 +38,7 @@ The ability to boot a machine over the network is useful for
 or
 .Em dataless
 machines, or as a temporary measure while repairing or
-re-installing filesystems on a local disk.
+re-installing file systems on a local disk.
 This file provides a general description of the interactions between
 a client and its server when a client is booting over the network.
 .Sh OPERATION
@@ -80,7 +80,7 @@ loaded using TFTP or NFS.
 .Pp
 In phase 3, the kernel uses again DHCP or BOOTP to acquire
 configuration information, and proceeds to mount the
-root filesystem and start operation.
+root file system and start operation.
 Some specific actions performed during the startup
 of a diskless system are listed in
 .Pa /etc/rc.diskless1
@@ -155,7 +155,7 @@ The files and subdirectories within
 .Pa /conf/default/etc
 are used to bootstrap the diskless environment's
 .Pa /etc
-memory filesystem.
+memory file system.
 Be sure and copy the entirety of
 .Pa /etc ,
 and not just overrides.
@@ -208,7 +208,7 @@ local startup files will not be used.
 .Pp
 While an
 .Xr md 4 Ns -backed
-filesystem is mounted on
+file system is mounted on
 .Pa /var
 by the startup scripts,
 some sites may want to disable the saving of entropy by setting
@@ -248,7 +248,7 @@ This manpage is probably incomplete.
 sometimes requires to write onto
 the root partition, so the startup scripts create and mount
 .Xr md 4 Ns -backed
-filesystems on some locations (e.g.\&
+file systems on some locations (e.g.\&
 .Pa /etc
 and
 .Pa /var ) ,
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 415de10..04a99af 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -41,9 +41,9 @@
 .Sh DESCRIPTION
 This section contains information related to system operation
 and maintenance.
-It describes commands used to create new filesystems,
+It describes commands used to create new file systems,
 .Xr newfs 8 ,
-verify the integrity of the filesystems,
+verify the integrity of the file systems,
 .Xr fsck 8 ,
 control disk usage,
 .Xr edquota 8 ,
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index 8e7fd53..1aa0d67 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -30,15 +30,15 @@ in the server, it can be extremely useful to developers to
 test their code without having to reinstall the system.
 .Pp
 The boot media (typically a floppy disk) contains a boot loader and a
-compressed kernel which includes a memory filesystem.
+compressed kernel which includes a memory file system.
 Depending on the media, it might also contain a number of
 additional files, which can be updated at run time, and are
-used to override/update those in the memory filesystem.
+used to override/update those in the memory file system.
 .Pp
 The system loads the kernel in the normal way, uncompresses
-the memory filesystem and mounts it as root.
+the memory file system and mounts it as root.
 It then updates the memory
-filesystem with files from the boot media (if present),
+file system with files from the boot media (if present),
 and executes a specialized version of
 .Pa /etc/rc .
 The boot media (floppy, etc.) is
@@ -96,8 +96,8 @@ commands to be executed and waiting for user
 input before executing each of them.
 Useful for debugging.
 .It Fl -all_in_mfs
-Put the entire contents of the filesystem in the
-memory filesystem image which is contained in the
+Put the entire contents of the file system in the
+memory file system image which is contained in the
 kernel.
 This is the default behaviour, and is
 extremely useful as the kernel itself can be loaded,
@@ -233,7 +233,7 @@ option:
 options MD_ROOT_SIZE=4200      # same as def_sz
 .Ed
 .Pp
-This informs the script of the size of the memory filesystem and
+This informs the script of the size of the memory file system and
 provides a few other details on how to build the image.
 .It Pa crunch.conf
 .Xr crunchgen 1
@@ -317,7 +317,7 @@ because only the files that are actually loaded from the image
 contribute to the memory usage.
 .It Va import_files
 Contains a list of files to be imported in the floppy tree.
-Absolute names refer to the standard filesystem, relative
+Absolute names refer to the standard file system, relative
 names refer to the root of the source tree being used
 (i.e.\&
 .Va SRC_PATH/.. ) .
@@ -494,7 +494,7 @@ ethernet.
 .Pp
 After booting,
 .Nm
-loads the root filesystem from the memory filesystem, starts
+loads the root file system from the memory file system, starts
 .Pa /sbin/init ,
 and passes control to a first startup script,
 .Pa /etc/rc .
@@ -504,7 +504,7 @@ and
 .Pa /root
 directories with the default files, then tries to identify the boot
 device (floppy, hard disk partition) and possibly override the contents
-of the root filesystem with files read from the boot device.
+of the root file system with files read from the boot device.
 This allows you to store local configuration on the same media.
 After this phase the boot device is no longer used, unless the
 user specifically does it.
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index f299111..b82da37 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -379,7 +379,7 @@ the script does not do anything.
 The
 .Nm rc.early
 script is run very early in the startup process, immediately before the
-filesystem check.
+file system check.
 The
 .Nm rc.early
 script is deprecated.
diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9
index 5a8f008..dc46c5c 100644
--- a/share/man/man9/VFS.9
+++ b/share/man/man9/VFS.9
@@ -33,11 +33,11 @@
 .Dt VFS 9
 .Sh NAME
 .Nm VFS
-.Nd kernel interface to filesystems
+.Nd kernel interface to file systems
 .Sh DESCRIPTION
-Calls used to set or query filesystems for settings or information.
+Calls used to set or query file systems for settings or information.
 .Pp
-Filesystems that don't implement a VFS operation should use the appropriate
+File systems that don't implement a VFS operation should use the appropriate
 .Fa vfs_std
 function from
 .Pa src/sys/kern/vfs_default.c
diff --git a/share/man/man9/VFS_CHECKEXP.9 b/share/man/man9/VFS_CHECKEXP.9
index 3295972..a0ba24f 100644
--- a/share/man/man9/VFS_CHECKEXP.9
+++ b/share/man/man9/VFS_CHECKEXP.9
@@ -29,7 +29,7 @@
 .Dt VFS_CHECKEXP 9
 .Sh NAME
 .Nm VFS_CHECKEXP
-.Nd check if a filesystem is exported to a client
+.Nd check if a file system is exported to a client
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -51,21 +51,21 @@ Return parameter for the export flags for this client.
 Return parameter for the anonymous credentials for this client.
 .El
 .Pp
-This should be called on a filesystem's mount structure to determine if it
+This should be called on a file system's mount structure to determine if it
 is exported to a client whose address is contained in
 .Fa nam .
 .Pp
 It is generally called before
 .Xr VFS_FHTOVP 9
-to validate that a client has access to the filesystem.
+to validate that a client has access to the file system.
 .Pp
-The filesystem should call
+The file system should call
 .Xr vfs_export_lookup 9
 with the address of an appropriate
 .Dv netexport
 structure and the address of the client,
 .Fa nam ,
-to verify that the client can access this filesystem.
+to verify that the client can access this file system.
 .Sh RETURN VALUES
 The export flags and anonymous credentials specific to the client (returned
 by
diff --git a/share/man/man9/VFS_FHTOVP.9 b/share/man/man9/VFS_FHTOVP.9
index 5eb5867..a5d4432 100644
--- a/share/man/man9/VFS_FHTOVP.9
+++ b/share/man/man9/VFS_FHTOVP.9
@@ -46,19 +46,19 @@ This is used by the NFS server to turn an NFS filehandle into a vnode.
 Its arguments are:
 .Bl -tag -width vpp
 .It Ar mp
-The filesystem.
+The file system.
 .It Ar fhp
 The filehandle to convert.
 .It Ar vpp
 Return parameter for the new locked vnode.
 .El
 .Pp
-The contents of the filehandle are defined by the filesystem and are
+The contents of the filehandle are defined by the file system and are
 not examined by any other part of the system.  It should contain
-enough information to uniquely identify a file within the filesystem
-as well as noticing when a file has been removed and the filesystem
+enough information to uniquely identify a file within the file system
+as well as noticing when a file has been removed and the file system
 resources have been reused for a new file.  For instance, UFS
-filesystem stores the inode number and inode generation counter in its
+file system stores the inode number and inode generation counter in its
 filehandle.
 .Pp
 A call to this function should generally be preceded by a call to
diff --git a/share/man/man9/VFS_INIT.9 b/share/man/man9/VFS_INIT.9
index cadfe1c..0e48bd7 100644
--- a/share/man/man9/VFS_INIT.9
+++ b/share/man/man9/VFS_INIT.9
@@ -33,7 +33,7 @@
 .Dt VFS_INIT 9
 .Sh NAME
 .Nm VFS_INIT
-.Nd initialize a filesystem
+.Nd initialize a file system
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -41,10 +41,10 @@
 .Ft int
 .Fn VFS_INIT
 .Sh DESCRIPTION
-This function is called once to allow a filesystem to initialize any
+This function is called once to allow a file system to initialize any
 global data structures that it might have.  It is either called when
-the operating system boots or, for dynamically loaded filesystems,
-when the kernel module containing the filesystem is loaded.
+the operating system boots or, for dynamically loaded file systems,
+when the kernel module containing the file system is loaded.
 .Sh SEE ALSO
 .Xr VFS 9 ,
 .Xr vnode 9
diff --git a/share/man/man9/VFS_MOUNT.9 b/share/man/man9/VFS_MOUNT.9
index 8fd2ac4..be00b68 100644
--- a/share/man/man9/VFS_MOUNT.9
+++ b/share/man/man9/VFS_MOUNT.9
@@ -33,7 +33,7 @@
 .Dt VFS_MOUNT 9
 .Sh NAME
 .Nm VFS_MOUNT
-.Nd mount a filesystem
+.Nd mount a file system
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -41,44 +41,44 @@
 .Ft int
 .Fn VFS_MOUNT "struct mount *mp" "char *path" "caddr_t data" "struct nameidata *ndp" "struct thread *td"
 .Sh DESCRIPTION
-Mount a filesystem into the system's namespace.
+Mount a file system into the system's namespace.
 .Pp
 Its arguments are:
 .Bl -tag -width data
 .It Ar mp
-Structure representing the filesystem.
+Structure representing the file system.
 .It Ar path
-Pathname where the filesystem is being mounted.
+Pathname where the file system is being mounted.
 .It Ar data
-Filesystem specific data.  This should be read into the kernel using
+File system specific data.  This should be read into the kernel using
 .Xr copyin 9 .
 .It Ar ndp
 Contains the result of a
 .Xr namei 9
 call on the pathname of the mountpoint.
 .It Ar td
-Thread which is mounting the filesystem.
+Thread which is mounting the file system.
 .El
 .Pp
-This is called both to mount new filesystems and to change the
-attributes of an existing filesystem.  If the
+This is called both to mount new file systems and to change the
+attributes of an existing file system.  If the
 .Dv MNT_UPDATE
 flag is set in
 .Fa mp->mnt_flag
-then the filesystem should update its internal state from the value of
+then the file system should update its internal state from the value of
 .Fa mp->mnt_flag .
-This can be used, for instance, to convert a read-only filesystem to
+This can be used, for instance, to convert a read-only file system to
 read-write.
 It is also used by
 .Xr mountd 8
-to update the NFS export information for the filesystem.
+to update the NFS export information for the file system.
 .Pp
 If the
 .Dv MNT_UPDATE
-flag is not specified, then this is a newly mounted filesystem.  The
-filesystem code should allocate and initialize
+flag is not specified, then this is a newly mounted file system.  The
+file system code should allocate and initialize
 any private data needed to represent
-the filesystem (it can use the
+the file system (it can use the
 .Fa mp->mnt_data
 field to store this information).
 .Sh SEE ALSO
diff --git a/share/man/man9/VFS_QUOTACTL.9 b/share/man/man9/VFS_QUOTACTL.9
index 3350b1a..56bbf85 100644
--- a/share/man/man9/VFS_QUOTACTL.9
+++ b/share/man/man9/VFS_QUOTACTL.9
@@ -33,7 +33,7 @@
 .Dt VFS_QUOTACTL 9
 .Sh NAME
 .Nm VFS_QUOTACTL
-.Nd manipulate filesystem quotas
+.Nd manipulate file system quotas
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -41,7 +41,7 @@
 .Ft int
 .Fn VFS_QUOTACTL "struct mount *mp" "int cmds" "uid_t uid" "caddr_t arg" "struct thread *td"
 .Sh DESCRIPTION
-Implement filesystem quotas.  See
+Implement file system quotas.  See
 .Xr quotactl 2
 for a description of the arguments.
 .Sh SEE ALSO
diff --git a/share/man/man9/VFS_ROOT.9 b/share/man/man9/VFS_ROOT.9
index a4fc77c..fbcc6b7 100644
--- a/share/man/man9/VFS_ROOT.9
+++ b/share/man/man9/VFS_ROOT.9
@@ -33,7 +33,7 @@
 .Dt VFS_ROOT 9
 .Sh NAME
 .Nm VFS_ROOT
-.Nd return the root vnode of a filesystem
+.Nd return the root vnode of a file system
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -41,12 +41,12 @@
 .Ft int
 .Fn VFS_ROOT "struct mount *mp" "struct vnode **vpp"
 .Sh DESCRIPTION
-Return a locked vnode for the root directory of the filesystem.
+Return a locked vnode for the root directory of the file system.
 .Pp
 Its arguments are:
 .Bl -tag -width vpp
 .It Ar mp
-The filesystem.
+The file system.
 .It Ar vpp
 Return parameter for the root vnode.
 .El
diff --git a/share/man/man9/VFS_SET.9 b/share/man/man9/VFS_SET.9
index 856eace..0383c8d 100644
--- a/share/man/man9/VFS_SET.9
+++ b/share/man/man9/VFS_SET.9
@@ -31,7 +31,7 @@
 .Os
 .Sh NAME
 .Nm VFS_SET
-.Nd set up loadable filesystem
+.Nd set up loadable file system
 .Vt vfsconf
 .Sh SYNOPSIS
 .In sys/param.h
diff --git a/share/man/man9/VFS_START.9 b/share/man/man9/VFS_START.9
index 64ab8c7..5cec4e3 100644
--- a/share/man/man9/VFS_START.9
+++ b/share/man/man9/VFS_START.9
@@ -33,7 +33,7 @@
 .Dt VFS_START 9
 .Sh NAME
 .Nm VFS_START
-.Nd make a filesystem operational
+.Nd make a file system operational
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -43,15 +43,15 @@
 .Sh DESCRIPTION
 This is called after
 .Xr VFS_MOUNT 9
-and before the first access to the filesystem.
+and before the first access to the file system.
 Its arguments are:
 .Bl -tag -width flags
 .It Ar mp
-The filesystem.
+The file system.
 .It Ar flags
 ??
 .It Ar td
-Thread which is starting the filesystem.
+Thread which is starting the file system.
 .El
 .Sh SEE ALSO
 .Xr VFS 9 ,
diff --git a/share/man/man9/VFS_STATFS.9 b/share/man/man9/VFS_STATFS.9
index 9a157c6..8ab457f 100644
--- a/share/man/man9/VFS_STATFS.9
+++ b/share/man/man9/VFS_STATFS.9
@@ -33,7 +33,7 @@
 .Dt VFS_STATFS 9
 .Sh NAME
 .Nm VFS_STATFS
-.Nd return filesystem status
+.Nd return file system status
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -41,17 +41,17 @@
 .Ft int
 .Fn VFS_STATFS "struct mount *mp" "struct statfs *sbp" "struct thread *td"
 .Sh DESCRIPTION
-This call returns various pieces of information about the filesystem,
+This call returns various pieces of information about the file system,
 including recommended I/O sizes, free space, free inodes, etc.
 .Pp
 Its arguments are:
 .Bl -tag -width sbp
 .It Ar mp
-The filesystem.
+The file system.
 .It Ar sbp
-Return parameter for the filesystem's status.
+Return parameter for the file system's status.
 .It Ar td
-The thread which is querying the filesystem.
+The thread which is querying the file system.
 .El
 .Sh SEE ALSO
 .Xr VFS 9 ,
diff --git a/share/man/man9/VFS_SYNC.9 b/share/man/man9/VFS_SYNC.9
index 2543471..d32cc44 100644
--- a/share/man/man9/VFS_SYNC.9
+++ b/share/man/man9/VFS_SYNC.9
@@ -41,12 +41,12 @@
 .Ft int
 .Fn VFS_SYNC "struct mount *mp" "int waitfor" "struct ucred *cred" "struct thread *td"
 .Sh DESCRIPTION
-This writes out all unwritten data in a filesystem.
+This writes out all unwritten data in a file system.
 .Pp
 Its arguments are:
 .Bl -tag -width waitfor
 .It Ar mp
-The filesystem.
+The file system.
 .It Ar waitfor
 Whether the function should wait for I/O to complete.
 Possible values are:
@@ -56,7 +56,7 @@ synchronously wait for I/O to complete
 .It Dv MNT_NOWAIT
 start all I/O, but do not wait for it
 .It Dv MNT_LAZY
-push data not written by filesystem syncer
+push data not written by file system syncer
 .El
 .It Ar cred
 The caller's credentials.
@@ -66,7 +66,7 @@ The calling thread.
 .Pp
 This would normally call
 .Xr VOP_FSYNC 9
-for all the vnodes in the filesystem.
+for all the vnodes in the file system.
 .Sh SEE ALSO
 .Xr fsync 2 ,
 .Xr sync 2 ,
diff --git a/share/man/man9/VFS_UNMOUNT.9 b/share/man/man9/VFS_UNMOUNT.9
index bf6aa7c..e743186 100644
--- a/share/man/man9/VFS_UNMOUNT.9
+++ b/share/man/man9/VFS_UNMOUNT.9
@@ -33,7 +33,7 @@
 .Dt VFS_UNMOUNT 9
 .Sh NAME
 .Nm VFS_UNMOUNT
-.Nd unmount a filesystem
+.Nd unmount a file system
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -41,16 +41,16 @@
 .Ft int
 .Fn VFS_UNMOUNT "struct mount *mp" "int mntflags" "struct thread *td"
 .Sh DESCRIPTION
-Unmount a filesystem.
+Unmount a file system.
 .Pp
 Its arguments are:
 .Bl -tag -width mntflags
 .It Ar mp
-The filesystem.
+The file system.
 .It Ar mntflags
 Various flags.
 .It Ar td
-Thread which is unmounting the filesystem.
+Thread which is unmounting the file system.
 .El
 .Pp
 If the
diff --git a/share/man/man9/VFS_VGET.9 b/share/man/man9/VFS_VGET.9
index ee015de..eb93c4b 100644
--- a/share/man/man9/VFS_VGET.9
+++ b/share/man/man9/VFS_VGET.9
@@ -46,7 +46,7 @@ This converts an inode number into a locked vnode.
 Its arguments are:
 .Bl -tag -width ".Ar flags"
 .It Ar mp
-The filesystem.
+The file system.
 .It Ar ino
 The inode representing the file.
 .It Ar flags
@@ -55,14 +55,14 @@ Additional locking flags to pass through.
 Return parameter for the vnode.
 .El
 .Pp
-This is an optional filesystem entry-point for filesystems which have a
-unique id number for every file in the filesystem.  It is used
-internally by the UFS filesystem and also by the NFSv3 server to
+This is an optional file system entry-point for file systems which have a
+unique id number for every file in the file system.  It is used
+internally by the UFS file system and also by the NFSv3 server to
 implement the
 .Dv READDIRPLUS
 nfs call.
 .Pp
-If the filesystem does not support this call, then it should return
+If the file system does not support this call, then it should return
 .Er EOPNOTSUPP .
 .Sh SEE ALSO
 .Xr VFS 9 ,
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index a72a799..f1a1aa2 100644
--- a/share/man/man9/VOP_ACCESS.9
+++ b/share/man/man9/VOP_ACCESS.9
@@ -76,7 +76,7 @@ vop_access(struct vnode *vp, int mode, struct ucred *cred, struct thread *td)
     int error;
 
     /*
-     * Disallow write attempts on read-only filesystems;
+     * Disallow write attempts on read-only file systems;
      * unless the file is a socket, fifo, or a block or
      * character device resident on the filesystem.
      */
diff --git a/share/man/man9/VOP_ACLCHECK.9 b/share/man/man9/VOP_ACLCHECK.9
index 4e3f254..0315b2c 100644
--- a/share/man/man9/VOP_ACLCHECK.9
+++ b/share/man/man9/VOP_ACLCHECK.9
@@ -86,7 +86,7 @@ The file or directory ACL does not permit access.
 .It Bq Er ENOMEM
 Sufficient memory is not available to fulfill the request.
 .It Bq Er EOPNOTSUPP
-The filesystem does not support
+The file system does not support
 .Fn VOP_ACLCHECK .
 .El
 .Sh SEE ALSO
diff --git a/share/man/man9/VOP_ADVLOCK.9 b/share/man/man9/VOP_ADVLOCK.9
index e402636..925cc2f 100644
--- a/share/man/man9/VOP_ADVLOCK.9
+++ b/share/man/man9/VOP_ADVLOCK.9
@@ -68,7 +68,7 @@ semantics for lock
 .El
 .Pp
 This entry point manipulates advisory record locks on the file.  Most
-filesystems delegate the work for this call to
+file systems delegate the work for this call to
 .Fn lf_advlock .
 .Sh RETURN VALUES
 Zero is returned on success, otherwise an error is returned.
diff --git a/share/man/man9/VOP_ATTRIB.9 b/share/man/man9/VOP_ATTRIB.9
index 1f77e82..e75958b 100644
--- a/share/man/man9/VOP_ATTRIB.9
+++ b/share/man/man9/VOP_ATTRIB.9
@@ -94,7 +94,7 @@ vop_getattr(struct vnode *vp, struct vattr *vap,
 {
     /*
      * Fill in the contents of *vap with information from
-     * the filesystem.
+     * the file system.
      */
     ...;
 
@@ -155,7 +155,7 @@ The file is immutable.
 .It Bq Er EACCES
 The caller does not have permission to modify the file or directory attributes.
 .It Bq Er EROFS
-The filesystem is read-only.
+The file system is read-only.
 .El
 .Sh SEE ALSO
 .Xr VFS 9 ,
diff --git a/share/man/man9/VOP_BWRITE.9 b/share/man/man9/VOP_BWRITE.9
index c758b59..8aad090 100644
--- a/share/man/man9/VOP_BWRITE.9
+++ b/share/man/man9/VOP_BWRITE.9
@@ -33,7 +33,7 @@
 .Dt VOP_BWRITE 9
 .Sh NAME
 .Nm VOP_BWRITE
-.Nd write a filesystem buffer
+.Nd write a file system buffer
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/vnode.h
diff --git a/share/man/man9/VOP_CREATE.9 b/share/man/man9/VOP_CREATE.9
index 1223dae..558adac 100644
--- a/share/man/man9/VOP_CREATE.9
+++ b/share/man/man9/VOP_CREATE.9
@@ -155,7 +155,7 @@ bad:
     vput(vp);
 
     /*
-     * Deallocate filesystem resources for vp.
+     * Deallocate file system resources for vp.
      */
     ...;
 
@@ -167,9 +167,9 @@ bad:
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ENOSPC
-The filesystem is full.
+The file system is full.
 .It Bq Er EDQUOT
-The user's filesystem space or inode quota would be exceeded.
+The user's file system space or inode quota would be exceeded.
 .El
 .Sh SEE ALSO
 .Xr VOP_LOOKUP 9
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index eabba32..63d49e6 100644
--- a/share/man/man9/VOP_FSYNC.9
+++ b/share/man/man9/VOP_FSYNC.9
@@ -33,14 +33,14 @@
 .Dt VOP_FSYNC 9
 .Sh NAME
 .Nm VOP_FSYNC
-.Nd flush filesystem buffers for a file
+.Nd flush file system buffers for a file
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/vnode.h
 .Ft int
 .Fn VOP_FSYNC "struct vnode *vp" "struct ucred *cred" "int waitfor" "struct thread *td"
 .Sh DESCRIPTION
-This call flushes any dirty filesystem buffers for the file.
+This call flushes any dirty file system buffers for the file.
 It is used to implement the
 .Xr sync 2
 and
@@ -62,7 +62,7 @@ synchronously wait for I/O to complete
 .It Dv MNT_NOWAIT
 start all I/O, but do not wait for it
 .It Dv MNT_LAZY
-push data not written by filesystem syncer
+push data not written by file system syncer
 .El
 .It Ar td
 the calling thread
@@ -139,7 +139,7 @@ loop:
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ENOSPC
-The filesystem is full.
+The file system is full.
 .It Bq Er EDQUOT
 Quota exceeded.
 .El
diff --git a/share/man/man9/VOP_GETACL.9 b/share/man/man9/VOP_GETACL.9
index 47b2a81..a59419a 100644
--- a/share/man/man9/VOP_GETACL.9
+++ b/share/man/man9/VOP_GETACL.9
@@ -83,7 +83,7 @@ The the caller does not have the appropriate privilege.
 .It Bq Er ENOMEM
 Sufficient memory is not available to fulfill the request.
 .It Bq Er EOPNOTSUPP
-The filesystem does not support
+The file system does not support
 .Fn VOP_GETACL .
 .El
 .Sh SEE ALSO
diff --git a/share/man/man9/VOP_GETEXTATTR.9 b/share/man/man9/VOP_GETEXTATTR.9
index 2cd3ce6..8487c54 100644
--- a/share/man/man9/VOP_GETEXTATTR.9
+++ b/share/man/man9/VOP_GETEXTATTR.9
@@ -88,7 +88,7 @@ This
 setting might be used to allow the kernel to authorize extended attribute
 retrieval that the active process might not be permitted to do.
 .Pp
-Extended attribute semantics may vary by filesystem implementing the call.
+Extended attribute semantics may vary by file system implementing the call.
 More information on extended attributes may be found in
 .Xr extattr 9 .
 .Sh LOCKS
@@ -103,7 +103,7 @@ The attribute name is not defined for this vnode.
 .It Bq Er EACCES
 The the caller does not have the appropriate privilege.
 .It Bq Er ENXIO
-The request was not valid in this filesystem for the specified vnode and
+The request was not valid in this file system for the specified vnode and
 attribute name.
 .It Bq Er ENOMEM
 Sufficient memory is not available to fulfill the request.
@@ -116,7 +116,7 @@ or
 .Fa uio
 argument is invalid.
 .It Bq Er EOPNOTSUPP
-The filesystem does not support
+The file system does not support
 .Fn VOP_GETEXTATTR .
 .El
 .Sh SEE ALSO
diff --git a/share/man/man9/VOP_GETVOBJECT.9 b/share/man/man9/VOP_GETVOBJECT.9
index 1e84e07..19b4c84 100644
--- a/share/man/man9/VOP_GETVOBJECT.9
+++ b/share/man/man9/VOP_GETVOBJECT.9
@@ -61,9 +61,9 @@ invokes
 .Fn VOP_CREATEVOBJECT
 when it needs to create a VM object for the given
 .Xr vnode 9 .
-Filesystem code may pass this call down to the underlying filesystem.
+File system code may pass this call down to the underlying file system.
 This VOP can be called multiple times,
-and filesystem code should ignore any additional calls,
+and file system code should ignore any additional calls,
 exiting with a zero return code.
 .Pp
 .Fn VOP_DESTROYVOBJECT
@@ -74,7 +74,7 @@ is recycled.
 .Fn VOP_GETVOBJECT
 should be used by all kernel code to get a VM object.
 .\" XXX What is the next sentence trying to tell people?
-The returned VM object may belong to a different filesystem in the case
+The returned VM object may belong to a different file system in the case
 of stacked mounts.
 .Pp
 .Xr VFS 9
@@ -101,7 +101,7 @@ Zero is returned on success, otherwise an error is returned.
 .Sh EXAMPLES
 .\" XXX Why is this code here when it does not use the functions
 .\" described in this manual page?
-By default, filesystems leave VM object handling to the
+By default, file systems leave VM object handling to the
 .Fn vop_std*
 functions.
 .Sh SEE ALSO
diff --git a/share/man/man9/VOP_INACTIVE.9 b/share/man/man9/VOP_INACTIVE.9
index 696470e..9fa3833 100644
--- a/share/man/man9/VOP_INACTIVE.9
+++ b/share/man/man9/VOP_INACTIVE.9
@@ -34,7 +34,7 @@
 .Sh NAME
 .Nm VOP_INACTIVE ,
 .Nm VOP_RECLAIM
-.Nd reclaim filesystem resources for a vnode
+.Nd reclaim file system resources for a vnode
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/vnode.h
@@ -52,11 +52,11 @@ the vnode being reclaimed
 .Xr VOP_INACTIVE 9
 is called when the kernel is no longer using the vnode.  This may be
 because the reference count reaches zero or it may be that the
-filesystem is being forcibly unmounted while there are open files.
+file system is being forcibly unmounted while there are open files.
 It can be used to reclaim space for 'open but deleted' files.
 .Xr VOP_RECLAIM 9
-is called when a vnode is being reused for a different filesystem.
-Any filesystem specific resources associated with the vnode should be
+is called when a vnode is being reused for a different file system.
+Any file system specific resources associated with the vnode should be
 freed.
 .Sh LOCKS
 For VOP_INACTIVE, the vp will be locked on entry.  Your VOP_INACTIVE code
@@ -71,7 +71,7 @@ vop_inactive(struct vnode *vp, struct thread *td)
 {
     if (link count of vp == 0) {
 	/*
-	 * Reclaim space in filesystem for vp.
+	 * Reclaim space in file system for vp.
 	 */
 	...;
     }
@@ -89,7 +89,7 @@ vop_reclaim(struct vnode *vp, struct thread *td)
     cache_purge(vp);
 
     /*
-     * Free filesystem-related data.
+     * Free file system related data.
      */
     ...;
 
diff --git a/share/man/man9/VOP_IOCTL.9 b/share/man/man9/VOP_IOCTL.9
index 3670d62..82b335a 100644
--- a/share/man/man9/VOP_IOCTL.9
+++ b/share/man/man9/VOP_IOCTL.9
@@ -58,7 +58,7 @@ the caller's credentials
 the calling thread
 .El
 .Pp
-Most filesystems do not implement this entry point.
+Most file systems do not implement this entry point.
 .Sh LOCKS
 The file should not be locked on entry.
 .Sh RETURN VALUES
diff --git a/share/man/man9/VOP_LOCK.9 b/share/man/man9/VOP_LOCK.9
index fbc597c..e0c2c0d 100644
--- a/share/man/man9/VOP_LOCK.9
+++ b/share/man/man9/VOP_LOCK.9
@@ -50,7 +50,7 @@
 .Ft int
 .Fn vn_lock "struct vnode *vp" "int flags" "struct thread *td"
 .Sh DESCRIPTION
-These calls are used to serialize access to the filesystem, such as
+These calls are used to serialize access to the file system, such as
 to prevent two writes to the same file from happening at the
 same time.
 .Pp
@@ -106,7 +106,7 @@ Zero is returned on success, otherwise an error is returned.
 struct vopnode {
     int von_flag;
     /*
-     * Other filesystem specific data.
+     * Other file system specific data.
      */
     ...;
 };
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index e44f1f2..8934a3a 100644
--- a/share/man/man9/VOP_LOOKUP.9
+++ b/share/man/man9/VOP_LOOKUP.9
@@ -77,7 +77,7 @@ struct componentname {
 .Pp
 Convert a component of a pathname into a pointer to a locked vnode.
 This is a very central and rather complicated routine.
-If the filesystem is not maintained in a strict tree hierarchy,
+If the file system is not maintained in a strict tree hierarchy,
 this can result in a deadlock situation.
 .Pp
 The
@@ -371,7 +371,7 @@ vop_lookup(struct vnode *dvp,
 	 * infrequently since we cannot avoid this race condition without
 	 * implementing a sophisticated deadlock detection algorithm.
 	 * Note also that this simple deadlock detection scheme will not
-	 * work if the filesystem has any hard links other than ".."
+	 * work if the file system has any hard links other than ".."
 	 * that point backwards in the directory structure.
 	 */
 	if (flags & ISDOTDOT) {
diff --git a/share/man/man9/VOP_OPENCLOSE.9 b/share/man/man9/VOP_OPENCLOSE.9
index bf3fee8..5c1be6c 100644
--- a/share/man/man9/VOP_OPENCLOSE.9
+++ b/share/man/man9/VOP_OPENCLOSE.9
@@ -85,7 +85,7 @@ int
 vop_open(struct vnode *vp, int mode, struct ucred *cred, struct thread *td)
 {
     /*
-     * Most filesystems don't do much here.
+     * Most file systems don't do much here.
      */
     return 0;
 }
diff --git a/share/man/man9/VOP_RDWR.9 b/share/man/man9/VOP_RDWR.9
index 545fd57..2202893 100644
--- a/share/man/man9/VOP_RDWR.9
+++ b/share/man/man9/VOP_RDWR.9
@@ -60,9 +60,9 @@ the credentials of the caller
 .Pp
 The
 .Fa ioflag
-argument is used to give directives and hints to the filesystem.
+argument is used to give directives and hints to the file system.
 When attempting a read, the high 16 bits are used to provide a
-read-ahead hint (in units of filesystem blocks) that the filesystem
+read-ahead hint (in units of file system blocks) that the file system
 should attempt.  The low 16 bits are a bit mask which can contain
 the following flags:
 .Bl -tag -width IO_NODELOCKED
@@ -95,7 +95,7 @@ vop_read(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred)
     long size, xfersize, blkoffset;
     int error;
 
-    size = block size of filesystem;
+    size = block size of file system;
 
     for (error = 0, bp = NULL; uio->uio_resid > 0; bp = NULL) {
 	bytesinfile = size of file - uio->uio_offset;
@@ -156,7 +156,7 @@ vop_write(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred)
     int error;
 
     osize = size of file;
-    size = block size of filesystem;
+    size = block size of file system;
     resid = uio->uio_resid;
     if (ioflag & IO_SYNC)
 	flags = B_SYNC;
@@ -224,7 +224,7 @@ vop_write(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred)
 An attempt was made to write a file that exceeds the process's file size
 limit or the maximum file size.
 .It Bq Er ENOSPC
-The filesystem is full.
+The file system is full.
 .It Bq Er EPERM
 An append-only flag is set on the file, but the caller is attempting to
 write before the current end of file.
diff --git a/share/man/man9/VOP_SETACL.9 b/share/man/man9/VOP_SETACL.9
index 5fd76bc..1c01b71 100644
--- a/share/man/man9/VOP_SETACL.9
+++ b/share/man/man9/VOP_SETACL.9
@@ -87,12 +87,12 @@ The the caller does not have the appropriate privilege.
 .It Bq Er ENOMEM
 Sufficient memory is not available to fulfill the request.
 .It Bq Er EOPNOTSUPP
-The filesystem does not support
+The file system does not support
 .Fn VOP_SETACL .
 .It Bq Er ENOSPC
-The filesystem is out of space.
+The file system is out of space.
 .It Bq Er EROFS
-The filesystem is read-only.
+The file system is read-only.
 .El
 .Sh SEE ALSO
 .Xr acl 9 ,
diff --git a/share/man/man9/VOP_SETEXTATTR.9 b/share/man/man9/VOP_SETEXTATTR.9
index 9269552..7f7c2a4 100644
--- a/share/man/man9/VOP_SETEXTATTR.9
+++ b/share/man/man9/VOP_SETEXTATTR.9
@@ -80,7 +80,7 @@ This
 setting might be used to allow the kernel to authorize extended attribute
 changes that the active process might not be permitted to make.
 .Pp
-Extended attribute semantics may vary by filesystem implementing the call.
+Extended attribute semantics may vary by file system implementing the call.
 More information on extended attributes may be found in
 .Xr extattr 9 .
 .Sh LOCKS
@@ -93,7 +93,7 @@ Otherwise, an appropriate error code is returned.
 .It Bq Er EACCES
 The the caller does not have the appropriate privilege.
 .It Bq Er ENXIO
-The request was not valid in this filesystem for the specified vnode and
+The request was not valid in this file system for the specified vnode and
 attribute name.
 .It Bq Er ENOMEM
 Insufficient memory available to fulfill request
@@ -102,12 +102,12 @@ The uio structure refers to an invalid userspace address.
 .It Bq Er EINVAL
 The name or uio argument is invalid.
 .It Bq Er EOPNOTSUPP
-The filesystem does not support
+The file system does not support
 .Fn VOP_SETEXTATTR .
 .It Bq Er ENOSPC
-The filesystem is out of space.
+The file system is out of space.
 .It Bq Er EROFS
-The filesystem is read-only.
+The file system is read-only.
 .El
 .Sh SEE ALSO
 .Xr extattr 9 ,
diff --git a/share/man/man9/VOP_STRATEGY.9 b/share/man/man9/VOP_STRATEGY.9
index d020d15..7336bad 100644
--- a/share/man/man9/VOP_STRATEGY.9
+++ b/share/man/man9/VOP_STRATEGY.9
@@ -33,7 +33,7 @@
 .Dt VOP_STRATEGY 9
 .Sh NAME
 .Nm VOP_STRATEGY
-.Nd read or write a filesystem buffer
+.Nd read or write a file system buffer
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/vnode.h
diff --git a/share/man/man9/acl.9 b/share/man/man9/acl.9
index 0a61575..9ea49de 100644
--- a/share/man/man9/acl.9
+++ b/share/man/man9/acl.9
@@ -30,7 +30,7 @@
 .Dt ACL 9
 .Sh NAME
 .Nm acl
-.Nd virtual filesystem access control lists
+.Nd virtual file system access control lists
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/vnode.h
@@ -42,10 +42,10 @@ In the kernel configuration file:
 Access control lists, or ACLs,
 allow fine-grained specification of rights
 for vnodes representing files and directories.
-However, as there are a plethora of filesystems with differing ACL semantics,
+However, as there are a plethora of file systems with differing ACL semantics,
 the vnode interface is aware only of the syntax of ACLs,
-relying on the underlying filesystem to implement the details.
-Depending on the underlying filesystem, each file or directory
+relying on the underlying file system to implement the details.
+Depending on the underlying file system, each file or directory
 may have zero or more ACLs associated with it, named using the
 .Fa type
 field of the appropriate vnode ACL calls:
diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9
index 9d8b643..1a2a68a 100644
--- a/share/man/man9/buf.9
+++ b/share/man/man9/buf.9
@@ -40,7 +40,7 @@
 .Sh DESCRIPTION
 The kernel implements a KVM abstraction of the buffer cache which allows it
 to map potentially disparate vm_page's into contiguous KVM for use by
-(mainly filesystem) devices and device I/O.  This abstraction supports
+(mainly file system) devices and device I/O.  This abstraction supports
 block sizes from DEV_BSIZE (usually 512) to upwards of several pages or more.
 It also supports a relatively primitive byte-granular valid range and dirty
 range currently hardcoded for use by NFS.  The code implementing the
@@ -49,7 +49,7 @@ VM Buffer abstraction is mostly concentrated in
 .Pp
 One of the most important things to remember when dealing with buffer pointers
 (struct buf) is that the underlying pages are mapped directly from the buffer
-cache.  No data copying occurs in the scheme proper, though some filesystems
+cache.  No data copying occurs in the scheme proper, though some file systems
 such as UFS do have to copy a little when dealing with file fragments.  The
 second most important thing to remember is that due to the underlying page
 mapping, the b_data base pointer in a buf is always *page* aligned, not
@@ -83,14 +83,14 @@ system typically unmaps it from KVM and replaces the page in the b_pages[]
 array with a place-marker called bogus_page.  The place-marker forces any kernel
 subsystems referencing the associated struct buf to re-lookup the associated
 page.  I believe the place-marker hack is used to allow sophisticated devices
-such as filesystem devices to remap underlying pages in order to deal with,
+such as file system devices to remap underlying pages in order to deal with,
 for example, re-mapping a file fragment into a file block.
 .Pp
 VM buffers are used to track I/O operations within the kernel.  Unfortunately,
 the I/O implementation is also somewhat of a hack because the kernel wants
 to clear the dirty bit on the underlying pages the moment it queues the I/O
 to the VFS device, not when the physical I/O is actually initiated.  This
-can create confusion within filesystem devices that use delayed-writes because
+can create confusion within file system devices that use delayed-writes because
 you wind up with pages marked clean that are actually still dirty.  If not
 treated carefully, these pages could be thrown away!  Indeed, a number of
 serious bugs related to this hack were not fixed until the 2.2.8/3.0 release.
diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9
index 224df09..70ecb11 100644
--- a/share/man/man9/extattr.9
+++ b/share/man/man9/extattr.9
@@ -30,7 +30,7 @@
 .Dt EXTATTR 9
 .Sh NAME
 .Nm extattr
-.Nd virtual filesystem named extended attributes
+.Nd virtual file system named extended attributes
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/vnode.h
@@ -47,7 +47,7 @@ operation refers.
 If the same name is present in multiple namespaces, the extended attributes
 associated with the names are stored and manipulated independently.
 The following two namespaces are defined universally, although individual
-filesystems may implement additional namespaces, or not implement
+file systems may implement additional namespaces, or not implement
 these namespaces:
 .Dv EXTATTR_NAMESPACE_USER ,
 .Dv EXTATTR_NAMESPACE_SYSTEM .
@@ -62,16 +62,16 @@ the meta-data, in the style of
 .Xr VOP_READ 9 ,
 but writes will replace the entire current "value" associated with
 a given name.
-As there are a plethora of filesystems with differing extended attributes,
+As there are a plethora of file systems with differing extended attributes,
 availability and functionality of these functions may be limited, and they
 should be used with awareness of the underlying semantics of the supporting
-filesystem.
+file system.
 Authorization schemes for extended attribute data may also vary by file
 system, as well as maximum attribute size, and whether or not any or
 specific new attributes may be defined.
 .Pp
 Extended attributes are named using a null-terminated character string.
-Depending on underlying filesystem semantics, this name may or may not be
+Depending on underlying file system semantics, this name may or may not be
 case-sensitive.  Appropriate vnode extended attribute calls are:
 .Xr VOP_GETEXTATTR 9
 and
diff --git a/share/man/man9/getnewvnode.9 b/share/man/man9/getnewvnode.9
index 1ffd9e6..d1790ff 100644
--- a/share/man/man9/getnewvnode.9
+++ b/share/man/man9/getnewvnode.9
@@ -51,7 +51,7 @@ The arguments to
 are:
 .Bl -tag -width ".Fa vops"
 .It Fa tag
-The filesystem type string.
+The file system type string.
 This field should only be referenced for debugging or for userland utilities.
 .It Fa mp
 The mount point to add the new vnode to.
diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index 281ba23..39dd741 100644
--- a/share/man/man9/inittodr.9
+++ b/share/man/man9/inittodr.9
@@ -48,12 +48,12 @@ The
 function determines the time and sets the system clock.
 It tries to pick the correct time using a set of heuristics that examine
 the system's battery backed clock and the time obtained from the root
-filesystem, as given in
+file system, as given in
 .Fa base .
 How the
 .Fa base
 value is obtained will vary depending on the
-root filesystem type.
+root file system type.
 The heuristics used include:
 .Bl -bullet
 .It
diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9
index 79f47fa..4e5cc8b 100644
--- a/share/man/man9/pseudofs.9
+++ b/share/man/man9/pseudofs.9
@@ -30,14 +30,14 @@
 .Os
 .Sh NAME
 .Nm pseudofs
-.Nd pseudo-filesystem construction kit
+.Nd pseudo file system construction kit
 .Sh SYNOPSIS
 .In fs/pseudofs/pseudofs.h
 .\" Insert usage example here
 .Sh DESCRIPTION
 The
 .Nm
-module offers an abstract API for pseudo-filesystems such as
+module offers an abstract API for pseudo-file systems such as
 .Xr procfs 5
 and
 .Xr linprocfs 5 .
@@ -45,7 +45,7 @@ It takes care of all the hairy bits like interfacing with the VFS
 system, enforcing access control, keeping track of file numbers, and
 cloning files and directories that are process-specific.
 The consumer module, i.e. the module that implements the actual guts
-of the filesystem, needs only provide the directory structure
+of the file system, needs only provide the directory structure
 (represented by a collection of structures declared and initialized by
 macros provided by
 .Nm )
diff --git a/share/man/man9/vaccess.9 b/share/man/man9/vaccess.9
index b366830..fd05071 100644
--- a/share/man/man9/vaccess.9
+++ b/share/man/man9/vaccess.9
@@ -48,7 +48,7 @@
 This call implements the logic for the
 .Ux
 discretionary file security model
-common to many filesystems in
+common to many file systems in
 .Fx .
 It accepts the vnodes type
 .Fa type ,
diff --git a/share/man/man9/vfs_getnewfsid.9 b/share/man/man9/vfs_getnewfsid.9
index f11f4a1..c09f050 100644
--- a/share/man/man9/vfs_getnewfsid.9
+++ b/share/man/man9/vfs_getnewfsid.9
@@ -31,7 +31,7 @@
 .Os
 .Sh NAME
 .Nm vfs_getnewfsid
-.Nd "allocate a new filesystem identifier"
+.Nd "allocate a new file system identifier"
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -40,11 +40,11 @@
 .Sh DESCRIPTION
 The
 .Fn vfs_getnewfsid
-function allocates a new filesystem identifier for the mount point given.
-Filesystems typically call
+function allocates a new file system identifier for the mount point given.
+File systems typically call
 .Fn vfs_getnewfsid
 in their mount routine in order to acquire a unique ID within the system
-which can later be used to uniquely identify the filesystem via calls such as
+which can later be used to uniquely identify the file system via calls such as
 .Xr vfs_getvfs 9 .
 .Pp
 The actual
@@ -53,8 +53,8 @@ is made up of two 32 bit integers, that are stored in the
 .Vt statfs
 structure of
 .Fa mp .
-The first integer is unique in the set of mounted filesystems,
-while the second holds the filesystem type.
+The first integer is unique in the set of mounted file systems,
+while the second holds the file system type.
 .Bd -literal
 typedef	struct fsid {
 	int32_t val[2];
diff --git a/share/man/man9/vfs_getvfs.9 b/share/man/man9/vfs_getvfs.9
index 664470c..37d931b 100644
--- a/share/man/man9/vfs_getvfs.9
+++ b/share/man/man9/vfs_getvfs.9
@@ -31,7 +31,7 @@
 .Os
 .Sh NAME
 .Nm vfs_getvfs
-.Nd "returns a mount point given its filesystem identifier"
+.Nd "returns a mount point given its file system identifier"
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -40,9 +40,9 @@
 .Sh DESCRIPTION
 The
 .Fn vfs_getvfs
-function returns the mount point structure for a filesystem given its filesystem
+function returns the mount point structure for a file system given its file system
 identifier.
-The filesystem ID should have been allocated by calling
+The file system ID should have been allocated by calling
 .Xr vfs_getnewfsid 9 ;
 otherwise, it will not be found.
 .Pp
@@ -51,12 +51,12 @@ A major user of
 is NFS, which uses the
 .Vt fsid
 as part of file handles in order to determine the
-filesystem a given RPC is for.
+file system a given RPC is for.
 If
 .Fn vfs_getvfs
 fails to find the mount point related to
 .Fa fsid ,
-the filesystem is considered stale.
+the file system is considered stale.
 .Sh RETURN VALUES
 If
 .Fa fsid
diff --git a/share/man/man9/vfs_mount.9 b/share/man/man9/vfs_mount.9
index d9e37cd..17ef0f3c 100644
--- a/share/man/man9/vfs_mount.9
+++ b/share/man/man9/vfs_mount.9
@@ -31,7 +31,7 @@
 .Os
 .Sh NAME
 .Nm vfs_mount
-.Nd "generic filesystem mount function"
+.Nd "generic file system mount function"
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -46,8 +46,8 @@
 .Sh DESCRIPTION
 The
 .Fn vfs_mount
-function handles the generic portion of mounting a filesystem,
-and calls the filesystem specific mount function after verifying
+function handles the generic portion of mounting a file system,
+and calls the file system specific mount function after verifying
 its parameters and setting up the structures expected by the
 underlying mount code.
 .Pp
@@ -61,9 +61,9 @@ Its arguments are:
 .It Fa td
 The thread responsible for this call.
 .It Fa fstype
-The type of filesystem being mounted.
+The type of file system being mounted.
 .It Fa fspath
-The path to the mount point of the filesystem.
+The path to the mount point of the file system.
 .It Fa fsflags
 Flags controlling the mount.
 See
@@ -75,11 +75,11 @@ for details.
 .Dv MNT_SNAPSHOT , MNT_NOCLUSTERR , MNT_NOCLUSTERW , MNT_IGNORE ,
 .Dv MNT_UNION , MNT_NOSYMFOLLOW
 .It Fa fsdata
-Filesystem specific data structure.
+File system specific data structure.
 It is in userspace
 when passed to
 .Fn vfs_mount
-and is left untouched when passed to filesystem's
+and is left untouched when passed to file system's
 .Fn mount .
 .El
 .Sh RETURN VALUES
@@ -92,7 +92,7 @@ path component is too long.
 .It Bq Er EPERM
 Permission denied.
 There are a number of reason this can occur
-ranging from the user not having permission to mount a filesystem
+ranging from the user not having permission to mount a file system
 to the securelevel being to high to load the
 .Fa fstype
 module.
@@ -105,7 +105,7 @@ The mount point does not exist (from
 The mount point is a muddle of links (from
 .Fn namei ) .
 .It Bq Er EOPNOTSUPP
-The operation is not supported (ex: reloading a r/w filesystem).
+The operation is not supported (ex: reloading a r/w file system).
 .It Bq Er EBUSY
 The mount point is busy or is not really a mount point (on update).
 .It Bq Er ENOTDIR
@@ -118,10 +118,10 @@ or was unable to find the specified
 module.
 .El
 .Pp
-Other errors can be returned by the filesystem's
+Other errors can be returned by the file system's
 .Fn mount
 and
-you should check the specific filesystem for details.
+you should check the specific file system for details.
 Also
 this call relies on a large number of other kernel services
 whose errors it returns so this list may not be exhaustive.
diff --git a/share/man/man9/vfs_mountedon.9 b/share/man/man9/vfs_mountedon.9
index 07f2b09..bdf53d0 100644
--- a/share/man/man9/vfs_mountedon.9
+++ b/share/man/man9/vfs_mountedon.9
@@ -31,7 +31,7 @@
 .Os
 .Sh NAME
 .Nm vfs_mountedon
-.Nd "check if the vnode belongs to a mounted filesystem"
+.Nd "check if the vnode belongs to a mounted file system"
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -49,7 +49,7 @@ If the mount is valid, the vnode is considered to be busy.
 A common use of
 .Fn vfs_mountedon
 is to call it on device vnodes to determine if they are already associated with
-a filesystem.
+a file system.
 This is done to prevent multiple mounts on the same device.
 .Sh RETURN VALUES
 .Er EBUSY
diff --git a/share/man/man9/vfs_unmountall.9 b/share/man/man9/vfs_unmountall.9
index 9762c1a..d315077 100644
--- a/share/man/man9/vfs_unmountall.9
+++ b/share/man/man9/vfs_unmountall.9
@@ -29,7 +29,7 @@
 .Os
 .Sh NAME
 .Nm vfs_unmountall
-.Nd unmount all filesystems
+.Nd unmount all file systems
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -40,7 +40,7 @@ The
 .Nm
 function,
 run only at system shutdown,
-unmounts all mounted filesystems
+unmounts all mounted file systems
 from most recent to oldest
 in order to avoid handling dependencies.
 .Sh SEE ALSO
diff --git a/share/man/man9/vfsconf.9 b/share/man/man9/vfsconf.9
index e64b8e2..638052d 100644
--- a/share/man/man9/vfsconf.9
+++ b/share/man/man9/vfsconf.9
@@ -42,28 +42,28 @@
 .Ft int
 .Fn vfs_modevent "module_t mod" "int type" "void *data"
 .Sh DESCRIPTION
-Each filesystem type known to the kernel has a
+Each file system type known to the kernel has a
 .Vt vfsconf
 structure that contains the
-information required to create a new mount of that filesystems type.
+information required to create a new mount of that file systems type.
 .Bd -literal
 struct vfsconf {
-	struct	vfsops *vfc_vfsops;	/* filesystem operations vector */
-	char	vfc_name[MFSNAMELEN];	/* filesystem type name */
-	int	vfc_typenum;		/* historic filesystem type number */
+	struct	vfsops *vfc_vfsops;	/* file system operations vector */
+	char	vfc_name[MFSNAMELEN];	/* file system type name */
+	int	vfc_typenum;		/* historic file system type number */
 	int	vfc_refcount;		/* number mounted of this type */
 	int	vfc_flags;		/* permanent flags */
 	struct	vfsconf *vfc_next;	/* next in list */
 };
 .Ed
 .Pp
-When a new filesystem is mounted,
+When a new file system is mounted,
 .Xr vfs_mount 9
 does a lookup of the
 .Vt vfsconf
 structure by its name, and if it is not already registered,
 attempts to load a kernel module for it.
-The filesystem operations for the new mount point are taken from
+The file system operations for the new mount point are taken from
 .Va vfc_vfsops ,
 and
 .Va mnt_vfc
@@ -72,40 +72,40 @@ in the
 structure is made to point directly at the
 .Vt vfsconf
 structure for the
-filesystem type.
-The filesystem type number is taken from
+file system type.
+The file system type number is taken from
 .Va vfc_typenum
 which was assigned in
 .Fn vfs_register ,
 and the mount flags are taken from a mask of
 .Va vfc_flags .
-Each time a filesystem of a given type is mounted,
+Each time a file system of a given type is mounted,
 .Va vfc_refcount
 is incremented.
 .Pp
 .Fn vfs_register
 takes a new
 .Vt vfsconf
-structure and adds it to the list of existing filesystems.
+structure and adds it to the list of existing file systems.
 If the type has not already been registered, it is initialized by calling the
 .Fn vfs_init
-function in the filesystem operations vector.
+function in the file system operations vector.
 .Fn vfs_register
-also updates the oid's of any sysctl nodes for this filesystem type
+also updates the oid's of any sysctl nodes for this file system type
 to be the same as the newly assigned type number.
 .Pp
 .Fn vfs_unregister
 unlinks
 .Fa vfc
-from the list of registered filesystem types if there are currently no mounted instances.
+from the list of registered file system types if there are currently no mounted instances.
 If the
 .Fn vfs_uninit
-function in the filesystems initialization vector is defined, it is called.
+function in the file systems initialization vector is defined, it is called.
 .Pp
 .Fn vfs_modevent
 is registered by
 .Fn VFS_SET
-to handle the loading and unloading of filesystem kernel modules.
+to handle the loading and unloading of file system kernel modules.
 In the case of
 .Dv MOD_LOAD ,
 .Fn vfs_register
@@ -118,7 +118,7 @@ is called.
 .Fn vfs_register
 returns 0 if successful; otherwise,
 .Er EEXIST
-is returned indicating that the filesystem type has already been registered.
+is returned indicating that the file system type has already been registered.
 .Pp
 .Fn vfs_unregister
 returns 0 if successful.
@@ -128,7 +128,7 @@ entry can be found matching the name in
 .Fa vfc ,
 .Er EINVAL
 is returned.
-If the reference count of mounted instances of the filesystem type is not zero,
+If the reference count of mounted instances of the file system type is not zero,
 .Er EBUSY
 is returned.
 If
diff --git a/share/man/man9/vgone.9 b/share/man/man9/vgone.9
index 3807a0f..3731f93 100644
--- a/share/man/man9/vgone.9
+++ b/share/man/man9/vgone.9
@@ -43,8 +43,8 @@
 .Fn vgone
 and
 .Fn vgonel
-prepare a vnode for reuse by another filesystem.
-The preparation includes the cleaning of all filesystem specific data and
+prepare a vnode for reuse by another file system.
+The preparation includes the cleaning of all file system specific data and
 the removal from its mount point vnode list.
 .Pp
 If the vnode has a
@@ -53,7 +53,7 @@ of zero, and its
 .Dv VDOOMED
 flag is not set, it is moved to the head of the free list
 as in most cases the vnode
-is about to be reused, or its filesystem being unmounted.
+is about to be reused, or its file system being unmounted.
 .Pp
 The difference between
 .Fn vgone
diff --git a/share/man/man9/vinvalbuf.9 b/share/man/man9/vinvalbuf.9
index dd5a60f..c00f654 100644
--- a/share/man/man9/vinvalbuf.9
+++ b/share/man/man9/vinvalbuf.9
@@ -87,7 +87,7 @@ if (error)
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ENOSPC
-The filesystem is full.
+The file system is full.
 (With
 .Dv V_SAVE )
 .It Bq Er EDQUOT
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index 84510f2..dc163f2 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -57,7 +57,7 @@ enum vtagtype	{
 };
 
 /*
- * Each underlying filesystem allocates its own private area and hangs
+ * Each underlying file system allocates its own private area and hangs
  * it from v_data.  If non-null, this area is freed in getnewvnode().
  */
 TAILQ_HEAD(buflists, buf);
@@ -127,7 +127,7 @@ struct vnode {
 /*
  * Vnode flags.
  */
-#define	VROOT		0x00001	/* root of its filesystem */
+#define	VROOT		0x00001	/* root of its file system */
 #define	VTEXT		0x00002	/* vnode is a pure text prototype */
 #define	VSYSTEM		0x00004	/* vnode being used by kernel */
 #define	VISTTY		0x00008	/* vnode represents a tty */
@@ -174,7 +174,7 @@ When both the
 and the
 .Dv v_holdcnt
 of a vnode reaches zero then the vnode will be put on the freelist
-and may be reused for another file, possibly in another filesystem.
+and may be reused for another file, possibly in another file system.
 The transition to and from the freelist is handled by
 .Xr getnewvnode 9 ,
 .Xr vfree 9
@@ -204,17 +204,17 @@ Other commonly used members of the vnode structure are
 .Dv v_id
 which is used to maintain consistency in the name cache,
 .Dv v_mount
-which points at the filesystem which owns the vnode,
+which points at the file system which owns the vnode,
 .Dv v_type
 which contains the type of object the vnode represents and
 .Dv v_data
-which is used by filesystems to store filesystem specific data with
+which is used by file systems to store file system specific data with
 the vnode.
 The
 .Dv v_op
 field is used by the
 .Dv VOP_*
-macros to call functions in the filesystem which implement the vnode's
+macros to call functions in the file system which implement the vnode's
 functionality.
 .Sh VNODE TYPES
 .Bl -tag -width VSOCK