s/filesystem/file system/g as discussed on -developers

111 files changed, 870 insertions, 870 deletions

diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index eec148d..84e8491 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -44,13 +44,13 @@ time.
 The
 .Nm
 utility also informs the kernel about machine timezone shifts to
-maintain proper timestamps for local time filesystems such as the MS-DOS
-filesystem.
+maintain proper timestamps for local time file systems such as the MS-DOS
+file system.
 The main purpose of this thing is not general fixing of
 initially broken MS-DOS file timestamp idea but keeping
 the same timestamps between
 .Fx
-MS-DOS filesystem
+MS-DOS file system
 and MS-DOS operating system installed on the same
 machine.
 If the file
@@ -90,7 +90,7 @@ utility also stores the local time zone offset into the
 .Pa machdep.adjkerntz
 kernel variable, for use by subsequent invocations of
 .Em "'adjkerntz -a'"
-and by local time filesystems.
+and by local time file systems.
 .Pp
 For a local time CMOS clock
 .Em "'adjkerntz -i'"
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 89abe88..a9b00fa 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -55,7 +55,7 @@ The technique used by this program is also less general than
 bad block forwarding, as
 .Nm
 can't make amends for
-bad blocks in the i-list of filesystems or in swap areas.
+bad blocks in the i-list of file systems or in swap areas.
 .Pp
 On some disks,
 adding a sector which is suddenly bad to the bad sector table
@@ -70,8 +70,8 @@ may be used to good effect.
 .Pp
 The
 .Nm
-utility is used on a quiet filesystem in the following way:
-First mount the filesystem, and change to its root directory.
+utility is used on a quiet file system in the following way:
+First mount the file system, and change to its root directory.
 Make a directory
 .Li BAD
 there.
@@ -82,12 +82,12 @@ giving as argument the
 directory followed by
 all the bad sectors you wish to add.
 (The sector numbers must be relative to the beginning of
-the filesystem, but this is not hard as the system reports
+the file system, but this is not hard as the system reports
 relative sector numbers in its console error messages.)
-Then change back to the root directory, unmount the filesystem
+Then change back to the root directory, unmount the file system
 and run
 .Xr fsck 8
-on the filesystem.  The bad sectors should show up in two files
+on the file system.  The bad sectors should show up in two files
 or in the bad sector files and the free list.  Have
 .Xr fsck
 remove files containing the offending bad sectors, but
@@ -119,14 +119,14 @@ to convert the inode to a regular file containing the bad block.
 The
 .Nm
 utility refuses to attach a block that
-resides in a critical area or is out of range of the filesystem.
+resides in a critical area or is out of range of the file system.
 A warning is issued if the block is already in use.
 .Sh BUGS
-If more than one sector which comprise a filesystem fragment are bad,
+If more than one sector which comprise a file system fragment are bad,
 you should specify only one of them to
 .Nm ,
 as the blocks in the bad sector files actually cover all the sectors in a
-filesystem fragment.
+file system fragment.
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 94f9023..519f2b7 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -52,7 +52,7 @@ static const char rcsid[] =
  * and makes files containing the blocks of which these sectors are a part.
  * It can be used to contain sectors which have problems if these sectors
  * are not part of the bad file for the pack (see bad144).  For instance,
- * this program can be used if the driver for the filesystem in question
+ * this program can be used if the driver for the file system in question
  * does not support bad block forwarding.
  */
 #include <sys/param.h>
@@ -150,7 +150,7 @@ main(int argc, char *argv[])
 			break;
 	}
 	if (sblock_try[i] == -1) {
-		printf("Cannot find filesystem\n");
+		printf("Cannot find file system\n");
 		exit(7);
 	}
 	dev_bsize = fs->fs_fsize / fsbtodb(fs, 1);
@@ -187,7 +187,7 @@ chkuse(daddr_t blkno, int cnt)
 
 	fsbn = dbtofsb(fs, blkno);
 	if ((unsigned)(fsbn+cnt) > fs->fs_size) {
-		printf("block %ld out of range of filesystem\n", (long)blkno);
+		printf("block %ld out of range of file system\n", (long)blkno);
 		return (1);
 	}
 	cg = dtog(fs, fsbn);
@@ -218,7 +218,7 @@ chkuse(daddr_t blkno, int cnt)
 }
 
 /*
- * read a block from the filesystem
+ * read a block from the file system
  */
 void
 rdfs(daddr_t bno, int size, char *bf)
diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
index 4b44c0e..2f30a92 100644
--- a/sbin/bsdlabel/bsdlabel.5
+++ b/sbin/bsdlabel/bsdlabel.5
@@ -54,13 +54,13 @@ and may be changed later with the
 program.
 This information is used by the system disk driver and by the bootstrap
 program to determine how to program the drive
-and where to find the filesystems on the disk partitions.
-Additional information is used by the filesystem in order
-to use the disk most efficiently and to locate important filesystem information.
+and where to find the file systems on the disk partitions.
+Additional information is used by the file system in order
+to use the disk most efficiently and to locate important file system information.
 The description of each partition contains an identifier for the partition
-type (standard filesystem, swap area, etc.).
-The filesystem updates the in-core copy of the label if it contains
-incomplete information about the filesystem.
+type (standard file system, swap area, etc.).
+The file system updates the in-core copy of the label if it contains
+incomplete information about the file system.
 .Pp
 The label is located in sector number
 .Dv LABELSECTOR
@@ -122,7 +122,7 @@ is
 
 /*
  * Each disk has a label which includes information about the hardware
- * disk geometry, filesystem partitions, and drive specific information.
+ * disk geometry, file system partitions, and drive specific information.
  * The label is in block 0 or 1, possibly offset from the beginning
  * to leave room for a bootstrap, etc.
  */
@@ -216,16 +216,16 @@ struct disklabel {
 	u_int32_t d_magic2;		/* the magic number (again) */
 	u_int16_t d_checksum;		/* xor of data incl. partitions */
 
-			/* filesystem and partition information: */
+			/* file system and partition information: */
 	u_int16_t d_npartitions;	/* number of partitions in following */
 	u_int32_t d_bbsize;		/* size of boot area at sn0, bytes */
 	u_int32_t d_sbsize;		/* max size of fs superblock, bytes */
 	struct	partition {		/* the partition table */
 		u_int32_t p_size;	/* number of sectors in partition */
 		u_int32_t p_offset;	/* starting sector */
-		u_int32_t p_fsize;	/* filesystem basic fragment size */
-		u_int8_t p_fstype;	/* filesystem type, see below */
-		u_int8_t p_frag;	/* filesystem fragments per block */
+		u_int32_t p_fsize;	/* file system basic fragment size */
+		u_int8_t p_fstype;	/* file system type, see below */
+		u_int8_t p_frag;	/* file system fragments per block */
 		union {
 			u_int16_t cpg;	/* UFS: FS cylinders per group */
 			u_int16_t sgs;	/* LFS: FS segment shift */
@@ -288,7 +288,7 @@ static char *dktypenames[] = {
 
 /*
  * Filesystem type and version.
- * Used to interpret other filesystem-specific
+ * Used to interpret other file system-specific
  * per-partition information.
  */
 #define	FS_UNUSED	0		/* unused */
@@ -298,11 +298,11 @@ static char *dktypenames[] = {
 #define	FS_SYSV		4		/* System V */
 #define	FS_V71K		5		/* V7 with 1K blocks (4.1, 2.9) */
 #define	FS_V8		6		/* Eighth Edition, 4K blocks */
-#define	FS_BSDFFS	7		/* 4.2BSD fast filesystem */
-#define	FS_MSDOS	8		/* MSDOS filesystem */
-#define	FS_BSDLFS	9		/* 4.4BSD log-structured filesystem */
+#define	FS_BSDFFS	7		/* 4.2BSD fast file system */
+#define	FS_MSDOS	8		/* MSDOS file system */
+#define	FS_BSDLFS	9		/* 4.4BSD log-structured file system */
 #define	FS_OTHER	10		/* in use, but unknown/unsupported */
-#define	FS_HPFS		11		/* OS/2 high-performance filesystem */
+#define	FS_HPFS		11		/* OS/2 high-performance file system */
 #define	FS_ISO9660	12		/* ISO 9660, normally CD-ROM */
 #define	FS_BOOT		13		/* partition contains bootstrap */
 #define	FS_VINUM	14		/* Vinum drive */
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index faae777..32ed01c 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -473,11 +473,11 @@ they can be defined later using
 .It
 Finally use
 .Xr newfs 8
-to create a filesystem on the new partition.
+to create a file system on the new partition.
 A typical partitioning scheme would be to have an
 .Dq a
 partition
-of approximately 128MB to hold the root filesystem, a
+of approximately 128MB to hold the root file system, a
 .Dq b
 partition for
 swap, a
@@ -633,7 +633,7 @@ will be interpreted as an offset of 0.
 .It fstype
 describes the purpose of the partition.  The example shows all currently used
 partition types.
-For UFS filesystems and ccd partitions, use type
+For UFS file systems and ccd partitions, use type
 .Cm 4.2BSD .
 For Vinum drives, use type
 .Cm vinum .
@@ -661,17 +661,17 @@ for more details.
 .It fsize
 For
 .Cm 4.2BSD
-and LFS filesystems only, the fragment size.  Defaults to 1024 for
+and LFS file systems only, the fragment size.  Defaults to 1024 for
 partitions smaller than 1 GB, 4096 for partitions 1GB or larger.
 .It bsize
 For
 .Cm 4.2BSD
-and LFS filesystems only, the block size.  Defaults to 8192 for
+and LFS file systems only, the block size.  Defaults to 8192 for
 partitions smaller than 1 GB, 16384 for partitions 1GB or larger.
 .It bps/cpg
 For
 .Cm 4.2BSD
-filesystems, the number of cylinders in a cylinder group.  For LFS file
+file systems, the number of cylinders in a cylinder group.  For LFS file
 systems, the segment shift value.  Defaults to 16 for
 partitions smaller than 1 GB, 64 for partitions 1GB or larger.
 .El
@@ -734,7 +734,7 @@ NOT install the new label either in-core or on-disk.
 Try to auto-detect the required information from
 .Pa da0s1 ,
 and write a new label to the disk.  Use another disklabel -e command to edit the
-partitioning and filesystem information.
+partitioning and file system information.
 .Pp
 .Dl disklabel -R da0s1 savedlabel
 .Pp
@@ -851,8 +851,8 @@ the
 partition.
 .Pp
 On some machines the bootstrap code may not fit entirely in the area
-allocated for it by some filesystems.
-As a result, it may not be possible to have filesystems on some partitions
+allocated for it by some file systems.
+As a result, it may not be possible to have file systems on some partitions
 of a
 .Dq bootable
 disk.
@@ -863,7 +863,7 @@ If the installed boot code would overlap a partition of type FS_UNUSED
 it is marked as type FS_BOOT.
 The
 .Xr newfs 8
-utility will disallow creation of filesystems on FS_BOOT partitions.
+utility will disallow creation of file systems on FS_BOOT partitions.
 Conversely, if a partition has a type other than FS_UNUSED or FS_BOOT,
 .Nm
 will not install bootstrap code that overlaps it.
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index f5c35d2..4a364ac 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -1240,7 +1240,7 @@ getasciipartspec(char *tp, struct disklabel *lp, int part, int lineno)
 			v = FSMAXTYPES;
 		if ((unsigned)v >= FSMAXTYPES) {
 			fprintf(stderr,
-			    "line %d: Warning, unknown filesystem type %s\n",
+			    "line %d: Warning, unknown file system type %s\n",
 			    lineno, cp);
 			v = FS_UNUSED;
 		}
@@ -1614,7 +1614,7 @@ getvirginlabel(void)
 /*
  * If we are installing a boot program that doesn't fit in d_bbsize
  * we need to mark those partitions that the boot overflows into.
- * This allows newfs to prevent creation of a filesystem where it might
+ * This allows newfs to prevent creation of a file system where it might
  * clobber bootstrap code.
  */
 void
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index fc662f9..58a2727 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -155,7 +155,7 @@ When you create a new ccd disk you generally want to
 .Nm disklabel
 it before doing anything else.  Once you create the initial label you can
 edit it, adding additional partitions.  The label itself takes up the first
-16 sectors of the ccd disk.  If all you are doing is creating filesystems
+16 sectors of the ccd disk.  If all you are doing is creating file systems
 with newfs, you do not have to worry about this as newfs will skip the
 label area.  However, if you intend to
 .Nm dd
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 41c137f..b0c0f10 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -45,14 +45,14 @@
 .Bf -symbolic
 The
 .Nm
-utility is obsoleted for normal filesystem repair work by
+utility is obsoleted for normal file system repair work by
 .Xr fsck 8 .
 .Ef
 .Pp
 The
 .Nm
 utility zeros out the inodes with the specified inode number(s)
-on the filesystem residing on the given
+on the file system residing on the given
 .Ar special_device .
 The
 .Xr fsck 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index a33726d..6f3995b 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -70,7 +70,7 @@ static int sblock_try[] = SBLOCKSEARCH;
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: clri filesystem inode ...\n");
+	(void)fprintf(stderr, "usage: clri file system inode ...\n");
 	exit(1);
 }
 
@@ -108,7 +108,7 @@ main(int argc, char *argv[])
 			break;
 	}
 	if (sblock_try[i] == -1) {
-		fprintf(stderr, "Cannot find filesystem\n");
+		fprintf(stderr, "Cannot find file system\n");
 		exit(2);
 	}
 	bsize = sbp->fs_bsize;
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 4b44c0e..2f30a92 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -54,13 +54,13 @@ and may be changed later with the
 program.
 This information is used by the system disk driver and by the bootstrap
 program to determine how to program the drive
-and where to find the filesystems on the disk partitions.
-Additional information is used by the filesystem in order
-to use the disk most efficiently and to locate important filesystem information.
+and where to find the file systems on the disk partitions.
+Additional information is used by the file system in order
+to use the disk most efficiently and to locate important file system information.
 The description of each partition contains an identifier for the partition
-type (standard filesystem, swap area, etc.).
-The filesystem updates the in-core copy of the label if it contains
-incomplete information about the filesystem.
+type (standard file system, swap area, etc.).
+The file system updates the in-core copy of the label if it contains
+incomplete information about the file system.
 .Pp
 The label is located in sector number
 .Dv LABELSECTOR
@@ -122,7 +122,7 @@ is
 
 /*
  * Each disk has a label which includes information about the hardware
- * disk geometry, filesystem partitions, and drive specific information.
+ * disk geometry, file system partitions, and drive specific information.
  * The label is in block 0 or 1, possibly offset from the beginning
  * to leave room for a bootstrap, etc.
  */
@@ -216,16 +216,16 @@ struct disklabel {
 	u_int32_t d_magic2;		/* the magic number (again) */
 	u_int16_t d_checksum;		/* xor of data incl. partitions */
 
-			/* filesystem and partition information: */
+			/* file system and partition information: */
 	u_int16_t d_npartitions;	/* number of partitions in following */
 	u_int32_t d_bbsize;		/* size of boot area at sn0, bytes */
 	u_int32_t d_sbsize;		/* max size of fs superblock, bytes */
 	struct	partition {		/* the partition table */
 		u_int32_t p_size;	/* number of sectors in partition */
 		u_int32_t p_offset;	/* starting sector */
-		u_int32_t p_fsize;	/* filesystem basic fragment size */
-		u_int8_t p_fstype;	/* filesystem type, see below */
-		u_int8_t p_frag;	/* filesystem fragments per block */
+		u_int32_t p_fsize;	/* file system basic fragment size */
+		u_int8_t p_fstype;	/* file system type, see below */
+		u_int8_t p_frag;	/* file system fragments per block */
 		union {
 			u_int16_t cpg;	/* UFS: FS cylinders per group */
 			u_int16_t sgs;	/* LFS: FS segment shift */
@@ -288,7 +288,7 @@ static char *dktypenames[] = {
 
 /*
  * Filesystem type and version.
- * Used to interpret other filesystem-specific
+ * Used to interpret other file system-specific
  * per-partition information.
  */
 #define	FS_UNUSED	0		/* unused */
@@ -298,11 +298,11 @@ static char *dktypenames[] = {
 #define	FS_SYSV		4		/* System V */
 #define	FS_V71K		5		/* V7 with 1K blocks (4.1, 2.9) */
 #define	FS_V8		6		/* Eighth Edition, 4K blocks */
-#define	FS_BSDFFS	7		/* 4.2BSD fast filesystem */
-#define	FS_MSDOS	8		/* MSDOS filesystem */
-#define	FS_BSDLFS	9		/* 4.4BSD log-structured filesystem */
+#define	FS_BSDFFS	7		/* 4.2BSD fast file system */
+#define	FS_MSDOS	8		/* MSDOS file system */
+#define	FS_BSDLFS	9		/* 4.4BSD log-structured file system */
 #define	FS_OTHER	10		/* in use, but unknown/unsupported */
-#define	FS_HPFS		11		/* OS/2 high-performance filesystem */
+#define	FS_HPFS		11		/* OS/2 high-performance file system */
 #define	FS_ISO9660	12		/* ISO 9660, normally CD-ROM */
 #define	FS_BOOT		13		/* partition contains bootstrap */
 #define	FS_VINUM	14		/* Vinum drive */
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index faae777..32ed01c 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -473,11 +473,11 @@ they can be defined later using
 .It
 Finally use
 .Xr newfs 8
-to create a filesystem on the new partition.
+to create a file system on the new partition.
 A typical partitioning scheme would be to have an
 .Dq a
 partition
-of approximately 128MB to hold the root filesystem, a
+of approximately 128MB to hold the root file system, a
 .Dq b
 partition for
 swap, a
@@ -633,7 +633,7 @@ will be interpreted as an offset of 0.
 .It fstype
 describes the purpose of the partition.  The example shows all currently used
 partition types.
-For UFS filesystems and ccd partitions, use type
+For UFS file systems and ccd partitions, use type
 .Cm 4.2BSD .
 For Vinum drives, use type
 .Cm vinum .
@@ -661,17 +661,17 @@ for more details.
 .It fsize
 For
 .Cm 4.2BSD
-and LFS filesystems only, the fragment size.  Defaults to 1024 for
+and LFS file systems only, the fragment size.  Defaults to 1024 for
 partitions smaller than 1 GB, 4096 for partitions 1GB or larger.
 .It bsize
 For
 .Cm 4.2BSD
-and LFS filesystems only, the block size.  Defaults to 8192 for
+and LFS file systems only, the block size.  Defaults to 8192 for
 partitions smaller than 1 GB, 16384 for partitions 1GB or larger.
 .It bps/cpg
 For
 .Cm 4.2BSD
-filesystems, the number of cylinders in a cylinder group.  For LFS file
+file systems, the number of cylinders in a cylinder group.  For LFS file
 systems, the segment shift value.  Defaults to 16 for
 partitions smaller than 1 GB, 64 for partitions 1GB or larger.
 .El
@@ -734,7 +734,7 @@ NOT install the new label either in-core or on-disk.
 Try to auto-detect the required information from
 .Pa da0s1 ,
 and write a new label to the disk.  Use another disklabel -e command to edit the
-partitioning and filesystem information.
+partitioning and file system information.
 .Pp
 .Dl disklabel -R da0s1 savedlabel
 .Pp
@@ -851,8 +851,8 @@ the
 partition.
 .Pp
 On some machines the bootstrap code may not fit entirely in the area
-allocated for it by some filesystems.
-As a result, it may not be possible to have filesystems on some partitions
+allocated for it by some file systems.
+As a result, it may not be possible to have file systems on some partitions
 of a
 .Dq bootable
 disk.
@@ -863,7 +863,7 @@ If the installed boot code would overlap a partition of type FS_UNUSED
 it is marked as type FS_BOOT.
 The
 .Xr newfs 8
-utility will disallow creation of filesystems on FS_BOOT partitions.
+utility will disallow creation of file systems on FS_BOOT partitions.
 Conversely, if a partition has a type other than FS_UNUSED or FS_BOOT,
 .Nm
 will not install bootstrap code that overlaps it.
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index f5c35d2..4a364ac 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1240,7 +1240,7 @@ getasciipartspec(char *tp, struct disklabel *lp, int part, int lineno)
 			v = FSMAXTYPES;
 		if ((unsigned)v >= FSMAXTYPES) {
 			fprintf(stderr,
-			    "line %d: Warning, unknown filesystem type %s\n",
+			    "line %d: Warning, unknown file system type %s\n",
 			    lineno, cp);
 			v = FS_UNUSED;
 		}
@@ -1614,7 +1614,7 @@ getvirginlabel(void)
 /*
  * If we are installing a boot program that doesn't fit in d_bbsize
  * we need to mark those partitions that the boot overflows into.
- * This allows newfs to prevent creation of a filesystem where it might
+ * This allows newfs to prevent creation of a file system where it might
  * clobber bootstrap code.
  */
 void
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index 07c3a4b..45b605f 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -78,7 +78,7 @@ which is the kernel image the system has booted from.
 .Bl -tag -width ".Pa /var/run/dmesg.boot" -compact
 .It Pa /var/run/dmesg.boot
 usually a snapshot of the buffer contents
-taken soon after filesystems are mounted
+taken soon after file systems are mounted
 at startup time
 .El
 .Sh SEE ALSO
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 77a7ada..1148d8f 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -7,7 +7,7 @@
 #	optr.c			operator interface
 #	dumprmt.c		handles remote tape via rmt(8)
 #	tape.c			handles the mag tape and opening/closing
-#	traverse.c		traverses the filesystem
+#	traverse.c		traverses the file system
 #	unctime.c		undo ctime
 #
 #	DEBUG			use local directory to find ddate and dumpdates
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index f51abca..ad9a447 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -39,7 +39,7 @@
 .Sh NAME
 .Nm dump ,
 .Nm rdump
-.Nd filesystem backup
+.Nd file system backup
 .Sh SYNOPSIS
 .Nm
 .Op Fl 0123456789acknSu
@@ -51,7 +51,7 @@
 .Op Fl h Ar level
 .Op Fl s Ar feet
 .Op Fl T Ar date
-.Ar filesystem
+.Ar file system
 .Nm
 .Fl W | Fl w
 .Pp
@@ -68,7 +68,7 @@ is not documented here.)
 The
 .Nm
 utility examines files
-on a filesystem
+on a file system
 and determines which files
 need to be backed up.
 These files
@@ -93,8 +93,8 @@ options.
 By default, the same output file name is used for each volume
 after prompting the operator to change media.
 .Pp
-The filesystem to be dumped is specified by the argument
-.Ar filesystem
+The file system to be dumped is specified by the argument
+.Ar file system
 as either its device-special file or its mount point
 (if that is in a standard entry in
 .Pa /etc/fstab ) .
@@ -105,7 +105,7 @@ The following options are supported by
 .It Fl 0\-9
 Dump levels.
 A level 0, full backup,
-guarantees the entire filesystem is copied
+guarantees the entire file system is copied
 (but see also the
 .Fl h
 option below).
@@ -239,12 +239,12 @@ the
 file
 is readable by people, consisting of one
 free format record per line:
-filesystem name,
+file system name,
 increment level
 and
 .Xr ctime 3
 format dump date.
-There may be only one entry per filesystem at each level.
+There may be only one entry per file system at each level.
 The
 .Pa dumpdates
 file
@@ -258,7 +258,7 @@ but the
 .Fl D
 option may be used to change it.
 .It Fl W
-Tell the operator what filesystems need to be dumped.
+Tell the operator what file systems need to be dumped.
 This information is gleaned from the files
 .Pa dumpdates
 and
@@ -267,19 +267,19 @@ The
 .Fl W
 option causes
 .Nm
-to print out, for each filesystem in
+to print out, for each file system in
 the
 .Pa dumpdates
 file
 the most recent dump date and level,
-and highlights those filesystems that should be dumped.
+and highlights those file systems that should be dumped.
 If the
 .Fl W
 option is set, all other options are ignored, and
 .Nm
 exits immediately.
 .It Fl w
-Is like W, but prints only those filesystems which need to be dumped.
+Is like W, but prints only those file systems which need to be dumped.
 .El
 .Pp
 Directories and regular files which have their
@@ -360,7 +360,7 @@ Always start with a level 0 backup, for example:
 This should be done at set intervals, say once a month or once every two months,
 and on a set of fresh tapes that is saved forever.
 .It
-After a level 0, dumps of active filesystems are taken on a daily basis,
+After a level 0, dumps of active file systems are taken on a daily basis,
 using a modified Tower of Hanoi algorithm,
 with this sequence of dump levels:
 .Bd -literal -offset indent
@@ -371,7 +371,7 @@ For the daily dumps, it should be possible to use a fixed number of tapes
 for each day, used on a weekly basis.
 Each week, a level 1 dump is taken, and
 the daily Hanoi sequence repeats beginning with 3.
-For weekly dumps, another fixed set of tapes per dumped filesystem is
+For weekly dumps, another fixed set of tapes per dumped file system is
 used, also on a cyclical basis.
 .El
 .Pp
@@ -394,7 +394,7 @@ see the
 .Fl D
 option)
 .It Pa /etc/fstab
-dump table: filesystems and frequency
+dump table: file systems and frequency
 .It Pa /etc/group
 to find group
 .Em operator
@@ -411,7 +411,7 @@ Dump exits with zero status on success.
 Startup errors are indicated with an exit code of 1;
 abnormal termination is indicated with an exit code of 3.
 .Sh BUGS
-Fewer than 32 read errors on the filesystem are ignored.
+Fewer than 32 read errors on the file system are ignored.
 .Pp
 Each reel requires a new process, so parent processes for
 reels already written just hang around until the entire tape
@@ -430,7 +430,7 @@ utility with the
 .Fl W
 or
 .Fl w
-options does not report filesystems that have never been recorded
+options does not report file systems that have never been recorded
 in the
 .Pa dumpdates
 file,
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index d6807c6..e200347 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -81,7 +81,7 @@ int	tapeno;		/* current tape number */
 time_t	tstart_writing;	/* when started writing the first tape block */
 time_t	tend_writing;	/* after writing the last tape block */
 int	passno;		/* current dump pass number */
-struct	fs *sblock;	/* the filesystem super block */
+struct	fs *sblock;	/* the file system super block */
 char	sblock_buf[MAXBSIZE];
 long	dev_bsize;	/* block size of underlying disk device */
 int	dev_bshift;	/* log2(dev_bsize) */
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index b18fc7c..cc4f80d 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -215,7 +215,7 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	if (argc < 1) {
-		(void)fprintf(stderr, "Must specify disk or filesystem\n");
+		(void)fprintf(stderr, "Must specify disk or file system\n");
 		exit(X_STARTUP);
 	}
 	disk = *argv++;
@@ -294,7 +294,7 @@ main(int argc, char *argv[])
 	 *	disk can be either the full special file name,
 	 *	the suffix of the special file name,
 	 *	the special name missing the leading '/',
-	 *	the filesystem name with or without the leading '/'.
+	 *	the file system name with or without the leading '/'.
 	 */
 	dt = fstabsearch(disk);
 	if (dt != NULL) {
@@ -303,7 +303,7 @@ main(int argc, char *argv[])
 		(void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
 	} else {
 		(void)strncpy(spcl.c_dev, disk, NAMELEN);
-		(void)strncpy(spcl.c_filesys, "an unlisted filesystem",
+		(void)strncpy(spcl.c_filesys, "an unlisted file system",
 		    NAMELEN);
 	}
 	spcl.c_dev[NAMELEN-1]='\0';
@@ -342,7 +342,7 @@ main(int argc, char *argv[])
 	if (fstat(diskfd, &sb) != 0)
 		err(X_STARTUP, "%s: stat", disk);
 	if (S_ISDIR(sb.st_mode))
-		errx(X_STARTUP, "%s: unknown filesystem", disk);
+		errx(X_STARTUP, "%s: unknown file system", disk);
 	sync();
 	sblock = (struct fs *)sblock_buf;
 	for (i = 0; sblock_try[i] != -1; i++) {
@@ -356,7 +356,7 @@ main(int argc, char *argv[])
 			break;
 	}
 	if (sblock_try[i] == -1)
-		quit("Cannot find filesystem superblock\n");
+		quit("Cannot find file system superblock\n");
 	dev_bsize = sblock->fs_fsize / fsbtodb(sblock, 1);
 	dev_bshift = ffs(dev_bsize) - 1;
 	if (dev_bsize != (1 << dev_bshift))
@@ -525,7 +525,7 @@ usage(void)
 #endif
 		"nSu] [-B records] [-b blocksize] [-D dumpdates]\n"
 		"            [-d density] [-f file ] [-h level] [-s feet] "
-		"[-T date] filesystem\n"
+		"[-T date] file system\n"
 		"       dump [-W | -w]\n");
 	exit(X_STARTUP);
 }
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 53b5741..a28d522 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -371,9 +371,9 @@ lastdump(int arg)	/* w ==> just what to do; W ==> most recent dumps */
 	qsort((char *) ddatev, nddates, sizeof(struct dumpdates *), datesort);
 
 	if (arg == 'w')
-		(void) printf("Dump these filesystems:\n");
+		(void) printf("Dump these file systems:\n");
 	else
-		(void) printf("Last dump(s) done (Dump '>' filesystems):\n");
+		(void) printf("Last dump(s) done (Dump '>' file systems):\n");
 	lastname = "??";
 	ITITERATE(i, dtwalk) {
 		if (strncmp(lastname, dtwalk->dd_name,
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index aa65b47..4a3b810 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -82,7 +82,7 @@ static	void rollforward(void);
  * Concurrent dump mods (Caltech) - disk block reading and tape writing
  * are exported to several slave processes.  While one slave writes the
  * tape, the others read disk blocks; they pass control of the tape in
- * a ring via signals. The parent process traverses the filesystem and
+ * a ring via signals. The parent process traverses the file system and
  * sends writeheader()'s and lists of daddr's to the slaves via pipes.
  * The following structure defines the instruction packets sent to slaves.
  */
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 4cbce6e..5be1dca 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -131,9 +131,9 @@ blockest(union dinode *dp)
 /*
  * Dump pass 1.
  *
- * Walk the inode list for a filesystem to find all allocated inodes
+ * Walk the inode list for a file system to find all allocated inodes
  * that have been modified since the previous dump time. Also, find all
- * the directories in the filesystem.
+ * the directories in the file system.
  */
 int
 mapfiles(ino_t maxino, long *tapesize)
@@ -181,7 +181,7 @@ mapfiles(ino_t maxino, long *tapesize)
 /*
  * Dump pass 2.
  *
- * Scan each directory on the filesystem to see if it has any modified
+ * Scan each directory on the file system to see if it has any modified
  * files in it. If it does, and has not already been added to the dump
  * list (because it was itself modified), then add it. If a directory
  * has not been modified itself, contains no modified files and has no
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 3e26071..8c26724 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm dumpfs
-.Nd dump filesystem information
+.Nd dump file system information
 .Sh SYNOPSIS
 .Nm
 .Op Ar filesys No \&| Ar device
@@ -45,10 +45,10 @@
 The
 .Nm
 utility prints out the super block and cylinder group information
-for the filesystem or special device specified.
+for the file system or special device specified.
 The listing is very long and detailed.  This
-command is useful mostly for finding out certain filesystem
-information such as the filesystem block size and minimum
+command is useful mostly for finding out certain file system
+information such as the file system block size and minimum
 free space percentage.
 .Sh SEE ALSO
 .Xr disktab 5 ,
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index a767755..8fd88c2 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -77,11 +77,11 @@ Since a
 .Xr panic 9
 condition may occur in a situation
 where the kernel cannot trust its internal representation
-of the state of any given filesystem,
+of the state of any given file system,
 one of the system swap devices,
 and
 .Em not
-a device containing a filesystem,
+a device containing a file system,
 should be used as the dump device.
 .Pp
 The
@@ -126,7 +126,7 @@ standard swap areas
 boot-time system configuration
 .El
 .Sh BUGS
-Because the filesystem layer is already dead by the time a crash dump
+Because the file system layer is already dead by the time a crash dump
 is taken, it is not possible to send crash dumps directly to a file.
 .Sh HISTORY
 The
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 27da79b..f773d5c 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -343,7 +343,7 @@ Note that bootable
 .Fx
 slices (the
 .Dq Pa /
-filesystem) must lie completely within the
+file system) must lie completely within the
 first 1024 cylinders; if this is not true, booting may fail.
 Non-bootable slices do not have this restriction.
 .Pp
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 2952903..6cf814c 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -131,13 +131,13 @@ static struct part_type
 } part_types[] = {
 	 {0x00, "unused"}
 	,{0x01, "Primary DOS with 12 bit FAT"}
-	,{0x02, "XENIX / filesystem"}
-	,{0x03, "XENIX /usr filesystem"}
+	,{0x02, "XENIX / file system"}
+	,{0x03, "XENIX /usr file system"}
 	,{0x04, "Primary DOS with 16 bit FAT (< 32MB)"}
 	,{0x05, "Extended DOS"}
 	,{0x06, "Primary 'big' DOS (>= 32MB)"}
 	,{0x07, "OS/2 HPFS, NTFS, QNX-2 (16 bit) or Advanced UNIX"}
-	,{0x08, "AIX filesystem or SplitDrive"}
+	,{0x08, "AIX file system or SplitDrive"}
 	,{0x09, "AIX boot partition or Coherent"}
 	,{0x0A, "OS/2 Boot Manager, OPUS or Coherent swap"}
 	,{0x0B, "DOS or Windows 95 with 32 bit FAT"}
@@ -186,7 +186,7 @@ static struct part_type
 	,{0x85, "Linux extended"}
 	,{0x86, "NTFS volume set??"}
 	,{0x87, "NTFS volume set??"}
-	,{0x93, "Amoeba filesystem"}
+	,{0x93, "Amoeba file system"}
 	,{0x94, "Amoeba bad block table"}
 	,{0x9F, "BSD/OS"}
 	,{0xA0, "Suspend to Disk"}
@@ -195,7 +195,7 @@ static struct part_type
 	,{0xA7, "NeXTSTEP"}
 	,{0xA9, "NetBSD"}
 	,{0xAC, "IBM JFS"}
-	,{0xB7, "BSDI BSD/386 filesystem"}
+	,{0xB7, "BSDI BSD/386 file system"}
 	,{0xB8, "BSDI BSD/386 swap"}
 	,{0xC1, "DRDOS/sec with 12-bit FAT"}
 	,{0xC4, "DRDOS/sec with 16-bit FAT (< 32MB)"}
@@ -205,7 +205,7 @@ static struct part_type
 	,{0xE1, "DOS access or SpeedStor with 12-bit FAT extended partition"}
 	,{0xE3, "DOS R/O or SpeedStor"}
 	,{0xE4, "SpeedStor with 16-bit FAT extended partition < 1024 cyl."}
-	,{0xEB, "BeOS filesystem"}
+	,{0xEB, "BeOS file system"}
 	,{0xEE, "EFI GPT"}
 	,{0xEF, "EFI System Partition"}
 	,{0xF1, "SpeedStor"}
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index 3a525ee..a3ca910 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -353,7 +353,7 @@ It is an error if the following is not true:
 The number of cylinders should be less than or equal to 1024, but this
 is not enforced, although a warning will be output.  Note that bootable
 .Fx
-partitions (the "/" filesystem) must lie completely within the
+partitions (the "/" file system) must lie completely within the
 first 1024 cylinders; if this is not true, booting may fail.
 Non-bootable partitions do not have this restriction.
 .Pp
diff --git a/sbin/fdisk_pc98/fdisk.c b/sbin/fdisk_pc98/fdisk.c
index d20c495..104cf8a 100644
--- a/sbin/fdisk_pc98/fdisk.c
+++ b/sbin/fdisk_pc98/fdisk.c
@@ -156,13 +156,13 @@ struct part_type
 	,{0x21, "MSDOS"}
 	,{0x22, "MSDOS"}
 	,{0x23, "MSDOS"}
-	,{0x02, "XENIX / filesystem"}  
-	,{0x03, "XENIX /usr filesystem"}  
+	,{0x02, "XENIX / file system"}  
+	,{0x03, "XENIX /usr file system"}  
 	,{0x04, "PC-UX"}   
 	,{0x05, "Extended DOS"}   
 	,{0x06, "Primary 'big' DOS (> 32MB)"}   
 	,{0x07, "OS/2 HPFS, QNX or Advanced UNIX"}  
-	,{0x08, "AIX filesystem"}   
+	,{0x08, "AIX file system"}   
 	,{0x09, "AIX boot partition or Coherent"}  
 	,{0x0A, "OS/2 Boot Manager or OPUS"}  
 	,{0x10, "OPUS"} 
@@ -180,13 +180,13 @@ struct part_type
 	,{0x75, "PCIX"}
 	,{0x40, "Minix"} 
 #else
-	,{0x02, "XENIX / filesystem"}
-	,{0x03, "XENIX /usr filesystem"}
+	,{0x02, "XENIX / file system"}
+	,{0x03, "XENIX /usr file system"}
 	,{0x04, "Primary DOS with 16 bit FAT (<= 32MB)"}
 	,{0x05, "Extended DOS"}
 	,{0x06, "Primary 'big' DOS (> 32MB)"}
 	,{0x07, "OS/2 HPFS, NTFS, QNX or Advanced UNIX"}
-	,{0x08, "AIX filesystem"}
+	,{0x08, "AIX file system"}
 	,{0x09, "AIX boot partition or Coherent"}
 	,{0x0A, "OS/2 Boot Manager or OPUS"}
 	,{0x0B, "DOS or Windows 95 with 32 bit FAT"}
@@ -207,15 +207,15 @@ struct part_type
 	,{0x80, "Minix 1.1 ... 1.4a"}
 	,{0x81, "Minix 1.4b ... 1.5.10"}
 	,{0x82, "Linux swap or Solaris x86"}
-	,{0x83, "Linux filesystem"}
-	,{0x93, "Amoeba filesystem"}
+	,{0x83, "Linux file system"}
+	,{0x93, "Amoeba file system"}
 	,{0x94, "Amoeba bad block table"}
 	,{0x9F, "BSD/OS"}
 	,{0xA5, "FreeBSD/NetBSD/386BSD"}
 	,{0xA6, "OpenBSD"}
 	,{0xA7, "NEXTSTEP"}
 	,{0xA9, "NetBSD"}
-	,{0xB7, "BSDI BSD/386 filesystem"}
+	,{0xB7, "BSDI BSD/386 file system"}
 	,{0xB8, "BSDI BSD/386 swap"}
 	,{0xDB, "Concurrent CPM or C.DOS or CTOS"}
 	,{0xE1, "Speed"}
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index b730da2..2139a59 100644
--- a/sbin/ffsinfo/ffsinfo.8
+++ b/sbin/ffsinfo/ffsinfo.8
@@ -42,7 +42,7 @@
 .Os
 .Sh NAME
 .Nm ffsinfo
-.Nd "dump all meta information of an existing ufs filesystem"
+.Nd "dump all meta information of an existing ufs file system"
 .Sh SYNOPSIS
 .Nm
 .Op Fl L
@@ -61,7 +61,7 @@ utility.
 The output is generated into the file
 .Pa outfile .
 Also expect the output file to be rather large.
-Up to 2 percent of the size of the specified filesystem is not uncommon.
+Up to 2 percent of the size of the specified file system is not uncommon.
 .Pp
 The following options are available:
 .Bl -tag -width indent
@@ -128,15 +128,15 @@ with all available information.
 .Sh BUGS
 Currently
 .Nm
-can only dump unmounted filesystems.
-Do not try dumping a mounted filesystem, your system may panic and you will
-not be able to use the filesystem any longer.
+can only dump unmounted file systems.
+Do not try dumping a mounted file system, your system may panic and you will
+not be able to use the file system any longer.
 .Pp
 Also snapshots are handled like plain files.
 They should get their own level to provide for independent control of the
 amount of what gets dumped.
 It probably also makes sense to some extend to dump the snapshot as a
-filesystem.
+file system.
 .Sh SEE ALSO
 .Xr disklabel 8 ,
 .Xr dumpfs 8 ,
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 39c348e..3a184bd 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -125,12 +125,12 @@ rdfs(daddr_t bno, size_t size, void *bf, int fsi)
 
 /* ************************************************************** main ***** */
 /*
- * ffsinfo(8) is a tool to dump all metadata of a filesystem. It helps to find
- * errors is the filesystem much easier. You can run ffsinfo before and  after
+ * ffsinfo(8) is a tool to dump all metadata of a file system. It helps to find
+ * errors is the file system much easier. You can run ffsinfo before and  after
  * an  fsck(8),  and compare the two ascii dumps easy with diff, and  you  see
  * directly where the problem is. You can control how much detail you want  to
  * see  with some command line arguments. You can also easy check  the  status
- * of  a filesystem, like is there is enough space for growing  a  filesystem,
+ * of  a file system, like is there is enough space for growing  a  file system,
  * or  how  many active snapshots do we have. It provides much  more  detailed
  * information  then dumpfs. Snapshots, as they are very new, are  not  really
  * supported.  They  are just mentioned currently, but it is  planned  to  run
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 1d20f4f..af2a0e0 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -33,7 +33,7 @@
 .Os
 .Sh NAME
 .Nm fsck
-.Nd filesystem consistency check and interactive repair
+.Nd file system consistency check and interactive repair
 .Sh SYNOPSIS
 .Nm
 .Op Fl dvplfyn
@@ -45,7 +45,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility invokes filesystem-specific programs to check
+utility invokes file system-specific programs to check
 the special devices listed in the
 .Xr fstab 5
 file or in the command line for consistency.
@@ -55,31 +55,31 @@ It is normally used in the script
 during automatic reboot.
 Traditionally,
 .Nm
-is invoked before the filesystems are mounted
+is invoked before the file systems are mounted
 and all checks are done to completion at that time.
 If background checking is available,
 .Nm
 is invoked twice.
 It is first invoked at the traditional time,
-before the filesystems are mounted, with the
+before the file systems are mounted, with the
 .Fl F
-flag to do checking on all the filesystems
+flag to do checking on all the file systems
 that cannot do background checking.
 It is then invoked a second time,
 after the system has completed going multiuser, with the
 .Fl B
-flag to do checking on all the filesystems
+flag to do checking on all the file systems
 that can do background checking.
 Unlike the foreground checking,
 the background checking is started asynchonously
 so that other system activity can proceed
-even on the filesystems that are being checked.
+even on the file systems that are being checked.
 .Pp
-If no filesystems are specified,
+If no file systems are specified,
 .Nm
 reads the table
 .Pa /etc/fstab
-to determine which filesystems to check.
+to determine which file systems to check.
 Only partitions in
 .Pa /etc/fstab
 that are mounted
@@ -88,7 +88,7 @@ that are mounted
 or
 .Dq ro
 and that have non-zero pass number are checked.
-Filesystems with pass number 1 (normally just the root filesystem)
+Filesystems with pass number 1 (normally just the root file system)
 are always checked one at a time.
 .Pp
 If not in preen mode, the remaining entries are checked in order of
@@ -97,7 +97,7 @@ This is needed when interaction with
 .Nm
 is required.
 .Pp
-In preen mode, after pass 1 completes, all remaining filesystems are checked,
+In preen mode, after pass 1 completes, all remaining file systems are checked,
 in pass number order running one process per disk drive in parallel for each
 pass number in increasing order.
 .Pp
@@ -106,7 +106,7 @@ Next all pass 2 partitions are checked in parallel, one process per disk drive.
 Next all pass 3 partitions are checked in parallel, one process per disk drive.
 etc.
 .Pp
-The disk drive containing each filesystem is inferred from the shortest prefix
+The disk drive containing each file system is inferred from the shortest prefix
 of the device name that ends in a digit; the remaining characters are assumed
 to be the partition and slice designators.
 .Pp
@@ -118,7 +118,7 @@ only if
 .Nm
 is compiled to support it.
 .It Fl f
-Force checking of filesystems, even when they are marked clean (for filesystems
+Force checking of file systems, even when they are marked clean (for file systems
 that support this).
 .It Fl n
 Causes
@@ -127,7 +127,7 @@ to assume no as the answer to all operator questions, except "CONTINUE?".
 .It Fl p
 Enter preen mode.
 In preen mode, only a restricted class of innocuous
-filesystem inconsistencies will be corrected.
+file system inconsistencies will be corrected.
 If unexpected inconsistencies caused by hardware or
 software failures are encounted, the check program
 will exit with a failure.
@@ -136,7 +136,7 @@ for a list of the sorts of failures that they correct
 when running in preen mode.
 .It Fl F
 Run in foreground mode.
-The check program for each filesystem is invoked with the
+The check program for each file system is invoked with the
 .Fl F
 flag to determine whether it wishes to run as part of
 the boot up sequence,
@@ -148,29 +148,29 @@ A zero exit code indicates that it is able to run later in background
 and just a deferred message is printed.
 .It Fl B
 Run in background mode.
-The check program for each filesystem is invoked with the
+The check program for each file system is invoked with the
 .Fl F
 flag to determine whether it wishes to run as part of
 the boot up sequence,
 or if it is able to do its job in background after the
 system is up and running.
 A non-zero exit code indicates that it wanted to run in foreground
-which is assumed to have been done, so the filesystem is skipped.
+which is assumed to have been done, so the file system is skipped.
 A zero exit code indicates that it is able to run in background
 so the check program is invoked with the
 .Fl B
-flag to indicate that a check on the active filesystem should be done.
+flag to indicate that a check on the active file system should be done.
 When running in background mode,
-only one filesystem at a time will be checked.
+only one file system at a time will be checked.
 .It Fl t Ar fstype
 Invoke
 .Nm
-only for the comma separated list of filesystem types. If the
+only for the comma separated list of file system types. If the
 list starts with
 .Dq no
 then invoke
 .Nm
-for the filesystem types that are not specified in the list.
+for the file system types that are not specified in the list.
 .It Fl v
 Print the commands before executing them.
 .It Fl y
@@ -179,14 +179,14 @@ Causes
 to assume yes
 as the answer to all operator questions.
 .It Fl T Ar fstype : Ns Ar fsoptions
-List of comma separated filesystem specific options for the specified
-filesystem type, in the same format as
+List of comma separated file system specific options for the specified
+file system type, in the same format as
 .Xr mount 8 .
 .El
 .Sh FILES
 .Bl -tag -width /etc/fstab -compact
 .It Pa /etc/fstab
-filesystem table
+file system table
 .El
 .Sh SEE ALSO
 .Xr fstab 5 ,
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 5be806e..37bb64b 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -204,7 +204,7 @@ main(int argc, char *argv[])
 			type = fs->fs_vfstype;
 			mntpt = fs->fs_file;
 			if (BADTYPE(fs->fs_type))
-				errx(1, "%s has unknown filesystem type.",
+				errx(1, "%s has unknown file system type.",
 				    spec);
 		}
 		if ((flags & CHECK_BACKGRD) &&
@@ -237,9 +237,9 @@ isok(struct fstab *fs)
 	/*
 	 * If the -B flag has been given, then process the needed
 	 * background checks. Background checks cannot be run on
-	 * filesystems that will be mounted read-only or that were
+	 * file systems that will be mounted read-only or that were
 	 * not mounted at boot time (typically those marked `noauto').
-	 * If these basic tests are passed, check with the filesystem
+	 * If these basic tests are passed, check with the file system
 	 * itself to see if it is willing to do background checking
 	 * by invoking its check program with the -F flag.
 	 */
@@ -255,9 +255,9 @@ isok(struct fstab *fs)
 	/*
 	 * If the -F flag has been given, then consider deferring the
 	 * check to background. Background checks cannot be run on
-	 * filesystems that will be mounted read-only or that will
+	 * file systems that will be mounted read-only or that will
 	 * not be mounted at boot time (e.g., marked `noauto'). If
-	 * these basic tests are passed, check with the filesystem
+	 * these basic tests are passed, check with the file system
 	 * itself to see if it is willing to defer to background
 	 * checking by invoking its check program with the -F flag.
 	 */
@@ -550,7 +550,7 @@ getfslab(const char *str)
 	const char *vfstype;
 	u_char t;
 
-	/* deduce the filesystem type from the disk label */
+	/* deduce the file system type from the disk label */
 	if ((fd = open(str, O_RDONLY)) == -1)
 		err(1, "cannot open `%s'", str);
 
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index c26f23b..09403ec 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -63,7 +63,7 @@ struct partentry {
 	TAILQ_ENTRY(partentry)	 p_entries;
 	char		  	*p_devname;	/* device name */
 	char			*p_mntpt;	/* mount point */
-	char		  	*p_type;	/* filesystem type */
+	char		  	*p_type;	/* file system type */
 };
 
 TAILQ_HEAD(part, partentry) badh;
diff --git a/sbin/fsck_ffs/SMM.doc/0.t b/sbin/fsck_ffs/SMM.doc/0.t
index 80d19f3..1fb25ee6 100644
--- a/sbin/fsck_ffs/SMM.doc/0.t
+++ b/sbin/fsck_ffs/SMM.doc/0.t
@@ -63,31 +63,31 @@ Contract No. N00039-82-C-0235.
 .FE
 This document reflects the use of
 .I fsck_ffs
-with the 4.2BSD and 4.3BSD filesystem organization.  This
+with the 4.2BSD and 4.3BSD file system organization.  This
 is a revision of the
 original paper written by
 T. J. Kowalski.
 .PP
 File System Check Program (\fIfsck_ffs\fR)
-is an interactive filesystem check and repair program.
+is an interactive file system check and repair program.
 .I Fsck_ffs
 uses the redundant structural information in the
-UNIX filesystem to perform several consistency checks.
+UNIX file system to perform several consistency checks.
 If an inconsistency is detected, it is reported
 to the operator, who may elect to fix or ignore
 each inconsistency.
 These inconsistencies result from the permanent interruption
-of the filesystem updates, which are performed every
+of the file system updates, which are performed every
 time a file is modified.
 Unless there has been a hardware failure,
 .I fsck_ffs
-is able to repair corrupted filesystems
+is able to repair corrupted file systems
 using procedures based upon the order in which UNIX honors
-these filesystem update requests.
+these file system update requests.
 .PP
 The purpose of this document is to describe the normal updating
-of the filesystem,
-to discuss the possible causes of filesystem corruption,
+of the file system,
+to discuss the possible causes of file system corruption,
 and to present the corrective actions implemented
 by
 .I fsck_ffs.
@@ -108,16 +108,16 @@ Revised October 7, 1996
 .LP
 .sp .5v
 .nf
-.B "2.  Overview of the filesystem
+.B "2.  Overview of the file system
 2.1.    Superblock
 2.2.    Summary Information
 2.3.    Cylinder groups
 2.4.    Fragments
-2.5.    Updates to the filesystem
+2.5.    Updates to the file system
 .LP
 .sp .5v
 .nf
-.B "3.  Fixing corrupted filesystems
+.B "3.  Fixing corrupted file systems
 3.1.    Detecting and correcting corruption
 3.2.    Super block checking
 3.3.    Free block checking
diff --git a/sbin/fsck_ffs/SMM.doc/1.t b/sbin/fsck_ffs/SMM.doc/1.t
index ea07f07..1930102 100644
--- a/sbin/fsck_ffs/SMM.doc/1.t
+++ b/sbin/fsck_ffs/SMM.doc/1.t
@@ -38,14 +38,14 @@ Introduction
 .PP
 This document reflects the use of
 .I fsck_ffs
-with the 4.2BSD and 4.3BSD filesystem organization.  This
+with the 4.2BSD and 4.3BSD file system organization.  This
 is a revision of the
 original paper written by
 T. J. Kowalski.
 .PP
 When a UNIX
 operating system is brought up, a consistency
-check of the filesystems should always be performed.
+check of the file systems should always be performed.
 This precautionary measure helps to insure
 a reliable environment for file storage on disk.
 If an inconsistency is discovered,
@@ -55,7 +55,7 @@ runs in two modes.
 Normally it is run non-interactively by the system after 
 a normal boot.
 When running in this mode,
-it will only make changes to the filesystem that are known
+it will only make changes to the file system that are known
 to always be correct.
 If an unexpected inconsistency is found
 .I fsck_ffs
@@ -71,10 +71,10 @@ should be made.
 .PP
 The purpose of this memo is to dispel the
 mystique surrounding
-filesystem inconsistencies.
-It first describes the updating of the filesystem
+file system inconsistencies.
+It first describes the updating of the file system
 (the calm before the storm) and
-then describes filesystem corruption (the storm).
+then describes file system corruption (the storm).
 Finally,
 the set of deterministic corrective actions
 used by
diff --git a/sbin/fsck_ffs/SMM.doc/2.t b/sbin/fsck_ffs/SMM.doc/2.t
index 0f0bef7..c6a8e4b 100644
--- a/sbin/fsck_ffs/SMM.doc/2.t
+++ b/sbin/fsck_ffs/SMM.doc/2.t
@@ -32,22 +32,22 @@
 .\"	$FreeBSD$
 .\"	@(#)2.t	8.1 (Berkeley) 6/5/93
 .\"
-.ds RH Overview of the filesystem
+.ds RH Overview of the file system
 .NH
-Overview of the filesystem
+Overview of the file system
 .PP
-The filesystem is discussed in detail in [Mckusick84];
+The file system is discussed in detail in [Mckusick84];
 this section gives a brief overview.
 .NH 2
 Superblock
 .PP
-A filesystem is described by its
+A file system is described by its
 .I "super-block" .
-The super-block is built when the filesystem is created (\c
+The super-block is built when the file system is created (\c
 .I newfs (8))
 and never changes.
 The super-block
-contains the basic parameters of the filesystem,
+contains the basic parameters of the file system,
 such as the number of data blocks it contains
 and a count of the maximum number of files.
 Because the super-block contains critical data,
@@ -56,7 +56,7 @@ replicates it to protect against catastrophic loss.
 The
 .I "default super block"
 always resides at a fixed offset from the beginning
-of the filesystem's disk partition.
+of the file system's disk partition.
 The
 .I "redundant super blocks"
 are not referenced unless a head crash
@@ -64,7 +64,7 @@ or other hard disk error causes the default super-block
 to be unusable.
 The redundant blocks are sprinkled throughout the disk partition.
 .PP
-Within the filesystem are files.
+Within the file system are files.
 Certain files are distinguished as directories and contain collections
 of pointers to files that may themselves be directories.
 Every file has a descriptor associated with it called an
@@ -82,7 +82,7 @@ the range 5-13.
 .FE
 The inode structure may also contain references to indirect blocks
 containing further data block indices.
-In a filesystem with a 4096 byte block size, a singly indirect
+In a file system with a 4096 byte block size, a singly indirect
 block contains 1024 further block addresses,
 a doubly indirect block contains 1024 addresses of further single indirect
 blocks,
@@ -92,30 +92,30 @@ blocks (the triple indirect block is never needed in practice).
 In order to create files with up to
 2\(ua32 bytes,
 using only two levels of indirection,
-the minimum size of a filesystem block is 4096 bytes.
-The size of filesystem blocks can be any power of two
+the minimum size of a file system block is 4096 bytes.
+The size of file system blocks can be any power of two
 greater than or equal to 4096.
-The block size of the filesystem is maintained in the super-block,
-so it is possible for filesystems of different block sizes
+The block size of the file system is maintained in the super-block,
+so it is possible for file systems of different block sizes
 to be accessible simultaneously on the same system.
 The block size must be decided when
 .I newfs
-creates the filesystem;
+creates the file system;
 the block size cannot be subsequently
-changed without rebuilding the filesystem.
+changed without rebuilding the file system.
 .NH 2
 Summary information
 .PP
 Associated with the super block is non replicated
 .I "summary information" .
 The summary information changes
-as the filesystem is modified.
+as the file system is modified.
 The summary information contains
-the number of blocks, fragments, inodes and directories in the filesystem.
+the number of blocks, fragments, inodes and directories in the file system.
 .NH 2
 Cylinder groups
 .PP
-The filesystem partitions the disk into one or more areas called
+The file system partitions the disk into one or more areas called
 .I "cylinder groups".
 A cylinder group is comprised of one or more consecutive
 cylinders on a disk.
@@ -125,7 +125,7 @@ describing available blocks in the cylinder group,
 and summary information describing the usage of data blocks
 within the cylinder group.
 A fixed number of inodes is allocated for each cylinder group
-when the filesystem is created.
+when the file system is created.
 The current policy is to allocate one inode for each 2048
 bytes of disk space;
 this is expected to be far more inodes than will ever be needed.
@@ -158,12 +158,12 @@ and the beginning of the cylinder group information stores data.
 Fragments
 .PP
 To avoid waste in storing small files,
-the filesystem space allocator divides a single
-filesystem block into one or more
+the file system space allocator divides a single
+file system block into one or more
 .I "fragments".
-The fragmentation of the filesystem is specified
-when the filesystem is created;
-each filesystem block can be optionally broken into
+The fragmentation of the file system is specified
+when the file system is created;
+each file system block can be optionally broken into
 2, 4, or 8 addressable fragments.
 The lower bound on the size of these fragments is constrained
 by the disk sector size;
@@ -173,17 +173,17 @@ records the space availability at the fragment level.
 Aligned fragments are examined
 to determine block availability.
 .PP
-On a filesystem with a block size of 4096 bytes
+On a file system with a block size of 4096 bytes
 and a fragment size of 1024 bytes,
 a file is represented by zero or more 4096 byte blocks of data,
 and possibly a single fragmented block.
-If a filesystem block must be fragmented to obtain
+If a file system block must be fragmented to obtain
 space for a small amount of data,
 the remainder of the block is made available for allocation
 to other files.
 For example,
 consider an 11000 byte file stored on
-a 4096/1024 byte filesystem.
+a 4096/1024 byte file system.
 This file uses two full size blocks and a 3072 byte fragment.
 If no fragments with at least 3072 bytes
 are available when the file is created,
@@ -191,26 +191,26 @@ a full size block is split yielding the necessary 3072 byte
 fragment and an unused 1024 byte fragment.
 This remaining fragment can be allocated to another file, as needed.
 .NH 2
-Updates to the filesystem
+Updates to the file system
 .PP
 Every working day hundreds of files
 are created, modified, and removed.
 Every time a file is modified,
 the operating system performs a
-series of filesystem updates.
-These updates, when written on disk, yield a consistent filesystem.
-The filesystem stages
+series of file system updates.
+These updates, when written on disk, yield a consistent file system.
+The file system stages
 all modifications of critical information;
 modification can
 either be completed or cleanly backed out after a crash.
-Knowing the information that is first written to the filesystem,
+Knowing the information that is first written to the file system,
 deterministic procedures can be developed to
-repair a corrupted filesystem.
+repair a corrupted file system.
 To understand this process,
 the order that the update
 requests were being honored must first be understood.
 .PP
-When a user program does an operation to change the filesystem,
+When a user program does an operation to change the file system,
 such as a 
 .I write ,
 the data to be written is copied into an internal
@@ -225,9 +225,9 @@ is eventually written out to disk.
 The real disk write may not happen until long after the
 .I write
 system call has returned.
-Thus at any given time, the filesystem,
+Thus at any given time, the file system,
 as it resides on the disk,
-lags the state of the filesystem represented by the in-core information.
+lags the state of the file system represented by the in-core information.
 .PP
 The disk information is updated to reflect the in-core information
 when the buffer is required for another use,
@@ -239,7 +239,7 @@ or by manual operator intervention with the
 .I sync (8)
 command.
 If the system is halted without writing out the in-core information,
-the filesystem on the disk will be in an inconsistent state.
+the file system on the disk will be in an inconsistent state.
 .PP
 If all updates are done asynchronously, several serious
 inconsistencies can arise.
@@ -263,4 +263,4 @@ really written to disk)
 when they are being deallocated.
 Similarly inodes are kept consistent by synchronously
 deleting, adding, or changing directory entries.
-.ds RH Fixing corrupted filesystems
+.ds RH Fixing corrupted file systems
diff --git a/sbin/fsck_ffs/SMM.doc/3.t b/sbin/fsck_ffs/SMM.doc/3.t
index b02371b..66c3281 100644
--- a/sbin/fsck_ffs/SMM.doc/3.t
+++ b/sbin/fsck_ffs/SMM.doc/3.t
@@ -32,11 +32,11 @@
 .\"	$FreeBSD$
 .\"	@(#)3.t	8.1 (Berkeley) 6/5/93
 .\"
-.ds RH Fixing corrupted filesystems
+.ds RH Fixing corrupted file systems
 .NH
-Fixing corrupted filesystems
+Fixing corrupted file systems
 .PP
-A filesystem
+A file system
 can become corrupted in several ways.
 The most common of these ways are
 improper shutdown procedures
@@ -46,17 +46,17 @@ File systems may become corrupted during an
 .I "unclean halt" .
 This happens when proper shutdown
 procedures are not observed,
-physically write-protecting a mounted filesystem,
-or a mounted filesystem is taken off-line.
+physically write-protecting a mounted file system,
+or a mounted file system is taken off-line.
 The most common operator procedural failure is forgetting to
 .I sync
 the system before halting the CPU.
 .PP
 File systems may become further corrupted if proper startup
 procedures are not observed, e.g.,
-not checking a filesystem for inconsistencies,
+not checking a file system for inconsistencies,
 and not repairing inconsistencies.
-Allowing a corrupted filesystem to be used (and, thus, to be modified
+Allowing a corrupted file system to be used (and, thus, to be modified
 further) can be disastrous.
 .PP
 Any piece of hardware can fail at any time.
@@ -87,13 +87,13 @@ A quiescent\(dd
 .FS
 \(dd I.e., unmounted and not being written on.
 .FE
-filesystem may be checked for structural integrity
+file system may be checked for structural integrity
 by performing consistency checks on the
-redundant data intrinsic to a filesystem.
+redundant data intrinsic to a file system.
 The redundant data is either read from
-the filesystem,
+the file system,
 or computed from other known values.
-The filesystem
+The file system
 .B must
 be in a quiescent state when
 .I fsck_ffs
@@ -110,7 +110,7 @@ the data blocks containing directory entries.
 .NH 2
 Super-block checking
 .PP
-The most commonly corrupted item in a filesystem
+The most commonly corrupted item in a file system
 is the summary information
 associated with the super-block.
 The summary information is prone to corruption
@@ -133,7 +133,7 @@ since they are statically determined by
 .I newfs ,
 .I fsck_ffs
 can check that these sizes are within reasonable bounds.
-All other filesystem checks require that these sizes be correct.
+All other file system checks require that these sizes be correct.
 If
 .I fsck_ffs 
 detects corruption in the static parameters of the default super-block,
@@ -151,7 +151,7 @@ When all the blocks have been initially accounted for,
 checks that
 the number of free blocks
 plus the number of blocks claimed by the inodes
-equals the total number of blocks in the filesystem.
+equals the total number of blocks in the file system.
 .PP
 If anything is wrong with the block allocation maps,
 .I fsck_ffs
@@ -159,20 +159,20 @@ will rebuild them,
 based on the list it has computed of allocated blocks.
 .PP
 The summary information associated with the super-block
-counts the total number of free blocks within the filesystem.
+counts the total number of free blocks within the file system.
 .I Fsck_ffs
 compares this count to the
-number of free blocks it found within the filesystem.
+number of free blocks it found within the file system.
 If the two counts do not agree, then
 .I fsck_ffs
 replaces the incorrect count in the summary information
 by the actual free-block count.
 .PP
 The summary information
-counts the total number of free inodes within the filesystem.
+counts the total number of free inodes within the file system.
 .I Fsck_ffs
 compares this count to the number
-of free inodes it found within the filesystem.
+of free inodes it found within the file system.
 If the two counts do not agree, then
 .I fsck_ffs
 replaces the incorrect count in the
@@ -185,11 +185,11 @@ the allocation information.
 However, because of the great number of active inodes,
 a few of the inodes are usually corrupted.
 .PP
-The list of inodes in the filesystem
+The list of inodes in the file system
 is checked sequentially starting with inode 2
 (inode 0 marks unused inodes;
 inode 1 is saved for future generations)
-and progressing through the last inode in the filesystem.
+and progressing through the last inode in the file system.
 The state of each inode is checked for
 inconsistencies involving format and type,
 link count,
@@ -218,7 +218,7 @@ total number of directory entries
 linked to the inode.
 .I Fsck_ffs
 verifies the link count of each inode
-by starting at the root of the filesystem,
+by starting at the root of the file system,
 and descending through the directory structure.
 The actual link count for each inode
 is calculated during the descent.
@@ -279,12 +279,12 @@ and which one should be cleared.
 .I Fsck_ffs
 checks the range of each block number claimed by an inode.
 If the block number is
-lower than the first data block in the filesystem,
+lower than the first data block in the file system,
 or greater than the last data block,
 then the block number is a
 .I "bad block number" .
 Many bad blocks in an inode are usually caused by
-an indirect block that was not written to the filesystem,
+an indirect block that was not written to the file system,
 a condition which can only occur if there has been a hardware failure.
 If an inode contains bad block numbers,
 .I fsck_ffs
@@ -334,9 +334,9 @@ several types of inconsistencies.
 These inconsistencies include
 directory inode numbers pointing to unallocated inodes,
 directory inode numbers that are greater than
-the number of inodes in the filesystem,
+the number of inodes in the file system,
 incorrect directory inode numbers for ``\fB.\fP'' and ``\fB..\fP'',
-and directories that are not attached to the filesystem.
+and directories that are not attached to the file system.
 If the inode number in a directory data block
 references an unallocated inode,
 then
@@ -390,10 +390,10 @@ to which ``\fB..\fP'' should point;
 File system connectivity
 .PP
 .I Fsck_ffs
-checks the general connectivity of the filesystem.
-If directories are not linked into the filesystem, then
+checks the general connectivity of the file system.
+If directories are not linked into the file system, then
 .I fsck_ffs
-links the directory back into the filesystem in the
+links the directory back into the file system in the
 .I lost+found
 directory.
 This condition only occurs when there has been a hardware failure.
@@ -402,7 +402,7 @@ This condition only occurs when there has been a hardware failure.
 \s+2Acknowledgements\s0
 .PP
 I thank Bill Joy, Sam Leffler, Robert Elz and Dennis Ritchie 
-for their suggestions and help in implementing the new filesystem.
+for their suggestions and help in implementing the new file system.
 Thanks also to Robert Henry for his editorial input to
 get this document together.
 Finally we thank our sponsors,
diff --git a/sbin/fsck_ffs/SMM.doc/4.t b/sbin/fsck_ffs/SMM.doc/4.t
index 7f52588..5c23dcc 100644
--- a/sbin/fsck_ffs/SMM.doc/4.t
+++ b/sbin/fsck_ffs/SMM.doc/4.t
@@ -40,13 +40,13 @@ Conventions
 .PP
 .I Fsck_ffs
 is
-a multi-pass filesystem check program.
-Each filesystem pass invokes a different Phase of the
+a multi-pass file system check program.
+Each file system pass invokes a different Phase of the
 .I fsck_ffs
 program.
 After the initial setup,
 .I fsck_ffs
-performs successive Phases over each filesystem,
+performs successive Phases over each file system,
 checking blocks and sizes,
 path-names,
 connectivity,
@@ -59,8 +59,8 @@ Normally
 .I fsck_ffs
 is run non-interactively to
 .I preen
-the filesystems after an unclean halt.
-While preen'ing a filesystem,
+the file systems after an unclean halt.
+While preen'ing a file system,
 it will only fix corruptions that are expected
 to occur from an unclean halt.
 These actions are a proper subset of the actions that 
@@ -92,7 +92,7 @@ will be discussed in initialization.
 .NH 2 
 Initialization
 .PP
-Before a filesystem check can be performed, certain
+Before a file system check can be performed, certain
 tables have to be set up and certain files opened.
 This section concerns itself with the opening of files and
 the initialization of tables.
@@ -101,10 +101,10 @@ command line options,
 memory requests,
 opening of files,
 status of files,
-filesystem size checks,
+file system size checks,
 and creation of the scratch file.
 All the initialization errors are fatal
-when the filesystem is being preen'ed.
+when the file system is being preen'ed.
 .sp
 .LP
 .B "\fIC\fP option?"
@@ -138,7 +138,7 @@ See a guru.
 .LP
 .B "Can't open checklist file: \fIF\fP"
 .br
-The filesystem checklist file
+The file system checklist file
 \fIF\fP (usually
 .I /etc/fstab )
 can not be opened for reading.
@@ -162,19 +162,19 @@ See a guru.
 .B "Can't make sense out of name \fIF\fP"
 .br
 .I Fsck_ffs 's
-request for statistics about the filesystem \fIF\fP failed.
+request for statistics about the file system \fIF\fP failed.
 When running manually,
-it ignores this filesystem
-and continues checking the next filesystem given.
+it ignores this file system
+and continues checking the next file system given.
 Check access modes of \fIF\fP.
 .sp
 .LP
 .B "Can't open \fIF\fP"
 .br
 .I Fsck_ffs 's
-request attempt to open the filesystem \fIF\fP failed.
-When running manually, it ignores this filesystem
-and continues checking the next filesystem given.
+request attempt to open the file system \fIF\fP failed.
+When running manually, it ignores this file system
+and continues checking the next file system given.
 Check access modes of \fIF\fP.
 .sp
 .LP
@@ -182,7 +182,7 @@ Check access modes of \fIF\fP.
 .br
 Either the \-n flag was specified or
 .I fsck_ffs 's
-attempt to open the filesystem \fIF\fP for writing failed.
+attempt to open the file system \fIF\fP for writing failed.
 When running manually,
 all the diagnostics are printed out,
 but no modifications are attempted to fix them.
@@ -199,8 +199,8 @@ Possible responses to the OK prompt are:
 .IP YES
 ignore this error condition.
 .IP NO
-ignore this filesystem and continues checking
-the next filesystem given.
+ignore this file system and continues checking
+the next file system given.
 .sp
 .LP
 .B "UNDEFINED OPTIMIZATION IN SUPERBLOCK (SET TO DEFAULT)"
@@ -234,7 +234,7 @@ ignore this error condition.
 .LP
 .B "IMPOSSIBLE INTERLEAVE=\fID\fP IN SUPERBLOCK (SET TO DEFAULT)"
 .br
-The filesystem interleave is less than or equal to zero.
+The file system interleave is less than or equal to zero.
 .LP
 Possible responses to the SET TO DEFAULT prompt are:
 .IP YES
@@ -281,8 +281,8 @@ The super block has been corrupted.
 An alternative super block must be selected from among those
 listed by
 .I newfs
-(8) when the filesystem was created.
-For filesystems with a blocksize less than 32K,
+(8) when the file system was created.
+For file systems with a blocksize less than 32K,
 specifying \-b 32 is a good first choice.
 .sp
 .LP
@@ -298,19 +298,19 @@ See a guru.
 .br
 .I Fsck_ffs 's
 request for moving to a specified block number \fIB\fP in
-the filesystem failed.
+the file system failed.
 This should never happen.
 See a guru.
 .LP
 Possible responses to the CONTINUE prompt are:
 .IP YES
-attempt to continue to run the filesystem check.
+attempt to continue to run the file system check.
 Often,
 however the problem will persist.
-This error condition will not allow a complete check of the filesystem.
+This error condition will not allow a complete check of the file system.
 A second run of
 .I fsck_ffs
-should be made to re-check this filesystem.
+should be made to re-check this file system.
 If the block was part of the virtual memory buffer
 cache,
 .I fsck_ffs
@@ -323,13 +323,13 @@ terminate the program.
 .br
 .I Fsck_ffs 's
 request for reading a specified block number \fIB\fP in
-the filesystem failed.
+the file system failed.
 This should never happen.
 See a guru.
 .LP
 Possible responses to the CONTINUE prompt are:
 .IP YES
-attempt to continue to run the filesystem check.
+attempt to continue to run the file system check.
 It will retry the read and print out the message:
 .br
 .B "THE FOLLOWING SECTORS COULD NOT BE READ: \fIN\fP"
@@ -344,10 +344,10 @@ it will print the message:
 .br
 where \fIN\fP indicates the sector that was written with zero's.
 If the disk is experiencing hardware problems, the problem will persist.
-This error condition will not allow a complete check of the filesystem.
+This error condition will not allow a complete check of the file system.
 A second run of
 .I fsck_ffs
-should be made to re-check this filesystem.
+should be made to re-check this file system.
 If the block was part of the virtual memory buffer
 cache,
 .I fsck_ffs
@@ -360,14 +360,14 @@ terminate the program.
 .br
 .I Fsck_ffs 's
 request for writing a specified block number \fIB\fP
-in the filesystem failed.
+in the file system failed.
 The disk is write-protected;
 check the write protect lock on the drive.
 If that is not the problem, see a guru.
 .LP
 Possible responses to the CONTINUE prompt are:
 .IP YES
-attempt to continue to run the filesystem check.
+attempt to continue to run the file system check.
 The write operation will be retried with the failed blocks
 indicated by the message:
 .br
@@ -375,10 +375,10 @@ indicated by the message:
 .br
 where \fIN\fP indicates the sectors that could not be written.
 If the disk is experiencing hardware problems, the problem will persist.
-This error condition will not allow a complete check of the filesystem.
+This error condition will not allow a complete check of the file system.
 A second run of
 .I fsck_ffs
-should be made to re-check this filesystem.
+should be made to re-check this file system.
 If the block was part of the virtual memory buffer
 cache,
 .I fsck_ffs
@@ -409,7 +409,7 @@ All errors in this phase except
 .B "INCORRECT BLOCK COUNT"
 and
 .B "PARTIALLY TRUNCATED INODE"
-are fatal if the filesystem is being preen'ed.
+are fatal if the file system is being preen'ed.
 .sp
 .LP
 .B "UNKNOWN FILE TYPE I=\fII\fP (CLEAR)"
@@ -434,7 +434,7 @@ has found inode \fII\fP whose size is shorter than the number of
 blocks allocated to it.
 This condition should only occur if the system crashes while in the
 midst of truncating a file.
-When preen'ing the filesystem, 
+When preen'ing the file system, 
 .I fsck_ffs
 completes the truncation to the specified size.
 .LP
@@ -457,10 +457,10 @@ Increase the virtual memory for
 Possible responses to the CONTINUE prompt are:
 .IP YES
 continue with the program.
-This error condition will not allow a complete check of the filesystem.
+This error condition will not allow a complete check of the file system.
 A second run of
 .I fsck_ffs
-should be made to re-check this filesystem.
+should be made to re-check this file system.
 If another allocated inode with a zero link count is found,
 this error condition is repeated.
 .IP NO
@@ -470,13 +470,13 @@ terminate the program.
 .B "\fIB\fP BAD I=\fII\fP"
 .br
 Inode \fII\fP contains block number \fIB\fP with a number
-lower than the number of the first data block in the filesystem or
+lower than the number of the first data block in the file system or
 greater than the number of the last block
-in the filesystem.
+in the file system.
 This error condition may invoke the
 .B "EXCESSIVE BAD BLKS"
 error condition in Phase 1 (see next paragraph) if
-inode \fII\fP has too many block numbers outside the filesystem range.
+inode \fII\fP has too many block numbers outside the file system range.
 This error condition will always invoke the
 .B "BAD/DUP"
 error condition in Phase 2 and Phase 4.
@@ -485,17 +485,17 @@ error condition in Phase 2 and Phase 4.
 .B "EXCESSIVE BAD BLKS I=\fII\fP (CONTINUE)"
 .br
 There is more than a tolerable number (usually 10) of blocks with a number
-lower than the number of the first data block in the filesystem or greater than
-the number of last block in the filesystem associated with inode \fII\fP.
+lower than the number of the first data block in the file system or greater than
+the number of last block in the file system associated with inode \fII\fP.
 .LP
 Possible responses to the CONTINUE prompt are:
 .IP YES
 ignore the rest of the blocks in this inode
-and continue checking with the next inode in the filesystem.
-This error condition will not allow a complete check of the filesystem.
+and continue checking with the next inode in the file system.
+This error condition will not allow a complete check of the file system.
 A second run of
 .I fsck_ffs
-should be made to re-check this filesystem.
+should be made to re-check this file system.
 .IP NO
 terminate the program.
 .sp
@@ -531,11 +531,11 @@ inodes.
 Possible responses to the CONTINUE prompt are:
 .IP YES
 ignore the rest of the blocks in this inode
-and continue checking with the next inode in the filesystem.
-This error condition will not allow a complete check of the filesystem.
+and continue checking with the next inode in the file system.
+This error condition will not allow a complete check of the file system.
 A second run of
 .I fsck_ffs
-should be made to re-check this filesystem.
+should be made to re-check this file system.
 .IP NO
 terminate the program.
 .sp
@@ -551,10 +551,10 @@ Increase the amount of virtual memory available to
 Possible responses to the CONTINUE prompt are:
 .IP YES
 continue with the program.
-This error condition will not allow a complete check of the filesystem.
+This error condition will not allow a complete check of the file system.
 A second run of
 .I fsck_ffs
-should be made to re-check this filesystem.
+should be made to re-check this file system.
 If another duplicate block is found, this error condition will repeat.
 .IP NO
 terminate the program.
@@ -585,7 +585,7 @@ ignore this error condition.
 .NH 2 
 Phase 1B: Rescan for More Dups
 .PP
-When a duplicate block is found in the filesystem, the filesystem is
+When a duplicate block is found in the file system, the file system is
 rescanned to find the inode that previously claimed that block.
 This section lists the error condition when the duplicate block is found.
 .sp
@@ -611,7 +611,7 @@ root inode mode and status,
 directory inode pointers in range,
 and directory entries pointing to bad inodes,
 and directory integrity checks.
-All errors in this phase are fatal if the filesystem is being preen'ed,
+All errors in this phase are fatal if the file system is being preen'ed,
 except for directories not being a multiple of the blocks size
 and extraneous hard links.
 .sp
@@ -671,7 +671,7 @@ terminate the program.
 .B "DUPS/BAD IN ROOT INODE (REALLOCATE)"
 .br
 Phase 1 or Phase 1b have found duplicate blocks
-or bad blocks in the root inode (usually inode number 2) for the filesystem.
+or bad blocks in the root inode (usually inode number 2) for the file system.
 .LP
 Possible responses to the REALLOCATE prompt are:
 .IP YES
@@ -695,7 +695,7 @@ Possible responses to the CONTINUE prompt are:
 ignore the
 .B "DUPS/BAD"
 error condition in the root inode and
-attempt to continue to run the filesystem check.
+attempt to continue to run the file system check.
 If the root inode is not correct,
 then this may result in many other error conditions.
 .IP NO
@@ -705,7 +705,7 @@ terminate the program.
 .B "NAME TOO LONG \fIF\fP"
 .br
 An excessively long path name has been found.
-This usually indicates loops in the filesystem name space.
+This usually indicates loops in the file system name space.
 This can occur if the super user has made circular links to directories.
 The offending links must be removed (by a guru).
 .sp
@@ -785,8 +785,8 @@ a multiple of the directory blocksize \fIB\fP.
 Possible responses to the ADJUST prompt are:
 .IP YES
 the length is rounded up to the appropriate block size.
-This error can occur on 4.2BSD filesystems.
-Thus when preen'ing the filesystem only a warning is printed
+This error can occur on 4.2BSD file systems.
+Thus when preen'ing the file system only a warning is printed
 and the directory is adjusted.
 .IP NO
 ignore the error condition.
@@ -837,9 +837,9 @@ leave the directory unchanged.
 A directory \fII\fP has been found whose first entry is \fIF\fP.
 .I Fsck_ffs
 cannot resolve this problem. 
-The filesystem should be mounted and the offending entry \fIF\fP
+The file system should be mounted and the offending entry \fIF\fP
 moved elsewhere.
-The filesystem should then be unmounted and
+The file system should then be unmounted and
 .I fsck_ffs
 should be run again.
 .sp
@@ -897,9 +897,9 @@ leave the directory unchanged.
 A directory \fII\fP has been found whose second entry is \fIF\fP.
 .I Fsck_ffs
 cannot resolve this problem. 
-The filesystem should be mounted and the offending entry \fIF\fP
+The file system should be mounted and the offending entry \fIF\fP
 moved elsewhere.
-The filesystem should then be unmounted and
+The file system should then be unmounted and
 .I fsck_ffs
 should be run again.
 .sp
@@ -911,9 +911,9 @@ should be run again.
 A directory \fII\fP has been found whose second entry is not `..'.
 .I Fsck_ffs
 cannot resolve this problem.
-The filesystem should be mounted and the second entry in the directory
+The file system should be mounted and the second entry in the directory
 moved elsewhere.
-The filesystem should then be unmounted and
+The file system should then be unmounted and
 .I fsck_ffs
 should be run again.
 .sp
@@ -945,7 +945,7 @@ ignore the error condition.
 .B "BAD INODE \fIS\fP TO DESCEND"
 .br
 An internal error has caused an impossible state \fIS\fP to be passed to the
-routine that descends the filesystem directory structure.
+routine that descends the file system directory structure.
 .I Fsck_ffs
 exits.
 See a guru.
@@ -954,7 +954,7 @@ See a guru.
 .B "BAD RETURN STATE \fIS\fP FROM DESCEND"
 .br
 An internal error has caused an impossible state \fIS\fP to be returned
-from the routine that descends the filesystem directory structure.
+from the routine that descends the file system directory structure.
 .I Fsck_ffs
 exits.
 See a guru.
@@ -982,7 +982,7 @@ directories.
 .B "UNREF DIR I=\fII\fP OWNER=\fIO\fP MODE=\fIM\fP SIZE=\fIS\fP MTIME=\fIT\fP (RECONNECT)"
 .br
 The directory inode \fII\fP was not connected to a directory entry
-when the filesystem was traversed.
+when the file system was traversed.
 The owner \fIO\fP, mode \fIM\fP, size \fIS\fP, and
 modify time \fIT\fP of directory inode \fII\fP are printed.
 When preen'ing, the directory is reconnected if its size is non-zero,
@@ -990,7 +990,7 @@ otherwise it is cleared.
 .LP
 Possible responses to the RECONNECT prompt are:
 .IP YES
-reconnect directory inode \fII\fP to the filesystem in the
+reconnect directory inode \fII\fP to the file system in the
 directory for lost files (usually \fIlost+found\fP).
 This may invoke the
 .I lost+found
@@ -1007,14 +1007,14 @@ This will always invoke the UNREF error condition in Phase 4.
 .br
 There is no
 .I lost+found
-directory in the root directory of the filesystem;
+directory in the root directory of the file system;
 When preen'ing
 .I fsck_ffs
 tries to create a \fIlost+found\fP directory.
 .LP
 Possible responses to the CREATE prompt are:
 .IP YES
-create a \fIlost+found\fP directory in the root of the filesystem.
+create a \fIlost+found\fP directory in the root of the file system.
 This may raise the message:
 .br
 .B "NO SPACE LEFT IN / (EXPAND)"
@@ -1059,7 +1059,7 @@ This will always invoke the UNREF error condition in Phase 4.
 There is no space to add another entry to the
 .I lost+found
 directory in the root directory
-of the filesystem.
+of the file system.
 When preen'ing the 
 .I lost+found
 directory is expanded.
@@ -1079,7 +1079,7 @@ and aborts the attempt to linkup the lost inode.
 This will always invoke the UNREF error condition in Phase 4.
 Clean out unnecessary entries in
 .I lost+found .
-This error is fatal if the filesystem is being preen'ed.
+This error is fatal if the file system is being preen'ed.
 .IP NO
 abort the attempt to linkup the lost inode.
 This will always invoke the UNREF error condition in Phase 4.
@@ -1106,8 +1106,8 @@ a multiple of the directory blocksize \fIB\fP
 Possible responses to the ADJUST prompt are:
 .IP YES
 the length is rounded up to the appropriate block size.
-This error can occur on 4.2BSD filesystems.
-Thus when preen'ing the filesystem only a warning is printed
+This error can occur on 4.2BSD file systems.
+Thus when preen'ing the file system only a warning is printed
 and the directory is adjusted.
 .IP NO
 ignore the error condition.
@@ -1116,7 +1116,7 @@ ignore the error condition.
 .B "BAD INODE \fIS\fP TO DESCEND"
 .br
 An internal error has caused an impossible state \fIS\fP to be passed to the
-routine that descends the filesystem directory structure.
+routine that descends the file system directory structure.
 .I Fsck_ffs
 exits.
 See a guru.
@@ -1133,14 +1133,14 @@ directory,
 incorrect link counts for files, directories, symbolic links, or special files,
 unreferenced files, symbolic links, and directories,
 and bad or duplicate blocks in files, symbolic links, and directories.
-All errors in this phase are correctable if the filesystem is being preen'ed
+All errors in this phase are correctable if the file system is being preen'ed
 except running out of space in the \fIlost+found\fP directory.
 .sp
 .LP
 .B "UNREF FILE I=\fII\fP OWNER=\fIO\fP MODE=\fIM\fP SIZE=\fIS\fP MTIME=\fIT\fP (RECONNECT)"
 .br
 Inode \fII\fP was not connected to a directory entry
-when the filesystem was traversed.
+when the file system was traversed.
 The owner \fIO\fP, mode \fIM\fP, size \fIS\fP, and
 modify time \fIT\fP of inode \fII\fP are printed.
 When preen'ing the file is cleared if either its size or its
@@ -1149,7 +1149,7 @@ otherwise it is reconnected.
 .LP
 Possible responses to the RECONNECT prompt are:
 .IP YES
-reconnect inode \fII\fP to the filesystem in the directory for
+reconnect inode \fII\fP to the file system in the directory for
 lost files (usually \fIlost+found\fP).
 This may invoke the
 .I lost+found
@@ -1165,7 +1165,7 @@ This will always invoke the CLEAR error condition in Phase 4.
 .br
 The inode mentioned in the immediately previous error condition can not be
 reconnected.
-This cannot occur if the filesystem is being preen'ed,
+This cannot occur if the file system is being preen'ed,
 since lack of space to reconnect files is a fatal error.
 .LP
 Possible responses to the CLEAR prompt are:
@@ -1179,14 +1179,14 @@ ignore this error condition.
 .br
 There is no
 .I lost+found
-directory in the root directory of the filesystem;
+directory in the root directory of the file system;
 When preen'ing
 .I fsck_ffs
 tries to create a \fIlost+found\fP directory.
 .LP
 Possible responses to the CREATE prompt are:
 .IP YES
-create a \fIlost+found\fP directory in the root of the filesystem.
+create a \fIlost+found\fP directory in the root of the file system.
 This may raise the message:
 .br
 .B "NO SPACE LEFT IN / (EXPAND)"
@@ -1231,7 +1231,7 @@ This will always invoke the UNREF error condition in Phase 4.
 There is no space to add another entry to the
 .I lost+found
 directory in the root directory
-of the filesystem.
+of the file system.
 When preen'ing the 
 .I lost+found
 directory is expanded.
@@ -1251,7 +1251,7 @@ and aborts the attempt to linkup the lost inode.
 This will always invoke the UNREF error condition in Phase 4.
 Clean out unnecessary entries in
 .I lost+found .
-This error is fatal if the filesystem is being preen'ed.
+This error is fatal if the file system is being preen'ed.
 .IP NO
 abort the attempt to linkup the lost inode.
 This will always invoke the UNREF error condition in Phase 4.
@@ -1282,7 +1282,7 @@ ignore this error condition.
 .B "UNREF \fItype\fP I=\fII\fP OWNER=\fIO\fP MODE=\fIM\fP SIZE=\fIS\fP MTIME=\fIT\fP (CLEAR)"
 .br
 Inode \fII\fP, was not connected to a directory entry when the
-filesystem was traversed.
+file system was traversed.
 The owner \fIO\fP, mode \fIM\fP, size \fIS\fP,
 and modify time \fIT\fP of inode \fII\fP
 are printed.
@@ -1305,7 +1305,7 @@ inode \fII\fP.
 The owner \fIO\fP, mode \fIM\fP, size \fIS\fP,
 and modify time \fIT\fP of inode \fII\fP
 are printed.
-This error cannot arise when the filesystem is being preen'ed,
+This error cannot arise when the file system is being preen'ed,
 as it would have caused a fatal error earlier.
 .LP
 Possible responses to the CLEAR prompt are:
@@ -1333,7 +1333,7 @@ The magic number of cylinder group \fIC\fP is wrong.
 This usually indicates that the cylinder group maps have been destroyed.
 When running manually the cylinder group is marked as needing
 to be reconstructed.
-This error is fatal if the filesystem is being preen'ed.
+This error is fatal if the file system is being preen'ed.
 .sp
 .LP
 .B "BLK(S) MISSING IN BIT MAPS (SALVAGE)"
@@ -1375,19 +1375,19 @@ ignore this error condition.
 .NH 2 
 Cleanup
 .PP
-Once a filesystem has been checked, a few cleanup functions are performed.
+Once a file system has been checked, a few cleanup functions are performed.
 This section lists advisory messages about
-the filesystem
-and modify status of the filesystem.
+the file system
+and modify status of the file system.
 .sp
 .LP
 .B "\fIV\fP files, \fIW\fP used, \fIX\fP free (\fIY\fP frags, \fIZ\fP blocks)"
 .br
 This is an advisory message indicating that
-the filesystem checked contained
+the file system checked contained
 \fIV\fP files using
 \fIW\fP fragment sized blocks leaving
-\fIX\fP fragment sized blocks free in the filesystem.
+\fIX\fP fragment sized blocks free in the file system.
 The numbers in parenthesis breaks the free count down into
 \fIY\fP free fragments and
 \fIZ\fP free full sized blocks.
@@ -1396,7 +1396,7 @@ The numbers in parenthesis breaks the free count down into
 .B "***** REBOOT UNIX *****"
 .br
 This is an advisory message indicating that
-the root filesystem has been modified by
+the root file system has been modified by
 .I fsck_ffs.
 If UNIX is not rebooted immediately,
 the work done by
@@ -1413,9 +1413,9 @@ interprets an exit code of 4 by issuing a reboot system call.
 .B "***** FILE SYSTEM WAS MODIFIED *****"
 .br
 This is an advisory message indicating that
-the current filesystem was modified by
+the current file system was modified by
 .I fsck_ffs.
-If this filesystem is mounted or is the current root filesystem,
+If this file system is mounted or is the current root file system,
 .I fsck_ffs
 should be halted and UNIX rebooted.
 If UNIX is not rebooted immediately,
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index b50a80d..4b0d3bf 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -285,7 +285,7 @@ adjust(struct inodesc *idesc, int lcnt)
 	if (DIP(dp, di_nlink) == lcnt) {
 		/*
 		 * If we have not hit any unresolved problems, are running
-		 * in preen mode, and are on a filesystem using soft updates,
+		 * in preen mode, and are on a file system using soft updates,
 		 * then just toss any partially allocated files.
 		 */
 		if (resolved && (preen || bkgrdflag) && usedsoftdep) {
@@ -293,7 +293,7 @@ adjust(struct inodesc *idesc, int lcnt)
 			return;
 		} else {
 			/*
-			 * The filesystem can be marked clean even if
+			 * The file system can be marked clean even if
 			 * a file is not linked up, but is cleared.
 			 * Hence, resolved should not be cleared when
 			 * linkup is answered no, but clri is answered yes.
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index c820fde..1fd0c89 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -64,7 +64,7 @@ union dinode {
 	(dp)->dp1.field : (dp)->dp2.field)
 
 /*
- * Each inode on the filesystem is described by the following structure.
+ * Each inode on the file system is described by the following structure.
  * The linkcnt is initially set to the value in the inode. Each time it
  * is found during the descent in passes 2, 3, and 4 the count is
  * decremented. Any inodes whose count is non-zero after pass 4 needs to
@@ -122,7 +122,7 @@ struct bufarea {
 
 #define	MINBUFS		5	/* minimum number of buffers required */
 struct bufarea bufhead;		/* head of list of other blks in filesys */
-struct bufarea sblk;		/* filesystem superblock */
+struct bufarea sblk;		/* file system superblock */
 struct bufarea cgblk;		/* cylinder group blocks */
 struct bufarea *pdirbp;		/* current directory contents */
 struct bufarea *pbp;		/* current inode block */
@@ -226,7 +226,7 @@ int	adjblkcnt[MIBSIZE];	/* MIB command to adjust inode block count */
 int	freefiles[MIBSIZE];	/* MIB command to free a set of files */
 int	freedirs[MIBSIZE];	/* MIB command to free a set of directories */
 int	freeblks[MIBSIZE];	/* MIB command to free a set of data blocks */
-struct	fsck_cmd cmd;		/* sysctl filesystem update commands */
+struct	fsck_cmd cmd;		/* sysctl file system update commands */
 char	snapname[BUFSIZ];	/* when doing snapshots, the name of the file */
 char	*cdevname;		/* name of device being checked */
 long	dev_bsize;		/* computed value of DEV_BSIZE */
@@ -236,7 +236,7 @@ char	yflag;			/* assume a yes response */
 int	bkgrdflag;		/* use a snapshot to run on an active system */
 int	bflag;			/* location of alternate super block */
 int	debug;			/* output debugging info */
-int	cvtlevel;		/* convert to newer filesystem format */
+int	cvtlevel;		/* convert to newer file system format */
 int	bkgrdcheck;		/* determine if background check is possible */
 char	usedsoftdep;		/* just fix soft dependency inconsistencies */
 char	preen;			/* just fix normal inconsistencies */
@@ -244,14 +244,14 @@ char	rerun;			/* rerun fsck. Only used in non-preen mode */
 int	returntosingle;		/* 1 => return to single user mode on exit */
 char	resolved;		/* cleared if unresolved changes => not clean */
 char	havesb;			/* superblock has been read */
-char	skipclean;		/* skip clean filesystems if preening */
-int	fsmodified;		/* 1 => write done to filesystem */
-int	fsreadfd;		/* file descriptor for reading filesystem */
-int	fswritefd;		/* file descriptor for writing filesystem */
+char	skipclean;		/* skip clean file systems if preening */
+int	fsmodified;		/* 1 => write done to file system */
+int	fsreadfd;		/* file descriptor for reading file system */
+int	fswritefd;		/* file descriptor for writing file system */
 
-ufs2_daddr_t maxfsblock;	/* number of blocks in the filesystem */
+ufs2_daddr_t maxfsblock;	/* number of blocks in the file system */
 char	*blockmap;		/* ptr to primary blk allocation map */
-ino_t	maxino;			/* number of inodes in filesystem */
+ino_t	maxino;			/* number of inodes in file system */
 
 ino_t	lfdir;			/* lost & found directory inode number */
 const char *lfname;		/* lost & found directory name */
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index dd5de77..b77cc1a 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -39,19 +39,19 @@
 .Sh NAME
 .Nm fsck_ffs ,
 .Nm fsck_ufs
-.Nd filesystem consistency check and interactive repair
+.Nd file system consistency check and interactive repair
 .Sh SYNOPSIS
 .Nm
 .Op Fl BFpfny
 .Op Fl b Ar block#
 .Op Fl c Ar level
 .Op Fl m Ar mode
-.Ar filesystem
+.Ar file system
 .Ar ...
 .Sh DESCRIPTION
-The specified disk partitions and/or filesystems are checked.
-In "preen" mode the clean flag of each filesystem's superblock is examined
-and only those filesystems that
+The specified disk partitions and/or file systems are checked.
+In "preen" mode the clean flag of each file system's superblock is examined
+and only those file systems that
 are not marked clean are checked.
 Filesystems are marked clean when they are unmounted,
 when they have been mounted read-only, or when
@@ -59,10 +59,10 @@ when they have been mounted read-only, or when
 runs on them successfully.
 If the
 .Fl f
-option is specified, the filesystems
+option is specified, the file systems
 will be checked regardless of the state of their clean flag.
 .Pp
-The kernel takes care that only a restricted class of innocuous filesystem
+The kernel takes care that only a restricted class of innocuous file system
 inconsistencies can happen unless hardware or software failures intervene.
 These are limited to the following:
 .Pp
@@ -86,10 +86,10 @@ with the
 option will correct; if it encounters other inconsistencies, it exits
 with an abnormal return status and an automatic reboot will then fail.
 For each corrected inconsistency one or more lines will be printed
-identifying the filesystem on which the correction will take place,
-and the nature of the correction.  After successfully correcting a filesystem,
+identifying the file system on which the correction will take place,
+and the nature of the correction.  After successfully correcting a file system,
 .Nm
-will print the number of files on that filesystem,
+will print the number of files on that file system,
 the number of used and free blocks,
 and the percentage of fragmentation.
 .Pp
@@ -97,9 +97,9 @@ If sent a
 .Dv QUIT
 signal,
 .Nm
-will finish the filesystem checks, then exit with an abnormal
+will finish the file system checks, then exit with an abnormal
 return status that causes an automatic reboot to fail.
-This is useful when you want to finish the filesystem checks during an
+This is useful when you want to finish the file system checks during an
 automatic reboot,
 but do not want the machine to come up multiuser after the checks complete.
 .Pp
@@ -119,8 +119,8 @@ Without the
 .Fl p
 option,
 .Nm
-audits and interactively repairs inconsistent conditions for filesystems.
-If the filesystem is inconsistent the operator is prompted for concurrence
+audits and interactively repairs inconsistent conditions for file systems.
+If the file system is inconsistent the operator is prompted for concurrence
 before each correction is attempted.
 It should be noted that some of the corrective actions which are not
 correctable under the
@@ -133,7 +133,7 @@ is to wait for the operator to respond
 .Li yes
 or
 .Li no .
-If the operator does not have write permission on the filesystem
+If the operator does not have write permission on the file system
 .Nm
 will default to a
 .Fl n
@@ -143,7 +143,7 @@ The following flags are interpreted by
 .Nm :
 .Bl -tag -width indent
 .It Fl F
-Determine whether the filesystem needs to be cleaned immediately
+Determine whether the file system needs to be cleaned immediately
 in foreground, or if its cleaning can be deferred to background.
 To be eligible for background cleaning it must have been running
 with soft updates, not have been marked as needing a foreground check,
@@ -152,9 +152,9 @@ If these conditions are met, then
 .Nm
 exits with a zero exit status.
 Otherwise it exits with a non-zero exit status.
-If the filesystem is clean,
+If the file system is clean,
 it will exit with a non-zero exit status so that the clean status
-of the filesystem can be verified and reported during the foreground
+of the file system can be verified and reported during the foreground
 checks.
 Note that when invoked with the
 .Fl F
@@ -164,30 +164,30 @@ The only thing that
 does is to determine whether a foreground or background
 check is needed and exit with an appropriate status code.
 .It Fl B
-A check is done on the specified and possibly active filesystem.
+A check is done on the specified and possibly active file system.
 The set of corrections that can be done is limited to those done
 when running in preen mode (see the
 .Fl p
 flag).
 If unexpected errors are found,
-the filesystem is marked as needing a foreground check and
+the file system is marked as needing a foreground check and
 .Nm
 exits without attempting any further cleaning.
 .It Fl b
 Use the block specified immediately after the flag as
-the super block for the filesystem.  Block 32 is usually
+the super block for the file system.  Block 32 is usually
 an alternate super block.
 .It Fl c
-Convert the filesystem to the specified level.
-Note that the level of a filesystem can only be raised.
+Convert the file system to the specified level.
+Note that the level of a file system can only be raised.
 There are currently four levels defined:
 .Bl -tag -width indent
 .It 0
-The filesystem is in the old (static table) format.
+The file system is in the old (static table) format.
 .It 1
-The filesystem is in the new (dynamic table) format.
+The file system is in the new (dynamic table) format.
 .It 2
-The filesystem supports 32-bit uid's and gid's,
+The file system supports 32-bit uid's and gid's,
 short symbolic links are stored in the inode,
 and directories have an added field showing the file type.
 .It 3
@@ -201,13 +201,13 @@ In interactive mode,
 will list the conversion to be made
 and ask whether the conversion should be done.
 If a negative answer is given,
-no further operations are done on the filesystem.
+no further operations are done on the file system.
 In preen mode,
 the conversion is listed and done if
 possible without user interaction.
-Conversion in preen mode is best used when all the filesystems
+Conversion in preen mode is best used when all the file systems
 are being converted at once.
-The format of a filesystem can be determined from the
+The format of a file system can be determined from the
 first line of output from
 .Xr dumpfs 8 .
 .It Fl f
@@ -215,7 +215,7 @@ Force
 .Nm
 to check
 .Sq clean
-filesystems when preening.
+file systems when preening.
 .It Fl m
 Use the mode specified in octal immediately after the flag as the
 permission bits to use when creating the
@@ -230,9 +230,9 @@ Assume a no response to all questions asked by
 except for
 .Ql CONTINUE? ,
 which is assumed to be affirmative;
-do not open the filesystem for writing.
+do not open the file system for writing.
 .It Fl p
-Preen filesystems (see above).
+Preen file systems (see above).
 .It Fl y
 Assume a yes response to all questions asked by
 .Nm ;
@@ -246,7 +246,7 @@ Inconsistencies checked are as follows:
 .It
 Blocks claimed by more than one inode or the free map.
 .It
-Blocks claimed by an inode outside the range of the filesystem.
+Blocks claimed by an inode outside the range of the file system.
 .It
 Incorrect link counts.
 .It
@@ -278,7 +278,7 @@ or having the wrong inode number.
 Super Block checks:
 .Bl -item -offset indent -compact
 .It
-More blocks for inodes than there are in the filesystem.
+More blocks for inodes than there are in the file system.
 .It
 Bad free block map format.
 .It
@@ -299,7 +299,7 @@ If there is insufficient space its size is increased.
 .Sh FILES
 .Bl -tag -width /etc/fstab -compact
 .It Pa /etc/fstab
-contains default list of filesystems to check.
+contains default list of file systems to check.
 .El
 .Sh DIAGNOSTICS
 .Ex -std
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 6776656..705426a 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -530,13 +530,13 @@ catch(int sig __unused)
 
 /*
  * When preening, allow a single quit to signal
- * a special exit after filesystem checks complete
+ * a special exit after file system checks complete
  * so that reboot sequence may be interrupted.
  */
 void
 catchquit(int sig __unused)
 {
-	printf("returning to single-user after filesystem check\n");
+	printf("returning to single-user after file system check\n");
 	returntosingle = 1;
 	(void)signal(SIGQUIT, SIG_DFL);
 }
@@ -585,7 +585,7 @@ dofix(struct inodesc *idesc, const char *msg)
 
 /*
  * An unexpected inconsistency occured.
- * Die if preening or filesystem is running with soft dependency protocol,
+ * Die if preening or file system is running with soft dependency protocol,
  * otherwise just print message and continue.
  */
 void
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index d35d7a1..0e45917 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -152,7 +152,7 @@ main(int argc, char *argv[])
 	signal(SIGINFO, infohandler);
 	/*
 	 * Push up our allowed memory limit so we can cope
-	 * with huge filesystems.
+	 * with huge file systems.
 	 */
 	if (getrlimit(RLIMIT_DATA, &rlimit) == 0) {
 		rlimit.rlim_cur = rlimit.rlim_max;
@@ -179,7 +179,7 @@ argtoi(int flag, const char *req, const char *str, int base)
 }
 
 /*
- * Check the specified filesystem.
+ * Check the specified file system.
  */
 /* ARGSUSED */
 static int
@@ -200,7 +200,7 @@ checkfilesys(char *filesys)
 		pwarn("starting\n");
 	/*
 	 * Make best effort to get the disk name. Check first to see
-	 * if it is listed among the mounted filesystems. Failing that
+	 * if it is listed among the mounted file systems. Failing that
 	 * check to see if it is listed in /etc/fstab.
 	 */
 	mntp = getmntpt(filesys);
@@ -233,7 +233,7 @@ checkfilesys(char *filesys)
 	}
 	/*
 	 * If we are to do a background check:
-	 *	Get the mount point information of the filesystem
+	 *	Get the mount point information of the file system
 	 *	create snapshot file
 	 *	return created snapshot file
 	 *	if not found, clear bkgrdflag and proceed with normal fsck
@@ -259,7 +259,7 @@ checkfilesys(char *filesys)
 				if ((sblock.fs_flags & FS_UNCLEAN) == 0 &&
 				    skipclean && preen) {
 					/*
-					 * filesystem is clean;
+					 * file system is clean;
 					 * skip snapshot and report it clean
 					 */
 					pwarn("FILESYSTEM CLEAN; %s\n",
@@ -315,7 +315,7 @@ checkfilesys(char *filesys)
 	if (preen == 0) {
 		printf("** Last Mounted on %s\n", sblock.fs_fsmnt);
 		if (mntp != NULL && mntp->f_flags & MNT_ROOTFS)
-			printf("** Root filesystem\n");
+			printf("** Root file system\n");
 		printf("** Phase 1 - Check Blocks and Sizes\n");
 	}
 	pass1();
@@ -419,7 +419,7 @@ checkfilesys(char *filesys)
 		resolved = 0;
 
 	/*
-	 * Check to see if the filesystem is mounted read-write.
+	 * Check to see if the file system is mounted read-write.
 	 */
 	if (bkgrdflag == 0 && mntp != NULL && (mntp->f_flags & MNT_RDONLY) == 0)
 		resolved = 0;
@@ -436,7 +436,7 @@ checkfilesys(char *filesys)
 		printf("\n***** PLEASE RERUN FSCK *****\n");
 	if (mntp != NULL) {
 		/*
-		 * We modified a mounted filesystem.  Do a mount update on
+		 * We modified a mounted file system.  Do a mount update on
 		 * it unless it is read-write, so we can continue using it
 		 * as safely as possible.
 		 */
@@ -506,7 +506,7 @@ usage(void)
 {
         (void) fprintf(stderr,
             "usage: %s [-BFpfny] [-b block] [-c level] [-m mode] "
-                        "filesystem ...\n",
+                        "file system ...\n",
             getprogname());
         exit(1);
 }
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index fce4149..38506a9 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -70,7 +70,7 @@ pass1(void)
 	int c;
 
 	/*
-	 * Set filesystem reserved blocks in used block map.
+	 * Set file system reserved blocks in used block map.
 	 */
 	for (c = 0; c < sblock.fs_ncg; c++) {
 		cgd = cgdmin(&sblock, c);
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 16ba027..5bfae4d 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -67,7 +67,7 @@ static struct disklabel *getdisklabel(char *s, int fd);
 
 /*
  * Read in a superblock finding an alternate if necessary.
- * Return 1 if successful, 0 if unsuccessful, -1 if filesystem
+ * Return 1 if successful, 0 if unsuccessful, -1 if file system
  * is already clean (preen mode only).
  */
 int
@@ -212,7 +212,7 @@ setup(char *dev)
 	}
 	if (sblock.fs_magic == FS_UFS1_MAGIC &&
 	    sblock.fs_old_inodefmt < FS_44INODEFMT) {
-		pwarn("Format of filesystem is too old.\n");
+		pwarn("Format of file system is too old.\n");
 		pwarn("Must update to modern format using a version of fsck\n");
 		pfatal("from before 2002 with the command ``fsck -c 2''\n");
 		exit(EEXIT);
@@ -320,12 +320,12 @@ readsb(int listerr)
 				break;
 		}
 		if (sblock_try[i] == -1) {
-			fprintf(stderr, "Cannot find filesystem superblock\n");
+			fprintf(stderr, "Cannot find file system superblock\n");
 			return (0);
 		}
 	}
 	/*
-	 * Compute block size that the filesystem is based on,
+	 * Compute block size that the file system is based on,
 	 * according to fsbtodb, and adjust superblock block number
 	 * so we can tell if this is an alternate later.
 	 */
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 5c1ae5a..0f6a61b 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -97,7 +97,7 @@ readboot(dosfs, boot)
 		/* check version number: */
 		if (block[42] || block[43]) {
 			/* Correct?				XXX */
-			pfatal("Unknown filesystem version: %x.%x",
+			pfatal("Unknown file system version: %x.%x",
 			       block[43], block[42]);
 			return FSFATAL;
 		}
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 7cd1c03..2a7ccc7 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -171,7 +171,7 @@ checkfilesys(fname)
 				mod |= writefat(dosfs, &boot, fat, 1);
 			} else {
 				pwarn("\n***** FILE SYSTEM IS LEFT MARKED AS DIRTY *****\n");
-				mod |= FSERROR; /* filesystem not clean */
+				mod |= FSERROR; /* file system not clean */
 			}
 		}
 	}
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index b3abf55..3a5d439 100644
--- a/sbin/fsck_msdosfs/dosfs.h
+++ b/sbin/fsck_msdosfs/dosfs.h
@@ -66,7 +66,7 @@ struct bootblock {
 
 	/* and some more calculated values */
 	u_int	flags;			/* some flags: */
-#define	FAT32		1		/* this is a FAT32 filesystem */
+#define	FAT32		1		/* this is a FAT32 file system */
 					/*
 					 * Maybe, we should separate out
 					 * various parts of FAT32?	XXX
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index 5fe1d9c..ad80b15 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -49,7 +49,7 @@ extern int alwaysyes;	/* assume "yes" for all questions */
 extern int preen;	/* we are preening */
 extern int rdonly;	/* device is opened read only (supersedes above) */
 
-extern char *fname;	/* filesystem currently checked */
+extern char *fname;	/* file system currently checked */
 
 extern struct dosDirEntry *rootDir;
 
@@ -59,7 +59,7 @@ extern struct dosDirEntry *rootDir;
 int ask(int, const char *, ...) __attribute__((__format__(__printf__,2,3)));
 
 /*
- * Check filesystem given as arg
+ * Check file system given as arg
  */
 int checkfilesys(const char *);
 
@@ -73,7 +73,7 @@ int checkfilesys(const char *);
 #define	FSERROR		8		/* Some unrecovered error remains */
 #define	FSFATAL		16		/* Some unrecoverable error occured */
 #define FSDIRTY		32		/* File system is dirty */
-#define FSFIXFAT	64		/* Fix filesystem FAT */
+#define FSFIXFAT	64		/* Fix file system FAT */
 
 /*
  * read a boot block in a machine independend fashion and translate
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index e8b004e..9e0aef9 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -152,7 +152,7 @@ readfat(int fs, struct bootblock *boot, int no, struct fatEntry **fp)
 		/* Windows 95 OSR2 (and possibly any later) changes
 		 * the FAT signature to 0xXXffff7f for FAT16 and to
 		 * 0xXXffff0fffffff07 for FAT32 upon boot, to know that the
-		 * filesystem is dirty if it doesn't reboot cleanly.
+		 * file system is dirty if it doesn't reboot cleanly.
 		 * Check this special condition before errorring out.
 		 */
 		if (buffer[0] == boot->Media && buffer[1] == 0xff
diff --git a/sbin/fsck_msdosfs/fsck_msdosfs.8 b/sbin/fsck_msdosfs/fsck_msdosfs.8
index 0328ddc..3f72e8c 100644
--- a/sbin/fsck_msdosfs/fsck_msdosfs.8
+++ b/sbin/fsck_msdosfs/fsck_msdosfs.8
@@ -37,34 +37,34 @@
 .Os
 .Sh NAME
 .Nm fsck_msdosfs
-.Nd DOS/Windows (FAT) filesystem consistency checker
+.Nd DOS/Windows (FAT) file system consistency checker
 .Sh SYNOPSIS
 .Nm
 .Fl p
 .Op Fl f
-.Ar filesystem ...
+.Ar file system ...
 .Nm
 .Op Fl fny
-.Ar filesystem ...
+.Ar file system ...
 .Sh DESCRIPTION
 The
 .Nm
 utility verifies and repairs
 .Tn FAT
-filesystems (more commonly known
+file systems (more commonly known
 as
 .Tn DOS
-filesystems).
+file systems).
 .Pp
 The first form of
 .Nm
-preens the specified filesystems.
+preens the specified file systems.
 It is normally started by
 .Xr fsck 8
 run from
 .Pa /etc/rc
-during automatic reboot, when a FAT filesystem is detected.
-When preening filesystems,
+during automatic reboot, when a FAT file system is detected.
+When preening file systems,
 .Nm
 will fix common inconsistencies non-interactively.
 If more serious problems are found,
@@ -74,7 +74,7 @@ successful, and exits.
 .Pp
 The second form of
 .Nm
-checks the specified filesystems and tries to repair all
+checks the specified file systems and tries to repair all
 detected inconsistencies, requesting confirmation before
 making any changes.
 .Pp
@@ -83,15 +83,15 @@ The options are as follows:
 .It Fl F
 Compatibility with the wrapper
 .Xr fsck 8
-which seeks to determine whether the filesystem needs to be cleaned
+which seeks to determine whether the file system needs to be cleaned
 immediately in foreground, or if its cleaning can be deferred to background.
-FAT (MS-DOS) filesystems must always be cleaned in the foreground.
+FAT (MS-DOS) file systems must always be cleaned in the foreground.
 A non-zero exit code is always returned for this option.
 .It Fl f
 This option is ignored by
 .Nm ,
 and is present only for compatibility with programs that
-check other filesystem types for consistency, such as
+check other file system types for consistency, such as
 .Xr fsck_ffs 8 .
 .It Fl n
 Causes
@@ -102,7 +102,7 @@ as the answer to all operator
 questions, except
 .Dq Li CONTINUE? .
 .It Fl p
-Preen the specified filesystems.
+Preen the specified file systems.
 .It Fl y
 Causes
 .Nm
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index cbfe6da..5e8d4dd 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -59,7 +59,7 @@ static void usage(void) __dead2;
 static void
 usage()
 {
-	errexit("usage: fsck_msdos [-fnpy] filesystem ... \n");
+	errexit("usage: fsck_msdos [-fnpy] file system ... \n");
 }
 
 int
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 27f118d..21b4b70 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -46,18 +46,18 @@ The
 utility opens
 .Ar fsname
 (usually a raw disk partition) and runs a command loop
-allowing manipulation of the filesystem's inode data.  You are prompted
+allowing manipulation of the file system's inode data.  You are prompted
 to enter a command with
 .Ic "fsdb (inum X)>"
 where
 .Va X
 is the currently selected i-number.  The initial selected inode is the
-root of the filesystem (i-number 2).
+root of the file system (i-number 2).
 The command processor uses the
 .Xr editline 3
 library, so you can use command line editing to reduce typing if desired.
-When you exit the command loop, the filesystem superblock is marked
-dirty and any buffered blocks are written to the filesystem.
+When you exit the command loop, the file system superblock is marked
+dirty and any buffered blocks are written to the file system.
 .Pp
 The following options are available:
 .Bl -tag -width indent
@@ -68,7 +68,7 @@ code).
 .It Fl f
 Left for historical reasons and has no meaning.
 .It Fl r
-Open the filesystem read/only, and disables all commands that would
+Open the file system read/only, and disables all commands that would
 write to it.
 .El
 .Sh COMMANDS
@@ -231,7 +231,7 @@ The
 .Nm
 utility uses the source code for
 .Xr fsck 8
-to implement most of the filesystem manipulation code.  The remainder of
+to implement most of the file system manipulation code.  The remainder of
 .Nm
 first appeared in
 .Nx ,
@@ -242,7 +242,7 @@ written by
 ported it to
 .Fx .
 .Sh WARNING
-Use this tool with extreme caution--you can damage an FFS filesystem
+Use this tool with extreme caution--you can damage an FFS file system
 beyond what
 .Xr fsck 8
 can repair.
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 9971b7c..1e91d22 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -65,8 +65,8 @@ char nflag;
 /*
  * We suck in lots of fsck code, and just pick & choose the stuff we want.
  *
- * fsreadfd is set up to read from the filesystem, fswritefd to write to
- * the filesystem.
+ * fsreadfd is set up to read from the file system, fswritefd to write to
+ * the file system.
  */
 int
 main(int argc, char *argv[])
@@ -100,8 +100,8 @@ main(int argc, char *argv[])
 
 	sblock_init();
 	if (!setup(fsys))
-		errx(1, "cannot set up filesystem `%s'", fsys);
-	printf("%s filesystem `%s'\nLast Mounted on %s\n",
+		errx(1, "cannot set up file system `%s'", fsys);
+	printf("%s file system `%s'\nLast Mounted on %s\n",
 	       nflag? "Examining": "Editing", fsys, sblock.fs_fsmnt);
 	rval = cmdloop();
 	if (!nflag) {
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 9d89579..1d7e56e 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -46,9 +46,9 @@
 The
 .Nm
 utility installs random generation numbers on all the inodes for
-each filesystem specified on the command line by
+each file system specified on the command line by
 .Ar special .
-This increases the security of NFS-exported filesystems by making
+This increases the security of NFS-exported file systems by making
 it difficult to ``guess'' filehandles.
 .Pp
 .Em Note :
@@ -58,18 +58,18 @@ now does the equivalent of
 itself so it is no longer necessary to
 run
 .Nm
-by hand on a new filesystem.  It is only used to
-re-randomize or report on an existing filesystem.
+by hand on a new file system.  It is only used to
+re-randomize or report on an existing file system.
 .Pp
 The
 .Nm
-utility should only be used on an unmounted filesystem that
+utility should only be used on an unmounted file system that
 has been checked with
 .Xr fsck 8
-or a filesystem that is mounted read-only.
+or a file system that is mounted read-only.
 The
 .Nm
-utility may be used on the root filesystem in single-user mode
+utility may be used on the root file system in single-user mode
 but the system should be rebooted via ``reboot -n'' afterwards.
 .Sh OPTIONS
 .Bl -tag -width indent
@@ -80,7 +80,7 @@ of the value gleaned from the disklabel.
 .It Fl f
 Force
 .Nm
-to run even if the filesystem on
+to run even if the file system on
 .Ar special
 is not marked as clean.
 .It Fl p
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index 2e555be..a4d922b 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -159,18 +159,18 @@ fsirand(char *device)
 			break;
 	}
 	if (sblock_try[i] == -1) {
-		fprintf(stderr, "Cannot find filesystem superblock\n");
+		fprintf(stderr, "Cannot find file system superblock\n");
 		return (1);
 	}
 	maxino = sblock->fs_ncg * sblock->fs_ipg;
 
 	if (sblock->fs_magic == FS_UFS1_MAGIC &&
 	    sblock->fs_old_inodefmt < FS_44INODEFMT) {
-		warnx("filesystem format is too old, sorry");
+		warnx("file system format is too old, sorry");
 		return (1);
 	}
 	if (!force && !printonly && sblock->fs_clean != 1) {
-		warnx("filesystem is not clean, fsck %s first", device);
+		warnx("file system is not clean, fsck %s first", device);
 		return (1);
 	}
 
@@ -217,7 +217,7 @@ fsirand(char *device)
 			    sblock->fs_id[1]);
 	}
 
-	/* Randomize fs_id unless old 4.2BSD filesystem */
+	/* Randomize fs_id unless old 4.2BSD file system */
 	if (!printonly) {
 		/* Randomize fs_id and write out new sblock and backups */
 		sblock->fs_id[0] = (u_int32_t)time(NULL);
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index d178a26..3fe263f 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -97,7 +97,7 @@ dbg_close(void)
 
 /* ****************************************************** dbg_dump_hex ***** */
 /*
- * Dump out a full filesystem block in hex.
+ * Dump out a full file system block in hex.
  */
 void
 dbg_dump_hex(struct fs *sb, const char *comment, unsigned char *mem)
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index ef23cda..59bf016 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -42,7 +42,7 @@
 .Os
 .Sh NAME
 .Nm growfs
-.Nd grow size of an existing ufs filesystem
+.Nd grow size of an existing ufs file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl Ny
@@ -62,17 +62,17 @@ If you are using volumes you must enlarge them by using
 .Xr vinum 8 .
 The
 .Nm
-utility extends the size of the filesystem on the specified special file.
+utility extends the size of the file system on the specified special file.
 Currently
 .Nm
-can only enlarge unmounted filesystems.
-Do not try enlarging a mounted filesystem, your system may panic and you will
-not be able to use the filesystem any longer.
+can only enlarge unmounted file systems.
+Do not try enlarging a mounted file system, your system may panic and you will
+not be able to use the file system any longer.
 Most of the
 .Xr newfs 8
 options cannot be changed by
 .Nm .
-In fact, you can only increase the size of the filesystem.
+In fact, you can only increase the size of the file system.
 Use
 .Xr tunefs 8
 for other changes.
@@ -81,8 +81,8 @@ The following options are available:
 .Bl -tag -width indent
 .It Fl N
 .Dq Test mode .
-Causes the new filesystem parameters to be printed out without actually
-enlarging the filesystem.
+Causes the new file system parameters to be printed out without actually
+enlarging the file system.
 .It Fl y
 .Dq Expert mode .
 Usually
@@ -97,12 +97,12 @@ So use this option with great care!
 .It Fl s Ar size
 Determines the
 .Ar size
-of the filesystem after enlarging in sectors.
+of the file system after enlarging in sectors.
 This value defaults to the size of the raw partition specified in
 .Ar special
 (in other words,
 .Nm
-will enlarge the filesystem to the size of the entire partition).
+will enlarge the file system to the size of the entire partition).
 .El
 .Sh EXAMPLES
 .Dl growfs -s 4194304 /dev/vinum/testvol
@@ -121,12 +121,12 @@ There may be cases on
 .Fx
 3.x only, when
 .Nm
-does not recognize properly whether or not the filesystem is mounted and
+does not recognize properly whether or not the file system is mounted and
 exits with an error message.
 Then please use
 .Nm
 .Fl y
-if you are sure that the filesystem is not mounted.
+if you are sure that the file system is not mounted.
 It is also recommended to always use
 .Xr fsck 8
 after enlarging (just to be on the safe side).
@@ -159,8 +159,8 @@ on the first cylinder group to verify that
 in the CYLINDER SUMMARY (internal cs) of the CYLINDER GROUP
 .Em cgr0
 has enough blocks.
-As a rule of thumb for default filesystem parameters one block is needed for
-every 2 GB of total filesystem size.
+As a rule of thumb for default file system parameters one block is needed for
+every 2 GB of total file system size.
 .Pp
 Normally
 .Nm
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 48cfad9..2db3430 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -150,7 +150,7 @@ static void	indirchk(ufs_lbn_t, ufs_lbn_t, ufs2_daddr_t, ufs_lbn_t,
 
 /* ************************************************************ growfs ***** */
 /*
- * Here  we actually start growing the filesystem. We basically  read  the
+ * Here  we actually start growing the file system. We basically  read  the
  * cylinder  summary  from the first cylinder group as we want  to  update
  * this  on  the fly during our various operations. First  we  handle  the
  * changes in the former last cylinder group. Afterwards we create all new
@@ -222,7 +222,7 @@ growfs(int fsi, int fso, unsigned int Nflag)
 	updjcg(osblock.fs_ncg-1, utime, fsi, fso, Nflag);
 
 	/*
-	 * Dump out summary information about filesystem.
+	 * Dump out summary information about file system.
 	 */
 #	define B2MBFACTOR (1 / (1024.0 * 1024.0))
 	printf("growfs: %.1fMB (%qd sectors) block size %d, fragment size %d\n",
@@ -424,7 +424,7 @@ initcg(int cylno, time_t utime, int fso, unsigned int Nflag)
 	if (acg.cg_nextfreeoff > sblock.fs_cgsize) {
 		/*
 		 * This should never happen as we would have had that panic
-		 * already on filesystem creation
+		 * already on file system creation
 		 */
 		errx(37, "panic: cylinder group too big");
 	}
@@ -656,7 +656,7 @@ cond_bl_upd(ufs2_daddr_t *block, struct gfs_bpp *field, int fsi, int fso,
 /* ************************************************************ updjcg ***** */
 /*
  * Here we do all needed work for the former last cylinder group. It has to be
- * changed  in  any case, even if the filesystem ended exactly on the  end  of
+ * changed  in  any case, even if the file system ended exactly on the  end  of
  * this  group, as there is some slightly inconsistent handling of the  number
  * of cylinders in the cylinder group. We start again by reading the  cylinder
  * group from disk. If the last block was not fully available, we first handle
@@ -764,7 +764,7 @@ updjcg(int cylno, time_t utime, int fsi, int fso, unsigned int Nflag)
 	 * the  rotational  layout tables and the cluster summary.  This  is
 	 * also  done per fragment for the first new block if the  old  file
 	 * system end was not on a block boundary, per fragment for the  new
-	 * last block if the new filesystem end is not on a block boundary,
+	 * last block if the new file system end is not on a block boundary,
 	 * and per block for all space in between.
 	 *
 	 * Handle the first new block here if it was partially available
@@ -788,7 +788,7 @@ updjcg(int cylno, time_t utime, int fsi, int fso, unsigned int Nflag)
 			/*
 			 * Check  if the fragment just created could join  an
 			 * already existing fragment at the former end of the
-			 * filesystem.
+			 * file system.
 			 */
 			if(isblock(&sblock, cg_blksfree(&acg),
 			    ((osblock.fs_size - cgbase(&sblock, cylno))/
@@ -915,7 +915,7 @@ updjcg(int cylno, time_t utime, int fsi, int fso, unsigned int Nflag)
  * Option (1) is considered to be less intrusive to the structure of the  file-
  * system. So we try to stick to that whenever possible. If there is not enough
  * space  in the cylinder group containing the cylinder summary we have to  use
- * method  (2). In case of active snapshots in the filesystem we  probably  can
+ * method  (2). In case of active snapshots in the file system we  probably  can
  * completely avoid implementing copy on write if we stick to method (2) only.
  */
 static void
@@ -1274,7 +1274,7 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag)
 		/*
 		 * No cluster handling is needed here, as there was at least
 		 * one  fragment in use by the cylinder summary in  the  old
-		 * filesystem.
+		 * file system.
 		 * No block-free counter handling here as this block was not
 		 * a free block.
 		 */
@@ -1582,7 +1582,7 @@ wtfs(ufs2_daddr_t bno, size_t size, void *bf, int fso, unsigned int Nflag)
 /*
  * Here we allocate a free block in the current cylinder group. It is assumed,
  * that  acg contains the current cylinder group. As we may take a block  from
- * somewhere in the filesystem we have to handle cluster summary here.
+ * somewhere in the file system we have to handle cluster summary here.
  */
 static ufs2_daddr_t
 alloc(void)
@@ -1886,9 +1886,9 @@ charsperline(void)
 /* ************************************************************** main ***** */
 /*
  * growfs(8)  is a utility which allows to increase the size of  an  existing
- * ufs filesystem. Currently this can only be done on unmounted file  system.
+ * ufs file system. Currently this can only be done on unmounted file  system.
  * It  recognizes some command line options to specify the new desired  size,
- * and  it does some basic checkings. The old filesystem size is  determined
+ * and  it does some basic checkings. The old file system size is  determined
  * and  after some more checks like we can really access the new  last  block
  * on the disk etc. we calculate the new parameters for the superblock. After
  * having  done  this we just call growfs() which will do  the  work.  Before
@@ -1900,11 +1900,11 @@ charsperline(void)
  * are lucky, then we only have to handle our blocks to be relocated in  that
  * way.
  * Also  we  have to consider in what order we actually update  the  critical
- * data structures of the filesystem to make sure, that in case of a disaster
+ * data structures of the file system to make sure, that in case of a disaster
  * fsck(8) is still able to restore any lost data.
  * The  foreseen last step then will be to provide for growing  even  mounted
  * file  systems. There we have to extend the mount() system call to  provide
- * userland access to the filesystem locking facility.
+ * userland access to the file system locking facility.
  */
 int
 main(int argc, char **argv)
@@ -2030,7 +2030,7 @@ main(int argc, char **argv)
 	}
 
 	/*
-	 * Check if that partition looks suited for growing a filesystem.
+	 * Check if that partition looks suited for growing a file system.
 	 */
 	if (pp->p_size < 1) {
 		errx(1, "partition is unavailable");
@@ -2092,7 +2092,7 @@ main(int argc, char **argv)
 	if(ExpertFlag == 0) {
 		for(j=0; j<FSMAXSNAP; j++) {
 			if(sblock.fs_snapinum[j]) {
-				errx(1, "active snapshot found in filesystem\n"
+				errx(1, "active snapshot found in file system\n"
 				    "	please remove all snapshots before "
 				    "using growfs\n");
 			}
@@ -2114,10 +2114,10 @@ main(int argc, char **argv)
 		}		
 	}
 
-	printf("new filesystemsize is: %d frags\n", sblock.fs_size);
+	printf("new file systemsize is: %d frags\n", sblock.fs_size);
 
 	/*
-	 * Try to access our new last block in the filesystem. Even if we
+	 * Try to access our new last block in the file system. Even if we
 	 * later on realize we have to abort our operation, on that block
 	 * there should be no data, so we can't destroy something yet.
 	 */
@@ -2126,7 +2126,7 @@ main(int argc, char **argv)
 
 	/*
 	 * Now calculate new superblock values and check for reasonable
-	 * bound for new filesystem size:
+	 * bound for new file system size:
 	 *     fs_size:    is derived from label or user input
 	 *     fs_dsize:   should get updated in the routines creating or
 	 *                 updating the cylinder groups on the fly
@@ -2135,7 +2135,7 @@ main(int argc, char **argv)
 	 */
 
 	/*
-	 * Update the number of cylinders and cylinder groups in the filesystem.
+	 * Update the number of cylinders and cylinder groups in the file system.
 	 */
 	if (sblock.fs_magic == FS_UFS1_MAGIC) {
 		sblock.fs_old_ncyl =
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index d1622c7..029840c 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -105,7 +105,7 @@ All devices may be read or written subject to their permissions.
 .It Ic 1
 Secure mode \- the system immutable and system append-only flags may not
 be turned off;
-disks for mounted filesystems,
+disks for mounted file systems,
 .Pa /dev/mem ,
 and
 .Pa /dev/kmem
@@ -118,7 +118,7 @@ Highly secure mode \- same as secure mode, plus disks may not be
 opened for writing (except by
 .Xr mount 2 )
 whether mounted or not.
-This level precludes tampering with filesystems by unmounting them,
+This level precludes tampering with file systems by unmounting them,
 but also inhibits running
 .Xr newfs 8
 while the system is multi-user.
@@ -398,7 +398,7 @@ behave as though they have security level \-1.
 Setting the security level above 1 too early in the boot sequence can
 prevent
 .Xr fsck 8
-from repairing inconsistent filesystems.  The
+from repairing inconsistent file systems.  The
 preferred location to set the security level is at the end of
 .Pa /etc/rc
 after all multi-user startup actions are complete.
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index b894311..5763aa0 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -108,7 +108,7 @@ as its first character, the usual
 .Ev PATH
 name search is performed.
 Care should be taken with this in environments where not all
-filesystems are mounted (yet) by the time
+file systems are mounted (yet) by the time
 .Nm
 is being run (e.g. when they are mounted over NFS).
 Once
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 62b66ed..9ae1367 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -304,7 +304,7 @@ as its first character, the usual
 .Ev PATH
 name search is performed.
 Care should be taken with this in environments where not all
-filesystems are mounted (yet) by the time
+file systems are mounted (yet) by the time
 .Nm
 is being run (e.g. when they are mounted over NFS).
 Once
diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8
index f8b9f79..65766ec 100644
--- a/sbin/kldconfig/kldconfig.8
+++ b/sbin/kldconfig/kldconfig.8
@@ -58,7 +58,7 @@ Do not display a diagnostic message if a path specified for adding is
 already present in the search path, or if a path specified for removing
 is not present in the search path.
 This may be useful in startup/shutdown scripts for adding a path to
-a filesystem which is still not mounted, or in shutdown scripts for
+a file system which is still not mounted, or in shutdown scripts for
 unconditionally removing a path that may have been added during startup.
 .It Fl i
 Add the specified paths to the beginning of the search path, not to the end.
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 2d02547..30ec7ca 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -153,7 +153,7 @@ To detach and free all resources used by
 .Pp
 .Dl mdconfig -d -u 4
 .Pp
-To create and mount a 128MByte swap backed filesystem on
+To create and mount a 128MByte swap backed file system on
 .Pa /tmp :
 .Bd -literal -offset indent
 mdconfig -a -t swap -s 128M -u 10
diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8
index eb97897..135f938 100644
--- a/sbin/mdmfs/mdmfs.8
+++ b/sbin/mdmfs/mdmfs.8
@@ -30,7 +30,7 @@
 .Os
 .Sh NAME
 .Nm mdmfs
-.Nd configure and mount an in-memory filesystem using the
+.Nd configure and mount an in-memory file system using the
 .Xr md 4
 driver
 .Sh SYNOPSIS
@@ -86,7 +86,7 @@ disk using
 .Xr mdconfig 8 ,
 labels it using
 .Xr disklabel 8 ,
-puts a UFS filesystem on it using
+puts a UFS file system on it using
 .Xr newfs 8 ,
 and mounts it using
 .Xr mount 8 .
@@ -128,7 +128,7 @@ out before forcing a rotational delay
 .Fl d
 option).
 .It Fl b Ar block-size
-The block size of the filesystem, in bytes.
+The block size of the file system, in bytes.
 .It Fl C
 Enable full compatibility mode with
 .Xr mount_mfs 8 .
@@ -136,7 +136,7 @@ See the
 .Sx COMPATIBILITY
 section for more information.
 .It Fl c Ar cylinders
-The number of cylinders per cylinder group in the filesystem.
+The number of cylinders per cylinder group in the file system.
 .It Fl D
 If not using auto-unit,
 do not run
@@ -158,7 +158,7 @@ Create a vnode-backed
 memory disk backed by
 .Ar file .
 .It Fl f Ar frag-size
-The fragment size of the filesystem in bytes.
+The fragment size of the file system in bytes.
 .It Fl i Ar bytes
 Number of bytes per inode.
 .It Fl L
@@ -190,7 +190,7 @@ which will optimize for minimum space fragmentation and
 minimum time spent allocating blocks,
 respectively.
 .It Fl o Ar mount-options
-Specify the mount options with which to mount the filesystem.
+Specify the mount options with which to mount the file system.
 See
 .Xr mount 8
 for more information.
@@ -200,7 +200,7 @@ Set the file (directory) permissions of the mount point
 to
 .Ar permissions .
 .It Fl S
-Do not enable soft-updates on the filesystem.
+Do not enable soft-updates on the file system.
 .It Fl s Ar size
 Specify the size of the disk to create.
 This only makes sense if
@@ -218,7 +218,7 @@ and the optional
 backed disks
 .Pq Dv MD_MALLOC .
 .It Fl U
-Enable soft-updates on the filesystem.
+Enable soft-updates on the file system.
 This is the default, even in compatibility mode, and is accepted only
 for compatibility.
 It is only really useful to negate the
@@ -274,12 +274,12 @@ with the same letter.
 See the programs that the options are passed to for more information
 on their semantics.
 .Sh EXAMPLES
-Create and mount a 32 megabyte swap-backed filesystem on
+Create and mount a 32 megabyte swap-backed file system on
 .Pa /tmp :
 .Pp
 .Dl "mdmfs -s 32m md /tmp"
 .Pp
-Create and mount a 16 megabyte malloc-backed filesystem on
+Create and mount a 16 megabyte malloc-backed file system on
 .Pa /tmp
 using the
 .Pa /dev/md1
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index 53e772e..2dcd791 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -482,7 +482,7 @@ do_mtptsetup(const char *mtpoint, struct mtpt_info *mip)
 }
 
 /*
- * Put a filesystem on the memory disk.
+ * Put a file system on the memory disk.
  */
 static void
 do_newfs(const char *args)
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 541df7d..493102f 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -84,7 +84,7 @@ or
 .It Ar minor
 The minor device number tells the kernel which subunit
 the node corresponds to on the device; for example,
-a subunit may be a filesystem partition
+a subunit may be a file system partition
 or a tty line.
 .It Ar owner : Ns Ar group
 The
diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3
index aa4929d..3fd3558 100644
--- a/sbin/mount/getmntopts.3
+++ b/sbin/mount/getmntopts.3
@@ -140,7 +140,7 @@ Finally, the table must be terminated by an entry with a
 first element.
 .Sh EXAMPLES
 Most commands will use the standard option set.
-Local filesystems which support the
+Local file systems which support the
 .Dv MNT_UPDATE
 flag, would also have an
 .Dv MOPT_UPDATE
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 209fdbc..30dd2c8 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm mount
-.Nd mount filesystems
+.Nd mount file systems
 .Sh SYNOPSIS
 .Nm
 .Op Fl adfpruvw
@@ -57,7 +57,7 @@ utility calls the
 .Xr mount 2
 system call to prepare and graft a
 .Ar "special device"
-or the remote node (rhost:path) on to the filesystem tree at the point
+or the remote node (rhost:path) on to the file system tree at the point
 .Ar node .
 If either
 .Ar special
@@ -67,7 +67,7 @@ are not provided, the appropriate information is taken from the
 .Xr fstab 5
 file.
 .Pp
-The system maintains a list of currently mounted filesystems.
+The system maintains a list of currently mounted file systems.
 If no arguments are given to
 .Nm ,
 this list is printed.
@@ -75,7 +75,7 @@ this list is printed.
 The options are as follows:
 .Bl -tag -width indent
 .It Fl a
-All the filesystems described in
+All the file systems described in
 .Xr fstab 5
 are mounted.
 Exceptions are those marked as
@@ -83,7 +83,7 @@ Exceptions are those marked as
 excluded by the
 .Fl t
 flag (see below), or if they are already mounted (except the
-root filesystem which is always remounted to preserve
+root file system which is always remounted to preserve
 traditional single user mode behavior).
 .It Fl d
 Causes everything to be done except for the actual system call.
@@ -95,9 +95,9 @@ determine what the
 command is trying to do.
 .It Fl f
 Forces the revocation of write access when trying to downgrade
-a filesystem mount status from read-write to read-only.
+a file system mount status from read-write to read-only.
 Also
-forces the R/W mount of an unclean filesystem (dangerous; use with
+forces the R/W mount of an unclean file system (dangerous; use with
 caution).
 .It Fl o
 Options are specified with a
@@ -110,7 +110,7 @@ The following options are available:
 .It Cm async
 All
 .Tn I/O
-to the filesystem should be done asynchronously.
+to the file system should be done asynchronously.
 This is a
 .Em dangerous
 flag to set,
@@ -120,20 +120,20 @@ system should your system crash.
 When used with the
 .Fl u
 flag, this is the same as specifying the options currently in effect for
-the mounted filesystem.
+the mounted file system.
 .It Cm force
 The same as
 .Fl f ;
 forces the revocation of write access when trying to downgrade
-a filesystem mount status from read-write to read-only.
+a file system mount status from read-write to read-only.
 Also
-forces the R/W mount of an unclean filesystem (dangerous; use with caution).
+forces the R/W mount of an unclean file system (dangerous; use with caution).
 .It Cm fstab
 When used with the
 .Fl u
 flag, this is the same as specifying all the options listed in the
 .Xr fstab 5
-file for the filesystem.
+file for the file system.
 .It Cm noasync
 Metadata I/O should be done synchronously, while data I/O should be done
 asynchronously.
@@ -141,12 +141,12 @@ This is the default.
 .It Cm noatime
 Do not update the file access time when reading from a file.
 This option
-is useful on filesystems where there are large numbers of files and
+is useful on file systems where there are large numbers of files and
 performance is more critical than updating the file access time (which is
 rarely ever important).
-This option is currently only supported on local filesystems.
+This option is currently only supported on local file systems.
 .It Cm noauto
-This filesystem should be skipped when
+This file system should be skipped when
 .Nm
 is run with the
 .Fl a
@@ -156,12 +156,12 @@ Disable read clustering.
 .It Cm noclusterw
 Disable write clustering.
 .It Cm nodev
-Do not interpret character or block special devices on the filesystem.
-This option is useful for a server that has filesystems containing
+Do not interpret character or block special devices on the file system.
+This option is useful for a server that has file systems containing
 special devices for architectures other than its own.
 .It Cm noexec
-Do not allow execution of any binaries on the mounted filesystem.
-This option is useful for a server that has filesystems containing
+Do not allow execution of any binaries on the mounted file system.
+This option is useful for a server that has file systems containing
 binaries for architectures other than its own.
 .It Cm nosuid
 Do not allow set-user-identifier or set-group-identifier bits to take effect.
@@ -171,23 +171,23 @@ wrapper like
 is installed on your system.
 .It Cm nosymfollow
 Do not follow symlinks
-on the mounted filesystem.
+on the mounted file system.
 .It Cm rdonly
 The same as
 .Fl r ;
-mount the filesystem read-only (even the super-user may not write it).
+mount the file system read-only (even the super-user may not write it).
 .It Cm sync
 All
 .Tn I/O
-to the filesystem should be done synchronously.
+to the file system should be done synchronously.
 .It Cm snapshot
-This option allows a snapshot of the specified filesystem to be taken.
+This option allows a snapshot of the specified file system to be taken.
 The
 .Fl u
 flag is required with this option.
-Note that snapshot files must be created in the filesystem that is being
+Note that snapshot files must be created in the file system that is being
 snapshotted.
-You may create up to 20 snapshots per filesystem.
+You may create up to 20 snapshots per file system.
 Active snapshots are recorded in the superblock, so they persist across unmount
 and remount operations and across system reboots.
 When you are done with a snapshot, it can be removed with the
@@ -210,7 +210,7 @@ do with it:
 Run
 .Xr fsck 8
 on the snapshot file.
-Assuming that the filesystem was clean when it was mounted, you should always
+Assuming that the file system was clean when it was mounted, you should always
 get a clean (and unchanging) result from running fsck on the snapshot.
 This is essentially what the background fsck process does.
 .Pp
@@ -218,7 +218,7 @@ This is essentially what the background fsck process does.
 Run
 .Xr dump 8
 on the snapshot.
-You will get a dump that is consistent with the filesystem as of the timestamp
+You will get a dump that is consistent with the file system as of the timestamp
 of the snapshot.
 Note that
 .Xr dump 8
@@ -228,7 +228,7 @@ file correctly, so do not use this
 feature in production until that fix is made.
 .Pp
 .It
-Mount the snapshot as a frozen image of the filesystem.
+Mount the snapshot as a frozen image of the file system.
 To mount the snapshot
 .Pa /var/snapshot/snap1 :
 .Bd -literal
@@ -238,7 +238,7 @@ mount -r /dev/md4 /mnt
 .Pp
 You can now cruise around your frozen
 .Pa /var
-filesystem at
+file system at
 .Pa /mnt .
 Everything will be in the same state that it was at the time the snapshot was
 taken.
@@ -254,7 +254,7 @@ Further details can be found in the file at
 .Pa /usr/src/sys/ufs/ffs/README.snapshot .
 .El
 .It Cm suiddir
-A directory on the mounted filesystem will respond to the SUID bit
+A directory on the mounted file system will respond to the SUID bit
 being set, by setting the owner of any new files to be the same
 as the owner of the directory.
 New directories will inherit the bit from their parents.
@@ -267,24 +267,24 @@ It provides security holes for shell users and as
 such should not be used on shell machines, especially on home directories.
 This option requires the SUIDDIR
 option in the kernel to work.
-Only UFS filesystems support this option.
+Only UFS file systems support this option.
 See
 .Xr chmod 2
 for more information.
 .It Cm update
 The same as
 .Fl u ;
-indicate that the status of an already mounted filesystem should be changed.
+indicate that the status of an already mounted file system should be changed.
 .It Cm union
 Causes the namespace at the mount point to appear as the union
-of the mounted filesystem root and the existing directory.
-Lookups will be done in the mounted filesystem first.
+of the mounted file system root and the existing directory.
+Lookups will be done in the mounted file system first.
 If those operations fail due to a non-existent file the underlying
 directory is then accessed.
-All creates are done in the mounted filesystem.
+All creates are done in the mounted file system.
 .El
 .Pp
-Any additional options specific to a filesystem type that is not
+Any additional options specific to a file system type that is not
 one of the internally known types (see the
 .Fl t
 option) may be passed as a comma separated list; these options are
@@ -306,7 +306,7 @@ to execute the equivalent of:
 /sbin/mount_unionfs -b /sys $HOME/sys
 .Ed
 .Pp
-Additional options specific to filesystem types
+Additional options specific to file system types
 which are not internally known
 (see the description of the
 .Fl t
@@ -322,8 +322,8 @@ Implies also the
 .Fl v
 option.
 .It Fl r
-The filesystem is to be mounted read-only.
-Mount the filesystem read-only (even the super-user may not write it).
+The file system is to be mounted read-only.
+Mount the file system read-only (even the super-user may not write it).
 The same as the
 .Cm rdonly
 argument to the
@@ -332,7 +332,7 @@ option.
 .It Fl t Ar ufs | external_type
 The argument following the
 .Fl t
-is used to indicate the filesystem type.
+is used to indicate the file system type.
 The type
 .Ar ufs
 is the default.
@@ -340,11 +340,11 @@ The
 .Fl t
 option can be used
 to indicate that the actions should only be taken on
-filesystems of the specified type.
+file systems of the specified type.
 More than one type may be specified in a comma separated list.
-The list of filesystem types can be prefixed with
+The list of file system types can be prefixed with
 .Dq no
-to specify the filesystem types for which action should
+to specify the file system types for which action should
 .Em not
 be taken.
 For example, the
@@ -354,7 +354,7 @@ command:
 mount -a -t nonfs,nullfs
 .Ed
 .Pp
-mounts all filesystems except those of type
+mounts all file systems except those of type
 .Tn NFS
 and
 .Tn NULLFS .
@@ -366,10 +366,10 @@ will attempt to execute a program in
 where
 .Sy XXX
 is replaced by the type name.
-For example, nfs filesystems are mounted by the program
+For example, nfs file systems are mounted by the program
 .Pa /sbin/mount_nfs .
 .Pp
-Most filesystems will be dynamically loaded by the kernel
+Most file systems will be dynamically loaded by the kernel
 if not already present, and if the kernel module is available.
 .It Fl u
 The
@@ -380,10 +380,10 @@ Any of the options discussed above (the
 .Fl o
 option)
 may be changed;
-also a filesystem can be changed from read-only to read-write
+also a file system can be changed from read-only to read-write
 or vice versa.
 An attempt to change from read-write to read-only will fail if any
-files on the filesystem are currently open for writing unless the
+files on the file system are currently open for writing unless the
 .Fl f
 flag is also specified.
 The set of options is determined by applying the options specified
@@ -397,22 +397,22 @@ option.
 .It Fl v
 Verbose mode.
 .It Fl w
-The filesystem object is to be read and write.
+The file system object is to be read and write.
 .El
 .Sh DIAGNOSTICS
 Various, most of them are self-explanatory.
 .Pp
-.Dl XXXXX filesystem is not available
+.Dl XXXXX file system is not available
 .Pp
-The kernel does not support the respective filesystem type.
+The kernel does not support the respective file system type.
 Note that
-support for a particular filesystem might be provided either on a static
+support for a particular file system might be provided either on a static
 (kernel compile-time), or dynamic basis (loaded as a kernel module by
 .Xr kldload 8 ) .
 .Sh FILES
 .Bl -tag -width /etc/fstab -compact
 .It Pa /etc/fstab
-filesystem table
+file system table
 .El
 .Sh SEE ALSO
 .Xr mount 2 ,
@@ -438,13 +438,13 @@ filesystem table
 .Xr mount_unionfs 8 ,
 .Xr umount 8
 .Sh BUGS
-It is possible for a corrupted filesystem to cause a crash.
+It is possible for a corrupted file system to cause a crash.
 .Sh CAVEATS
 After a successful
 .Nm ,
 the permissions on the original mount point determine if
 .Pa ..\&
-is accessible from the mounted filesystem.
+is accessible from the mounted file system.
 The minimum permissions for
 the mount point for traversal across the mount point in both
 directions to be possible for all users is 0111 (execute for all).
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index e08202f..8eff3a8 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -269,10 +269,10 @@ main(argc, argv)
 		rmslashes(*argv, *argv);
 		if ((fs = getfsfile(*argv)) == NULL &&
 		    (fs = getfsspec(*argv)) == NULL)
-			errx(1, "%s: unknown special file or filesystem",
+			errx(1, "%s: unknown special file or file system",
 			    *argv);
 		if (BADTYPE(fs->fs_type))
-			errx(1, "%s has unknown filesystem type",
+			errx(1, "%s has unknown file system type",
 			    *argv);
 		rval = mountfs(fs->fs_vfstype, fs->fs_spec, fs->fs_file,
 		    init_flags, options, fs->fs_mntops);
@@ -281,7 +281,7 @@ main(argc, argv)
 		/*
 		 * If -t flag has not been specified, the path cannot be
 		 * found, spec contains either a ':' or a '@', then assume
-		 * that an NFS filesystem is being specified ala Sun.
+		 * that an NFS file system is being specified ala Sun.
 		 * Check if the hostname contains only allowed characters
 		 * to reduce false positives.  IPv6 addresses containing
 		 * ':' will be correctly parsed only if the separator is '@'.
@@ -335,7 +335,7 @@ ismounted(fs, mntbuf, mntsize)
 	int i;
 
 	if (fs->fs_file[0] == '/' && fs->fs_file[1] == '\0')
-		/* the root filesystem can always be remounted */
+		/* the root file system can always be remounted */
 		return (0);
 
 	for (i = mntsize - 1; i >= 0; --i)
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 644afda..fa74784 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -41,7 +41,7 @@
 .Os
 .Sh NAME
 .Nm mount_cd9660
-.Nd mount an ISO-9660 filesystem
+.Nd mount an ISO-9660 file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl begjrv
@@ -51,9 +51,9 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility attaches the ISO-9660 filesystem residing on the device
+utility attaches the ISO-9660 file system residing on the device
 .Pa special
-to the global filesystem namespace at the location indicated by
+to the global file system namespace at the location indicated by
 .Pa node .
 This command is normally executed by
 .Xr mount 8
@@ -73,7 +73,7 @@ only the last one will be listed.)
 In either case, files may be opened without explicitly stating a
 version number.
 .It Fl j
-Do not use any Joliet extensions included in the filesystem.
+Do not use any Joliet extensions included in the file system.
 .It Fl o
 Options are specified with a
 .Fl o
@@ -101,15 +101,15 @@ Same as
 .Fl b .
 .El
 .It Fl r
-Do not use any Rockridge extensions included in the filesystem.
+Do not use any Rockridge extensions included in the file system.
 .It Fl s Ar startsector
-Start the filesystem at
+Start the file system at
 .Ar startsector .
 Normally, if the underlying device is a CD-ROM drive,
 .Nm
 will try to figure out the last track from the CD-ROM containing
-data, and start the filesystem there.  If the device is not a CD-ROM,
-or the table of contents cannot be examined, the filesystem will be
+data, and start the file system there.  If the device is not a CD-ROM,
+or the table of contents cannot be examined, the file system will be
 started at sector 0.  This option can be used to override the behaviour.
 Note that
 .Ar startsector
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 2ac0216..e9ff591 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -143,7 +143,7 @@ main(int argc, char **argv)
 
 #define DEFAULT_ROOTUID	-2
 	/*
-	 * ISO 9660 filesystems are not writeable.
+	 * ISO 9660 file systems are not writeable.
 	 */
 	mntflags |= MNT_RDONLY;
 	args.export.ex_flags = MNT_EXRDONLY;
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 7bedb82..6a08c28 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -36,7 +36,7 @@
 .Os
 .Sh NAME
 .Nm mount_ext2fs
-.Nd mount an ext2fs filesystem
+.Nd mount an ext2fs file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl o Ar options
@@ -45,9 +45,9 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility attaches a ext2fs filesystem
+utility attaches a ext2fs file system
 .Ar special
-device on to the filesystem tree at the point
+device on to the file system tree at the point
 .Ar node .
 .Pp
 This command is normally executed by
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index e328748..623b4d3 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -35,7 +35,7 @@
 .Os
 .Sh NAME
 .Nm mount_hpfs
-.Nd mount an HPFS filesystem
+.Nd mount an HPFS file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl o Ar options
@@ -47,33 +47,33 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility attaches the HPFS filesystem residing on the device
+utility attaches the HPFS file system residing on the device
 .Pa special
-to the global filesystem namespace at the location
+to the global file system namespace at the location
 indicated by
 .Pa node .
 This command is normally executed by
 .Xr mount 8
 at boot time, but can be used by any user to mount an
-HPFS filesystem on any directory that they own (provided,
+HPFS file system on any directory that they own (provided,
 of course, that they have appropriate access to the device that
-contains the filesystem).
+contains the file system).
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl u Ar uid
-Set the owner of the files in the filesystem to
+Set the owner of the files in the file system to
 .Ar uid .
 The default owner is the owner of the directory
-on which the filesystem is being mounted.
+on which the file system is being mounted.
 .It Fl g Ar gid
-Set the group of the files in the filesystem to
+Set the group of the files in the file system to
 .Ar gid .
 The default group is the group of the directory
-on which the filesystem is being mounted.
+on which the file system is being mounted.
 .It Fl m Ar mask
 Specify the maximum file permissions for files
-in the filesystem.
+in the file system.
 .El
 .Sh EXAMPLES
 To mount an hpfs volume located in /dev/wd1s1:
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index c2c263d..4bf024a 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.8
@@ -35,7 +35,7 @@
 .Os
 .Sh NAME
 .Nm mount_msdosfs
-.Nd mount an MS-DOS filesystem
+.Nd mount an MS-DOS file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl o Ar options
@@ -53,18 +53,18 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility attaches the MS-DOS filesystem residing on
+utility attaches the MS-DOS file system residing on
 the device
 .Pa special
-to the global filesystem namespace at the location
+to the global file system namespace at the location
 indicated by
 .Pa node .
 This command is normally executed by
 .Xr mount 8
 at boot time, but can be used by any user to mount an
-MS-DOS filesystem on any directory that they own (provided,
+MS-DOS file system on any directory that they own (provided,
 of course, that they have appropriate access to the device that
-contains the filesystem).
+contains the file system).
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -73,26 +73,26 @@ Use the specified mount
 .Ar options ,
 as described in
 .Xr mount 8 ,
-or one of the MSDOS filesystem-specific options
+or one of the MSDOS file system-specific options
 .Ar shortnames ,
 .Ar longnames
 or
 .Ar nowin95 ,
 all of which can be used to affect Windows name translation in the
-underlying filesystem.
+underlying file system.
 .It Fl u Ar uid
-Set the owner of the files in the filesystem to
+Set the owner of the files in the file system to
 .Ar uid .
 The default owner is the owner of the directory
-on which the filesystem is being mounted.
+on which the file system is being mounted.
 .It Fl g Ar gid
-Set the group of the files in the filesystem to
+Set the group of the files in the file system to
 .Ar gid .
 The default group is the group of the directory
-on which the filesystem is being mounted.
+on which the file system is being mounted.
 .It Fl m Ar mask
 Specify the maximum file permissions for files
-in the filesystem.
+in the file system.
 (For example, a
 .Ar mask
 of
@@ -109,7 +109,7 @@ are used.
 The default
 .Ar mask
 is taken from the
-directory on which the filesystem is being mounted.
+directory on which the file system is being mounted.
 .It Fl s
 Force behaviour to
 ignore and not generate Win'95 long filenames.
@@ -124,7 +124,7 @@ nor
 .Fl l
 are given,
 .Nm
-searches the root directory of the filesystem to
+searches the root directory of the file system to
 be mounted for any existing Win'95 long filenames.
 If no such entries are found, but short DOS filenames are found,
 .Fl s
@@ -138,8 +138,8 @@ if deleting or renaming a file.
 This forces
 .Fl s .
 .\".It Fl G
-.\"This option causes the filesystem to be interpreted as an Atari-Gemdos
-.\"filesystem. The differences to the MS-DOS filesystem are minimal and
+.\"This option causes the file system to be interpreted as an Atari-Gemdos
+.\"file system. The differences to the MS-DOS file system are minimal and
 .\"limited to the boot block. This option enforces
 .\".Fl s .
 .It Fl L Ar locale
@@ -190,16 +190,16 @@ default place for character sets conversion tables
 .Sh CAVEATS
 The use of the
 .Fl 9
-flag could result in damaged filesystems,
+flag could result in damaged file systems,
 albeit the damage is in part taken care of by
 procedures similar to the ones used in Win'95.
 .Pp
 .Fx 2.1
 and earlier versions could not handle cluster sizes larger than 16K.
-Just mounting an MS-DOS filesystem could cause corruption to any
-mounted filesystem.
-Cluster sizes larger than 16K are unavoidable for filesystem sizes
-larger than 1G, and also occur when filesystems larger than 1G are
+Just mounting an MS-DOS file system could cause corruption to any
+mounted file system.
+Cluster sizes larger than 16K are unavoidable for file system sizes
+larger than 1G, and also occur when file systems larger than 1G are
 shrunk to smaller than 1G using FIPS.
 .Sh HISTORY
 The
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 06e8c8f..b610ea7 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -38,7 +38,7 @@
 .Os
 .Sh NAME
 .Nm mount_nfs
-.Nd mount nfs filesystems
+.Nd mount nfs file systems
 .Sh SYNOPSIS
 .Nm
 .Op Fl 23NPTUbcdiLls
@@ -58,9 +58,9 @@ The
 .Nm
 utility calls the
 .Xr mount 2
-system call to prepare and graft a remote nfs filesystem
+system call to prepare and graft a remote nfs file system
 .Pq Ar rhost : Ns Ar path
-on to the filesystem tree at the point
+on to the file system tree at the point
 .Ar node .
 This command is normally executed by
 .Xr mount 8 .
@@ -71,18 +71,18 @@ Appendix I.
 By default,
 .Nm
 keeps retrying until the mount succeeds.
-This behaviour is intended for filesystems listed in
+This behaviour is intended for file systems listed in
 .Xr fstab 5
 that are critical to the boot process.
-For non-critical filesystems, the
+For non-critical file systems, the
 .Fl b
 and
 .Fl R
 flags provide mechanisms to prevent the boot process from hanging
 if the server is unavailable.
 .Pp
-If the server becomes unresponsive while an NFS filesystem is
-mounted, any new or outstanding file operations on that filesystem
+If the server becomes unresponsive while an NFS file system is
+mounted, any new or outstanding file operations on that file system
 will hang uninterruptibly until the server comes back.
 To modify this default behaviour, see the
 .Fl i
@@ -168,7 +168,7 @@ If an initial attempt to contact the server fails, fork off a child to keep
 trying the mount in the background.
 Useful for
 .Xr fstab 5 ,
-where the filesystem mount is not critical to multiuser operation.
+where the file system mount is not critical to multiuser operation.
 .It Fl c
 For UDP mount points, do not do a
 .Xr connect 2 .
@@ -187,7 +187,7 @@ group list size of 16, as specified in RFC 1057.
 Try 8, if users in a lot of groups cannot get response from the mount
 point.
 .It Fl i
-Make the mount interruptible, which implies that filesystem calls that
+Make the mount interruptible, which implies that file system calls that
 are delayed due to an unresponsive server will fail with EINTR when a
 termination signal is posted for the process.
 .It Fl l
@@ -288,7 +288,7 @@ See the
 .Fl w
 option as well.
 .It Fl s
-A soft mount, which implies that filesystem calls will fail
+A soft mount, which implies that file system calls will fail
 after \fBRetry\fR round trip timeout intervals.
 .It Fl t
 Set the initial retransmit timeout to the specified value.
@@ -296,7 +296,7 @@ May be useful for fine tuning UDP mounts over internetworks
 with high packet loss rates or an overloaded server.
 Try increasing the interval if
 .Xr nfsstat 1
-shows high retransmit rates while the filesystem is active or reducing the
+shows high retransmit rates while the file system is active or reducing the
 value if there is a low retransmit rate but long response delay observed.
 (Normally, the -d option should be specified when using this option to manually
 tune the timeout
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 07a1901..b0abaf4 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -550,7 +550,7 @@ getnfsargs(spec, nfsargsp)
 	}
 	freeaddrinfo(ai_nfs);
 	nfsargsp->hostname = nam;
-	/* Add mounted filesystem to PATH_MOUNTTAB */
+	/* Add mounted file system to PATH_MOUNTTAB */
 	if (!add_mtab(hostp, spec))
 		warnx("can't update %s for %s:%s", PATH_MOUNTTAB, hostp, spec);
 	return (1);
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index f00ec12..c65eef1 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -35,7 +35,7 @@
 .Os
 .Sh NAME
 .Nm mount_ntfs
-.Nd mount an NTFS filesystem
+.Nd mount an NTFS file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl a
@@ -49,17 +49,17 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility attaches the NTFS filesystem residing on the device
+utility attaches the NTFS file system residing on the device
 .Pa special
-to the global filesystem namespace at the location
+to the global file system namespace at the location
 indicated by
 .Pa node .
 This command is normally executed by
 .Xr mount 8
 at boot time, but can be used by any user to mount an
-NTFS filesystem on any directory that they own (provided,
+NTFS file system on any directory that they own (provided,
 of course, that they have appropriate access to the device that
-contains the filesystem).
+contains the file system).
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -69,18 +69,18 @@ Force behaviour to return MS-DOS 8.3 names also on
 .It Fl i
 Make name lookup case insensitive for all names except POSIX names.
 .It Fl u Ar uid
-Set the owner of the files in the filesystem to
+Set the owner of the files in the file system to
 .Ar uid .
 The default owner is the owner of the directory
-on which the filesystem is being mounted.
+on which the file system is being mounted.
 .It Fl g Ar gid
-Set the group of the files in the filesystem to
+Set the group of the files in the file system to
 .Ar gid .
 The default group is the group of the directory
-on which the filesystem is being mounted.
+on which the file system is being mounted.
 .It Fl m Ar mask
 Specify the maximum file permissions for files
-in the filesystem.
+in the file system.
 .It Fl W Ar u2wtable
 Specify
 .Ux
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index a6f8312..dccf5e4 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -42,7 +42,7 @@
 .Os
 .Sh NAME
 .Nm mount_nullfs
-.Nd "mount a loopback filesystem sub-tree; demonstrate the use of a null filesystem layer"
+.Nd "mount a loopback file system sub-tree; demonstrate the use of a null file system layer"
 .Sh SYNOPSIS
 .Nm
 .Op Fl o Ar options
@@ -52,15 +52,15 @@
 The
 .Nm
 utility creates a
-null layer, duplicating a sub-tree of the filesystem
-name space under another part of the global filesystem namespace.
+null layer, duplicating a sub-tree of the file system
+name space under another part of the global file system namespace.
 This allows existing files and directories to be accessed
 using a different pathname.
 .Pp
-The primary differences between a virtual copy of the filesystem
+The primary differences between a virtual copy of the file system
 and a symbolic link are that the
 .Xr getcwd 3
-functions work correctly in the virtual copy, and that other filesystems
+functions work correctly in the virtual copy, and that other file systems
 may be mounted on the virtual copy without affecting the original.
 A different device number for the virtual copy is returned by
 .Xr stat 2 ,
@@ -68,8 +68,8 @@ but in other respects it is indistinguishable from the original.
 .Pp
 The
 .Nm
-filesystem differs from a traditional
-loopback filesystem in two respects: it is implemented using
+file system differs from a traditional
+loopback file system in two respects: it is implemented using
 a stackable layers techniques, and it's
 .Do null-node Dc Ns s
 stack above
@@ -89,11 +89,11 @@ man page for possible options and their meanings.
 The null layer has two purposes.
 First, it serves as a demonstration of layering by providing a layer
 which does nothing.
-(It actually does everything the loopback filesystem does,
+(It actually does everything the loopback file system does,
 which is slightly more than nothing.)
 Second, the null layer can serve as a prototype layer.
 Since it provides all necessary layer framework,
-new filesystem layers can be created very easily by starting
+new file system layers can be created very easily by starting
 with a null layer.
 .Pp
 The remainder of this man page examines the null layer as a basis
@@ -113,7 +113,7 @@ of target-pn subtree will be aliased under mount-point-pn.
 .\"
 .\"
 .Sh OPERATION OF A NULL LAYER
-The null layer is the minimum filesystem layer,
+The null layer is the minimum file system layer,
 simply bypassing all possible operations to the lower layer
 for processing there.  The majority of its activity centers
 on the bypass routine, through which nearly all vnode operations
@@ -187,7 +187,7 @@ process when constructing other vnode stacks.
 .\"
 .\"
 .Sh CREATING OTHER FILE SYSTEM LAYERS
-One of the easiest ways to construct new filesystem layers is to make
+One of the easiest ways to construct new file system layers is to make
 a copy of the null layer, rename all files and variables, and
 then begin modifying the copy.
 .Xr Sed 1
diff --git a/sbin/mount_nwfs/mount_nwfs.8 b/sbin/mount_nwfs/mount_nwfs.8
index 341ec78..afc68e0 100644
--- a/sbin/mount_nwfs/mount_nwfs.8
+++ b/sbin/mount_nwfs/mount_nwfs.8
@@ -96,7 +96,7 @@ All existing file names converted to lower case.
 Newly created file gets a lower case under OS2 name space.
 This is the default when mounting volumes with DOS name space.
 .It L
-Same as 'l' but filesystem tries to be case insensitive.
+Same as 'l' but file system tries to be case insensitive.
 May not work well.
 .It n
 No case conversion is performed.
@@ -109,7 +109,7 @@ This is the default when mounting volumes with OS2 name space.
 All existing file names converted to upper case.
 Newly created file gets an upper case under OS2 name space.
 .It U
-Same as 'u' but filesystem tries to be case insensitive.
+Same as 'u' but file system tries to be case insensitive.
 May not work well.
 .El
 .It Fl f Ar mode , Fl d Ar mode
diff --git a/sbin/mount_portalfs/mount_portalfs.8 b/sbin/mount_portalfs/mount_portalfs.8
index daaed15..b747466 100644
--- a/sbin/mount_portalfs/mount_portalfs.8
+++ b/sbin/mount_portalfs/mount_portalfs.8
@@ -52,7 +52,7 @@
 The
 .Nm
 utility attaches an instance of the portal daemon
-to the global filesystem namespace.
+to the global file system namespace.
 The conventional mount point is
 .Pa /p .
 .\" .PA /dev .
@@ -78,7 +78,7 @@ Objects opened under the portal mount point are
 dynamically created by the portal daemon according
 to rules specified in the named configuration file.
 Using this mechanism allows descriptors such as sockets
-to be made available in the filesystem namespace.
+to be made available in the file system namespace.
 .Pp
 The portal daemon works by being passed the full pathname
 of the object being opened.
@@ -144,7 +144,7 @@ fs/		file fs/
 .Xr fstab 5 ,
 .Xr mount 8
 .Sh CAVEATS
-This filesystem may not be NFS-exported.
+This file system may not be NFS-exported.
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index a228700..fa90f57 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -47,7 +47,7 @@
 .Nm mount_procfs
 .Nd mount
 .Dq standard
-filesystems
+file systems
 .Sh SYNOPSIS
 .Nm mount_ Ns Ar fsname
 .Op Fl o Ar options
@@ -56,16 +56,16 @@ filesystems
 .Sh DESCRIPTION
 The
 .Nm
-utility is a generic mechanism for attaching ``standard'' filesystems to
-the filesystem.  The
+utility is a generic mechanism for attaching ``standard'' file systems to
+the file system.  The
 .Nm
-utility currently supports the following filesystems:
+utility currently supports the following file systems:
 .Nm devfs ,
 .Nm fdescfs ,
 .Nm linprocfs
 and
 .Nm procfs .
-A ``standard'' filesystem is one which:
+A ``standard'' file system is one which:
 .Bl -enum -offset indent
 .It
 accepts only the standard
@@ -80,7 +80,7 @@ options
 and
 .Dq union .
 .It
-has a kernel filesystem module name the same as its user-visible name.
+has a kernel file system module name the same as its user-visible name.
 .It
 requires no other special processing on the part of the
 .Nm
@@ -101,25 +101,25 @@ man page for possible options and their meanings.
 The
 .Nm
 utility examines its zeroth command-line argument (the name by which
-it was called) to determine the type of filesystem to be mounted.  If
+it was called) to determine the type of file system to be mounted.  If
 it is called by a name which does not end in
 .Dq Li _ Ns Ar fsname ,
 .Nm
 will assume (for compatibility
 with
 .Xr mount 8 )
-that the zeroth argument contains only the name of the filesystem type.
+that the zeroth argument contains only the name of the file system type.
 The
 .Nm
 utility is normally installed with appropriate links to commands for
-the distributed filesystems which can be mounted in this way;
-for information on the function of each filesystem, see the manual page
+the distributed file systems which can be mounted in this way;
+for information on the function of each file system, see the manual page
 for that specific
 .Nm mount_ Ns Ar fsname
 utility.
 .Pp
 Refer to the following manual pages for detailed information
-on these filesystem:
+on these file system:
 .Xr devfs 5 ,
 .Xr fdescfs 5 ,
 .Xr linprocfs 5
@@ -132,8 +132,8 @@ The
 .Nm
 utility was called with a zeroth argument of
 .Dq Li mount_std .
-.It %s filesystem not available
-The specified filesystem type was not present in the kernel and no
+.It %s file system not available
+The specified file system type was not present in the kernel and no
 loadable module for it was found.
 .El
 .Sh SEE ALSO
@@ -147,25 +147,25 @@ loadable module for it was found.
 .Xr procfs 5 ,
 .Xr mount 8
 .Sh CAVEATS
-None of the ``standard'' filesystems may be NFS-exported.
+None of the ``standard'' file systems may be NFS-exported.
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
 .Fx 2.2 .
-Loadable filesystem modules first appeared in
+Loadable file system modules first appeared in
 .Fx 2.0 .
 The
 .Dq fdescfs
 and
 .Dq procfs
-filesystem types first appeared in
+file system types first appeared in
 .Fx 2.0 ;
 the
 .Dq devfs
-filesystem type first appeared in
+file system type first appeared in
 .Fx 2.2 ;
 the
 .Dq linprocfs
-filesystem type first appeared in
+file system type first appeared in
 .Fx 4.0 .
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 00421a1..1f3c8d3 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -90,9 +90,9 @@ main(argc, argv)
 	/*
 	 * XXX
 	 * mount(8) calls the mount programs with an argv[0] which is
-	 * /just/ the filesystem name.  So, if there is no underscore
+	 * /just/ the file system name.  So, if there is no underscore
 	 * in argv[0], we assume that we are being called from mount(8)
-	 * and that argv[0] is thus the name of the filesystem type.
+	 * and that argv[0] is thus the name of the file system type.
 	 */
 	fsname = strrchr(argv[0], '_');
 	if (fsname) {
@@ -146,7 +146,7 @@ main(argc, argv)
 
 	/*
 	 * Try with the old mount syscall in the case
-	 * this filesystem has not been converted yet,
+	 * this file system has not been converted yet,
 	 * or the user didn't recompile his kernel.
 	 */
 	if (error && (errno == EOPNOTSUPP || errno == ENOSYS || caughtsig))
diff --git a/sbin/mount_udf/mount_udf.8 b/sbin/mount_udf/mount_udf.8
index 380f953..9632393 100644
--- a/sbin/mount_udf/mount_udf.8
+++ b/sbin/mount_udf/mount_udf.8
@@ -31,7 +31,7 @@
 .Os
 .Sh NAME
 .Nm mount_udf
-.Nd mount a UDF filesystem
+.Nd mount a UDF file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl v
@@ -40,9 +40,9 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility attaches the UDF filesystem residing on the device
+utility attaches the UDF file system residing on the device
 .Ar special
-to the global filesystem namespace at the location indicated by
+to the global file system namespace at the location indicated by
 .Ar node .
 .Pp
 The options are as follows:
@@ -56,7 +56,7 @@ See the
 man page for possible options and their meanings.
 The following UDF specific options are available:
 .It Fl v
-Be verbose about mounting the UDF filesystem.
+Be verbose about mounting the UDF file system.
 .El
 .Sh SEE ALSO
 .Xr cdcontrol 1 ,
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index b5b270d..eb68a4d 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -106,7 +106,7 @@ main(int argc, char **argv)
 	(void)rmslashes(dev, dev);
 
 	/*
-	 * UDF filesystems are not writeable.
+	 * UDF file systems are not writeable.
 	 */
 	mntflags |= MNT_RDONLY;
 
diff --git a/sbin/mount_umapfs/mount_umapfs.8 b/sbin/mount_umapfs/mount_umapfs.8
index 133c80a..5c0411d 100644
--- a/sbin/mount_umapfs/mount_umapfs.8
+++ b/sbin/mount_umapfs/mount_umapfs.8
@@ -41,7 +41,7 @@
 .Os
 .Sh NAME
 .Nm mount_umapfs
-.Nd sample filesystem layer
+.Nd sample file system layer
 .Sh SYNOPSIS
 .Nm
 .Op Fl o Ar options
@@ -52,10 +52,10 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility is used to mount a sub-tree of an existing filesystem
+utility is used to mount a sub-tree of an existing file system
 that uses a different set of uids and gids than the local system.
-Such a filesystem could be mounted from a remote site via NFS or
-it could be a filesystem on removable media brought from some
+Such a file system could be mounted from a remote site via NFS or
+it could be a file system on removable media brought from some
 foreign location that uses a different password file.
 .Pp
 The
@@ -118,7 +118,7 @@ in the first line of the map files is not correct.
 .Pp
 The layer created by the
 .Nm
-utility is meant to serve as a simple example of filesystem layering.
+utility is meant to serve as a simple example of file system layering.
 It is not meant for production use.  The implementation is not very
 sophisticated.
 .Sh SEE ALSO
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index 90d6523..81efdb7 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -40,7 +40,7 @@
 .Os
 .Sh NAME
 .Nm mount_unionfs
-.Nd mount union filesystems
+.Nd mount union file systems
 .Sh SYNOPSIS
 .Nm
 .Op Fl br
@@ -88,7 +88,7 @@ Hide the lower layer completely in the same way as mounting with
 .Xr mount_nullfs 8 .
 .El
 .Pp
-To enforce filesystem security, the user mounting the filesystem
+To enforce file system security, the user mounting the file system
 must be superuser or else have write permission on the mounted-on
 directory.
 .Pp
@@ -110,7 +110,7 @@ which will still allow the lower files to be accessed by a different
 pathname.
 .Pp
 Except in the case of a directory,
-access to an object is granted via the normal filesystem access checks.
+access to an object is granted via the normal file system access checks.
 For directories, the current user must have access to both the upper
 and lower directories (should they both exist).
 .Pp
@@ -128,12 +128,12 @@ Any other operation which would ultimately require modification to
 the lower layer fails with
 .Er EROFS .
 .Pp
-The union filesystem manipulates the namespace, rather than
-individual filesystems.
+The union file system manipulates the namespace, rather than
+individual file systems.
 The union operation applies recursively down the directory tree
 now rooted at
 .Ar uniondir .
-Thus any filesystems which are mounted under
+Thus any file systems which are mounted under
 .Ar uniondir
 will take part in the union operation.
 This differs from the
@@ -192,7 +192,7 @@ hackers can apply by sending mail to
 and announcing
 their intent to take it over.
 .Pp
-Without whiteout support from the filesystem backing the upper layer,
+Without whiteout support from the file system backing the upper layer,
 there is no way that delete and rename operations on lower layer
 objects can be done.
 .Er EROFS
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 8f5167d..39575ef 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -74,7 +74,7 @@ static const char rcsid[] =
 #include "newfs.h"
 
 /*
- * make filesystem for cylinder-group style filesystems
+ * make file system for cylinder-group style file systems
  */
 #define UMASK		0755
 #define POWEROF2(num)	(((num) & ((num) - 1)) == 0)
@@ -152,9 +152,9 @@ mkfs(struct partition *pp, char *fsys)
 	if (Uflag)
 		sblock.fs_flags |= FS_DOSOFTDEP;
 	/*
-	 * Validate the given filesystem size.
+	 * Validate the given file system size.
 	 * Verify that its last block can actually be accessed.
-	 * Convert to filesystem fragment sized units.
+	 * Convert to file system fragment sized units.
 	 */
 	if (fssize <= 0) {
 		printf("preposterous size %jd\n", (intmax_t)fssize);
@@ -163,7 +163,7 @@ mkfs(struct partition *pp, char *fsys)
 	wtfs(fssize - (realsectorsize / DEV_BSIZE), realsectorsize,
 	    (char *)&sblock);
 	/*
-	 * collect and verify the filesystem density info
+	 * collect and verify the file system density info
 	 */
 	sblock.fs_avgfilesize = avgfilesize;
 	sblock.fs_avgfpdir = avgfilesperdir;
@@ -418,7 +418,7 @@ mkfs(struct partition *pp, char *fsys)
 	}
 
 	/*
-	 * Dump out summary information about filesystem.
+	 * Dump out summary information about file system.
 	 */
 #	define B2MBFACTOR (1 / (1024.0 * 1024.0))
 	printf("%s: %.1fMB (%jd sectors) block size %d, fragment size %d\n",
@@ -462,7 +462,7 @@ mkfs(struct partition *pp, char *fsys)
 	if (Nflag)
 		exit(0);
 	/*
-	 * Now construct the initial filesystem,
+	 * Now construct the initial file system,
 	 * then write out the super-block.
 	 */
 	fsinit(utime);
@@ -650,7 +650,7 @@ initcg(int cylno, time_t utime)
 	}
 	wtfs(fsbtodb(&sblock, cgsblock(&sblock, cylno)), iobufsize, iobuf);
 	/*
-	 * For the old filesystem, we have to initialize all the inodes.
+	 * For the old file system, we have to initialize all the inodes.
 	 */
 	if (Oflag == 1) {
 		for (i = 2 * sblock.fs_frag;
@@ -668,7 +668,7 @@ initcg(int cylno, time_t utime)
 }
 
 /*
- * initialize the filesystem
+ * initialize the file system
  */
 #define PREDEFDIR 2
 
@@ -835,7 +835,7 @@ iput(union dinode *ip, ino_t ino)
 }
 
 /*
- * read a block from the filesystem
+ * read a block from the file system
  */
 void
 rdfs(ufs2_daddr_t bno, int size, char *bf)
@@ -881,7 +881,7 @@ wtfsflush()
 }
 
 /*
- * write a block to the filesystem
+ * write a block to the file system
  */
 static void
 wtfs(ufs2_daddr_t bno, int size, char *bf)
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 55d2d73..2713d56 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -37,11 +37,11 @@
 .Os
 .Sh NAME
 .Nm newfs ,
-.Nd construct a new filesystem
+.Nd construct a new file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl NU
-.Op Fl O Ar filesystem-type
+.Op Fl O Ar file system-type
 .Op Fl S Ar sector-size
 .Op Fl T Ar disktype
 .Op Fl a Ar maxcontig
@@ -60,14 +60,14 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility is used to initialize and clear filesystems before first use.
+utility is used to initialize and clear file systems before first use.
 Before running
 .Nm
 the disk must be labeled using
 .Xr disklabel 8 .
 The
 .Nm
-utility builds a filesystem on the specified special file.
+utility builds a file system on the specified special file.
 (We often refer to the
 .Dq special file
 as the
@@ -83,14 +83,14 @@ The following options define the general layout policies:
 .It Fl T Ar disktype
 For backward compatibility.
 .It Fl N
-Cause the filesystem parameters to be printed out
-without really creating the filesystem.
-.It Fl O Ar filesystem-type
-Use 1 to specify that a UFS1 format filesystem be built;
-use 2 to specify that a UFS2 format filesystem be built.
+Cause the file system parameters to be printed out
+without really creating the file system.
+.It Fl O Ar file system-type
+Use 1 to specify that a UFS1 format file system be built;
+use 2 to specify that a UFS2 format file system be built.
 The default is UFS1 format, but will eventually be changed to UFS2.
 .It Fl U
-Enables soft updates on the new filesystem.
+Enables soft updates on the new file system.
 .It Fl a Ar maxcontig
 Specify the maximum number of contiguous blocks that will be
 laid out before forcing a rotational delay.
@@ -99,7 +99,7 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl b Ar block-size
-The block size of the filesystem, in bytes.
+The block size of the file system, in bytes.
 It must be a power of 2.
 The
 default size is 16384 bytes, and the smallest allowable size is 4096 bytes.
@@ -107,16 +107,16 @@ The optimal block:fragment ratio is 8:1.
 Other ratios are possible, but are not recommended,
 and may produce poor results.
 .It Fl c Ar blocks-per-cylinder-group
-The number of blocks per cylinder group in a filesystem.
+The number of blocks per cylinder group in a file system.
 The default is to compute the maximum allowed by the other parameters.
 This value is
 dependent on a number of other parameters, in particular the block size
 and the number of bytes per inode.
 .It Fl d Ar max-extent-size
-The filesystem may choose to store large files using extents.
+The file system may choose to store large files using extents.
 This parameter specifies the largest extent size that may be used.
 It is presently limited to its default value which is 16 times
-the filesystem blocksize.
+the file system blocksize.
 .It Fl e Ar maxbpg
 Indicate the maximum number of blocks any single file can
 allocate out of a cylinder group before it is forced to begin
@@ -126,7 +126,7 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl f Ar frag-size
-The fragment size of the filesystem in bytes.
+The fragment size of the file system in bytes.
 It must be a power of two
 ranging in value between
 .Ar blocksize Ns /8
@@ -134,18 +134,18 @@ and
 .Ar blocksize .
 The default is 2048 bytes.
 .It Fl g Ar avgfilesize
-The expected average file size for the filesystem.
+The expected average file size for the file system.
 .It Fl h Ar avgfpdir
-The expected average number of files per directory on the filesystem.
+The expected average number of files per directory on the file system.
 .It Fl i Ar bytes
-Specify the density of inodes in the filesystem.
+Specify the density of inodes in the file system.
 The default is to create an inode for every
 .Pq 4 * Ar frag-size
 bytes of data space.
 If fewer inodes are desired, a larger number should be used;
 to create more inodes a smaller number should be given.
 One inode is required for each distinct file, so this value effectively
-specifies the average file size on the filesystem.
+specifies the average file size on the file system.
 .It Fl m Ar free-space
 The percentage of space reserved from normal users; the minimum free
 space threshold.
@@ -162,7 +162,7 @@ for more details on how to set this option.
 .Cm ( space
 or
 .Cm time ) .
-The filesystem can either be instructed to try to minimize the time spent
+The file system can either be instructed to try to minimize the time spent
 allocating blocks, or to try to minimize the space fragmentation on the disk.
 If the value of minfree (see above) is less than 8%,
 the default is to optimize for
@@ -174,20 +174,20 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl s Ar size
-The size of the filesystem in sectors.
+The size of the file system in sectors.
 This value defaults to the size of the
 raw partition specified in
 .Ar special
 (in other words,
 .Nm
-will use the entire partition for the filesystem).
+will use the entire partition for the file system).
 .El
 .Pp
 The following options override the standard sizes for the disk geometry.
 Their default values are taken from the disk label.
 Changing these defaults is useful only when using
 .Nm
-to build a filesystem whose raw image will eventually be used on a
+to build a file system whose raw image will eventually be used on a
 different type of disk than the one on which it is initially created
 (for example on a write-once disk).
 Note that changing any of these values from their defaults will make
@@ -201,7 +201,7 @@ The size of a sector in bytes (almost never anything but 512).
 .Sh EXAMPLES
 .Dl newfs /dev/ad3s1a
 .Pp
-Creates a new ufs filesystem on
+Creates a new ufs file system on
 .Pa ad3s1a .
 The
 .Nm
@@ -211,7 +211,7 @@ These values tend to produce better performance for most applications
 than the historical defaults
 (8192 byte block size and 1024 byte fragment size).
 This large fragment size may lead to much wasted space
-on filesystems that contain many small files.
+on file systems that contain many small files.
 .Sh SEE ALSO
 .Xr fdformat 1 ,
 .Xr disktab 5 ,
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 6c43a37..77d0bf8 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -98,7 +98,7 @@ static const char rcsid[] =
 /*
  * Cylinder groups may have up to MAXBLKSPERCG blocks. The actual
  * number used depends upon how much information can be stored
- * in a cylinder group map which must fit in a single filesystem
+ * in a cylinder group map which must fit in a single file system
  * block. The default is to use as many as possible blocks per group.
  */
 #define	MAXBLKSPERCG	0x7fffffff	/* desired fs_fpg ("infinity") */
@@ -111,16 +111,16 @@ static const char rcsid[] =
 #define MAXBLKPG(bsize)	((bsize) / sizeof(ufs2_daddr_t))
 
 /*
- * Each filesystem has a number of inodes statically allocated.
+ * Each file system has a number of inodes statically allocated.
  * We allocate one inode slot per NFPI fragments, expecting this
  * to be far more than we will ever need.
  */
 #define	NFPI		4
 
-int	Nflag;			/* run without writing filesystem */
-int	Oflag = 1;		/* filesystem format (1 => UFS1, 2 => UFS2) */
+int	Nflag;			/* run without writing file system */
+int	Oflag = 1;		/* file system format (1 => UFS1, 2 => UFS2) */
 int	Rflag;			/* regression test */
-int	Uflag;			/* enable soft updates for filesystem */
+int	Uflag;			/* enable soft updates for file system */
 quad_t	fssize;			/* file system size */
 int	sectorsize;		/* bytes/sector */
 int	realsectorsize;		/* bytes/sector in hardware */
@@ -164,7 +164,7 @@ main(int argc, char *argv[])
 			break;
 		case 'O':
 			if ((Oflag = atoi(optarg)) < 1 || Oflag > 2)
-				errx(1, "%s: bad filesystem format value",
+				errx(1, "%s: bad file system format value",
 				    optarg);
 			break;
 		case 'R':
@@ -235,7 +235,7 @@ main(int argc, char *argv[])
 			break;
 		case 's':
 			if ((fssize = atoi(optarg)) <= 0)
-				errx(1, "%s: bad filesystem size", optarg);
+				errx(1, "%s: bad file system size", optarg);
 			break;
 		case '?':
 		default:
@@ -271,7 +271,7 @@ main(int argc, char *argv[])
 		if (fssize == 0)
 			fssize = mediasize / sectorsize;
 		else if (fssize > mediasize / sectorsize)
-			errx(1, "%s: maximum filesystem size is %u",
+			errx(1, "%s: maximum file system size is %u",
 			    special, (u_int)(mediasize / sectorsize));
 	}
 	pp = NULL;
@@ -280,7 +280,7 @@ main(int argc, char *argv[])
 		cp = strchr(special, '\0');
 		cp--;
 		if ((*cp < 'a' || *cp > 'h') && !isdigit(*cp))
-			errx(1, "%s: can't figure out filesystem partition",
+			errx(1, "%s: can't figure out file system partition",
 			    special);
 		if (isdigit(*cp))
 			pp = &lp->d_partitions[RAW_PART];
@@ -297,7 +297,7 @@ main(int argc, char *argv[])
 			fssize = pp->p_size;
 		if (fssize > pp->p_size)
 			errx(1, 
-		    "%s: maximum filesystem size %d", special, pp->p_size);
+		    "%s: maximum file system size %d", special, pp->p_size);
 		if (sectorsize == 0)
 			sectorsize = lp->d_secsize;
 		if (fsize == 0)
@@ -315,7 +315,7 @@ main(int argc, char *argv[])
 		maxbsize = bsize;
 	/*
 	 * Maxcontig sets the default for the maximum number of blocks
-	 * that may be allocated sequentially. With filesystem clustering
+	 * that may be allocated sequentially. With file system clustering
 	 * it is possible to allocate contiguous blocks up to the maximum
 	 * transfer size permitted by the controller or buffering.
 	 */
@@ -389,8 +389,8 @@ usage()
 	    " [device-type]");
 	fprintf(stderr, "where fsoptions are:\n");
 	fprintf(stderr,
-	    "\t-N do not create filesystem, just print out parameters\n");
-	fprintf(stderr, "\t-O filesystem format: 1 => UFS1, 2 => UFS2\n");
+	    "\t-N do not create file system, just print out parameters\n");
+	fprintf(stderr, "\t-O file system format: 1 => UFS1, 2 => UFS2\n");
 	fprintf(stderr, "\t-R regression test, supress random factors\n");
 	fprintf(stderr, "\t-S sector size\n");
 	fprintf(stderr, "\t-T disktype\n");
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index 636c112..fb32a62 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -49,10 +49,10 @@
 /*
  * variables set up by front end.
  */
-extern int	Nflag;		/* run mkfs without writing filesystem */
-extern int	Oflag;		/* build UFS1 format filesystem */
+extern int	Nflag;		/* run mkfs without writing file system */
+extern int	Oflag;		/* build UFS1 format file system */
 extern int	Rflag;		/* regression test */
-extern int	Uflag;		/* enable soft updates for filesystem */
+extern int	Uflag;		/* enable soft updates for file system */
 extern quad_t	fssize;		/* file system size */
 extern int	sectorsize;	/* bytes/sector */
 extern int	realsectorsize;	/* bytes/sector in hardware*/
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 8771a7c..7d5718d 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -30,7 +30,7 @@
 .Os
 .Sh NAME
 .Nm newfs_msdos
-.Nd construct a new MS-DOS (FAT) filesystem
+.Nd construct a new MS-DOS (FAT) file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl N
@@ -59,7 +59,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility creates a FAT12, FAT16, or FAT32 filesystem on device
+utility creates a FAT12, FAT16, or FAT32 file system on device
 .Ar special ,
 using
 .Xr disktab 5
@@ -70,7 +70,7 @@ to determine geometry, if required.
 The options are as follow:
 .Bl -tag -width indent
 .It Fl N
-Don't create a filesystem: just print out parameters.
+Don't create a file system: just print out parameters.
 .It Fl B Ar boot
 Get bootstrap from file.
 .It Fl F Ar FAT-type
@@ -103,7 +103,7 @@ are (capacities in kilobytes): 160, 180, 320, 360, 640, 720, 1200,
 .It Fl h Ar heads
 Number of drive heads.
 .It Fl i Ar info
-Location of the filesystem info sector (FAT32 only).
+Location of the file system info sector (FAT32 only).
 A value of 0xffff signifies no info sector.
 .It Fl k Ar backup
 Location of the backup boot sector (FAT32 only).  A value
@@ -124,9 +124,9 @@ File system size.
 Number of sectors per track.
 .El
 .Sh NOTES
-FAT filesystem parameters occupy a "Boot Sector BPB (BIOS Parameter
+FAT file system parameters occupy a "Boot Sector BPB (BIOS Parameter
 Block)" in the first of the "reserved" sectors which precede the actual
-filesystem.  For reference purposes, this structure is presented
+file system.  For reference purposes, this structure is presented
 below.
 .Bd -literal
 struct bsbpb {
@@ -147,9 +147,9 @@ struct bsbpb {
 struct bsxbpb {
     u_int32_t	bspf;		/* [-a] big sectors per FAT */
     u_int16_t	xflg;		/* control flags */
-    u_int16_t	vers;		/* filesystem version */
+    u_int16_t	vers;		/* file system version */
     u_int32_t	rdcl;		/* root directory start cluster */
-    u_int16_t	infs;		/* [-i] filesystem info sector */
+    u_int16_t	infs;		/* [-i] file system info sector */
     u_int16_t	bkbs;		/* [-k] backup boot sector */
 };
 .Ed
@@ -158,13 +158,13 @@ struct bsxbpb {
 newfs_msdos /dev/ad0s1
 .Ed
 .Pp
-Create a filesystem, using default parameters, on
+Create a file system, using default parameters, on
 .Pa /dev/ad0s1 .
 .Bd -literal -offset indent
 newfs_msdos -f 1440 -L foo fd0
 .Ed
 .Pp
-Create a standard 1.44M filesystem, with volume label
+Create a standard 1.44M file system, with volume label
 .Ar foo ,
 on
 .Pa /dev/fd0 .
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index c0fd131..d0085f7 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -116,9 +116,9 @@ struct bsbpb {
 struct bsxbpb {
     u_int8_t bspf[4];		/* big sectors per FAT */
     u_int8_t xflg[2];		/* FAT control flags */
-    u_int8_t vers[2];		/* filesystem version */
+    u_int8_t vers[2];		/* file system version */
     u_int8_t rdcl[4];		/* root directory start cluster */
-    u_int8_t infs[2];		/* filesystem info sector */
+    u_int8_t infs[2];		/* file system info sector */
     u_int8_t bkbs[2];		/* backup boot sector */
     u_int8_t rsvd[12];		/* reserved */
 };
@@ -129,7 +129,7 @@ struct bsx {
     u_int8_t sig;		/* extended boot signature */
     u_int8_t volid[4];		/* volume ID number */
     u_int8_t label[11]; 	/* volume label */
-    u_int8_t type[8];		/* filesystem type */
+    u_int8_t type[8];		/* file system type */
 };
 
 struct de {
@@ -157,7 +157,7 @@ struct bpb {
     u_int bsec; 		/* big total sectors */
     u_int bspf; 		/* big sectors per FAT */
     u_int rdcl; 		/* root directory start cluster */
-    u_int infs; 		/* filesystem info sector */
+    u_int infs; 		/* file system info sector */
     u_int bkbs; 		/* backup boot sector */
 };
 
@@ -222,7 +222,7 @@ static void setstr(u_int8_t *, const char *, size_t);
 static void usage(void);
 
 /*
- * Construct a FAT12, FAT16, or FAT32 filesystem.
+ * Construct a FAT12, FAT16, or FAT32 file system.
  */
 int
 main(int argc, char *argv[])
@@ -324,7 +324,7 @@ main(int argc, char *argv[])
 	    opt_r = argto2(optarg, 1, "reserved sectors");
 	    break;
 	case 's':
-	    opt_s = argto4(optarg, 1, "filesystem size");
+	    opt_s = argto4(optarg, 1, "file system size");
 	    break;
 	case 'u':
 	    opt_u = argto2(optarg, 1, "sectors/track");
@@ -502,7 +502,7 @@ main(int argc, char *argv[])
     x1 = bpb.res + rds;
     x = bpb.bspf ? bpb.bspf : 1;
     if (x1 + (u_int64_t)x * bpb.nft > bpb.bsec)
-	errx(1, "meta data exceeds filesystem size");
+	errx(1, "meta data exceeds file system size");
     x1 += x * bpb.nft;
     x = (u_int64_t)(bpb.bsec - x1) * bpb.bps * NPB /
 	(bpb.spc * bpb.bps * NPB + fat / BPN * bpb.nft);
@@ -517,7 +517,7 @@ main(int argc, char *argv[])
     if (cls > x)
 	cls = x;
     if (bpb.bspf < x2)
-	warnx("warning: sectors/FAT limits filesystem to %u clusters",
+	warnx("warning: sectors/FAT limits file system to %u clusters",
 	      cls);
     if (cls < mincls(fat))
 	errx(1, "%u clusters too few clusters for FAT%u, need %u", cls, fat,
@@ -525,7 +525,7 @@ main(int argc, char *argv[])
     if (cls > maxcls(fat)) {
 	cls = maxcls(fat);
 	bpb.bsec = x1 + (cls + 1) * bpb.spc - 1;
-	warnx("warning: FAT type limits filesystem to %u sectors",
+	warnx("warning: FAT type limits file system to %u sectors",
 	      bpb.bsec);
     }
     printf("%s: %u sector%s in %u FAT%u cluster%s "
@@ -660,7 +660,7 @@ main(int argc, char *argv[])
 }
 
 /*
- * Exit with error if filesystem is mounted.
+ * Exit with error if file system is mounted.
  */
 static void
 check_mounted(const char *fname, mode_t mode)
@@ -904,7 +904,7 @@ usage(void)
     fprintf(stderr,
 	    "usage: newfs_msdos [ -options ] special [disktype]\n");
     fprintf(stderr, "where the options are:\n");
-    fprintf(stderr, "\t-N don't create filesystem: "
+    fprintf(stderr, "\t-N don't create file system: "
 	    "just print out parameters\n");
     fprintf(stderr, "\t-B get bootstrap from file\n");
     fprintf(stderr, "\t-F FAT type (12, 16, or 32)\n");
@@ -918,13 +918,13 @@ usage(void)
     fprintf(stderr, "\t-e root directory entries\n");
     fprintf(stderr, "\t-f standard format\n");
     fprintf(stderr, "\t-h drive heads\n");
-    fprintf(stderr, "\t-i filesystem info sector\n");
+    fprintf(stderr, "\t-i file system info sector\n");
     fprintf(stderr, "\t-k backup boot sector\n");
     fprintf(stderr, "\t-m media descriptor\n");
     fprintf(stderr, "\t-n number of FATs\n");
     fprintf(stderr, "\t-o hidden sectors\n");
     fprintf(stderr, "\t-r reserved sectors\n");
-    fprintf(stderr, "\t-s filesystem size (sectors)\n");
+    fprintf(stderr, "\t-s file system size (sectors)\n");
     fprintf(stderr, "\t-u sectors/track\n");
     exit(1);
 }
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index a049a56..4571f67 100644
--- a/sbin/quotacheck/preen.c
+++ b/sbin/quotacheck/preen.c
@@ -60,7 +60,7 @@ char *blockcheck(char *origname);
 struct part {
 	struct	part *next;		/* forward link of partitions on disk */
 	char	*name;			/* device name */
-	char	*fsname;		/* mounted filesystem name */
+	char	*fsname;		/* mounted file system name */
 	long	auxdata;		/* auxiliary data for application */
 } *badlist, **badnext = &badlist;
 
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 069db3c..fb544a1 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -40,13 +40,13 @@
 .Os
 .Sh NAME
 .Nm quotacheck
-.Nd filesystem quota consistency checker
+.Nd file system quota consistency checker
 .Sh SYNOPSIS
 .Nm
 .Op Fl g
 .Op Fl u
 .Op Fl v
-.Ar filesystem
+.Ar file system
 .Ar
 .Nm
 .Op Fl g
@@ -56,22 +56,22 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility examines each filesystem,
+utility examines each file system,
 builds a table of current disk usage,
 and compares this table against that recorded
-in the disk quota file for the filesystem.
+in the disk quota file for the file system.
 If any inconsistencies are detected, both the
 quota file and the current system copy of the
 incorrect quotas are updated (the latter only
-occurs if an active filesystem is checked).
+occurs if an active file system is checked).
 By default both user and group quotas are checked.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl a
-If supplied in place of any filesystem names,
+If supplied in place of any file system names,
 .Nm
-will check all the filesystems indicated in
+will check all the file systems indicated in
 .Pa /etc/fstab
 to be read-write with disk quotas.
 By default only the types of quotas listed in
@@ -95,7 +95,7 @@ Specifying both
 and
 .Fl u
 is equivalent to the default.
-Parallel passes are run on the filesystems required,
+Parallel passes are run on the file systems required,
 using the pass numbers in
 .Pa /etc/fstab
 in an identical fashion to
@@ -107,12 +107,12 @@ operates silently.
 .Pp
 The
 .Nm
-utility expects each filesystem to be checked to have a
+utility expects each file system to be checked to have a
 quota 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 in
 .Pa /etc/fstab .
 If a file is not present,
@@ -143,18 +143,18 @@ The
 .Nm
 utility accesses the raw device in calculating the actual
 disk usage for each user.
-Thus, the filesystems
+Thus, the file systems
 checked should be quiescent while
 .Nm
 is running.
 .Sh FILES
 .Bl -tag -width quota.group -compact
 .It Pa quota.user
-at the filesystem root with user quotas
+at the file system root with user quotas
 .It Pa quota.group
-at the filesystem root with group quotas
+at the file system root with group quotas
 .It Pa /etc/fstab
-default filesystems
+default file systems
 .El
 .Sh SEE ALSO
 .Xr quota 1 ,
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 8407676..a8c051b 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -109,7 +109,7 @@ struct fileusage {
 #define FUHASH 1024	/* must be power of two */
 struct fileusage *fuhead[MAXQUOTAS][FUHASH];
 
-int	aflag;			/* all filesystems */
+int	aflag;			/* all file systems */
 int	gflag;			/* check group quotas */
 int	uflag;			/* check user quotas */
 int	vflag;			/* verbose */
@@ -254,7 +254,7 @@ needchk(fs)
 static int sblock_try[] = SBLOCKSEARCH;
 
 /*
- * Scan the specified filesystem to check quota(s) present on it.
+ * Scan the specified file system to check quota(s) present on it.
  */
 int
 chkquota(fsname, mntpt, qnp)
@@ -292,7 +292,7 @@ chkquota(fsname, mntpt, qnp)
 			break;
 	}
 	if (sblock_try[i] == -1) {
-		warn("Cannot find filesystem superblock");
+		warn("Cannot find file system superblock");
 		return (1);
 	}
 	dev_bsize = sblock.fs_fsize / fsbtodb(&sblock, 1);
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 6c6ed54..000052d 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -49,7 +49,7 @@
 .Sh DESCRIPTION
 .Sy Power fail and crash recovery .
 Normally, the system will reboot itself at power-up or after crashes.
-An automatic consistency check of the filesystems will be performed,
+An automatic consistency check of the file systems will be performed,
 and unless this fails, the system will resume multi-user operations.
 .Pp
 .Sy Cold starts .
@@ -180,7 +180,7 @@ Boot flags:
 .Bl -tag -width "-CXX" -compact
 .It Fl a
 during kernel initialization,
-ask for the device to mount as the root filesystem.
+ask for the device to mount as the root file system.
 .It Fl C
 boot from CDROM.
 .It Fl c
@@ -246,10 +246,10 @@ options are automatically set.
 pause after each attached device during the device probing phase.
 .It Fl r
 use the statically configured default for the device containing the
-root filesystem
+root file system
 (see
 .Xr config 8 ) .
-Normally, the root filesystem is on the device
+Normally, the root file system is on the device
 that the kernel was loaded from.
 .It Fl s
 boot into single-user mode; if the console is marked as
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index 2778814..12a31dd 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -59,7 +59,7 @@ The
 .Nm halt
 and
 .Nm
-utilities flush the filesystem cache to disk, send all running processes
+utilities flush the file system cache to disk, send all running processes
 a
 .Dv SIGTERM
 (and subsequently a
@@ -100,11 +100,11 @@ or
 .Nm halt
 and log this themselves.
 .It Fl n
-The filesystem cache is not flushed.
+The file system cache is not flushed.
 This option should probably not be used.
 .It Fl q
 The system is halted or restarted quickly and ungracefully, and only
-the flushing of the filesystem cache is performed (if the
+the flushing of the file system cache is performed (if the
 .Fl n
 is not specified).
 This option should probably not be used.
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index ef3df7a..2d316c0 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -194,7 +194,7 @@ main(int argc, char *argv[])
 		runcmdshell();
 		break;
 	/*
-	 * Incremental restoration of a filesystem.
+	 * Incremental restoration of a file system.
 	 */
 	case 'r':
 		setup();
@@ -231,7 +231,7 @@ main(int argc, char *argv[])
 		dumpsymtable(symtbl, (long)1);
 		break;
 	/*
-	 * Resume an incremental filesystem restoration.
+	 * Resume an incremental file system restoration.
 	 */
 	case 'R':
 		initsymtable(symtbl);
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index d551f28..56d6756 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -38,7 +38,7 @@
 .Sh NAME
 .Nm restore ,
 .Nm rrestore
-.Nd "restore files or filesystems from backups made with dump"
+.Nd "restore files or file systems from backups made with dump"
 .Sh SYNOPSIS
 .Nm
 .Fl i
@@ -87,7 +87,7 @@ The
 .Nm
 utility performs the inverse function of
 .Xr dump 8 .
-A full backup of a filesystem may be restored and
+A full backup of a file system may be restored and
 subsequent incremental backups layered on top of it.
 Single files and
 directory subtrees may be restored from full or partial
@@ -180,7 +180,7 @@ It also causes
 to print out information about each file as it is extracted.
 .It Ic what
 Display dump header information, which includes: date,
-level, label, and the filesystem and host dump was made
+level, label, and the file system and host dump was made
 from.
 .El
 .It Fl R
@@ -191,12 +191,12 @@ a full restore
 flag below).
 This is useful if the restore has been interrupted.
 .It Fl r
-Restore (rebuild a filesystem).
-The target filesystem should be made pristine with
+Restore (rebuild a file system).
+The target file system should be made pristine with
 .Xr newfs 8 ,
 mounted and the user
 .Xr cd Ns 'd
-into the pristine filesystem
+into the pristine file system
 before starting the restoration of the initial level 0 backup.
 If the
 level 0 restores successfully, the
@@ -232,7 +232,7 @@ in conjunction with
 .Xr newfs 8
 and
 .Xr dump 8 ,
-may be used to modify filesystem parameters
+may be used to modify file system parameters
 such as size or block size.
 .It Fl t
 The names of the specified files are listed if they occur
@@ -281,7 +281,7 @@ tries to determine the media block size dynamically.
 Normally,
 .Nm
 will try to determine dynamically whether the dump was made from an
-old (pre-4.4) or new format filesystem.  The
+old (pre-4.4) or new format file system.  The
 .Fl c
 flag disables this check, and only allows reading a dump in the old
 format.
@@ -385,19 +385,19 @@ Most checks are self-explanatory or can ``never happen''.
 Common errors are given below.
 .Pp
 .Bl -tag -width Ds -compact
-.It Converting to new filesystem format.
-A dump tape created from the old filesystem has been loaded.
-It is automatically converted to the new filesystem format.
+.It Converting to new file system format.
+A dump tape created from the old file system has been loaded.
+It is automatically converted to the new file system format.
 .Pp
 .It <filename>: not found on tape
 The specified file name was listed in the tape directory,
 but was not found on the tape.
 This is caused by tape read errors while looking for the file,
-and from using a dump tape created on an active filesystem.
+and from using a dump tape created on an active file system.
 .Pp
 .It expected next file <inumber>, got <inumber>
 A file that was not listed in the directory showed up.
-This can occur when using a dump created on an active filesystem.
+This can occur when using a dump created on an active file system.
 .Pp
 .It Incremental dump too low
 When doing incremental restore,
@@ -446,7 +446,7 @@ information passed between incremental restores.
 The
 .Nm
 utility can get confused when doing incremental restores from
-dumps that were made on active filesystems.
+dumps that were made on active file systems.
 .Pp
 A level zero dump must be done after a full restore.
 Because restore runs in user code,
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 0a3647d..08b932f 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -325,7 +325,7 @@ nodeupdates(char *name, ino_t ino, int type)
 
 	/*
 	 * A previously non-existent file.
-	 * Add it to the filesystem, and request its extraction.
+	 * Add it to the file system, and request its extraction.
 	 * If it is a directory, create it immediately.
 	 * (Since the name is unused there can be no conflict)
 	 */
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 6aff827..8d7206d 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -55,7 +55,7 @@ extern int	yflag;		/* always try to recover from tape errors */
  */
 extern char	*dumpmap; 	/* map of inodes on this dump tape */
 extern char	*usedinomap; 	/* map of inodes that are in use on this fs */
-extern ino_t	maxino;		/* highest numbered inode in this filesystem */
+extern ino_t	maxino;		/* highest numbered inode in this file system */
 extern long	dumpnum;	/* location of the dump on this tape */
 extern long	volno;		/* current volume being read */
 extern long	ntrec;		/* number of TP_BSIZE records per tape block */
@@ -66,7 +66,7 @@ extern FILE	*terminal;	/* file descriptor for the terminal input */
 extern int	Bcvt;		/* need byte swapping on inodes and dirs */
 
 /*
- * Each file in the filesystem is described by one of these entries
+ * Each file in the file system is described by one of these entries
  */
 struct entry {
 	char	*e_name;		/* the current name of this entry */
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index a0282f8..3dd55f8 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -41,7 +41,7 @@ static const char rcsid[] =
 
 /*
  * These routines maintain the symbol table which tracks the state
- * of the filesystem being restored. They provide lookup by either
+ * of the file system being restored. They provide lookup by either
  * name or inode number. They also provide for creation, deletion,
  * and renaming of entries. Because of the dynamic nature of pathnames,
  * names should not be saved, but always constructed just before they
@@ -66,7 +66,7 @@ static const char rcsid[] =
 /*
  * The following variables define the inode symbol table.
  * The primary hash table is dynamically allocated based on
- * the number of inodes in the filesystem (maxino), scaled by
+ * the number of inodes in the file system (maxino), scaled by
  * HASHFACTOR. The variable "entry" points to the hash table;
  * the variable "entrytblsize" indicates its size (in entries).
  */
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 0a815b1..ba1d31f 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -49,7 +49,7 @@ __RCSID("$NetBSD$");
 
 
 #ifdef sgi
-/* use *stat64 for files on large filesystems */
+/* use *stat64 for files on large file systems */
 #define stat	stat64
 #endif
 
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index f034c79..5ec8799 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -102,12 +102,12 @@ The
 .Nm
 utility
 also checks the available disk space before attempting to make the copies.
-If there is insufficient disk space in the filesystem containing
+If there is insufficient disk space in the file system containing
 .Ar directory ,
 or if the file
 .Ar directory Ns Pa /minfree
 exists and the number of free kilobytes (for non-superusers) in the
-filesystem after the copies were made would be less than the number
+file system after the copies were made would be less than the number
 in the first line of this file, the copies are not attempted.
 .Pp
 If
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index cf15bd5..2d6aa00 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -96,7 +96,7 @@ instead of sending signal to
 .It Fl n
 If the
 .Fl o
-is specified, prevent the filesystem cache from being flushed by passing
+is specified, prevent the file system cache from being flushed by passing
 .Fl n
 option to
 .Xr halt 8
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 0267427..ce23b38 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -83,7 +83,7 @@ standard paging devices
 .It Pa /dev/md?
 memory disk devices
 .It Pa /etc/fstab
-ASCII filesystem description table
+ASCII file system description table
 .El
 .Sh BUGS
 There is no way to stop paging and swapping on a device.
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 903713f..153c1a8 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm tunefs
-.Nd tune up an existing filesystem
+.Nd tune up an existing file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl A
@@ -49,23 +49,23 @@
 .Op Fl o Cm space | time
 .Op Fl p
 .Op Fl s Ar avgfpdir
-.Ar special | filesystem
+.Ar special | file system
 .Sh DESCRIPTION
 The
 .Nm
-utility is designed to change the dynamic parameters of a filesystem
+utility is designed to change the dynamic parameters of a file system
 which affect the layout policies.
 The
 .Nm
-utility cannot be run on an active filesystem.
-To change an active filesystem,
+utility cannot be run on an active file system.
+To change an active file system,
 it must be downgraded to read-only or unmounted.
 .Pp
 The parameters which are to be changed are indicated by the flags
 given below:
 .Bl -tag -width indent
 .It Fl A
-The filesystem has several backups of the super-block.
+The file system has several backups of the super-block.
 Specifying
 this option will cause all backups to be modified as well as the
 primary super-block.
@@ -87,7 +87,7 @@ in that cylinder group.
 The effect of this limit is to cause big files to do long seeks
 more frequently than if they were allowed to allocate all the blocks
 in a cylinder group before seeking elsewhere.
-For filesystems with exclusively large files,
+For file systems with exclusively large files,
 this parameter should be set higher.
 .It Fl f Ar avgfilesize
 Specify the expected average file size.
@@ -102,7 +102,7 @@ Settings of 5% and less force space optimization to
 always be used which will greatly increase the overhead for file
 writes.
 .It
-The filesystem's ability to avoid fragmentation will be reduced
+The file system's ability to avoid fragmentation will be reduced
 when the total free space, including the reserve, drops below 15%.
 As free space approaches zero, throughput can degrade by up to a
 factor of three over the performance obtained at a 10% threshold.
@@ -114,16 +114,16 @@ been deleted to get under the higher threshold.
 .It Fl n Cm enable | disable
 Turn on/off soft updates.
 .It Fl o Cm space | time
-The filesystem can either try to minimize the time spent
+The file system can either try to minimize the time spent
 allocating blocks, or it can attempt to minimize the space
 fragmentation on the disk.
 Optimization for space has much
 higher overhead for file writes.
 The kernel normally changes the preference automatically as
-the percent fragmentation changes on the filesystem.
+the percent fragmentation changes on the file system.
 .It Fl p
 Show a summary of what the current tunable settings
-are on the selected filesystem.
+are on the selected file system.
 More detailed information can be
 obtained from the
 .Xr dumpfs 8
@@ -159,11 +159,11 @@ specified mount point.
 .%O "(reprinted in the BSD System Manager's Manual, SMM:5)"
 .Re
 .Sh BUGS
-This utility should work on active filesystems.
+This utility should work on active file systems.
 .\" Take this out and a Unix Daemon will dog your steps from now until
 .\" the time_t's wrap around.
 .Pp
-You can tune a filesystem, but you can't tune a fish.
+You can tune a file system, but you can't tune a fish.
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index e272446..15373ce 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -46,7 +46,7 @@ static const char rcsid[] =
 #endif /* not lint */
 
 /*
- * tunefs: change layout parameters to an existing filesystem.
+ * tunefs: change layout parameters to an existing file system.
  */
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -214,7 +214,7 @@ again:
 		err(1, "%s", special);
 	}
 	if (fs == NULL && (st.st_mode & S_IFMT) == S_IFDIR)
-		errx(10, "%s: unknown filesystem", special);
+		errx(10, "%s: unknown file system", special);
 	getsb(&sblock, special);
 
 	if (pflag) {
@@ -327,7 +327,7 @@ again:
 		if (mount("ufs", fs->fs_file,
 		    stfs.f_flags | MNT_UPDATE | MNT_RELOAD, &args) < 0)
 			err(9, "%s: reload", special);
-		warnx("filesystem reloaded");
+		warnx("file system reloaded");
 	}
 	exit(0);
 }
@@ -338,7 +338,7 @@ usage()
 	fprintf(stderr, "%s\n%s\n%s\n",
 "usage: tunefs [-A] [-a maxcontig] [-d rotdelay] [-e maxbpg] [-f avgfilesize]",
 "              [-m minfree] [-p] [-n enable | disable] [-o space | time]",
-"              [-s filesperdir] special | filesystem");
+"              [-s filesperdir] special | file system");
 	exit(2);
 }
 
@@ -369,7 +369,7 @@ getsb(fs, file)
 			break;
 	}
 	if (sblock_try[i] == -1)
-		err(5, "Cannot find filesystem superblock");
+		err(5, "Cannot find file system superblock");
 	dev_bsize = fs->fs_fsize / fsbtodb(fs, 1);
 	sblockloc = sblock_try[i] / dev_bsize;
 }
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index d990f61..8d75508 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm umount
-.Nd unmount filesystems
+.Nd unmount file systems
 .Sh SYNOPSIS
 .Nm
 .Op Fl fv
@@ -54,7 +54,7 @@ utility calls the
 .Xr unmount 2
 system call to remove a
 .Ar "special device"
-or the remote node (rhost:path) from the filesystem tree at the point
+or the remote node (rhost:path) from the file system tree at the point
 .Ar node .
 If either
 .Ar special
@@ -67,19 +67,19 @@ file.
 The options are as follows:
 .Bl -tag -width indent
 .It Fl a
-All the filesystems described in
+All the file systems described in
 .Xr fstab 5
 are unmounted.
 .It Fl A
-All the currently mounted filesystems except
+All the currently mounted file systems except
 the root are unmounted.
 .It Fl f
-The filesystem is forcibly unmounted.
+The file system is forcibly unmounted.
 Active special devices continue to work,
 but all other files return errors if further accesses are attempted.
-The root filesystem cannot be forcibly unmounted.
+The root file system cannot be forcibly unmounted.
 .It Fl h Ar host
-Only filesystems mounted from the specified host will be
+Only file systems mounted from the specified host will be
 unmounted.
 This option implies the
 .Fl A
@@ -87,14 +87,14 @@ option and, unless otherwise specified with the
 .Fl t
 option, will only unmount
 .Tn NFS
-filesystems.
+file systems.
 .It Fl t Ar type
 Is used to indicate the actions should only be taken on
-filesystems of the specified type.
+file systems of the specified type.
 More than one type may be specified in a comma separated list.
-The list of filesystem types can be prefixed with
+The list of file system types can be prefixed with
 .Dq no
-to specify the filesystem types for which action should
+to specify the file system types for which action should
 .Em not
 be taken.
 For example, the
@@ -104,7 +104,7 @@ command:
 umount -a -t nfs,nullfs
 .Ed
 .Pp
-unmounts all filesystems of the type
+unmounts all file systems of the type
 .Tn NFS
 and
 .Tn NULLFS
@@ -112,13 +112,13 @@ that are listed in the
 .Xr fstab 5
 file.
 .It Fl v
-Verbose, additional information is printed out as each filesystem
+Verbose, additional information is printed out as each file system
 is unmounted.
 .El
 .Sh FILES
 .Bl -tag -width /etc/fstab -compact
 .It Pa /etc/fstab
-filesystem table
+file system table
 .El
 .Sh SEE ALSO
 .Xr unmount 2 ,
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index 0406d28..a376ceb 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -224,14 +224,14 @@ umountall(char **typelist)
 		    strcmp(fs->fs_type, FSTAB_RO) &&
 		    strcmp(fs->fs_type, FSTAB_RQ))
 			continue;
-		/* Ignore unknown filesystem types. */
+		/* Ignore unknown file system types. */
 		if (getvfsbyname(fs->fs_vfstype, &vfc) == -1)
 			continue;
 		if (checkvfsname(fs->fs_vfstype, typelist))
 			continue;
 
 		/*
-		 * We want to unmount the filesystems in the reverse order
+		 * We want to unmount the file systems in the reverse order
 		 * that they were mounted.  So, we save off the file name
 		 * in some allocated memory, and then call recursively.
 		 */
@@ -507,13 +507,13 @@ getmntname(const char *fromname, const char *onname,
 			err(1, "calloc");
 	}
 	/*
-	 * We want to get the filesystems in the reverse order
-	 * that they were mounted. Mounted and unmounted filesystems
+	 * We want to get the file systems in the reverse order
+	 * that they were mounted. Mounted and unmounted file systems
 	 * are marked or unmarked in a table called 'mntcheck'.
 	 * Unmount(const char *dir, int flags) does only take the
 	 * mountpoint as argument, not the destination. If we don't pay
 	 * attention to the order, it can happen that a overlaying
-	 * filesystem get's unmounted instead of the one the user
+	 * file system get's unmounted instead of the one the user
 	 * has choosen.
 	 */
 	switch (mark) {
diff --git a/sbin/vinum/v.c b/sbin/vinum/v.c
index eaefabb..fc8fb29 100644
--- a/sbin/vinum/v.c
+++ b/sbin/vinum/v.c
@@ -137,7 +137,7 @@ main(int argc, char *argv[], char *envp[])
 	    exit(1);
 	}
     } else if ((errno != ENOENT)			    /* not "not there",  */
-    &&(errno != EROFS)) {				    /* and not read-only filesystem */
+    &&(errno != EROFS)) {				    /* and not read-only file system */
 	fprintf(stderr,
 	    "Can't open %s: %s (%d)\n",
 	    historyfile,
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index 119a5df..dae97f4 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -1662,7 +1662,7 @@ state.  Use the
 .Ic start
 command to first bring them to a consistent state.  In the case of striped and
 concatenated plexes, however, it does not normally cause problems to leave them
-inconsistent: when using a volume for a filesystem or a swap partition, the
+inconsistent: when using a volume for a file system or a swap partition, the
 previous contents of the disks are not of interest, so they may be ignored.
 If you want to take this risk, use the
 .Cm setupstate
@@ -1859,7 +1859,7 @@ and
 .Dq Li f
 may be used as
 .Em UFS
-filesystems or
+file systems or
 .Em ccd
 partitions.  Partition
 .Dq Li b
@@ -2015,8 +2015,8 @@ can access the complete address space of the volume even if a drive fails.
 .It
 You want to set up
 .Nm
-to allow more concurrent access to a filesystem.  In many cases, access to a
-filesystem is limited by the speed of the disk.  By spreading the volume across
+to allow more concurrent access to a file system.  In many cases, access to a
+file system is limited by the speed of the disk.  By spreading the volume across
 multiple disks, you can increase the throughput in multi-access environments.
 This technique shows little or no performance improvement in single-access
 environments.
@@ -2290,7 +2290,7 @@ reasonably small number of fragmented requests with a stripe size between 256 kB
 and 512 kB; with correct RAID implementations there is no obvious reason not to
 increase the size to 2 or 4 MB on a large disk.
 .Pp
-When choosing a stripe size, consider that most current UFS filesystems have
+When choosing a stripe size, consider that most current UFS file systems have
 cylinder groups 32 MB in size.  If you have a stripe size and number of disks
 both of which are a power of two, it is probable that all superblocks and inodes
 will be placed on the same subdisk, which will impact performance significantly.
@@ -2312,11 +2312,11 @@ speed, the transfer time depends only on the total size of the transfer.
 .Pp
 Consider a typical news article or web page of 24 kB, which will probably be
 read in a single I/O.  Take disks with a transfer rate of 6 MB/s and an average
-positioning time of 8 ms, and a filesystem with 4 kB blocks.  Since it's 24 kB,
+positioning time of 8 ms, and a file system with 4 kB blocks.  Since it's 24 kB,
 we don't have to worry about fragments, so the file will start on a 4 kB
 boundary.  The number of transfers required depends on where the block starts:
-it's (S + F - 1) / S, where S is the stripe size in filesystem blocks, and F is
-the file size in filesystem blocks.
+it's (S + F - 1) / S, where S is the stripe size in file system blocks, and F is
+the file size in file system blocks.
 .Bl -enum
 .It
 Stripe size of 4 kB.  You'll have 6 transfers.  Total subsystem load: 48 ms
@@ -2356,8 +2356,8 @@ volume:
 Striping improves performance for multiple access only, since it increases the
 chance of individual requests being on different drives.
 .It
-Concatenating UFS filesystems across multiple drives can also improve
-performance for multiple file access, since UFS divides a filesystem into
+Concatenating UFS file systems across multiple drives can also improve
+performance for multiple file access, since UFS divides a file system into
 cylinder groups and attempts to keep files in a single cylinder group.  In
 general, it is not as effective as striping.
 .It
@@ -2394,17 +2394,17 @@ state of one of the objects),
 writes up to 128 kB of updated configuration to each drive.  The larger the
 number of drives, the longer this takes.
 .El
-.Ss Creating filesystems on Vinum volumes
+.Ss Creating file systems on Vinum volumes
 You do not need to run
 .Xr disklabel 8
-before creating a filesystem on a
+before creating a file system on a
 .Nm
 volume.  Just run
 .Xr newfs 8 .
 Use the
 .Fl v
 option to state that the device is not divided into partitions.  For example, to
-create a filesystem on volume
+create a file system on volume
 .Pa mirror ,
 enter the following command:
 .Pp
@@ -2422,8 +2422,8 @@ will suffer when the configuration changes.  Use appropriately sized subdisks in
 It is possible to increase the size of a concatenated
 .Nm
 plex, but currently the size of striped and RAID-5 plexes cannot be increased.
-Currently the size of an existing UFS filesystem also cannot be increased, but
-it is planned to make both plexes and filesystems extensible.
+Currently the size of an existing UFS file system also cannot be increased, but
+it is planned to make both plexes and file systems extensible.
 .El
 .Sh STATE MANAGEMENT
 Vinum objects have the concept of
@@ -2484,7 +2484,7 @@ This behaviour of
 .Nm ccd
 is an invitation to shoot yourself in the foot: with
 .Nm ccd
-you can easily overwrite a filesystem.
+you can easily overwrite a file system.
 The
 .Nm
 utility will not permit this.