aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2019-02-26 17:19:08 +0100
committerMichael Kerrisk <mtk.manpages@gmail.com>2019-02-26 17:39:00 +0100
commit953d1e0792e4772e0fe56c6b0547871ee690438e (patch)
tree54a24af8752ede1742930f0d7146c87cf09ca3da
parentb2f8214d470db2efcc082d78c4e5b1ecc1a2a35e (diff)
downloadman-pages-953d1e0792e4772e0fe56c6b0547871ee690438e.tar.gz
fanotify_mark.2, fanotify.7: Minor tweaks to Amir Goldstein's patch
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man2/fanotify_mark.24
-rw-r--r--man7/fanotify.74
2 files changed, 4 insertions, 4 deletions
diff --git a/man2/fanotify_mark.2 b/man2/fanotify_mark.2
index 8a50aafaaa..6ac30d18d8 100644
--- a/man2/fanotify_mark.2
+++ b/man2/fanotify_mark.2
@@ -70,7 +70,7 @@ must be nonempty or the error
will occur.
.TP
.B FAN_MARK_FLUSH
-Remove either all marks for filesystems, all marks for mounts or all
+Remove either all marks for filesystems, all marks for mounts, or all
marks for directories and files from the fanotify group.
If
.I flags
@@ -83,7 +83,7 @@ contains
.BR FAN_MARK_FILESYSTEM ,
all marks for filesystems are removed from the group.
Otherwise, all marks for directories and files are removed.
-No flag other than and only one of the flags
+No flag other than and at most one of the flags
.B FAN_MARK_MOUNT
or
.B FAN_MARK_FILESYSTEM
diff --git a/man7/fanotify.7 b/man7/fanotify.7
index ef0a47cfb6..74f5105df6 100644
--- a/man7/fanotify.7
+++ b/man7/fanotify.7
@@ -56,7 +56,7 @@ system call creates and initializes an fanotify notification group
and returns a file descriptor referring to it.
.PP
An fanotify notification group is a kernel-internal object that holds
-a list of files, directories, filesystems and mount points for which
+a list of files, directories, filesystems, and mount points for which
events shall be created.
.PP
For each entry in an fanotify notification group, two bit masks exist: the
@@ -66,7 +66,7 @@ mask and the
mask.
The mark mask defines file activities for which an event shall be created.
The ignore mask defines activities for which no event shall be generated.
-Having these two types of masks permits a filesystem, mount point or
+Having these two types of masks permits a filesystem, mount point, or
directory to be marked for receiving events, while at the same time
ignoring events for specific objects under a mount point or directory.
.PP