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

2 files changed, 22 insertions, 22 deletions

diff --git a/bin/df/df.1 b/bin/df/df.1
index 7b73e3e..3f0f0e1 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -46,19 +46,19 @@
 .Oc
 .Op Fl ailn
 .Op Fl t Ar type
-.Op Ar file | filesystem ...
+.Op Ar file | file system ...
 .Sh DESCRIPTION
 The
 .Nm
 utility
 displays statistics about the amount of free disk space on the specified
-.Ar filesystem
-or on the filesystem of which
+.Ar file system
+or on the file system of which
 .Ar file
 is a part.
 Values are displayed in 512-byte per block counts.
-If neither a file or a filesystem operand is specified,
-statistics for all mounted filesystems are displayed
+If neither a file or a file system operand is specified,
+statistics for all mounted file systems are displayed
 (subject to the
 .Fl t
 option below).
@@ -94,20 +94,20 @@ this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl l
-Only display information about locally-mounted filesystems.
+Only display information about locally-mounted file systems.
 .It Fl m
 Use 1048576-byte (1-Mbyte) blocks rather than the default.  Note that
 this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl n
-Print out the previously obtained statistics from the filesystems.
+Print out the previously obtained statistics from the file systems.
 This option should be used if it is possible that one or more
-filesystems are in a state such that they will not be able to provide
+file systems are in a state such that they will not be able to provide
 statistics without a long delay.
 When this option is specified,
 .Nm
-will not request new statistics from the filesystems, but will respond
+will not request new statistics from the file systems, but will respond
 with the possibly stale statistics that were previously obtained.
 .It Fl P
 Use POSIX compliant output of 512-byte blocks rather than the default.
@@ -115,11 +115,11 @@ Note that this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl t
-Only print out statistics for filesystems of the specified types.
+Only print out statistics for file systems of the specified types.
 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
@@ -129,13 +129,13 @@ command:
 df -t nonfs,nullfs
 .Ed
 .Pp
-lists all filesystems except those of type
+lists all file systems except those of type
 .Tn NFS
 and
 .Tn NULLFS .
 The
 .Xr lsvfs 1
-command can be used to find out the types of filesystems
+command can be used to find out the types of file systems
 that are available on the system.
 .El
 .Sh ENVIRONMENT
@@ -150,7 +150,7 @@ The
 .Fl n
 and
 .Fl t
-flags are ignored if a file or filesystem is specified.
+flags are ignored if a file or file system is specified.
 .Sh SEE ALSO
 .Xr lsvfs 1 ,
 .Xr quota 1 ,
diff --git a/bin/df/df.c b/bin/df/df.c
index 9bb5204..ae15cf2 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -289,8 +289,8 @@ getmntpt(char *name)
 }
 
 /*
- * Make a pass over the filesystem info in ``mntbuf'' filtering out
- * filesystem types not in vfslist and possibly re-stating to get
+ * Make a pass over the file system info in ``mntbuf'' filtering out
+ * file system types not in vfslist and possibly re-stating to get
  * current (not cached) info.  Returns the new count of valid statfs bufs.
  */
 static long
@@ -367,15 +367,15 @@ prthumanval(double bytes)
 }
 
 /*
- * Convert statfs returned filesystem size into BLOCKSIZE units.
- * Attempts to avoid overflow for large filesystems.
+ * Convert statfs returned file system size into BLOCKSIZE units.
+ * Attempts to avoid overflow for large file systems.
  */
 #define fsbtoblk(num, fsbs, bs) \
 	(((fsbs) != 0 && (fsbs) < (bs)) ? \
 		(num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs)))
 
 /*
- * Print out status about a filesystem.
+ * Print out status about a file system.
  */
 static void
 prtstat(struct statfs *sfsp, struct maxwidths *mwp)
@@ -435,7 +435,7 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp)
 
 /*
  * Update the maximum field-width information in `mwp' based on
- * the filesystem specified by `sfsp'.
+ * the file system specified by `sfsp'.
  */
 static void
 update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp)
@@ -483,7 +483,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr,
-	    "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | filesystem ...]\n");
+	    "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | file system ...]\n");
 	exit(EX_USAGE);
 }