From 5cbf34865df8b9bdc5eff306d4608056187132fe Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Sun, 23 Mar 2014 00:48:08 +0000
Subject: [PATCH] Revise documentation of QUOTA and QUOTA2 options to make it
 clear that these are FFS options. (QUOTA2 also works with mfs. AFAIK,
 traditional quotas don't.)

Don't refer to QUOTA2 as "the new quotas format" as "new" is not a
good long-term identifier.

Also, don't xref half the quota utilities; there's no need to.
---
 share/man/man4/options.4 | 45 ++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 33a91bf6c2df..985cab37ee21 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.435 2014/03/22 07:49:06 skrll Exp $
+.\"	$NetBSD: options.4,v 1.436 2014/03/23 00:48:08 dholland Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -992,34 +992,25 @@ It also provides better general use performance over regular FFS.
 See also
 .Xr wapbl 4 .
 .It Cd options QUOTA
-Enables kernel support for file system quotas.
-See
-.Xr quotaon 8 ,
-.Xr edquota 8 ,
+Enables kernel support for traditional quotas in FFS.
+Traditional quotas store the quota information in external files and
+require
+.Xr quotacheck 8
 and
-.Xr quota 1
-for details.
-Note that quotas only work on
-.Dq ffs
-file systems, although
-.Xr rpc.rquotad 8
-permits them to be accessed over
-.Em NFS .
+.Xr quotaon 8
+at boot time.
+Traditional quotas are limited to 32-bit sizes and are at this point
+considered a legacy feature.
 .It Cd options QUOTA2
-Enables kernel support for the new file system quotas format.
-See
-.Xr tunefs 8 ,
-.Xr newfs 8 ,
-.Xr mount_mfs 8 ,
-.Xr edquota 8 ,
-and
-.Xr quota 1
-for details.
-Note that quota2 is only supported by
-.Dq ffs
-and
-.Dq mfs
-file systems at this time.
+Enables kernel support for in-volume quotas in FFS.
+The quota information is file system metadata maintained by
+.Xr fsck 8
+and/or WAPBL journaling.
+MFS volumes can also use
+.Dv QUOTA2
+quotas; see
+.Xr mount_mfs 8
+for more information.
 .It Cd options FFS_EI
 Enable
 .Dq Endian-Independent