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

Approved by:	re

18 files changed, 112 insertions, 112 deletions

diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index f0be152..7854c36 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -112,7 +112,7 @@ The
 VM system totally ignores the sticky bit
 .Pq Dv ISVTX
 for executables.
-On UFS-based filesystems (FFS, LFS) the sticky
+On UFS-based file systems (FFS, LFS) the sticky
 bit may only be set upon directories.
 .Pp
 If mode
@@ -127,7 +127,7 @@ For more details of the properties of the sticky bit, see
 .Xr sticky 8 .
 .Pp
 If mode ISUID (set UID) is set on a directory,
-and the MNT_SUIDDIR option was used in the mount of the filesystem,
+and the MNT_SUIDDIR option was used in the mount of the file system,
 then the owner of any new files and sub-directories
 created within this directory are set
 to be the same as the owner of that directory.
@@ -145,7 +145,7 @@ 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.
 For more details of the suiddir mount option, see
 .Xr mount 8 .
 .Pp
diff --git a/lib/libc/sys/extattr_get_file.2 b/lib/libc/sys/extattr_get_file.2
index 151fced..42625b8 100644
--- a/lib/libc/sys/extattr_get_file.2
+++ b/lib/libc/sys/extattr_get_file.2
@@ -139,7 +139,7 @@ the namespace in which the extended attribute resides; see
 the name of the extended attribute
 .El
 .Pp
-Named extended attribute semantics vary by filesystem implementing the call.
+Named extended attribute semantics vary by file system implementing the call.
 Not all operations may be supported for a particular attribute.
 Additionally, the format of the data in
 .Fa data
@@ -174,7 +174,7 @@ is set to indicate the error.
 .Rv -std extattr_delete_file
 .Sh ERRORS
 The following errors may be returned by the system calls themselves.
-Additionally, the filesystem implementing the call may return any
+Additionally, the file system implementing the call may return any
 other errors it desires.
 .Bl -tag -width Er
 .It Bq Er EFAULT
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index d5f073c..4efd448 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -38,7 +38,7 @@
 .Sh NAME
 .Nm getdirentries ,
 .Nm getdents
-.Nd "get directory entries in a filesystem independent format"
+.Nd "get directory entries in a file system independent format"
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -58,7 +58,7 @@ referenced by the file descriptor
 .Fa fd
 into the buffer pointed to by
 .Fa buf ,
-in a filesystem independent format.
+in a file system independent format.
 Up to
 .Fa nbytes
 of data will be transferred.
@@ -68,7 +68,7 @@ argument must be greater than or equal to the
 block size associated with the file,
 see
 .Xr stat 2 .
-Some filesystems may not support these functions
+Some file systems may not support these functions
 with buffers smaller than this size.
 .Pp
 The data in the buffer is a series of
@@ -85,7 +85,7 @@ char	d_name[MAXNAMELEN + 1];	/* see below */
 The
 .Fa d_fileno
 entry is a number which is unique for each
-distinct file in the filesystem.
+distinct file in the file system.
 Files that are linked by hard links (see
 .Xr link 2 )
 have the same
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index 8d4d545..d25610b 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm getfsstat
-.Nd get list of all mounted filesystems
+.Nd get list of all mounted file systems
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -48,7 +48,7 @@
 .Fn getfsstat "struct statfs *buf" "long bufsize" "int flags"
 .Sh DESCRIPTION
 .Fn Getfsstat
-returns information about all mounted filesystems.
+returns information about all mounted file systems.
 .Fa Buf
 is a pointer to
 .Xr statfs
@@ -73,53 +73,53 @@ struct statfs {
     long    f_files;		/* total file nodes in file system */
     long    f_ffree;		/* free file nodes in fs */
     fsid_t  f_fsid;		/* file system id */
-    uid_t   f_owner;		/* user that mounted the filesystem */
-    int     f_type;		/* type of filesystem (see below) */
+    uid_t   f_owner;		/* user that mounted the file system */
+    int     f_type;		/* type of file system (see below) */
     int     f_flags;		/* copy of mount flags */
     long    f_spare[2];		/* spare for later */
     char    f_fstypename[MFSNAMELEN];/* fs type name */
     char    f_mntonname[MNAMELEN];/* directory on which mounted */
-    char    f_mntfromname[MNAMELEN];/* mounted filesystem */
+    char    f_mntfromname[MNAMELEN];/* mounted file system */
 };
 .Ed
 .Pp
 The flags that may be returned include:
 .Bl -tag -width MNT_ASYNCHRONOUS
 .It Dv MNT_RDONLY
-The filesystem is mounted read-only;
+The file system is mounted read-only;
 Even the super-user may not write on it.
 .It Dv MNT_NOEXEC
-Files may not be executed from the filesystem.
+Files may not be executed from the file system.
 .It Dv MNT_NOSUID
 Setuid and setgid bits on files are not honored when they are executed.
 .It Dv MNT_NODEV
-Special files in the filesystem may not be opened.
+Special files in the file system may not be opened.
 .It Dv MNT_SYNCHRONOUS
-All I/O to the filesystem is done synchronously.
+All I/O to the file system is done synchronously.
 .It Dv MNT_ASYNCHRONOUS
-No filesystem I/O is done synchronously.
+No file system I/O is done synchronously.
 .It Dv MNT_LOCAL
-The filesystem resides locally.
+The file system resides locally.
 .It Dv MNT_QUOTA
-The filesystem has quotas enabled on it.
+The file system has quotas enabled on it.
 .It Dv MNT_ROOTFS
-Identifies the root filesystem.
+Identifies the root file system.
 .It Dv MNT_EXRDONLY
-The filesystem is exported read-only.
+The file system is exported read-only.
 .It Dv MNT_EXPORTED
-The filesystem is exported for both reading and writing.
+The file system is exported for both reading and writing.
 .It Dv MNT_DEFEXPORTED
-The filesystem is exported for both reading and writing to any Internet host.
+The file system is exported for both reading and writing to any Internet host.
 .It Dv MNT_EXPORTANON
-The filesystem maps all remote accesses to the anonymous user.
+The file system maps all remote accesses to the anonymous user.
 .It Dv MNT_EXKERB
-The filesystem is exported with Kerberos uid mapping.
+The file system is exported with Kerberos uid mapping.
 .El
 .Pp
-Fields that are undefined for a particular filesystem are set to -1.
+Fields that are undefined for a particular file system are set to -1.
 The buffer is filled with an array of
 .Fa fsstat
-structures, one for each mounted filesystem
+structures, one for each mounted file system
 up to the size specified by
 .Fa bufsize .
 .Pp
@@ -127,7 +127,7 @@ If
 .Fa buf
 is given as NULL,
 .Fn getfsstat
-returns just the number of mounted filesystems.
+returns just the number of mounted file systems.
 .Pp
 Normally
 .Fa flags
@@ -139,10 +139,10 @@ is set to
 .Dv MNT_NOWAIT ,
 .Fn getfsstat
 will return the information it has available without requesting
-an update from each filesystem.
+an update from each file system.
 Thus, some of the information will be out of date, but
 .Fn getfsstat
-will not block waiting for information from a filesystem that is
+will not block waiting for information from a file system that is
 unable to respond.
 .Sh RETURN VALUES
 Upon successful completion, the number of
@@ -161,7 +161,7 @@ points to an invalid address.
 .It Bq Er EIO
 An
 .Tn I/O
-error occurred while reading from or writing to the filesystem.
+error occurred while reading from or writing to the file system.
 .El
 .Sh SEE ALSO
 .Xr statfs 2 ,
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 2791452..3b4ef29 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -394,7 +394,7 @@ was exhausted.
 .It Er 70 ESTALE Em "Stale NFS file handle" .
 An attempt was made to access an open file (on an
 .Tn NFS
-filesystem)
+file system)
 which is now unavailable as referenced by the file descriptor.
 This may indicate the file was deleted on the
 .Tn NFS
@@ -432,11 +432,11 @@ the wrong format.
 .It Er 80 EAUTH Em "Authentication error" .
 Attempted to use an invalid authentication ticket to mount a
 .Tn NFS
-filesystem.
+file system.
 .It Er 81 ENEEDAUTH Em "Need authenticator" .
 An authentication ticket must be obtained before the given
 .Tn NFS
-filesystem may be mounted.
+file system may be mounted.
 .It Er 82 EIDRM Em "Identifier removed" .
 An IPC identifier was removed while the current process was waiting on it.
 .It Er 83 ENOMSG Em "No message of desired type" .
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 1acd08e..5d44d2d 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -164,5 +164,5 @@ function call appeared in
 The
 .Fn link
 system call traditionally allows the super-user to link directories which
-corrupts the filesystem coherency.  This implementation no longer permits
+corrupts the file system coherency.  This implementation no longer permits
 it.
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index 8f19270..2260a7d 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -104,8 +104,8 @@ modified again.
 .It Dv MADV_NOSYNC
 Request that the system not flush the data associated with this map to
 physical backing store unless it needs to.  Typically this prevents the
-filesystem update daemon from gratuitously writing pages dirtied
-by the VM system to physical disk.  Note that VM/filesystem coherency is
+file system update daemon from gratuitously writing pages dirtied
+by the VM system to physical disk.  Note that VM/file system coherency is
 always maintained, this feature simply ensures that the mapped data is
 only flush when it needs to be, usually by the system pager.
 .Pp
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index 36f1f5b8..f23bce2 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -45,7 +45,7 @@
 .Ft int
 .Fn mknod "const char *path" "mode_t mode" "dev_t dev"
 .Sh DESCRIPTION
-The filesystem node
+The file system node
 .Fa path
 is created with the file type and access permissions specified in
 .Fa mode .
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index e78520d..f336df5 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -145,7 +145,7 @@ this option any VM pages you dirty may be flushed to disk every so often
 (every 30-60 seconds usually) which can create performance problems if you
 do not need that to occur (such as when you are using shared file-backed
 mmap regions for IPC purposes).
-Note that VM/filesystem coherency is
+Note that VM/file system coherency is
 maintained whether you use
 .Dv MAP_NOSYNC
 or not.
@@ -197,9 +197,9 @@ The
 .Xr msync 2
 system call is obsolete since
 .Bx
-implements a coherent filesystem buffer cache.
+implements a coherent file system buffer cache.
 However, it may be
-used to associate dirty VM pages with filesystem buffers and thus cause
+used to associate dirty VM pages with file system buffers and thus cause
 them to be flushed to physical media sooner rather then later.
 .It Dv MAP_PRIVATE
 Modifications are private.
@@ -346,8 +346,8 @@ this gives
 .Fx
 a maximum of 8TB filesizes.
 It is actually bugs in
-the filesystem code that causes the limit to be further restricted to
+the file system code that causes the limit to be further restricted to
 1TB (loss of precision when doing blockno calculations).
 .Pp
-Another reason for the 2GB limit is that filesystem metadata can
+Another reason for the 2GB limit is that file system metadata can
 reside at negative offsets.
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index dc1b45b..b5f92f2 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -38,7 +38,7 @@
 .Sh NAME
 .Nm mount ,
 .Nm unmount
-.Nd mount or dismount a filesystem
+.Nd mount or dismount a file system
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -52,12 +52,12 @@
 The
 .Fn mount
 function grafts
-a filesystem object onto the system file tree
+a file system object onto the system file tree
 at the point
 .Ar dir .
 The argument
 .Ar data
-describes the filesystem object to be mounted.
+describes the file system object to be mounted.
 The argument
 .Ar type
 tells the kernel how to interpret
@@ -65,41 +65,41 @@ tells the kernel how to interpret
 (See
 .Ar type
 below).
-The contents of the filesystem
+The contents of the file system
 become available through the new mount point
 .Ar dir .
 Any files in
 .Ar dir
 at the time
 of a successful mount are swept under the carpet so to speak, and
-are unavailable until the filesystem is unmounted.
+are unavailable until the file system is unmounted.
 .Pp
 The following
 .Ar flags
 may be specified to
-suppress default semantics which affect filesystem access.
+suppress default semantics which affect file system access.
 .Bl -tag -width MNT_SYNCHRONOUS
 .It Dv MNT_RDONLY
-The filesystem should be treated as read-only;
+The file system should be treated as read-only;
 Even the super-user may not write on it.
 Specifying MNT_UPDATE without this option will upgrade
-a read-only filesystem to read/write.
+a read-only file system to read/write.
 .It Dv MNT_NOEXEC
-Do not allow files to be executed from the filesystem.
+Do not allow files to be executed from the file system.
 .It Dv MNT_NOSUID
 Do not honor setuid or setgid bits on files when executing them.
 .It Dv MNT_NOATIME
 Disable update of file access times.
 .It Dv MNT_NODEV
-Do not interpret special files on the filesystem.
+Do not interpret special files on the file system.
 .It Dv MNT_SUIDDIR
 Directories with the SUID bit set chown new files to their own owner.
 .It Dv MNT_SYNCHRONOUS
-All I/O to the filesystem should be done synchronously.
+All I/O to the file system should be done synchronously.
 .It Dv MNT_ASYNC
-All I/O to the filesystem should be done asynchronously.
+All I/O to the file system should be done asynchronously.
 .It Dv MNT_FORCE
-Force a read-write mount even if the filesystem appears to be unclean.
+Force a read-write mount even if the file system appears to be unclean.
 Dangerous.
 .It Dv MNT_NOCLUSTERR
 Disable read clustering.
@@ -110,41 +110,41 @@ Disable write clustering.
 The flag
 .Dv MNT_UPDATE
 indicates that the mount command is being applied
-to an already mounted filesystem.
+to an already mounted file system.
 This allows the mount flags to be changed without requiring
-that the filesystem be unmounted and remounted.
-Some filesystems may not allow all flags to be changed.
+that the file system be unmounted and remounted.
+Some file systems may not allow all flags to be changed.
 For example,
-many filesystems will not allow a change from read-write to read-only.
+many file systems will not allow a change from read-write to read-only.
 .Pp
 The flag
 .Dv MNT_RELOAD
 causes the vfs subsystem to update its data structures pertaining to
-the specified already mounted filesystem.
+the specified already mounted file system.
 .Pp
 The
 .Fa type
-argument names the filesystem.
-The types of filesystems known to the system can be obtained with
+argument names the file system.
+The types of file systems known to the system can be obtained with
 .Xr lsvfs 1 .
 .Pp
 .Fa Data
 is a pointer to a structure that contains the type
 specific arguments to mount.
 The format for these argument structures is described in the
-manual page for each filesystem.
-By convention filesystem manual pages are named
-by prefixing ``mount_'' to the name of the filesystem as returned by
+manual page for each file system.
+By convention file system manual pages are named
+by prefixing ``mount_'' to the name of the file system as returned by
 .Xr lsvfs 1 .
 Thus the
 .Nm NFS
-filesystem is described by the
+file system is described by the
 .Xr mount_nfs 8
 manual page.
 .Pp
 The
 .Fn unmount
-function call disassociates the filesystem from the specified
+function call disassociates the file system from the specified
 mount point
 .Fa dir .
 .Pp
@@ -152,12 +152,12 @@ The
 .Fa flags
 argument may specify
 .Dv MNT_FORCE
-to specify that the filesystem should be forcibly unmounted or made read-only
+to specify that the file system should be forcibly unmounted or made read-only
 (if MNT_UPDATE and MNT_RDONLY are also specified)
 even if files are still active.
 Active special devices continue to work,
 but any further accesses to any other active files result in errors
-even if the filesystem is later remounted.
+even if the file system is later remounted.
 .Pp
 The
 .Dv MNT_SUIDDIR
@@ -203,7 +203,7 @@ points outside the process's allocated address space.
 .Pp
 The following errors can occur for a
 .Em ufs
-filesystem mount:
+file system mount:
 .Bl -tag -width Er
 .It Bq Er ENODEV
 A component of ufs_args
@@ -223,11 +223,11 @@ is already mounted.
 .It Bq Er EMFILE
 No space remains in the mount table.
 .It Bq Er EINVAL
-The super block for the filesystem had a bad magic
+The super block for the file system had a bad magic
 number or an out of range block size.
 .It Bq Er ENOMEM
 Not enough memory was available to read the cylinder
-group information for the filesystem.
+group information for the file system.
 .It Bq Er EIO
 An I/O error occurred while reading the super block or
 cylinder group information.
@@ -238,7 +238,7 @@ points outside the process's allocated address space.
 .Pp
 The following errors can occur for a
 .Em nfs
-filesystem mount:
+file system mount:
 .Bl -tag -width Er
 .It Bq Er ETIMEDOUT
 .Em Nfs
@@ -265,9 +265,9 @@ Too many symbolic links were encountered in translating the pathname.
 The requested directory is not in the mount table.
 .It Bq Er EBUSY
 A process is holding a reference to a file located
-on the filesystem.
+on the file system.
 .It Bq Er EIO
-An I/O error occurred while writing cached filesystem information.
+An I/O error occurred while writing cached file system information.
 .It Bq Er EFAULT
 .Fa Dir
 points outside the process's allocated address space.
@@ -275,7 +275,7 @@ points outside the process's allocated address space.
 .Pp
 A
 .Em ufs
-mount can also fail if the maximum number of filesystems are currently
+mount can also fail if the maximum number of file systems are currently
 mounted.
 .Sh SEE ALSO
 .Xr lsvfs 1 ,
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index 04d18c2..6960c98 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -48,7 +48,7 @@
 The
 .Fn msync
 system call
-writes any modified pages back to the filesystem and updates
+writes any modified pages back to the file system and updates
 the file modification time.
 If
 .Fa len
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index fdad061..f9d3dac 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -151,7 +151,7 @@ for an exclusive lock.
 If creating a file with
 .Dv O_CREAT ,
 the request for the lock will never fail
-(provided that the underlying filesystem supports locking).
+(provided that the underlying file system supports locking).
 .Pp
 .Dv O_DIRECT
 may be used to minimize or eliminate the cache effects of reading and writing.
@@ -243,7 +243,7 @@ operation was interrupted by a signal.
 .Dv O_SHLOCK
 or
 .Dv O_EXLOCK
-is specified but the underlying filesystem does not support locking.
+is specified but the underlying file system does not support locking.
 .It Bq Er EWOULDBLOCK
 .Dv O_NONBLOCK
 and one of
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index dd024e9..44d74b2 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -40,7 +40,7 @@
 .Os
 .Sh NAME
 .Nm quotactl
-.Nd manipulate filesystem quotas
+.Nd manipulate file system quotas
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -52,7 +52,7 @@
 The
 .Fn quotactl
 call enables, disables and
-manipulates filesystem quotas.
+manipulates file system quotas.
 A quota control command
 given by
 .Fa cmd
@@ -71,7 +71,7 @@ is discussed below with each command.
 .Pp
 Currently quotas are supported only for the
 .Dq ufs
-filesystem.
+file system.
 For
 .Dq ufs ,
 a command is composed of a primary command (see below)
@@ -84,7 +84,7 @@ The
 specific commands are:
 .Bl -tag -width Q_QUOTAOFFxx
 .It Dv Q_QUOTAON
-Enable disk quotas for the filesystem specified by
+Enable disk quotas for the file system specified by
 .Fa path .
 The command type specifies the type of the quotas being enabled.
 The
@@ -99,7 +99,7 @@ The
 argument is unused.
 Only the super-user may turn quotas on.
 .It Dv Q_QUOTAOFF
-Disable disk quotas for the filesystem specified by
+Disable disk quotas for the file system specified by
 .Fa path .
 The command type specifies the type of the quotas being disabled.
 The
@@ -170,7 +170,7 @@ In
 .Dv Q_GETQUOTA
 and
 .Dv Q_SETQUOTA ,
-quotas are not currently enabled for this filesystem.
+quotas are not currently enabled for this file system.
 .It Bq Er EACCES
 In
 .Dv Q_QUOTAON ,
@@ -189,7 +189,7 @@ Too many symbolic links were encountered in translating a pathname.
 .It Bq Er EROFS
 In
 .Dv Q_QUOTAON ,
-the quota file resides on a read-only filesystem.
+the quota file resides on a read-only file system.
 .It Bq Er EIO
 An
 .Tn I/O
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index a4b7e8a..fb48f98 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -51,7 +51,7 @@
 .Fn Statfs
 returns information about a mounted file system.
 .Fa Path
-is the path name of any file within the mounted filesystem.
+is the path name of any file within the mounted file system.
 .Fa Buf
 is a pointer to a
 .Fn statfs
@@ -75,8 +75,8 @@ long	f_bavail;	  /* free blocks avail to non-superuser */
 long	f_files;	  /* total file nodes in file system */
 long	f_ffree;	  /* free file nodes in fs */
 fsid_t	f_fsid;		  /* file system id */
-uid_t	f_owner;	  /* user that mounted the filesystem */
-int	f_type;		  /* type of filesystem */
+uid_t	f_owner;	  /* user that mounted the file system */
+int	f_type;		  /* type of file system */
 int	f_flags;	  /* copy of mount flags */
 long    f_syncwrites;	  /* count of sync writes since mount */
 long    f_asyncwrites;	  /* count of async writes since mount */
@@ -84,40 +84,40 @@ char	f_fstypename[MFSNAMELEN];/* fs type name */
 char	f_mntonname[MNAMELEN];	 /* mount point */
 long    f_syncreads;		 /* count of sync reads since mount */
 long    f_asyncreads;		 /* count of async reads since mount */
-char	f_mntfromname[MNAMELEN]; /* mounted filesystem */
+char	f_mntfromname[MNAMELEN]; /* mounted file system */
 };
 .Ed
 The flags that may be returned include:
 .Bl -tag -width MNT_SYNCHRONOUS
 .It Dv MNT_RDONLY
-The filesystem is mounted read-only;
+The file system is mounted read-only;
 Even the super-user may not write on it.
 .It Dv MNT_NOEXEC
-Files may not be executed from the filesystem.
+Files may not be executed from the file system.
 .It Dv MNT_NOSUID
 Setuid and setgid bits on files are not honored when they are executed.
 .It Dv MNT_NODEV
-Special files in the filesystem may not be opened.
+Special files in the file system may not be opened.
 .It Dv MNT_SYNCHRONOUS
-All I/O to the filesystem is done synchronously.
+All I/O to the file system is done synchronously.
 .It Dv MNT_ASYNC
-No filesystem I/O is done synchronously.
+No file system I/O is done synchronously.
 .It Dv MNT_LOCAL
-The filesystem resides locally.
+The file system resides locally.
 .It Dv MNT_QUOTA
-The filesystem has quotas enabled on it.
+The file system has quotas enabled on it.
 .It Dv MNT_ROOTFS
-Identifies the root filesystem.
+Identifies the root file system.
 .It Dv MNT_EXRDONLY
-The filesystem is exported read-only.
+The file system is exported read-only.
 .It Dv MNT_EXPORTED
-The filesystem is exported for both reading and writing.
+The file system is exported for both reading and writing.
 .It Dv MNT_DEFEXPORTED
-The filesystem is exported for both reading and writing to any Internet host.
+The file system is exported for both reading and writing to any Internet host.
 .It Dv MNT_EXPORTANON
-The filesystem maps all remote accesses to the anonymous user.
+The file system maps all remote accesses to the anonymous user.
 .It Dv MNT_EXKERB
-The filesystem is exported with Kerberos uid mapping.
+The file system is exported with Kerberos uid mapping.
 .El
 .Pp
 Fields that are undefined for a particular file system are set to -1.
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
index f304cce..6b16b1f 100644
--- a/lib/libc/sys/sync.2
+++ b/lib/libc/sys/sync.2
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm sync
-.Nd "schedule filesystem updates"
+.Nd "schedule file system updates"
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
diff --git a/lib/libc/sys/undelete.2 b/lib/libc/sys/undelete.2
index 8263314..12cc6f0 100644
--- a/lib/libc/sys/undelete.2
+++ b/lib/libc/sys/undelete.2
@@ -51,15 +51,15 @@ The
 function attempts to recover the deleted file named by
 .Fa path .
 Currently, this works only when the named object
-is a whiteout in a union filesystem.
+is a whiteout in a union file system.
 The system call removes the whiteout causing
 any objects in a lower layer of the
 union stack to become visible once more.
 .Pp
 Eventually, the
 .Fn undelete
-functionality may be expanded to other filesystems able to recover
-deleted files such as the log-structured filesystem.
+functionality may be expanded to other file systems able to recover
+deleted files such as the log-structured file system.
 .Sh RETURN VALUES
 .Rv -std undelete
 .Sh ERRORS
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index 5a10123..72c716d 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -114,5 +114,5 @@ function call appeared in
 The
 .Fn unlink
 system call traditionally allows the super-user to unlink directories which
-can damage the filesystem integrity.  This implementation no longer permits
+can damage the file system integrity.  This implementation no longer permits
 it.
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index bfa8abf..6ca9e38 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -75,7 +75,7 @@ is
 it is assumed to point to an array of two timeval structures.
 The access time is set to the value of the first element, and the
 modification time is set to the value of the second element.
-For filesystems that support file birth (creation) times (such as
+For file systems that support file birth (creation) times (such as
 .Dv UFS2 ) ,
 the birth time will be set to the value of the second element
 if the second element is older than the currently set birth time.