intro.1, time.1, access.2, acct.2, alloc_hugepages.2, bind.2, chdir.2, chmod.2, chown.2, chroot.2, clone.2, close.2, execve.2, fallocate.2, fcntl.2, getdents.2, getrusage.2, getxattr.2, init_module.2, inotify_add_watch.2, ioprio_set.2, kcmp.2, link.2, listxattr.2, lseek.2, madvise.2, mkdir.2, mknod.2, mmap.2, mount.2, move_pages.2, msgctl.2, nfsservctl.2, open.2, pivot_root.2, quotactl.2, read.2, readlink.2, removexattr.2, rename.2, rmdir.2, semctl.2, setfsgid.2, setfsuid.2, setresuid.2, setuid.2, setup.2, setxattr.2, shmctl.2, splice.2, spu_create.2, stat.2, statfs.2, swapon.2, symlink.2, sync.2, sync_file_range.2, sysfs.2, truncate.2, umount.2, unlink.2, unshare.2, ustat.2, utime.2, utimensat.2, write.2, btree.3, errno.3, fexecve.3, ftw.3, futimes.3, get_nprocs_conf.3, getcwd.3, getdirentries.3, getmntent.3, glob.3, mkfifo.3, mq_open.3, readdir.3, realpath.3, recno.3, remove.3, sem_open.3, shm_open.3, statvfs.3, sysconf.3, telldir.3, tmpfile.3, cciss.4, initrd.4, pts.4, sk98lin.4, vcs.4, core.5, filesystems.5, proc.5, boot.7, bootparam.7, capabilities.7, cpuset.7, credentials.7, feature_test_macros.7, fifo.7, hier.7, inotify.7, intro.7, mq_overview.7, path_resolution.7, pipe.7, sem_overview.7, shm_overview.7, spufs.7, symlink.7, unix.7, uri.7, sync.8: Global fix: s/file system/filesystem/

Notwithstanding 24d01c530c5a3f75217543d02bf6712395e5f90c,
"filesystem" is the form used by the great majority of man pages
outside the man-pages project and in a number of other sources,
so let's go with that.

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>

19 files changed, 102 insertions, 102 deletions

diff --git a/man7/boot.7 b/man7/boot.7
index db0582aa..2a40da3d 100644
--- a/man7/boot.7
+++ b/man7/boot.7
@@ -90,11 +90,11 @@ to the kernel.
 When the kernel is loaded, it initializes the devices (via
 their drivers), starts the swapper (it is a "kernel process",
 called kswapd in modern Linux kernels), and mounts the root
-file system (/).
+filesystem (/).
 
 Some of the parameters that may be passed to the kernel
 relate to these activities (e.g: You can override the
-default root file system).
+default root filesystem).
 For further information
 on Linux kernel parameters read
 .BR bootparam (7).
diff --git a/man7/bootparam.7 b/man7/bootparam.7
index 7dfda208..0889a475 100644
--- a/man7/bootparam.7
+++ b/man7/bootparam.7
@@ -178,7 +178,7 @@ to use Linux.
 .TP
 .B "'root=...'"
 This argument tells the kernel what device is to be used as the root
-file system while booting.
+filesystem while booting.
 The default of this setting is determined
 at compile time, and usually is the value of the root device of the
 system that the kernel was built on.
@@ -205,7 +205,7 @@ gscd, sbpcd, sonycd, bpcd.
 (The type nfs specifies a net boot; ram refers to a ram disk.)
 
 Note that this has nothing to do with the designation of these
-devices on your file system.
+devices on your filesystem.
 The '/dev/' part is purely conventional.
 
 The more awkward and less portable numeric specification of the above
@@ -224,16 +224,16 @@ filesystem, in fact reverting its format from ext3 to ext2 without the
 need to boot the box from alternate media.
 .TP
 .BR 'ro' " and " 'rw'
-The 'ro' option tells the kernel to mount the root file system
-as 'read-only' so that file system consistency check programs (fsck)
-can do their work on a quiescent file system.
+The 'ro' option tells the kernel to mount the root filesystem
+as 'read-only' so that filesystem consistency check programs (fsck)
+can do their work on a quiescent filesystem.
 No processes can
-write to files on the file system in question until it is 'remounted'
+write to files on the filesystem in question until it is 'remounted'
 as read/write capable, for example, by 'mount \-w \-n \-o remount /'.
 (See also
 .BR mount (8).)
 
-The 'rw' option tells the kernel to mount the root file system read/write.
+The 'rw' option tells the kernel to mount the root filesystem read/write.
 This is the default.
 
 .TP
@@ -418,7 +418,7 @@ But while booting (or while constructing boot floppies)
 it is often useful to load the floppy contents into a
 ramdisk.
 One might also have a system in which first
-some modules (for file system or hardware) must be loaded
+some modules (for filesystem or hardware) must be loaded
 before the main disk can be accessed.
 
 In Linux 1.3.48, ramdisk handling was changed drastically.
@@ -465,8 +465,8 @@ and an initial ramdisk; then the kernel converts initrd into
 a "normal" ramdisk, which is mounted read-write as root device;
 then
 .I /linuxrc
-is executed; afterward the "real" root file system is mounted,
-and the initrd file system is moved over to
+is executed; afterward the "real" root filesystem is mounted,
+and the initrd filesystem is moved over to
 .IR /initrd ;
 finally
 the usual boot sequence (e.g., invocation of
diff --git a/man7/capabilities.7 b/man7/capabilities.7
index 79a16685..3bb3ef46 100644
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -110,7 +110,7 @@ Invoke
 .RS
 .IP * 2
 Bypass permission checks on operations that normally
-require the file system UID of the process to match the UID of
+require the filesystem UID of the process to match the UID of
 the file (e.g.,
 .BR chmod (2),
 .BR utime (2)),
@@ -140,7 +140,7 @@ and
 Don't clear set-user-ID and set-group-ID permission
 bits when a file is modified;
 set the set-group-ID bit for a file whose GID does not match
-the file system or any of the supplementary GIDs of the calling process.
+the filesystem or any of the supplementary GIDs of the calling process.
 .TP
 .B CAP_IPC_LOCK
 .\" FIXME As at Linux 3.2, there are some strange uses of this capability
@@ -391,7 +391,7 @@ perform various privileged block-device
 .BR ioctl (2)
 operations;
 .IP *
-perform various privileged file-system
+perform various privileged filesystem
 .BR ioctl (2)
 operations;
 .IP *
@@ -523,7 +523,7 @@ perform a range of device-specific operations on other devices.
 .PD 0
 .RS
 .IP * 2
-Use reserved space on ext2 file systems;
+Use reserved space on ext2 filesystems;
 .IP *
 make
 .BR ioctl (2)
@@ -632,7 +632,7 @@ capability in its effective set.
 The kernel must provide system calls allowing a thread's capability sets to
 be changed and retrieved.
 .IP 3.
-The file system must support attaching capabilities to an executable file,
+The filesystem must support attaching capabilities to an executable file,
 so that a process gains those capabilities when the file is executed.
 .PP
 Before kernel 2.6.24, only the first two of these requirements are met;
@@ -918,7 +918,7 @@ To preserve the traditional semantics for transitions between
 0 and nonzero user IDs,
 the kernel makes the following changes to a thread's capability
 sets on changes to the thread's real, effective, saved set,
-and file system user IDs (using
+and filesystem user IDs (using
 .BR setuid (2),
 .BR setresuid (2),
 or similar):
@@ -935,7 +935,7 @@ then all capabilities are cleared from the effective set.
 If the effective user ID is changed from nonzero to 0,
 then the permitted set is copied to the effective set.
 .IP 4.
-If the file system user ID is changed from 0 to nonzero (see
+If the filesystem user ID is changed from 0 to nonzero (see
 .BR setfsuid (2))
 then the following capabilities are cleared from the effective set:
 .BR CAP_CHOWN ,
@@ -949,7 +949,7 @@ then the following capabilities are cleared from the effective set:
 and
 .B CAP_MKNOD
 (since Linux 2.2.30).
-If the file system UID is changed from nonzero to 0,
+If the filesystem UID is changed from nonzero to 0,
 then any of these capabilities that are enabled in the permitted set
 are enabled in the effective set.
 .PP
@@ -1017,7 +1017,7 @@ operation.)
 .TP
 .B SECBIT_NO_SETUID_FIXUP
 Setting this flag stops the kernel from adjusting capability sets when
-the threads's effective and file system UIDs are switched between
+the threads's effective and filesystem UIDs are switched between
 zero and nonzero values.
 (See the subsection
 .IR "Effect of User ID Changes on Capabilities" .)
diff --git a/man7/cpuset.7 b/man7/cpuset.7
index 407dc05a..e3c63dfb 100644
--- a/man7/cpuset.7
+++ b/man7/cpuset.7
@@ -26,7 +26,7 @@
 .SH NAME
 cpuset \- confine processes to processor and memory node subsets
 .SH DESCRIPTION
-The cpuset file system is a pseudo-file-system interface
+The cpuset filesystem is a pseudo-filesystem interface
 to the kernel cpuset mechanism,
 which is used to control the processor placement
 and memory placement of processes.
@@ -39,7 +39,7 @@ If a system supports cpusets, then it will have the entry
 .B nodev cpuset
 in the file
 .IR /proc/filesystems .
-By mounting the cpuset file system (see the
+By mounting the cpuset filesystem (see the
 .B EXAMPLE
 section below),
 the administrator can configure the cpusets on a system
@@ -62,14 +62,14 @@ just one memory node that contains all the system's main memory,
 while NUMA (non-uniform memory access) systems have multiple memory nodes.
 .PP
 Cpusets are represented as directories in a hierarchical
-pseudo-file system, where the top directory in the hierarchy
+pseudo-filesystem, where the top directory in the hierarchy
 .RI ( /dev/cpuset )
 represents the entire system (all online CPUs and memory nodes)
 and any cpuset that is the child (descendant) of
 another parent cpuset contains a subset of that parent's
 CPUs and memory nodes.
 The directories and files representing cpusets have normal
-file-system permissions.
+filesystem permissions.
 .PP
 Every process in the system belongs to exactly one cpuset.
 A process is confined to run only on the CPUs in
@@ -305,7 +305,7 @@ See the
 .IR cpuset.memory_spread_page " (since Linux 2.6.17)"
 Flag (0 or 1).
 If set (1), pages in the kernel page cache
-(file-system buffers) are uniformly spread across the cpuset.
+(filesystem buffers) are uniformly spread across the cpuset.
 By default this is off (0) in the top cpuset,
 and inherited from the parent cpuset in
 newly created cpusets.
@@ -362,7 +362,7 @@ In addition to the above pseudo-files in each directory below
 each process has a pseudo-file,
 .IR /proc/<pid>/cpuset ,
 that displays the path of the process's cpuset directory
-relative to the root of the cpuset file system.
+relative to the root of the cpuset filesystem.
 .\" ================== proc status ==================
 .PP
 Also the
@@ -446,7 +446,7 @@ All cpusets, whether
 or not, restrict allocations of memory for user space.
 .PP
 This enables configuring a system so that several independent
-jobs can share common kernel data, such as file system pages,
+jobs can share common kernel data, such as filesystem pages,
 while isolating each job's user allocation in its own cpuset.
 To do this, construct a large
 .I hardwall
@@ -471,7 +471,7 @@ and the last child cpuset of that cpuset is removed,
 the kernel will run the command
 .IR /sbin/cpuset_release_agent ,
 supplying the pathname (relative to the mount point of the
-cpuset file system) of the abandoned cpuset.
+cpuset filesystem) of the abandoned cpuset.
 This enables automatic removal of abandoned cpusets.
 .PP
 The default value of
@@ -565,9 +565,9 @@ kernel direct reclaim code.
 The kernel direct reclaim code is entered whenever a process has to
 satisfy a memory page request by first finding some other page to
 repurpose, due to lack of any readily available already free pages.
-Dirty file system pages are repurposed by first writing them
+Dirty filesystem pages are repurposed by first writing them
 to disk.
-Unmodified file system buffer pages are repurposed
+Unmodified filesystem buffer pages are repurposed
 by simply dropping them, though if that page is needed again, it
 will have to be reread from disk.
 .PP
@@ -580,7 +580,7 @@ times 1000.
 .\" ================== Memory Spread ==================
 .SS Memory spread
 There are two Boolean flag files per cpuset that control where the
-kernel allocates pages for the file-system buffers and related
+kernel allocates pages for the filesystem buffers and related
 in-kernel data structures.
 They are called
 .I cpuset.memory_spread_page
@@ -590,14 +590,14 @@ and
 If the per-cpuset Boolean flag file
 .I cpuset.memory_spread_page
 is set, then
-the kernel will spread the file-system buffers (page cache) evenly
+the kernel will spread the filesystem buffers (page cache) evenly
 over all the nodes that the faulting process is allowed to use, instead
 of preferring to put those pages on the node where the process is running.
 .PP
 If the per-cpuset Boolean flag file
 .I cpuset.memory_spread_slab
 is set,
-then the kernel will spread some file-system-related slab caches,
+then the kernel will spread some filesystem-related slab caches,
 such as those for inodes and directory entries, evenly over all the nodes
 that the faulting process is allowed to use, instead of preferring to
 put those pages on the node where the process is running.
@@ -652,7 +652,7 @@ need to place thread-local data on
 memory nodes close to the CPUs which are running the threads that most
 frequently access that data; but also
 .IP b)
-need to access large file-system data sets that must to be spread
+need to access large filesystem data sets that must to be spread
 across the several nodes in the job's cpuset in order to fit.
 .PP
 Without this policy,
@@ -946,7 +946,7 @@ its memory nodes may not overlap any sibling.
 .\" ================== PERMISSIONS ==================
 .SH PERMISSIONS
 The permissions of a cpuset are determined by the permissions
-of the directories and pseudo-files in the cpuset file system,
+of the directories and pseudo-files in the cpuset filesystem,
 normally mounted at
 .IR /dev/cpuset .
 .PP
@@ -978,7 +978,7 @@ or
 file.
 .PP
 There is one minor difference between the manner in which these
-permissions are evaluated and the manner in which normal file-system
+permissions are evaluated and the manner in which normal filesystem
 operation permissions are evaluated.
 The kernel interprets
 relative pathnames starting at a process's current working directory.
@@ -996,20 +996,20 @@ to its cpuset directory beneath
 .IR /dev/cpuset ,
 which is a bit unusual)
 or if some user code converts the relative cpuset path to a
-full file-system path.
+full filesystem path.
 .PP
 In theory, this means that user code should specify cpusets
 using absolute pathnames, which requires knowing the mount point of
-the cpuset file system (usually, but not necessarily,
+the cpuset filesystem (usually, but not necessarily,
 .IR /dev/cpuset ).
 In practice, all user level code that this author is aware of
-simply assumes that if the cpuset file system is mounted, then
+simply assumes that if the cpuset filesystem is mounted, then
 it is mounted at
 .IR /dev/cpuset .
 Furthermore, it is common practice for carefully written
 user code to verify the presence of the pseudo-file
 .I /dev/cpuset/tasks
-in order to verify that the cpuset pseudo-file system
+in order to verify that the cpuset pseudo-filesystem
 is currently mounted.
 .\" ================== WARNINGS ==================
 .SH WARNINGS
diff --git a/man7/credentials.7 b/man7/credentials.7
index e1c890d9..d8aea904 100644
--- a/man7/credentials.7
+++ b/man7/credentials.7
@@ -135,7 +135,7 @@ that the process will have when accessing shared resources such
 as message queues, shared memory, and semaphores.
 On most UNIX systems, these IDs also determine the
 permissions when accessing files.
-However, Linux uses the file system IDs described below
+However, Linux uses the filesystem IDs described below
 for this task.
 A process can obtain its effective user (group) ID using
 .BR geteuid (2)
@@ -163,18 +163,18 @@ A process can obtain its saved set-user-ID (set-group-ID) using
 .BR getresuid (2)
 .RB ( getresgid (2)).
 .IP *
-File system user ID and file system group ID (Linux-specific).
+Filesystem user ID and filesystem group ID (Linux-specific).
 These IDs, in conjunction with the supplementary group IDs described
 below, are used to determine permissions for accessing files; see
 .BR path_resolution (7)
 for details.
 Whenever a process's effective user (group) ID is changed,
-the kernel also automatically changes the file system user (group) ID
+the kernel also automatically changes the filesystem user (group) ID
 to the same value.
-Consequently, the file system IDs normally have the same values
+Consequently, the filesystem IDs normally have the same values
 as the corresponding effective ID, and the semantics for file-permission
 checks are thus the same on Linux as on other UNIX systems.
-The file system IDs can be made to differ from the effective IDs
+The filesystem IDs can be made to differ from the effective IDs
 by calling
 .BR setfsuid (2)
 and
@@ -236,7 +236,7 @@ Process IDs, parent process IDs, process group IDs, and session IDs
 are specified in POSIX.1-2001.
 The real, effective, and saved set user and groups IDs,
 and the supplementary group IDs, are specified in POSIX.1-2001.
-The file system user and group IDs are a Linux extension.
+The filesystem user and group IDs are a Linux extension.
 .SH NOTES
 The POSIX threads specification requires that
 credentials are shared by all of the threads in a process.
diff --git a/man7/feature_test_macros.7 b/man7/feature_test_macros.7
index 5eb9d35a..44efee6e 100644
--- a/man7/feature_test_macros.7
+++ b/man7/feature_test_macros.7
@@ -248,7 +248,7 @@ should be employed.
 .B _FILE_OFFSET_BITS
 Defining this macro with the value 64
 automatically converts references to 32-bit functions and data types
-related to file I/O and file system operations into references to
+related to file I/O and filesystem operations into references to
 their 64-bit counterparts.
 This is useful for performing I/O on large files (> 2 Gigabytes)
 on 32-bit systems.
diff --git a/man7/fifo.7 b/man7/fifo.7
index 65fef733..b9f63716 100644
--- a/man7/fifo.7
+++ b/man7/fifo.7
@@ -15,16 +15,16 @@
 fifo \- first-in first-out special file, named pipe
 .SH DESCRIPTION
 A FIFO special file (a named pipe) is similar to a pipe,
-except that it is accessed as part of the file system.
+except that it is accessed as part of the filesystem.
 It can be opened by multiple processes for reading or
 writing.
 When processes are exchanging data via the FIFO,
 the kernel passes all data internally without writing it
-to the file system.
+to the filesystem.
 Thus, the FIFO special file has no
-contents on the file system; the file system entry merely
+contents on the filesystem; the filesystem entry merely
 serves as a reference point so that processes can access
-the pipe using a name in the file system.
+the pipe using a name in the filesystem.
 .PP
 The kernel maintains exactly one pipe object for each
 FIFO special file that is opened by at least one process.
diff --git a/man7/hier.7 b/man7/hier.7
index 05cd13f3..ee5b5463 100644
--- a/man7/hier.7
+++ b/man7/hier.7
@@ -30,7 +30,7 @@
 .\" Modified Fri Sep  7 20:32:45 2001 by Tammy Fox <tfox@redhat.com>
 .TH HIER 7 2012-08-05 "Linux" "Linux Programmer's Manual"
 .SH NAME
-hier \- description of the file system hierarchy
+hier \- description of the filesystem hierarchy
 .SH DESCRIPTION
 A typical Linux system has, among others, the following directories:
 .TP
@@ -93,18 +93,18 @@ depends on local administration decisions.
 .TP
 .I /lib
 This directory should hold those shared libraries that are necessary
-to boot the system and to run the commands in the root file system.
+to boot the system and to run the commands in the root filesystem.
 .TP
 .I /media
 This directory contains mount points for removable media such as CD
 and DVD disks or USB sticks.
 .TP
 .I /mnt
-This directory is a mount point for a temporarily mounted file system.
+This directory is a mount point for a temporarily mounted filesystem.
 In some distributions,
 .I /mnt
 contains subdirectories intended to be used as mount points for several
-temporary file systems.
+temporary filesystems.
 .TP
 .I /opt
 This directory should contain add-on packages that contain static files.
@@ -112,9 +112,9 @@ This directory should contain add-on packages that contain static files.
 .I /proc
 This is a mount point for the
 .I proc
-file system, which provides information about running processes and
+filesystem, which provides information about running processes and
 the kernel.
-This pseudo-file system is described in more detail in
+This pseudo-filesystem is described in more detail in
 .BR proc (5).
 .TP
 .I /root
@@ -418,7 +418,7 @@ device lock files is
 .I LCK..<device>
 where
 .I <device>
-is the device's name in the file system.
+is the device's name in the filesystem.
 The format used is that of HDU UUCP lock files, that is, lock files
 contain a PID as a 10-byte ASCII decimal number, followed by a newline
 character.
diff --git a/man7/inotify.7 b/man7/inotify.7
index 97f19e2a..838c34a5 100644
--- a/man7/inotify.7
+++ b/man7/inotify.7
@@ -25,11 +25,11 @@
 .\"
 .TH INOTIFY 7 2013-07-21 "Linux" "Linux Programmer's Manual"
 .SH NAME
-inotify \- monitoring file system events
+inotify \- monitoring filesystem events
 .SH DESCRIPTION
 The
 .I inotify
-API provides a mechanism for monitoring file system events.
+API provides a mechanism for monitoring filesystem events.
 Inotify can be used to monitor individual files,
 or to monitor directories.
 When a directory is monitored, inotify will return events
@@ -310,7 +310,7 @@ field returned by
 .B IN_IGNORED
 Watch was removed explicitly
 .RB ( inotify_rm_watch (2))
-or automatically (file was deleted, or file system was unmounted).
+or automatically (file was deleted, or filesystem was unmounted).
 .TP
 .B IN_ISDIR
 Subject of this event is a directory.
@@ -321,7 +321,7 @@ Event queue overflowed
 is \-1 for this event).
 .TP
 .B IN_UNMOUNT
-File system containing watched object was unmounted.
+Filesystem containing watched object was unmounted.
 .PD
 .RE
 .SS /proc interfaces
diff --git a/man7/intro.7 b/man7/intro.7
index 5775ad31..4141cd22 100644
--- a/man7/intro.7
+++ b/man7/intro.7
@@ -31,7 +31,7 @@ intro \- introduction to overview, conventions, and miscellany section
 .SH DESCRIPTION
 Section 7 of the manual provides overviews on various topics, and
 describes conventions and protocols,
-character set standards, the standard file system layout,
+character set standards, the standard filesystem layout,
 and miscellaneous other things.
 .SH NOTES
 .SS Authors and copyright conditions
diff --git a/man7/mq_overview.7 b/man7/mq_overview.7
index 2b162768..f764dd57 100644
--- a/man7/mq_overview.7
+++ b/man7/mq_overview.7
@@ -195,11 +195,11 @@ resource limit, which places a limit on the amount of space
 that can be consumed by all of the message queues
 belonging to a process's real user ID, is described in
 .BR getrlimit (2).
-.SS Mounting the message queue file system
-On Linux, message queues are created in a virtual file system.
+.SS Mounting the message queue filesystem
+On Linux, message queues are created in a virtual filesystem.
 (Other implementations may also provide such a feature,
 but the details are likely to differ.)
-This file system can be mounted (by the superuser) using the following
+This filesystem can be mounted (by the superuser) using the following
 commands:
 .in +4n
 .nf
@@ -211,7 +211,7 @@ commands:
 .in
 The sticky bit is automatically enabled on the mount directory.
 
-After the file system has been mounted, the message queues on the system
+After the filesystem has been mounted, the message queues on the system
 can be viewed and manipulated using the commands usually used for files
 (e.g.,
 .BR ls (1)
diff --git a/man7/path_resolution.7 b/man7/path_resolution.7
index 1e8e5901..8cb6d4e6 100644
--- a/man7/path_resolution.7
+++ b/man7/path_resolution.7
@@ -126,17 +126,17 @@ respectively.
 
 The path resolution process will assume that these entries have
 their conventional meanings, regardless of whether they are
-actually present in the physical file system.
+actually present in the physical filesystem.
 
 One cannot walk down past the root: "/.." is the same as "/".
 .SS Mount points
 After a "mount dev path" command, the pathname "path" refers to
-the root of the file system hierarchy on the device "dev", and no
+the root of the filesystem hierarchy on the device "dev", and no
 longer to whatever it referred to earlier.
 
-One can walk out of a mounted file system: "path/.." refers to
+One can walk out of a mounted filesystem: "path/.." refers to
 the parent directory of "path",
-outside of the file system hierarchy on "dev".
+outside of the filesystem hierarchy on "dev".
 .SS Trailing slashes
 If a pathname ends in a \(aq/\(aq, that forces resolution of the preceding
 component as in Step 2: it has to exist and resolve to a directory.
@@ -189,7 +189,7 @@ Ordinarily the fsuid will equal the effective user ID, but the fsuid can be
 changed by the system call
 .BR setfsuid (2).
 
-(Here "fsuid" stands for something like "file system user ID".
+(Here "fsuid" stands for something like "filesystem user ID".
 The concept was required for the implementation of a user space
 NFS server at a time when processes could send a signal to a process
 with the same effective user ID.
@@ -197,11 +197,11 @@ It is obsolete now.
 Nobody should use
 .BR setfsuid (2).)
 
-Similarly, Linux uses the fsgid ("file system group ID")
+Similarly, Linux uses the fsgid ("filesystem group ID")
 instead of the effective group ID.
 See
 .BR setfsgid (2).
-.\" FIXME say something about file system mounted read-only ?
+.\" FIXME say something about filesystem mounted read-only ?
 .SS Bypassing permission checks: superuser and capabilities
 On a traditional UNIX system, the superuser
 .RI ( root ,
diff --git a/man7/pipe.7 b/man7/pipe.7
index 37298937..5cce716f 100644
--- a/man7/pipe.7
+++ b/man7/pipe.7
@@ -60,7 +60,7 @@ See
 .BR fifo (7)
 for further details.
 .IR Note :
-although FIFOs have a pathname in the file system,
+although FIFOs have a pathname in the filesystem,
 I/O on FIFOs does not involve operations on the underlying device
 (if there is one).
 .SS I/O on pipes and FIFOs
diff --git a/man7/sem_overview.7 b/man7/sem_overview.7
index e9de6745..7ea57bf8 100644
--- a/man7/sem_overview.7
+++ b/man7/sem_overview.7
@@ -121,8 +121,8 @@ Programs using the POSIX semaphores API must be compiled with
 .I cc \-pthread
 to link against the real-time library,
 .IR librt .
-.SS Accessing named semaphores via the file system
-On Linux, named semaphores are created in a virtual file system,
+.SS Accessing named semaphores via the filesystem
+On Linux, named semaphores are created in a virtual filesystem,
 normally mounted under
 .IR /dev/shm ,
 with names of the form
diff --git a/man7/shm_overview.7 b/man7/shm_overview.7
index cec57612..02d74df8 100644
--- a/man7/shm_overview.7
+++ b/man7/shm_overview.7
@@ -91,13 +91,13 @@ Programs using the POSIX shared memory API must be compiled with
 .I cc \-lrt
 to link against the real-time library,
 .IR librt .
-.SS Accessing shared memory objects via the file system
+.SS Accessing shared memory objects via the filesystem
 On Linux, shared memory objects are created in a
 .RI ( tmpfs )
-virtual file system, normally mounted under
+virtual filesystem, normally mounted under
 .IR /dev/shm .
 Since kernel 2.6.19, Linux supports the use of access control lists (ACLs)
-to control the permissions of objects in the virtual file system.
+to control the permissions of objects in the virtual filesystem.
 .SH CONFORMING TO
 POSIX.1-2001.
 .SH NOTES
diff --git a/man7/spufs.7 b/man7/spufs.7
index fef727cb..037c5588 100644
--- a/man7/spufs.7
+++ b/man7/spufs.7
@@ -26,16 +26,16 @@
 .\"
 .TH SPUFS 7 2007-12-20 Linux "Linux Programmer's Manual"
 .SH NAME
-spufs \- SPU file system
+spufs \- SPU filesystem
 .SH DESCRIPTION
-The SPU file system is used on PowerPC machines that implement the
+The SPU filesystem is used on PowerPC machines that implement the
 Cell Broadband Engine Architecture in order to access Synergistic
 Processor Units (SPUs).
 
-The file system provides a name space similar to POSIX shared
+The filesystem provides a name space similar to POSIX shared
 memory or message queues.
 Users that have write permissions
-on the file system can use
+on the filesystem can use
 .BR spu_create (2)
 to establish SPU contexts under the
 .B spufs
@@ -68,7 +68,7 @@ mostly follow the standard behavior for regular system calls like
 or
 .BR write (2),
 but often support only a subset of the operations
-supported on regular file systems.
+supported on regular filesystems.
 This list details the supported
 operations and the deviations from the standard behavior described
 in the respective man pages.
diff --git a/man7/symlink.7 b/man7/symlink.7
index b4ca88a3..236b88bf 100644
--- a/man7/symlink.7
+++ b/man7/symlink.7
@@ -47,22 +47,22 @@ it is a reference to the object underlying the original filename.
 the same
 .IR "i-node number" ,
 where an i-node number is an index into the i-node table,
-which contains metadata about all files on a file system.
+which contains metadata about all files on a filesystem.
 See
 .BR stat (2).)
 Changes to a file are independent of the name used to reference the file.
 Hard links may not refer to directories
-(to prevent the possibility of loops within the file system tree,
+(to prevent the possibility of loops within the filesystem tree,
 which would confuse many programs)
-and may not refer to files on different file systems
-(because i-node numbers are not unique across file systems).
+and may not refer to files on different filesystems
+(because i-node numbers are not unique across filesystems).
 
 A symbolic link is a special type of file whose contents are a string
 that is the pathname another file, the file to which the link refers.
 In other words, a symbolic link is a pointer to another name,
 and not to an underlying object.
 For this reason, symbolic links may refer to directories and may cross
-file system boundaries.
+filesystem boundaries.
 
 There is no requirement that the pathname referred to by a symbolic link
 should exist.
@@ -70,7 +70,7 @@ A symbolic link that refers to a pathname that does not exist is said
 to be a
 .IR "dangling link" .
 
-Because a symbolic link and its referenced object coexist in the file system
+Because a symbolic link and its referenced object coexist in the filesystem
 name space, confusion can arise in distinguishing between the link itself
 and the referenced object.
 On historical systems,
diff --git a/man7/unix.7 b/man7/unix.7
index 1892f2d8..d0d651e0 100644
--- a/man7/unix.7
+++ b/man7/unix.7
@@ -34,9 +34,9 @@ The
 socket family is used to communicate between processes on the same machine
 efficiently.
 Traditionally, UNIX domain sockets can be either unnamed,
-or bound to a file system pathname (marked as being of type socket).
+or bound to a filesystem pathname (marked as being of type socket).
 Linux also supports an abstract namespace which is independent of the
-file system.
+filesystem.
 
 Valid types are:
 .BR SOCK_STREAM ,
@@ -118,7 +118,7 @@ bytes in
 .IR sun_path
 that are covered by the specified length of the address structure.
 (Null bytes in the name have no special significance.)
-The name has no connection with file system pathnames.
+The name has no connection with filesystem pathnames.
 When the address of an abstract socket is returned by
 .BR getsockname (2),
 .BR getpeername (2),
@@ -322,7 +322,7 @@ defined in
 .SH ERRORS
 .TP
 .B EADDRINUSE
-The specified local address is already in use or the file system socket
+The specified local address is already in use or the filesystem socket
 object already exists.
 .TP
 .B ECONNREFUSED
@@ -396,7 +396,7 @@ versus
 Unknown socket type.
 .PP
 Other errors can be generated by the generic socket layer or
-by the file system while generating a file system socket object.
+by the filesystem while generating a filesystem socket object.
 See the appropriate manual pages for more information.
 .SH VERSIONS
 .B SCM_CREDENTIALS
@@ -406,7 +406,7 @@ be used in portable programs.
 but the implementation details differ.)
 .SH NOTES
 In the Linux implementation, sockets which are visible in the
-file system honor the permissions of the directory they are in.
+filesystem honor the permissions of the directory they are in.
 Their owner, group and their permissions can be changed.
 Creation of a new socket will fail if the process does not have write and
 search (execute) permission on the directory the socket is created in.
@@ -417,11 +417,11 @@ Portable programs should not rely on
 this feature for security.
 
 Binding to a socket with a filename creates a socket
-in the file system that must be deleted by the caller when it is no
+in the filesystem that must be deleted by the caller when it is no
 longer needed (using
 .BR unlink (2)).
 The usual UNIX close-behind semantics apply; the socket can be unlinked
-at any time and will be finally removed from the file system when the last
+at any time and will be finally removed from the filesystem when the last
 reference to it is closed.
 
 To pass file descriptors or credentials over a
diff --git a/man7/uri.7 b/man7/uri.7
index 4e488256..30d90b70 100644
--- a/man7/uri.7
+++ b/man7/uri.7
@@ -685,11 +685,11 @@ Also, the directory ZZZ usually changes when a version changes
 (though filename globbing could partially overcome this).
 Finally, using the file: scheme doesn't easily support people
 who dynamically load documentation from the Internet (instead of
-loading the files onto a local file system).
+loading the files onto a local filesystem).
 A future URI scheme may be added (e.g., "userdoc:") to permit
 programs to include cross-references to more detailed documentation
 without having to know the exact location of that documentation.
-Alternatively, a future version of the file-system specification may
+Alternatively, a future version of the filesystem specification may
 specify file locations sufficiently so that the file: scheme will
 be able to locate documentation.
 .PP