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

7 files changed, 21 insertions, 21 deletions

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