More file system > filesystem

38 files changed, 130 insertions, 130 deletions

diff --git a/share/man/man0/title.urm b/share/man/man0/title.urm
index 9266403..6b094b5 100644
--- a/share/man/man0/title.urm
+++ b/share/man/man0/title.urm
@@ -316,7 +316,7 @@ RPC support	Sun Microsystems Inc.
 Shared library support	Rob Gingell and Sun Microsystems Inc.
 Sony News 3400 support	Kazumasa Utashiro
 Sparc I/II support	Computer Systems Engineering Group, Lawrence Berkeley Laboratory
-Stackable file systems	John Heidemann
+Stackable filesystems	John Heidemann
 Stdio	Chris Torek
 System documentation	The Institute of Electrical and Electronics Engineers, Inc.
 TCP/IP	Rob Gurwitz and Bolt Beranek and Newman Inc.
@@ -897,7 +897,7 @@ J. M. Bloom
 .sp 1
 This update to the 4.1 distribution of June 1981 provides support
 for the VAX 11/730, full networking and interprocess communication
-support, an entirely new file system, and many other new features.
+support, an entirely new filesystem, and many other new features.
 It is certainly the most ambitious release of software ever prepared
 here and represents many man-years of work.
 Bill Shannon (both at DEC and at Sun Microsystems)
@@ -974,7 +974,7 @@ we hope this provides as noticeable an improvement for you as it did for us.
 This release finds the system in transition; a number of facilities
 have been added in experimental versions (job control, resource limits)
 and the implementation of others is imminent (shared-segments, higher
-performance from the file system, etc.).
+performance from the filesystem, etc.).
 Applications which use facilities that are in transition should be aware
 that some of the system calls and library routines will change
 in the near future.  We have tried to be conscientious and make it
@@ -1622,7 +1622,7 @@ command, which takes effect at your next login.
 .I
 The current directory.\ \ 
 .R
-\s-1UNIX\s+1 has a file system arranged as a hierarchy of directories.
+\s-1UNIX\s+1 has a filesystem arranged as a hierarchy of directories.
 When the system administrator gave you a user name,
 they also created a directory for you (ordinarily
 with the same name as your user name).
@@ -1643,7 +1643,7 @@ Path names.\ \
 .R
 To refer to files not in the current directory, you must use a path name.
 Full path names begin with ``/\|'', the name of the root directory of the
-whole file system.
+whole filesystem.
 After the slash comes the name of each directory containing the next
 sub-directory (followed by a ``/\|'') until finally the file name is reached.
 For example,
@@ -1684,7 +1684,7 @@ for making directories and
 .IR rmdir (1)
 for destroying them.
 .LP
-For a fuller discussion of the file system, see
+For a fuller discussion of the filesystem, see
 ``A Fast File System for \s-1UNIX\s+1'' (SMM:5)
 by McKusick, Joy, Leffler, and Fabry.
 It may also be useful to glance through PRM section 2,
diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index 019c1da..37a2d5e 100644
--- a/share/man/man3/sysexits.3
+++ b/share/man/man3/sysexits.3
@@ -104,7 +104,7 @@ The remote system returned something that was
 during a protocol exchange.
 .It Sy EX_NOPERM Pq 77
 You did not have sufficient permission to perform the operation.  This
-is not intended for file system problems, which should use
+is not intended for filesystem problems, which should use
 .Sy EX_NOINPUT
 or
 .Sy EX_CANTCREAT ,
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 994774b..4eae7b7 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -167,7 +167,7 @@ then restoring the partition.
 If just one (or more) of the disks in a
 .Nm
 fails, the entire
-file system will be lost unless you are mirroring the disks.
+filesystem will be lost unless you are mirroring the disks.
 .Pp
 If one of the disks in a mirror is lost, you should still
 be able to backup your data.  If a write error occurs, however, data
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index 418791e..a11cfed 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -105,7 +105,7 @@ and allows the device to reorganize writes to increase efficiency and
 performance.  This performance gain comes at a price.  Should the device
 lose power while its cache contains uncommitted write operations, these
 writes will be lost.  The effect of a loss of write transactions on
-a file system is non-deterministic and can cause corruption.  Most
+a filesystem is non-deterministic and can cause corruption.  Most
 devices age write transactions to limit vulnerability to a few transactions
 recently reported as complete, but it is none-the-less recommended that
 systems with write cache enabled devices reside on an Uninterruptible
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index 8912544..56cb049 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -71,7 +71,7 @@ sometimes also called
 .Em special files .
 They are usually located under the directory
 .Pa /dev
-in the file system hierarchy
+in the filesystem hierarchy
 (see also
 .Xr hier 7 ) .
 .Pp
@@ -106,7 +106,7 @@ and
 as the file type identification in the output of
 .Ql ls -l .
 Buffered devices are being accessed through the buffer cache of the
-operating system, and they are solely intended to layer a file system
+operating system, and they are solely intended to layer a filesystem
 on top of them.  They are normally implemented for disks and disk-like
 devices only and, for historical reasons, for tape devices.
 .Pp
@@ -121,7 +121,7 @@ denotes the raw device for the first SCSI disk, while
 is the corresponding device node for the buffered device.
 .Pp
 Unbuffered devices should be used for all actions that are not related
-to file system operations, even if the device in question is a disk
+to filesystem operations, even if the device in question is a disk
 device.  This includes making backups of entire disk partitions, or
 to
 .Em raw
diff --git a/share/man/man4/man4.alpha/linux.4 b/share/man/man4/man4.alpha/linux.4
index 9ff8a0d..591553f 100644
--- a/share/man/man4/man4.alpha/linux.4
+++ b/share/man/man4/man4.alpha/linux.4
@@ -113,7 +113,7 @@ or loaded as a module.
 .It Pa /compat/linux
 minimal Linux run-time environment
 .It Pa /compat/linux/proc
-limited Linux process file system
+limited Linux process filesystem
 .El
 .Sh SEE ALSO
 .Xr brandelf 1 ,
diff --git a/share/man/man4/man4.i386/linux.4 b/share/man/man4/man4.i386/linux.4
index 926b4ab..5f08ac1c 100644
--- a/share/man/man4/man4.i386/linux.4
+++ b/share/man/man4/man4.i386/linux.4
@@ -113,7 +113,7 @@ or loaded as a module.
 .It Pa /compat/linux
 minimal Linux run-time environment
 .It Pa /compat/linux/proc
-limited Linux process file system
+limited Linux process filesystem
 .El
 .Sh SEE ALSO
 .Xr brandelf 1 ,
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 8793083..09fede1 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -132,7 +132,7 @@ accesses
 .Bx
 partition on the disc.
 Normally, there is only
-one file system on a CD-ROM disc.
+one filesystem on a CD-ROM disc.
 .It Pa /dev/(r)mcd0c
 accesses raw device.
 .El
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index ad8456d..eff4b15 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -52,7 +52,7 @@ accesses
 .Bx
 partition on the disc.
 Normally, there is only
-one file system on a CDROM disc.
+one filesystem on a CDROM disc.
 .It Pa /dev/[r]scd0c
 accesses the raw device.
 .El
diff --git a/share/man/man4/syncer.4 b/share/man/man4/syncer.4
index 60f9db4..ee425f1 100644
--- a/share/man/man4/syncer.4
+++ b/share/man/man4/syncer.4
@@ -87,5 +87,5 @@ process first appeared in
 It is possible on some systems that a
 .Xr sync 2
 occurring simultaneously with a crash may cause
-file system damage.  See
+filesystem damage.  See
 .Xr fsck 8 .
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index b997a94..6d7a168 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -77,9 +77,9 @@ Additional plexes can be used for on-line data reorganization.  By attaching an
 additional plex and subsequently detaching one of the older plexes, data can be
 moved on-line without compromising access.
 .It
-An additional plex can be used to obtain a consistent dump of a file system.  By
+An additional plex can be used to obtain a consistent dump of a filesystem.  By
 attaching an additional plex and detaching at a specific time, the detached plex
-becomes an accurate snapshot of the file system at the time of detachment.
+becomes an accurate snapshot of the filesystem at the time of detachment.
 .\" Make sure to flush!
 .El
 .It
@@ -140,7 +140,7 @@ devices.
 .Nm
 offers automatic startup.  Unlike
 .Ux
-file systems,
+filesystems,
 .Nm
 volumes contain all the configuration information needed to ensure that they are
 started correctly when the subsystem is enabled.  This is also a significant
@@ -311,7 +311,7 @@ flag to
 .Nm newfs .
 For example, if you have a volume
 .Pa concat ,
-use the following command to create a ufs file system on it:
+use the following command to create a ufs filesystem on it:
 .Pp
 .Bd -literal
   # newfs -v /dev/vinum/concat
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index c499735..077eff6 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -43,11 +43,11 @@
 .Os
 .Sh NAME
 .Nm devfs
-.Nd device file system
+.Nd device filesystem
 .Sh SYNOPSIS
 devfs	/dev	devfs rw 0 0
 .Sh DESCRIPTION
-The device file system, or
+The device filesystem, or
 .Nm ,
 provides access to kernel's device
 namespace in the global filesystem namespace.
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index c8f598c..5f6599f 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -54,7 +54,7 @@ Directory entries may contain other directories
 as well as plain files; such nested directories are referred to as
 subdirectories.
 A hierarchy of directories and files is formed in this manner
-and is called a file system (or referred to as a file system tree).
+and is called a filesystem (or referred to as a filesystem tree).
 .\" An entry in this tree,
 .\" nested or not nested,
 .\" is a pathname.
@@ -72,7 +72,7 @@ the system root directory
 has no parent and dot-dot points to itself like dot.
 .Pp
 File system nodes are ordinary directory files on which has
-been grafted a file system object, such as a physical disk or a
+been grafted a filesystem object, such as a physical disk or a
 partitioned area of such a disk.
 (See
 .Xr mount 2
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index 61c3979..b595c66 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -43,18 +43,18 @@
 .Os
 .Sh NAME
 .Nm fdescfs
-.Nd file-descriptor file system
+.Nd file-descriptor filesystem
 .Sh SYNOPSIS
 fdescfs	/dev/fd	fdescfs rw 0 0
 .Sh DESCRIPTION
-The file-descriptor file system, or
+The file-descriptor filesystem, or
 .Nm ,
 provides access to the per-process file descriptor
 namespace in the global filesystem namespace.
 The conventional mount point is
 .Pa /dev/fd .
 .Pp
-The file system's contents
+The filesystem's contents
 appear as a list of numbered files
 which correspond to the open files of the process reading the
 directory.
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index 9f54eae..0804908 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -38,7 +38,7 @@
 .Sh NAME
 .Nm fs ,
 .Nm inode
-.Nd format of file system volume
+.Nd format of filesystem volume
 .Sh SYNOPSIS
 .In sys/param.h
 .In ufs/ffs/fs.h
@@ -54,10 +54,10 @@ and
 .Aq Pa inode.h
 declare several structures, defined variables and macros
 which are used to create and manage the underlying format of
-file system objects on random access devices (disks).
+filesystem objects on random access devices (disks).
 .Pp
 The block size and number of blocks which
-comprise a file system are parameters of the file system.
+comprise a filesystem are parameters of the filesystem.
 Sectors beginning at
 .Dv BBLOCK
 and continuing for
@@ -66,7 +66,7 @@ are used
 for a disklabel and for some hardware primary
 and secondary bootstrapping programs.
 .Pp
-The actual file system begins at sector
+The actual filesystem begins at sector
 .Dv SBLOCK
 with the
 .Em super-block
@@ -77,10 +77,10 @@ from the file
 .Aq Pa ufs/ffs/fs.h :
 .Bd -literal
 /*
- * Super block for an FFS file system.
+ * Super block for an FFS filesystem.
  */
 struct fs {
-	int32_t	 fs_firstfield;	/* historic file system linked list, */
+	int32_t	 fs_firstfield;	/* historic filesystem linked list, */
 	int32_t	 fs_unused_1;	/*     used for incore super blocks */
 	ufs_daddr_t fs_sblkno;	/* addr of super-block in filesys */
 	ufs_daddr_t fs_cblkno;	/* offset of cyl-block in filesys */
@@ -133,7 +133,7 @@ struct fs {
 	int32_t	 fs_nsect;	/* sectors per track */
 	int32_t  fs_spc;	/* sectors per cylinder */
 /* this comes from the disk driver partitioning */
-	int32_t	 fs_ncyl;	/* cylinders in file system */
+	int32_t	 fs_ncyl;	/* cylinders in filesystem */
 /* these fields can be computed from the others */
 	int32_t	 fs_cpg;	/* cylinders per group */
 	int32_t	 fs_ipg;	/* inodes per group */
@@ -142,7 +142,7 @@ struct fs {
 	struct	csum fs_cstotal;/* cylinder summary information */
 /* these fields are cleared at mount time */
 	int8_t   fs_fmod;	/* super block modified flag */
-	int8_t   fs_clean;	/* file system is clean flag */
+	int8_t   fs_clean;	/* filesystem is clean flag */
 	int8_t 	 fs_ronly;	/* mounted read-only flag */
 	int8_t   fs_flags;	/* currently unused flag */
 	u_char	 fs_fsmnt[MAXMNTLEN];	/* name mounted on */
@@ -189,14 +189,14 @@ struct fs {
 #define FS_DYNAMICPOSTBLFMT	1   /* dynamic rotational table format */
 .Ed
 .Pp
-Each disk drive contains some number of file systems.
-A file system consists of a number of cylinder groups.
+Each disk drive contains some number of filesystems.
+A filesystem consists of a number of cylinder groups.
 Each cylinder group has inodes and data.
 .Pp
-A file system is described by its super-block, which in turn
+A filesystem is described by its super-block, which in turn
 describes the cylinder groups.  The super-block is critical
 data and is replicated in each cylinder group to protect against
-catastrophic loss.  This is done at file system creation
+catastrophic loss.  This is done at filesystem creation
 time and the critical
 super-block data does not change, so the copies need not be
 referenced further unless disaster strikes.
@@ -216,17 +216,17 @@ unit.
 Large files consist of exclusively large data blocks.  To avoid
 undue wasted disk space, the last data block of a small file is
 allocated as only as many fragments of a large block as are
-necessary.  The file system format retains only a single pointer
+necessary.  The filesystem format retains only a single pointer
 to such a fragment, which is a piece of a single large block that
 has been divided.  The size of such a fragment is determinable from
 information in the inode, using the
 .Fn blksize fs ip lbn
 macro.
 .Pp
-The file system records space availability at the fragment level;
+The filesystem records space availability at the fragment level;
 to determine block availability, aligned fragments are examined.
 .Pp
-The root inode is the root of the file system.
+The root inode is the root of the filesystem.
 Inode 0 can't be used for normal purposes and
 historically bad blocks were linked to inode 1,
 thus the root inode is 2 (inode 1 is no longer used for
@@ -235,7 +235,7 @@ assumption, so we are stuck with it).
 .Pp
 The
 .Fa fs_minfree
-element gives the minimum acceptable percentage of file system
+element gives the minimum acceptable percentage of filesystem
 blocks that may be free.
 If the freelist drops below this level
 only the super-user may continue to allocate blocks.
@@ -244,7 +244,7 @@ The
 element
 may be set to 0 if no reserve of free blocks is deemed necessary,
 however severe performance degradations will be observed if the
-file system is run at greater than 90% full; thus the default
+filesystem is run at greater than 90% full; thus the default
 value of
 .Fa fs_minfree
 is 10%.
@@ -256,15 +256,15 @@ of the block size.
 .Pp
 The element
 .Fa fs_optim
-specifies whether the file system should try to minimize the time spent
+specifies whether the filesystem should try to minimize the time spent
 allocating blocks, or if it should attempt to minimize the space
 fragmentation on the disk.
 If the value of fs_minfree (see above) is less than 10%,
-then the file system defaults to optimizing for space to avoid
+then the filesystem defaults to optimizing for space to avoid
 running out of full sized blocks.
 If the value of minfree is greater than or equal to 10%,
 fragmentation is unlikely to be problematical, and
-the file system defaults to optimizing for time.
+the filesystem defaults to optimizing for time.
 .Pp
 .Em Cylinder group related limits :
 Each cylinder keeps track of the availability of blocks at different
@@ -284,7 +284,7 @@ the default value for
 .Fa fs_rotdelay
 is 2ms.
 .Pp
-Each file system has a statically allocated number of inodes.
+Each filesystem has a statically allocated number of inodes.
 An inode is allocated for each
 .Dv NBPI
 bytes of disk space.
@@ -306,12 +306,12 @@ must keep its size within
 Note that super-blocks are never more than size
 .Dv SBSIZE .
 .Pp
-The path name on which the file system is mounted is maintained in
+The path name on which the filesystem is mounted is maintained in
 .Fa fs_fsmnt .
 .Dv MAXMNTLEN
 defines the amount of space allocated in
 the super-block for this name.
-The limit on the amount of summary information per file system
+The limit on the amount of summary information per filesystem
 is defined by
 .Dv MAXCSBUFS .
 For a 4096 byte block size, it is currently parameterized for a
@@ -333,14 +333,14 @@ the
 macro to work.
 .Pp
 The
-.Em "Super-block for a file system" :
+.Em "Super-block for a filesystem" :
 The size of the rotational layout tables
 is limited by the fact that the super-block is of size
 .Dv SBSIZE .
 The size of these tables is
 .Em inversely
 proportional to the block
-size of the file system.
+size of the filesystem.
 The size of the tables is
 increased when sector sizes are not powers of two,
 as this increases the number of cylinders
@@ -361,7 +361,7 @@ The
 .Em Inode :
 The inode is the focus of all file activity in the
 .Tn UNIX
-file system.
+filesystem.
 There is a unique inode allocated
 for each active file,
 each current directory, each mounted-on file,
@@ -372,6 +372,6 @@ For further information, see the include file
 .Sh HISTORY
 A super-block structure named filsys appeared in
 .At v6 .
-The file system described in this manual appeared
+The filesystem described in this manual appeared
 in
 .Bx 4.2 .
diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5
index f72418f..47a3c69 100644
--- a/share/man/man5/linprocfs.5
+++ b/share/man/man5/linprocfs.5
@@ -7,15 +7,15 @@
 .Os
 .Sh NAME
 .Nm linprocfs
-.Nd Linux process file system
+.Nd Linux process filesystem
 .Sh SYNOPSIS
 .Bd -literal
 linproc		/compat/linux/proc	linprocfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
-The Linux process file system, or
+The Linux process filesystem, or
 .Nm ,
-emulates a subset of Linux' process file system and is required for
+emulates a subset of Linux' process filesystem and is required for
 the complete operation of some Linux binaries.
 .Pp
 The
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index f4adad2..2ebedfb 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -7,15 +7,15 @@
 .Os
 .Sh NAME
 .Nm procfs
-.Nd process file system
+.Nd process filesystem
 .Sh SYNOPSIS
 .Bd -literal
 proc		/proc	procfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
-The process file system, or
+The process filesystem, or
 .Nm ,
-implements a view of the system process table inside the file system.
+implements a view of the system process table inside the filesystem.
 It is normally mounted on
 .Pa /proc ,
 and is required for the complete operation of programs such as
diff --git a/share/man/man7/ffs.7 b/share/man/man7/ffs.7
index 5c6d1d3..6d88378 100644
--- a/share/man/man7/ffs.7
+++ b/share/man/man7/ffs.7
@@ -37,7 +37,7 @@
 .Dt FFS 7
 .Sh NAME
 .Nm ffs
-.Nd Berkeley fast file system
+.Nd Berkeley fast filesystem
 .Sh SYNOPSIS
 In the kernel configuration file:
 .Cd "options ENABLE_VFS_IOOPT"
@@ -56,14 +56,14 @@ In
 /dev/disk0a	/mnt ufs rw 1 1
 .Ed
 .Sh DESCRIPTION
-The Berkeley fast file system
-provides facilities to store file system data onto a disk device.
+The Berkeley fast filesystem
+provides facilities to store filesystem data onto a disk device.
 .Nm
 has been optimized over the years
 for speed and reliability
 and is the default
 .Fx
-file system.
+filesystem.
 .Ss VFS I/O optimization
 .Bl -tag -width 2n
 .It Cd "options ENABLE_VFS_IOOPT"
@@ -93,7 +93,7 @@ Aggressive optimization (VM used as much as possible)
 This option allows system administrators
 to set limits on disk usage
 on a per-user basis.
-Quotas can be used only on file systems
+Quotas can be used only on filesystems
 mounted with the
 .Cm quota
 option;
@@ -108,11 +108,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 file system remains consistent.
+to ensure that the filesystem remains consistent.
 .Pp
 To enable soft updates on an
 .Em unmounted
-file system, use the following command:
+filesystem, use the following command:
 .Pp
 .D1 Nm tunefs Fl n Cm enable Ar fs
 .Pp
@@ -134,7 +134,7 @@ on networks including
 and
 .Tn "Apple Macintosh"
 computers,
-this option allows files on file systems
+this option allows files on filesystems
 mounted with the
 .Cm suiddir
 option
@@ -153,7 +153,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 file system.
+so that ACLs are enabled atomically upon mounting the filesystem.
 .El
 .Pp
 In order to enable support for ACLs,
@@ -165,11 +165,11 @@ which holds the access ACL,
 and
 .Pa posix1e.acl_default ,
 which holds the default ACL for directories.
-If you are using file system extended attributes,
+If you are using filesystem 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 file system.
-In these examples, the root file system is used;
+for ACLs in the root of each filesystem.
+In these examples, the root filesystem is used;
 see
 .Sx "Extended Attributes"
 for more details.
@@ -180,7 +180,7 @@ extattrctl initattr -p / 388 posix1e.acl_access
 extattrctl initattr -p / 388 posix1e.acl_default
 .Ed
 .Pp
-On the next mount of the root file system,
+On the next mount of the root filesystem,
 the attributes will be automatically started
 (if
 .Dv UFS_EXTATTR_AUTOSTART
@@ -205,9 +205,9 @@ If this option is defined,
 .Nm
 will search for a
 .Pa .attribute
-subdirectory of the file system root during the mount operation.
+subdirectory of the filesystem root during the mount operation.
 If found, extended attribute support will be
-automatically started for that file system.
+automatically started for that filesystem.
 .El
 .Pp
 The following
@@ -217,7 +217,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 file system blocks to be contiguous.
+upon reallocating filesystem 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 5b9aa24..c1a5aa7 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -143,7 +143,7 @@ OpenSSL configuration files
 empty directory commonly used by
 system administrators as a temporary mount point
 .It Pa /proc/
-process file system;
+process filesystem;
 see
 .Xr procfs 5 ,
 .Xr mount_procfs 8
@@ -206,28 +206,28 @@ WaveLAN driver
 .It Pa fs/
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa fdescfs/
-per-process file descriptors file system
+per-process file descriptors filesystem
 .It Pa fifofs/
 .St -p1003.1
-FIFOs file system
+FIFOs filesystem
 .It Pa msdosfs/
-MS-DOS file system
+MS-DOS filesystem
 .It Pa ntfs/
-NTFS file system
+NTFS filesystem
 .It Pa nullfs/
-loopback file system
+loopback filesystem
 .It Pa nwfs/
-NetWare file system
+NetWare filesystem
 .It Pa portalfs/
-portal file system
+portal filesystem
 .It Pa procfs/
-process file system
+process filesystem
 .It Pa smbfs/
 SMB/CIFS filesystem
 .It Pa umapfs/
-alternate uid/gid mappings file system
+alternate uid/gid mappings filesystem
 .It Pa unionfs
-union file system
+union filesystem
 .El
 .It Pa g++/
 GNU C++ include files
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index e23a4be..3bc8aec 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -289,7 +289,7 @@ can run it out of space and cause the update to fail.
 A number of run-time
 .Xr mount 8
 options exist that can help you tune the system.
-For this reason, softupdates will not be enabled on the root file system
+For this reason, softupdates will not be enabled on the root filesystem
 during a typical install.
 The most obvious and most dangerous one is
 .Cm async .
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index 3a5d925..fc902f6 100644
--- a/share/man/man8/crash.8
+++ b/share/man/man8/crash.8
@@ -58,7 +58,7 @@ and then invokes an automatic reboot procedure as
 described in
 .Xr reboot 8 .
 Unless some unexpected inconsistency is encountered in the state
-of the file systems due to hardware or software failure, the system
+of the filesystems due to hardware or software failure, the system
 will then resume multi-user operations.
 .Pp
 The system has a large number of internal consistency checks; if one
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 46c7e56..d5e5252 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -208,7 +208,7 @@ local startup files will not be used.
 .Pp
 While an
 .Xr md 4 Ns -backed
-file system is mounted on
+filesystem is mounted on
 .Pa /var
 by the startup scripts,
 some sites may want to disable the saving of entropy by setting
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 20d8a61..3deeb48 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -41,9 +41,9 @@
 .Sh DESCRIPTION
 This section contains information related to system operation
 and maintenance.
-It describes commands used to create new file systems,
+It describes commands used to create new filesystems,
 .Xr newfs 8 ,
-verify the integrity of the file systems,
+verify the integrity of the filesystems,
 .Xr fsck 8 ,
 control disk usage,
 .Xr edquota 8 ,
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index 7e4ba8f..0ec373b 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -28,13 +28,13 @@ in the server, it can be extremely useful to developers to
 test their code without having to reinstall the system.
 .Pp
 The boot media (typically a floppy disk) contains a boot loader and a
-compressed kernel which includes a memory file system.
+compressed kernel which includes a memory filesystem.
 Depending on the media, it might also contain a number of
 additional files, which can be updated at run time, and are
-used to override/update those in the memory file system.
+used to override/update those in the memory filesystem.
 .Pp
 The system loads the kernel in the normal way, uncompresses
-the memory file system and mounts it as root.
+the memory filesystem and mounts it as root.
 It then updates the memory
 filesystem with files from the boot media (if present),
 and executes a specialized version of
@@ -493,7 +493,7 @@ ethernet.
 .Pp
 After booting,
 .Nm
-loads the root filesystem from the memory file system, starts
+loads the root filesystem from the memory filesystem, starts
 .Pa /sbin/init ,
 and passes control to a first startup script,
 .Pa /etc/rc .
diff --git a/share/man/man9/VFS_CHECKEXP.9 b/share/man/man9/VFS_CHECKEXP.9
index 502f4aa..3295972 100644
--- a/share/man/man9/VFS_CHECKEXP.9
+++ b/share/man/man9/VFS_CHECKEXP.9
@@ -51,7 +51,7 @@ Return parameter for the export flags for this client.
 Return parameter for the anonymous credentials for this client.
 .El
 .Pp
-This should be called on a file system's mount structure to determine if it
+This should be called on a filesystem's mount structure to determine if it
 is exported to a client whose address is contained in
 .Fa nam .
 .Pp
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index ee95032..0b7ee02 100644
--- a/share/man/man9/VOP_ACCESS.9
+++ b/share/man/man9/VOP_ACCESS.9
@@ -76,9 +76,9 @@ vop_access(struct vnode *vp, int mode, struct ucred *cred, struct thread *td)
     int error;
 
     /*
-     * Disallow write attempts on read-only file systems;
+     * Disallow write attempts on read-only filesystems;
      * unless the file is a socket, fifo, or a block or
-     * character device resident on the file system.
+     * character device resident on the filesystem.
      */
     if (mode & VWRITE) {
 	switch (vp->v_type) {
diff --git a/share/man/man9/VOP_ACLCHECK.9 b/share/man/man9/VOP_ACLCHECK.9
index f95492f..be55b5d 100644
--- a/share/man/man9/VOP_ACLCHECK.9
+++ b/share/man/man9/VOP_ACLCHECK.9
@@ -86,7 +86,7 @@ Permission denied
 .It Bq Er ENOMEM
 Insufficient memory available to fulfill request
 .It Bq Er EOPNOTSUPP
-The file system does not support VOP_ACLCHECK
+The filesystem does not support VOP_ACLCHECK
 .El
 .Sh SEE ALSO
 .Xr acl 9 ,
diff --git a/share/man/man9/VOP_GETACL.9 b/share/man/man9/VOP_GETACL.9
index 7846fa0..1404b40 100644
--- a/share/man/man9/VOP_GETACL.9
+++ b/share/man/man9/VOP_GETACL.9
@@ -83,7 +83,7 @@ Permission denied
 .It Bq Er ENOMEM
 Insufficient memory available to fulfill request
 .It Bq Er EOPNOTSUPP
-The file system does not support
+The filesystem does not support
 .Fn VOP_GETACL
 .El
 .Sh SEE ALSO
diff --git a/share/man/man9/VOP_GETEXTATTR.9 b/share/man/man9/VOP_GETEXTATTR.9
index 257f66b..5a54c46 100644
--- a/share/man/man9/VOP_GETEXTATTR.9
+++ b/share/man/man9/VOP_GETEXTATTR.9
@@ -88,7 +88,7 @@ This
 setting might be used to allow the kernel to authorize extended attribute
 retrieval that the active process might not be permitted to do.
 .Pp
-Extended attribute semantics may vary by file system implementing the call.
+Extended attribute semantics may vary by filesystem implementing the call.
 More information on extended attributes may be found in
 .Xr extattr 9 .
 .Sh LOCKS
@@ -103,7 +103,7 @@ The attribute name is not defined for this vnode
 .It Bq Er EACCES
 Permission denied
 .It Bq Er ENXIO
-The request was not valid in this file system for the specified vnode and
+The request was not valid in this filesystem for the specified vnode and
 attribute name.
 .It Bq Er ENOMEM
 Insufficient memory available to fulfill request
@@ -116,7 +116,7 @@ or
 .Fa uio
 argument is invalid.
 .It Bq Er EOPNOTSUPP
-The file system does not support
+The filesystem does not support
 .Fn VOP_GETEXTATTR
 .El
 .Sh SEE ALSO
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index d6c6c9e..ad9ca0e 100644
--- a/share/man/man9/VOP_LOOKUP.9
+++ b/share/man/man9/VOP_LOOKUP.9
@@ -77,7 +77,7 @@ struct componentname {
 .Pp
 Convert a component of a pathname into a pointer to a locked vnode.
 This is a very central and rather complicated routine.
-If the file system is not maintained in a strict tree hierarchy,
+If the filesystem is not maintained in a strict tree hierarchy,
 this can result in a deadlock situation.
 .Pp
 The
@@ -371,7 +371,7 @@ vop_lookup(struct vnode *dvp,
 	 * infrequently since we cannot avoid this race condition without
 	 * implementing a sophisticated deadlock detection algorithm.
 	 * Note also that this simple deadlock detection scheme will not
-	 * work if the file system has any hard links other than ".."
+	 * work if the filesystem has any hard links other than ".."
 	 * that point backwards in the directory structure.
 	 */
 	if (flags & ISDOTDOT) {
diff --git a/share/man/man9/VOP_SETACL.9 b/share/man/man9/VOP_SETACL.9
index e3568f7..bb2949f 100644
--- a/share/man/man9/VOP_SETACL.9
+++ b/share/man/man9/VOP_SETACL.9
@@ -87,12 +87,12 @@ Permission denied
 .It Bq Er ENOMEM
 Insufficient memory available to fulfill request
 .It Bq Er EOPNOTSUPP
-The file system does not support
+The filesystem does not support
 .Fn VOP_SETACL
 .It Bq Er ENOSPC
-The file system is out of space
+The filesystem is out of space
 .It Bq Er EROFS
-The file system is read-only
+The filesystem is read-only
 .El
 .Sh SEE ALSO
 .Xr acl 9 ,
diff --git a/share/man/man9/VOP_SETEXTATTR.9 b/share/man/man9/VOP_SETEXTATTR.9
index d1091d7..5047553 100644
--- a/share/man/man9/VOP_SETEXTATTR.9
+++ b/share/man/man9/VOP_SETEXTATTR.9
@@ -80,7 +80,7 @@ This
 setting might be used to allow the kernel to authorize extended attribute
 changes that the active process might not be permitted to make.
 .Pp
-Extended attribute semantics may vary by file system implementing the call.
+Extended attribute semantics may vary by filesystem implementing the call.
 More information on extended attributes may be found in
 .Xr extattr 9 .
 .Sh LOCKS
@@ -93,7 +93,7 @@ Otherwise, an appropriate error code is returned.
 .It Bq Er EACCES
 Permission denied
 .It Bq Er ENXIO
-The request was not valid in this file system for the specified vnode and
+The request was not valid in this filesystem for the specified vnode and
 attribute name.
 .It Bq Er ENOMEM
 Insufficient memory available to fulfill request
@@ -102,12 +102,12 @@ The uio structure refers to an invalid userspace address
 .It Bq Er EINVAL
 The name or uio argument is invalid
 .It Bq Er EOPNOTSUPP
-The file system does not support
+The filesystem does not support
 .Fn VOP_SETEXTATTR
 .It Bq Er ENOSPC
-The file system is out of space
+The filesystem is out of space
 .It Bq Er EROFS
-The file system is read-only
+The filesystem is read-only
 .El
 .Sh SEE ALSO
 .Xr extattr 9 ,
diff --git a/share/man/man9/acl.9 b/share/man/man9/acl.9
index e07c63a..9c25c4e 100644
--- a/share/man/man9/acl.9
+++ b/share/man/man9/acl.9
@@ -30,7 +30,7 @@
 .Dt ACL 9
 .Sh NAME
 .Nm acl
-.Nd virtual file system access control lists
+.Nd virtual filesystem access control lists
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/vnode.h
@@ -42,10 +42,10 @@ In the kernel configuration file:
 Access control lists, or ACLs,
 allow fine-grained specification of rights
 for vnodes representing files and directories.
-However, as there are a plethora of file systems with differing ACL semantics,
+However, as there are a plethora of filesystems with differing ACL semantics,
 the vnode interface is aware only of the syntax of ACLs,
-relying on the underlying file system to implement the details.
-Depending on the underlying file system, each file or directory
+relying on the underlying filesystem to implement the details.
+Depending on the underlying filesystem, each file or directory
 may have zero or more ACLs associated with it, named using the
 .Fa type
 field of the appropriate vnode ACL calls:
diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9
index 70ecb11..224df09 100644
--- a/share/man/man9/extattr.9
+++ b/share/man/man9/extattr.9
@@ -30,7 +30,7 @@
 .Dt EXTATTR 9
 .Sh NAME
 .Nm extattr
-.Nd virtual file system named extended attributes
+.Nd virtual filesystem named extended attributes
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/vnode.h
@@ -47,7 +47,7 @@ operation refers.
 If the same name is present in multiple namespaces, the extended attributes
 associated with the names are stored and manipulated independently.
 The following two namespaces are defined universally, although individual
-file systems may implement additional namespaces, or not implement
+filesystems may implement additional namespaces, or not implement
 these namespaces:
 .Dv EXTATTR_NAMESPACE_USER ,
 .Dv EXTATTR_NAMESPACE_SYSTEM .
@@ -62,16 +62,16 @@ the meta-data, in the style of
 .Xr VOP_READ 9 ,
 but writes will replace the entire current "value" associated with
 a given name.
-As there are a plethora of file systems with differing extended attributes,
+As there are a plethora of filesystems with differing extended attributes,
 availability and functionality of these functions may be limited, and they
 should be used with awareness of the underlying semantics of the supporting
-file system.
+filesystem.
 Authorization schemes for extended attribute data may also vary by file
 system, as well as maximum attribute size, and whether or not any or
 specific new attributes may be defined.
 .Pp
 Extended attributes are named using a null-terminated character string.
-Depending on underlying file system semantics, this name may or may not be
+Depending on underlying filesystem semantics, this name may or may not be
 case-sensitive.  Appropriate vnode extended attribute calls are:
 .Xr VOP_GETEXTATTR 9
 and
diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index 39dd741..281ba23 100644
--- a/share/man/man9/inittodr.9
+++ b/share/man/man9/inittodr.9
@@ -48,12 +48,12 @@ The
 function determines the time and sets the system clock.
 It tries to pick the correct time using a set of heuristics that examine
 the system's battery backed clock and the time obtained from the root
-file system, as given in
+filesystem, as given in
 .Fa base .
 How the
 .Fa base
 value is obtained will vary depending on the
-root file system type.
+root filesystem type.
 The heuristics used include:
 .Bl -bullet
 .It
diff --git a/share/man/man9/vaccess.9 b/share/man/man9/vaccess.9
index fd05071..b366830 100644
--- a/share/man/man9/vaccess.9
+++ b/share/man/man9/vaccess.9
@@ -48,7 +48,7 @@
 This call implements the logic for the
 .Ux
 discretionary file security model
-common to many file systems in
+common to many filesystems in
 .Fx .
 It accepts the vnodes type
 .Fa type ,
diff --git a/share/man/man9/vfs_unmountall.9 b/share/man/man9/vfs_unmountall.9
index 37c269e..7e9dfc9 100644
--- a/share/man/man9/vfs_unmountall.9
+++ b/share/man/man9/vfs_unmountall.9
@@ -29,7 +29,7 @@
 .Os
 .Sh NAME
 .Nm vfs_unmountall
-.Nd unmount all file systems
+.Nd unmount all filesystems
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/mount.h
@@ -40,7 +40,7 @@ The
 .Nm
 function,
 run only at system shutdown,
-unmounts all file mounted file systems
+unmounts all file mounted filesystems
 from most recent to oldest
 in order to avoid handling dependencies.
 .Sh SEE ALSO
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index 55095cb..4c17884 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -127,7 +127,7 @@ struct vnode {
 /*
  * Vnode flags.
  */
-#define	VROOT		0x00001	/* root of its file system */
+#define	VROOT		0x00001	/* root of its filesystem */
 #define	VTEXT		0x00002	/* vnode is a pure text prototype */
 #define	VSYSTEM		0x00004	/* vnode being used by kernel */
 #define	VISTTY		0x00008	/* vnode represents a tty */