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

Approved by:	re

5 files changed, 76 insertions, 76 deletions

diff --git a/share/man/man7/ffs.7 b/share/man/man7/ffs.7
index bf3acb9..34d083e 100644
--- a/share/man/man7/ffs.7
+++ b/share/man/man7/ffs.7
@@ -35,7 +35,7 @@
 .Os
 .Sh NAME
 .Nm ffs
-.Nd Berkeley fast filesystem
+.Nd Berkeley fast file system
 .Sh SYNOPSIS
 In the kernel configuration file:
 .Cd "options FFS"
@@ -53,21 +53,21 @@ In
 /dev/disk0a	/mnt ufs rw 1 1
 .Ed
 .Sh DESCRIPTION
-The Berkeley fast filesystem
-provides facilities to store filesystem data onto a disk device.
+The Berkeley fast file system
+provides facilities to store file system data onto a disk device.
 .Nm
 has been optimized over the years
 for speed and reliability
 and is the default
 .Fx
-filesystem.
+file system.
 .Ss Quotas
 .Bl -tag -width 2n
 .It Cd "options QUOTA"
 This option allows system administrators
 to set limits on disk usage
 on a per-user basis.
-Quotas can be used only on filesystems
+Quotas can be used only on file systems
 mounted with the
 .Cm quota
 option;
@@ -82,11 +82,11 @@ and
 The soft updates feature tracks writes to the disk
 and enforces metadata update dependencies
 (e.g., updating free block maps)
-to ensure that the filesystem remains consistent.
+to ensure that the file system remains consistent.
 .Pp
 To enable soft updates on an
 .Em unmounted
-filesystem, use the following command:
+file system, use the following command:
 .Pp
 .D1 Nm tunefs Fl n Cm enable Ar fs
 .Pp
@@ -108,7 +108,7 @@ on networks including
 and
 .Tn "Apple Macintosh"
 computers,
-this option allows files on filesystems
+this option allows files on file systems
 mounted with the
 .Cm suiddir
 option
@@ -127,7 +127,7 @@ This option requires the presence of the
 option, and it is recommended that
 .Dv UFS_EXTATTR_AUTOSTART
 is included as well,
-so that ACLs are enabled atomically upon mounting the filesystem.
+so that ACLs are enabled atomically upon mounting the file system.
 .El
 .Pp
 In order to enable support for ACLs,
@@ -139,11 +139,11 @@ which holds the access ACL,
 and
 .Pa posix1e.acl_default ,
 which holds the default ACL for directories.
-If you are using filesystem extended attributes,
+If you are using file system extended attributes,
 the following commands may be used to
 allocate space for and create the necessary EA backing files
-for ACLs in the root of each filesystem.
-In these examples, the root filesystem is used;
+for ACLs in the root of each file system.
+In these examples, the root file system is used;
 see
 .Sx "Extended Attributes"
 for more details.
@@ -154,7 +154,7 @@ extattrctl initattr -p / 388 posix1e.acl_access
 extattrctl initattr -p / 388 posix1e.acl_default
 .Ed
 .Pp
-On the next mount of the root filesystem,
+On the next mount of the root file system,
 the attributes will be automatically started
 (if
 .Dv UFS_EXTATTR_AUTOSTART
@@ -179,9 +179,9 @@ If this option is defined,
 .Nm
 will search for a
 .Pa .attribute
-subdirectory of the filesystem root during the mount operation.
+subdirectory of the file system root during the mount operation.
 If found, extended attribute support will be
-automatically started for that filesystem.
+automatically started for that file system.
 .El
 .Pp
 The following
@@ -191,7 +191,7 @@ MIBs are defined for use with
 .Bl -hang -width ".Va vfs.ffs.doreallocblk"
 .It Va vfs.ffs.doasyncfree
 Asynchronously write out modified i-node and indirect blocks
-upon reallocating filesystem blocks to be contiguous.
+upon reallocating file system blocks to be contiguous.
 (Default: 1.)
 .It Va vfs.ffs.doreallocblks
 Enable support for the rearrangement of blocks
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 1b6dc79..f07c9f3 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -37,12 +37,12 @@
 .Os
 .Sh NAME
 .Nm hier
-.Nd layout of filesystems
+.Nd layout of file systems
 .Sh DESCRIPTION
-A sketch of the filesystem hierarchy.
+A sketch of the file system hierarchy.
 .Bl -tag -width "/stand/"
 .It Pa /
-root directory of the filesystem
+root directory of the file system
 .It Pa /bin/
 user utilities fundamental to both single-user and multi-user environments
 .It Pa /boot/
@@ -143,7 +143,7 @@ OpenSSL configuration files
 empty directory commonly used by
 system administrators as a temporary mount point
 .It Pa /proc/
-process filesystem;
+process file system;
 see
 .Xr procfs 5 ,
 .Xr mount_procfs 8
@@ -208,28 +208,28 @@ WaveLAN driver
 .It Pa fs/
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa fdescfs/
-per-process file descriptors filesystem
+per-process file descriptors file system
 .It Pa fifofs/
 .St -p1003.1
-FIFOs filesystem
+FIFOs file system
 .It Pa msdosfs/
-MS-DOS filesystem
+MS-DOS file system
 .It Pa ntfs/
-NTFS filesystem
+NTFS file system
 .It Pa nullfs/
-loopback filesystem
+loopback file system
 .It Pa nwfs/
-NetWare filesystem
+NetWare file system
 .It Pa portalfs/
-portal filesystem
+portal file system
 .It Pa procfs/
-process filesystem
+process file system
 .It Pa smbfs/
-SMB/CIFS filesystem
+SMB/CIFS file system
 .It Pa umapfs/
-alternate uid/gid mappings filesystem
+alternate uid/gid mappings file system
 .It Pa unionfs
-union filesystem
+union file system
 .El
 .It Pa g++/
 GNU C++ include files
@@ -242,7 +242,7 @@ ISC utility library libisc include files
 .It Pa isofs/
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa cd9660/
-iso9660 filesystem
+iso9660 file system
 .El
 .It Pa kerberosIV/
 C include files for kerberos authentication package;
@@ -327,9 +327,9 @@ system C include files (kernel data structures)
 C include files for UFS (The U-word File System)
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa ffs/
-Fast filesystem
+Fast file system
 .It Pa ufs/
-UFS filesystem
+UFS file system
 .El
 .It Pa vm/
 virtual memory;
@@ -719,7 +719,7 @@ system messages database;
 see
 .Xr msgs 1
 .It Pa quotas/
-filesystem quota information files
+file system quota information files
 .It Pa run/
 system information files describing various info about
 system since it was booted
@@ -779,7 +779,7 @@ the NIS maps
 .Sh NOTES
 This manual page documents the default
 .Fx
-filesystem layout, but
+file system layout, but
 the actual hierarchy on a given system is defined at the system
 administrator's discretion.
 A well-maintained installation will include a customized version of
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 46cee45..36ab440 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -79,7 +79,7 @@ Uses
 .Dq Li "make installworld"
 to install a clean system into a
 .Xr chroot 8
-environment on the filesystem.
+environment on the file system.
 Checks out the specified version of the source code and then rebuilds
 the entire system in the clean environment with
 .Dq Li "make world" .
@@ -153,7 +153,7 @@ Sets up a suitable area to build CD-ROM images in
 .It Cm iso.1
 Builds two ISO images (installation and
 .Dq live
-filesystem) from the CD-ROM release area
+file system) from the CD-ROM release area
 (disabled by default, see
 .Va MAKE_ISOS
 below).
@@ -189,7 +189,7 @@ environment for the entire release build.
 .\" XXX: "we don't know how much space you'll need, but make sure you have
 .\" XXX: at least 3 GB to be safe" (I know i'm still hardcoding a number,
 .\" XXX: but at least it looks less like a decree and more like an estimate.
-This filesystem should have at least 2.3 gigabytes of free space on the
+This file system should have at least 2.3 gigabytes of free space on the
 i386 architecture.
 .It Va CVSROOT
 The location of the
@@ -440,7 +440,7 @@ used a manual checklist, compiled by
 .An Rod Grimes ,
 to produce a release.
 Apart from being incomplete, the list put a lot of specific demands on
-available filesystems and was quite torturous to execute.
+available file systems and was quite torturous to execute.
 .Pp
 As part of the
 .Fx 2.0
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index 27e1636..6c963e7 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -122,7 +122,7 @@ Securing user accounts
 .It
 Securing the password file
 .It
-Securing the kernel core, raw devices, and filesystems
+Securing the kernel core, raw devices, and file systems
 .It
 Quick detection of inappropriate changes made to the system
 .It
@@ -319,7 +319,7 @@ the password file
 (see
 .Sq Checking file integrity
 below).
-.Sh SECURING THE KERNEL CORE, RAW DEVICES, AND FILESYSTEMS
+.Sh SECURING THE KERNEL CORE, RAW DEVICES, AND FILE SYSTEMS
 If an attacker breaks root he can do just about anything, but there
 are certain conveniences.  For example, most modern kernels have a
 packet sniffing device driver built in.  Under
@@ -384,7 +384,7 @@ limited-access box significant access to the other machines in the business,
 usually either by doing a read-only NFS export of the other machines to the
 limited-access box, or by setting up ssh keypairs to allow the limit-access
 box to ssh to the other machines.  Except for its network traffic, NFS is
-the least visible method - allowing you to monitor the filesystems on each
+the least visible method - allowing you to monitor the file systems on each
 client box virtually undetected.  If your
 limited-access server is connected to the client boxes through a switch,
 the NFS method is often the better choice.  If your limited-access server
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 70c4e28..092658b 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -15,13 +15,13 @@ When using
 .Xr disklabel 8
 or
 .Xr sysinstall 8
-to lay out your filesystems on a hard disk it is important to remember
+to lay out your file systems on a hard disk it is important to remember
 that hard drives can transfer data much more quickly from outer tracks
 than they can from inner tracks.
 To take advantage of this you should
-try to pack your smaller filesystems and swap closer to the outer tracks,
-follow with the larger filesystems, and end with the largest filesystems.
-It is also important to size system standard filesystems such that you
+try to pack your smaller file systems and swap closer to the outer tracks,
+follow with the larger file systems, and end with the largest file systems.
+It is also important to size system standard file systems such that you
 will not be forced to resize them later as you scale the machine up.
 I usually create, in order, a 128M root, 1G swap, 128M
 .Pa /var ,
@@ -85,7 +85,7 @@ Also note that sysinstall will create a
 .Pa /tmp
 directory.
 Dedicating a partition for temporary file storage is important for
-two reasons: first, it reduces the possibility of filesystem corruption
+two reasons: first, it reduces the possibility of file system corruption
 in a crash, and second it reduces the chance of a runaway process that
 fills up
 .Oo Pa /var Oc Ns Pa /tmp
@@ -155,7 +155,7 @@ Then I do not have to worry about undersizing things!
 Well, there are several reasons this is not a good idea.
 First,
 each partition has different operational characteristics and separating them
-allows the filesystem to tune itself to those characteristics.
+allows the file system to tune itself to those characteristics.
 For example,
 the root and
 .Pa /usr
@@ -198,8 +198,8 @@ and
 .Em cylinders/group .
 .Pp
 .Fx
-performs best when using 8K or 16K filesystem block sizes.
-The default filesystem block size is 16K,
+performs best when using 8K or 16K file system block sizes.
+The default file system block size is 16K,
 which provides best performance for most applications,
 with the exception of those that perform random access on large files
 (such as database server software).
@@ -211,9 +211,9 @@ can cause fragmentation of the buffer cache and
 lead to lower performance.
 .Pp
 The defaults may be unsuitable
-for a filesystem that requires a very large number of i-nodes
+for a file system that requires a very large number of i-nodes
 or is intended to hold a large number of very small files.
-Such a filesystem should be created with an 8K or 4K block size.
+Such a file system should be created with an 8K or 4K block size.
 This also requires you to specify a smaller
 fragment size.
 We recommend always using a fragment size that is 1/8
@@ -229,12 +229,12 @@ as database files, you can increase the
 ratio which reduces the number of i-nodes (maximum number of files and
 directories that can be created) for that partition.
 Decreasing the number
-of i-nodes in a filesystem can greatly reduce
+of i-nodes in a file system can greatly reduce
 .Xr fsck 8
 recovery times after a crash.
 Do not use this option
 unless you are actually storing large files on the partition, because if you
-overcompensate you can wind up with a filesystem that has lots of free
+overcompensate you can wind up with a file system that has lots of free
 space remaining but cannot accommodate any more files.
 Using 32768, 65536, or 262144 bytes/i-node is recommended.
 You can go higher but
@@ -245,13 +245,13 @@ For example,
 .Dq Li "newfs -i 32768 ..." .
 .Pp
 .Xr tunefs 8
-may be used to further tune a filesystem.
+may be used to further tune a file system.
 This command can be run in
-single-user mode without having to reformat the filesystem.
+single-user mode without having to reformat the file system.
 However, this is possibly the most abused program in the system.
 Many people attempt to
-increase available filesystem space by setting the min-free percentage to 0.
-This can lead to severe filesystem fragmentation and we do not recommend
+increase available file system space by setting the min-free percentage to 0.
+This can lead to severe file system fragmentation and we do not recommend
 that you do this.
 Really the only
 .Xr tunefs 8
@@ -267,27 +267,27 @@ option to
 .Xr newfs 8 ,
 and
 .Xr sysinstall 8
-will typically enable softupdates automatically for non-root filesystems).
+will typically enable softupdates automatically for non-root file systems).
 Softupdates drastically improves meta-data performance, mainly file
 creation and deletion.
-We recommend enabling softupdates on most filesystems; however, there
+We recommend enabling softupdates on most file systems; however, there
 are two limitations to softupdates that you should be aware of when
-determining whether to use it on a filesystem.
-First, softupdates guarantees filesystem consistency in the
+determining whether to use it on a file system.
+First, softupdates guarantees file system consistency in the
 case of a crash but could very easily be several seconds (even a minute!\&)
 behind on pending write to the physical disk.
 If you crash you may lose more work
 than otherwise.
-Secondly, softupdates delays the freeing of filesystem
+Secondly, softupdates delays the freeing of file system
 blocks.
-If you have a filesystem (such as the root filesystem) which is
+If you have a file system (such as the root file system) which is
 close to full, doing a major update of it, e.g.\&
 .Dq Li "make installworld" ,
 can run it out of space and cause the update to fail.
-For this reason, softupdates will not be enabled on the root filesystem
+For this reason, softupdates will not be enabled on the root file system
 during a typical install.
 There is no loss of performance since the root
-filesystem is rarely written to.
+file system is rarely written to.
 .Pp
 A number of run-time
 .Xr mount 8
@@ -301,7 +301,7 @@ useful
 option is called
 .Cm noatime .
 .Ux
-filesystems normally update the last-accessed time of a file or
+file systems normally update the last-accessed time of a file or
 directory whenever it is accessed.
 This operation is handled in
 .Fx
@@ -318,7 +318,7 @@ However, you should not gratuitously turn off atime
 updates everywhere.
 For example, the
 .Pa /var
-filesystem customarily
+file system customarily
 holds mailboxes, and atime (in combination with mtime) is used to
 determine whether a mailbox has new mail.
 You might as well leave
@@ -335,13 +335,13 @@ use the atime field for reporting.
 In larger systems you can stripe partitions from several drives together
 to create a much larger overall partition.
 Striping can also improve
-the performance of a filesystem by splitting I/O operations across two
+the performance of a file system by splitting I/O operations across two
 or more disks.
 The
 .Xr vinum 8
 and
 .Xr ccdconfig 8
-utilities may be used to create simple striped filesystems.
+utilities may be used to create simple striped file systems.
 Generally
 speaking, striping smaller partitions such as the root and
 .Pa /var/tmp ,
@@ -354,7 +354,7 @@ typically
 or custom partitions used to hold databases and web pages.
 Choosing the proper stripe size is also
 important.
-Filesystems tend to store meta-data on power-of-2 boundaries
+File systems tend to store meta-data on power-of-2 boundaries
 and you usually want to reduce seeking rather than increase seeking.
 This
 means you want to use a large off-center stripe size such as 1152 sectors
@@ -400,7 +400,7 @@ sysctl defaults to 1 (on).
 This parameter controls how directories are cached
 by the system.
 Most directories are small and use but a single fragment
-(typically 1K) in the filesystem and even less (typically 512 bytes) in
+(typically 1K) in the file system and even less (typically 512 bytes) in
 the buffer cache.
 However, when operating in the default mode the buffer
 cache will only cache a fixed number of directories even if you have a huge
@@ -422,7 +422,7 @@ wasted memory but you should experiment to find out.
 The
 .Va vfs.write_behind
 sysctl defaults to 1 (on).
-This tells the filesystem to issue media
+This tells the file system to issue media
 writes as full clusters are collected, which typically occurs when writing
 large sequential files.
 The idea is to avoid saturating the buffer
@@ -749,7 +749,7 @@ More and more programs are using the
 system call to transmit files over the network.
 The
 .Va kern.ipc.nsfbufs
-sysctl controls the number of filesystem buffers
+sysctl controls the number of file system buffers
 .Xr sendfile 2
 is allowed to use to perform its work.
 This parameter nominally scales
@@ -818,7 +818,7 @@ With IDE write caching turned
 on, IDE hard drives will not only write data to disk out of order, they
 will sometimes delay some of the blocks indefinitely under heavy disk
 load.
-A crash or power failure can result in serious filesystem
+A crash or power failure can result in serious file system
 corruption.
 So our default was changed to be safe.
 Unfortunately, the