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

Approved by:	re

6 files changed, 20 insertions, 20 deletions

diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index 9308b02..da10482 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -82,8 +82,8 @@
 .Ar ...
 .Sh DESCRIPTION
 .Nm Amd
-is a daemon that automatically mounts filesystems whenever a file or directory
-within that filesystem is accessed.  Filesystems are automatically unmounted
+is a daemon that automatically mounts file systems whenever a file or directory
+within that file system is accessed.  File systems are automatically unmounted
 when they appear to be quiescent.
 .Pp
 .Nm Amd
@@ -97,7 +97,7 @@ are handled by
 which uses the map defined by
 .Ar mapname
 to determine how to resolve the lookup.  Generally, this will be a host name,
-some filesystem information and some mount options for the given filesystem.
+some file system information and some mount options for the given file system.
 .Pp
 In the first form depicted above,
 .Nm amd
@@ -171,7 +171,7 @@ to standard output where it can be saved into a file.
 .It Fl r
 Restart existing mounts.
 .Nm Amd
-will scan the mount file table to determine which filesystems
+will scan the mount file table to determine which file systems
 are currently mounted.  Whenever one of these would have
 been auto-mounted,
 .Nm amd
@@ -197,7 +197,7 @@ Version.  Displays version and configuration information on standard error.
 .It Fl w Ar interval
 Specify an
 .Ar interval ,
-in seconds, between attempts to dismount filesystems that have exceeded their
+in seconds, between attempts to dismount file systems that have exceeded their
 cached times.  The default is 2 minutes.
 .It Fl x Ar options
 Specify run-time logging options.  The options are a comma separated list
@@ -286,7 +286,7 @@ will not be processed.
 .Sh FILES
 .Bl -tag -width /axx
 .It Pa /.amd_mnt
-directory under which filesystems are dynamically mounted
+directory under which file systems are dynamically mounted
 .It Pa /etc/amd.conf
 default configuration file
 .El
@@ -295,7 +295,7 @@ Some care may be required when creating a mount map.
 .Pp
 Symbolic links on an
 .Tn NFS
-filesystem can be incredibly inefficient.
+file system can be incredibly inefficient.
 In most implementations of
 .Tn NFS ,
 their interpolations are not cached by
diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8
index 915e27e..7d928bb 100644
--- a/contrib/amd/amq/amq.8
+++ b/contrib/amd/amq/amq.8
@@ -66,14 +66,14 @@ program.
 Communication is by
 .Tn RPC .
 Three modes of operation are supported by the current protocol.
-By default a list of mount points and auto-mounted filesystems
+By default a list of mount points and auto-mounted file systems
 is output.
 An alternative host can be specified using the
 .Fl h
 option.
 .Pp
 If directory names are given, as output by default,
-then per-filesystem information is displayed.
+then per file system information is displayed.
 .Sh OPTIONS
 .Bl -tag -width Ds
 .It Fl f
@@ -97,8 +97,8 @@ refresh
 open file handle on the log file, so that it can be rotated and compressed via
 daily cron jobs.
 .It Fl m
-Request the automounter to provide a list of mounted filesystems,
-including the number of references to each filesystem and any error
+Request the automounter to provide a list of mounted file systems,
+including the number of references to each file system and any error
 which occurred while mounting.
 .It Fl p
 Return the process ID of the remote or locally running
@@ -112,9 +112,9 @@ script.
 .It Fl s
 Request the automounter to provide system-wide mount statistics.
 .It Fl u
-Request the automounter to unmount the named filesystems
+Request the automounter to unmount the named file systems
 instead of providing information about them.  Unmounts are requested,
-not forced.  They merely cause the mounted filesystem to timeout,
+not forced.  They merely cause the mounted file system to timeout,
 which will be picked up by
 .Nm amd Ns \'s
 main scheduler thus causing the normal timeout action to be taken.
diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8
index bd705bc..0f2c9e6 100644
--- a/contrib/amd/fixmount/fixmount.8
+++ b/contrib/amd/fixmount/fixmount.8
@@ -83,9 +83,9 @@ found.  The remote mount table is not changed.
 .It Fl A
 Issues a command to the remote mountd declaring that
 .Em all
-of its filesystems have been unmounted.  This should be used with caution, as
+of its file systems have been unmounted.  This should be used with caution, as
 it removes all remote mount entries pertaining to the local system, whether or
-not any filesystems are still mounted locally.
+not any file systems are still mounted locally.
 .It Fl v
 Be quiet.  Suppresses error messages due to timeouts and
 .Dq Program not Registered ,
@@ -135,7 +135,7 @@ and verifying the resulting path).
 Symbolic links on the server will cause the path in the remote entry to differ
 from the one in 
 .Pa /etc/mtab .
-To catch those cases, a filesystem is also deemed mounted if its
+To catch those cases, a file system is also deemed mounted if its
 .Em local
 mount point is identical to the remote entry.
 I.e., on a SunOS diskless client,
diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8
index 18b8eaf..004980d 100644
--- a/contrib/amd/fsinfo/fsinfo.8
+++ b/contrib/amd/fsinfo/fsinfo.8
@@ -41,7 +41,7 @@
 .Os
 .Sh NAME
 .Nm fsinfo
-.Nd co-ordinate site-wide filesystem information
+.Nd co-ordinate site-wide file system information
 .Sh SYNOPSIS
 .Nm
 .Op Fl qv
@@ -124,7 +124,7 @@ For each machine defined in the configuration files, a
 file is created with the file name determined by prefixing this
 .Ar fstabs_prefix
 string with the name of the machine.  These files contain entries
-for filesystems and partitions to mount at boot time.
+for file systems and partitions to mount at boot time.
 .It Fl h Ar hostname
 Defines the hostname of the destination machine to process for.
 If this is not specified, it defaults to the local machine name,
diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8
index 61daf7c..9eeeadf 100644
--- a/contrib/amd/hlfsd/hlfsd.8
+++ b/contrib/amd/hlfsd/hlfsd.8
@@ -70,7 +70,7 @@
 .Op linkname Op subdir
 .Sh DESCRIPTION
 .Nm 
-is a daemon which implements a filesystem containing a symbolic link to
+is a daemon which implements a file system containing a symbolic link to
 subdirectory within a user's home directory, depending on the user
 which accessed that link.  It was primarily designed to redirect
 incoming mail to users' home directories, so that it can read from
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index 283af8c..8e29faa 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -662,7 +662,7 @@ will attempt to unmount all file systems which it knows about.  Normally
 leaves all 
 (esp.\&)
 .Tn NFS
-mounted filesystems intact.  Note that
+mounted file systems intact.  Note that
 .Nm amd
 does not know about file systems mounted before it starts up, unless the
 .Ar restart_mounts