From c6821aa4c746ce60a09794faa5a08a9269df0c37 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Sat, 20 Aug 2022 07:03:24 +0000
Subject: [PATCH] Align description of -g and -u with mount_tmpfs.8

"Reads better indeed" otto
---
 sbin/mount_msdos/mount_msdos.8 | 24 ++++++++++--------------
 sbin/mount_msdos/mount_msdos.c |  4 ++--
 sbin/mount_ntfs/mount_ntfs.8   | 24 ++++++++++--------------
 sbin/mount_ntfs/mount_ntfs.c   |  4 ++--
 4 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index 965a768077f..6d548a3d29f 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_msdos.8,v 1.32 2021/11/13 18:18:59 kn Exp $
+.\"	$OpenBSD: mount_msdos.8,v 1.33 2022/08/20 07:03:24 tb Exp $
 .\"	$NetBSD: mount_msdos.8,v 1.10 1996/01/19 21:14:43 leo Exp $
 .\"
 .\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 13 2021 $
+.Dd $Mdocdate: August 20 2022 $
 .Dt MOUNT_MSDOS 8
 .Os
 .Sh NAME
@@ -38,10 +38,10 @@
 .Sh SYNOPSIS
 .Nm mount_msdos
 .Op Fl 9ls
-.Op Fl g Ar gid
+.Op Fl g Ar group
 .Op Fl m Ar mask
 .Op Fl o Ar options
-.Op Fl u Ar uid
+.Op Fl u Ar user
 .Ar special
 .Ar node
 .Sh DESCRIPTION
@@ -81,11 +81,9 @@ Ignore the special Windows 95/98 directory entries even
 if deleting or renaming a file.
 This forces
 .Fl s .
-.It Fl g Ar gid
-Set the group of the files in the file system to
-.Ar gid .
-The default group is the group of the directory
-on which the file system is being mounted.
+.It Fl g Ar group
+Specifies the group name or GID of the root inode of the file system.
+Defaults to the mount point's GID.
 .It Fl l
 Force listing and generation of
 Windows 95/98 long filenames
@@ -106,11 +104,9 @@ as described in
 .It Fl s
 Force behaviour to
 ignore and not generate Windows 95/98 long filenames.
-.It Fl u Ar uid
-Set the owner of the files in the file system to
-.Ar uid .
-The default owner is the owner of the directory
-on which the file system is being mounted.
+.It Fl u Ar user
+Specifies the user name or UID of the root inode of the file system.
+Defaults to the mount point's UID.
 .El
 .Pp
 File permissions for FAT file systems are imitated,
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index 4e4c042d5e9..08ae5cdf011 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_msdos.c,v 1.34 2019/06/28 13:32:45 deraadt Exp $	*/
+/*	$OpenBSD: mount_msdos.c,v 1.35 2022/08/20 07:03:24 tb Exp $	*/
 /*	$NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $	*/
 
 /*
@@ -202,6 +202,6 @@ usage(void)
 {
 
 	fprintf(stderr,
-	    "usage: mount_msdos [-9ls] [-g gid] [-m mask] [-o options] [-u uid] special node\n");
+	    "usage: mount_msdos [-9ls] [-g group] [-m mask] [-o options] [-u user] special node\n");
 	exit(1);
 }
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index de0809c2f8d..898f2639449 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_ntfs.8,v 1.16 2020/04/23 21:28:09 jmc Exp $
+.\" $OpenBSD: mount_ntfs.8,v 1.17 2022/08/20 07:03:24 tb Exp $
 .\" $NetBSD: mount_ntfs.8,v 1.13 2003/02/14 16:21:48 grant Exp $
 .\"
 .\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -32,7 +32,7 @@
 .\"
 .\"	Id: mount_ntfs.8,v 1.3 1999/05/04 11:34:33 jkoshy Exp
 .\"
-.Dd $Mdocdate: April 23 2020 $
+.Dd $Mdocdate: August 20 2022 $
 .Dt MOUNT_NTFS 8
 .Os
 .Sh NAME
@@ -41,10 +41,10 @@
 .Sh SYNOPSIS
 .Nm mount_ntfs
 .Op Fl ai
-.Op Fl g Ar gid
+.Op Fl g Ar user
 .Op Fl m Ar mask
 .Op Fl o Ar options
-.Op Fl u Ar uid
+.Op Fl u Ar group
 .Ar special
 .Ar node
 .Sh DESCRIPTION
@@ -89,11 +89,9 @@ The options are as follows:
 .It Fl a
 Force behaviour to return MS-DOS 8.3 names also on
 .Fn readdir .
-.It Fl g Ar gid
-Set the group of the files in the file system to
-.Ar gid .
-The default group is the group of the directory
-on which the file system is being mounted.
+.It Fl g Ar group
+Specifies the group name or GID of the root inode of the file system.
+Defaults to the mount point's GID.
 .It Fl i
 Make name lookup case insensitive for all names except POSIX names.
 .It Fl m Ar mask
@@ -106,11 +104,9 @@ flag followed by a comma separated string of options.
 See the
 .Xr mount 8
 man page for possible options and their meanings.
-.It Fl u Ar uid
-Set the owner of the files in the file system to
-.Ar uid .
-The default owner is the owner of the directory
-on which the file system is being mounted.
+.It Fl u Ar user
+Specifies the user name or UID of the root inode of the file system.
+Defaults to the mount point's UID.
 .El
 .Sh FEATURES
 .Ss NTFS file attributes
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index efd403a6c1e..ab07040ca01 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_ntfs.c,v 1.18 2022/08/20 05:59:57 otto Exp $ */
+/* $OpenBSD: mount_ntfs.c,v 1.19 2022/08/20 07:03:24 tb Exp $ */
 /* $NetBSD: mount_ntfs.c,v 1.9 2003/05/03 15:37:08 christos Exp $ */
 
 /*
@@ -181,7 +181,7 @@ static void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: mount_ntfs [-ai] [-g gid] [-m mask] [-o options] [-u uid]"
+	    "usage: mount_ntfs [-ai] [-g group] [-m mask] [-o options] [-u user]"
 	    " special node\n");
 	exit(1);
 }
-- 
2.20.1