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

3 files changed, 31 insertions, 31 deletions

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;