From cbe644a75f27869247648fa709c7ff5a201a464e Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 18 May 2007 17:14:14 +0000
Subject: [PATCH] Update # comments and documentation for disktab(5).

---
 etc/etc.i386/disktab     | 12 +++++++-----
 share/man/man5/disktab.5 | 12 ++++++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index b861f2e8f2..6fc7545dfd 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -1,11 +1,10 @@
 # $FreeBSD: src/etc/etc.i386/disktab,v 1.20.2.2 2002/04/15 00:44:15 dougb Exp $
-# $DragonFly: src/etc/etc.i386/disktab,v 1.2 2003/06/17 06:24:47 dillon Exp $
+# $DragonFly: src/etc/etc.i386/disktab,v 1.3 2007/05/18 17:14:12 dillon Exp $
 #
 # Disk geometry and partition layout tables. 
 # Key:
 #	dt	controller type
 #	ty	type of disk (fixed, removeable, simulated)
-#	d[0-4]	drive-type-dependent parameters
 #	ns	#sectors/track
 #	nt	#tracks/cylinder
 #	nc	#cylinders/disk
@@ -27,11 +26,14 @@
 #	f[a-h]	partition fragment sizes in bytes
 #	t[a-h]	partition types (filesystem, swap, etc)
 #
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
+# Obsolete keys no longer supported:
+#	b0	used to allow specification of boot0
+#	b1	used to allow specification of boot1
+#	d[0-4]  used to be drive-type-dependent parameters
 #
+#	Software driven bad sector tables are no longer supported (if
+#	they ever were in the first place).
 
-#
 # Floppy formats:
 #
 # To make a filesystem on a floppy:
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index de0a153f8c..55bd993ff7 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)disktab.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man5/disktab.5,v 1.4.2.6 2003/05/08 14:57:04 trhodes Exp $
-.\" $DragonFly: src/share/man/man5/disktab.5,v 1.2 2003/06/17 06:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man5/disktab.5,v 1.3 2007/05/18 17:14:14 dillon Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKTAB 5
@@ -76,17 +76,14 @@ floppy)
 .It "\&se	num	Sector size in bytes,"
 .Dv DEV_BSIZE
 default
-.It "\&sf	bool	Controller supports bad144-style bad sector forwarding"
 .It "\&rm	num	Rotation speed, rpm, 3600 default"
 .It "\&sk	num	Sector skew per track, default 0"
 .It "\&cs	num	Sector skew per cylinder, default 0"
 .It "\&hs	num	Headswitch time, usec, default 0"
 .It "\&ts	num	One-cylinder seek time, usec, default 0"
 .It "\&il	num	Sector interleave (n:1), 1 default"
-.It "\&d[0-4]	num	Drive-type-dependent parameters"
 .It "\&bs	num	Boot block size, default"
 .Dv BBSIZE
-.It "\&b[0-1]	num	Boot block filenames; see"
 .Xr disklabel 8
 .It "\&sb	num	Superblock size, default"
 .Dv SBSIZE
@@ -129,6 +126,13 @@ filesystem, swap, etc)
 .It "\&tg	str	Partition type of partition `g'"
 .It "\&th	str	Partition type of partition `h'"
 .El
+.Pp
+The following entries have been discontinued and are no longer supported:
+.Bl -column "indent" "boolx"
+.It "\&d[0-4]	num	Drive-type-dependent parameters"
+.It "\&b[0-1]	num	Boot block filenames"
+.It "\&sf	bool	Controller supports bad144-style bad sector forwarding"
+.El
 .Sh FILES
 .Bl -tag -width /etc/disktab -compact
 .It Pa /etc/disktab
-- 
2.11.4.GIT