fanotify_mark.2, fanotify.7: Minor tweaks to Amir Goldstein's patch

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

diff --git a/man2/fanotify_mark.2 b/man2/fanotify_mark.2
index 8a50aafaaa5fb58d4647844d560c1de6d8a920c7..6ac30d18d89c7af970935ac0005a563858b72dc6 100644 (file)
--- 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 ef0a47cfb61000b52d7e40a3eedddcac39a83ca8..74f5105df6c3fd6f7bb313184897fd97300a547e 100644 (file)
--- 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