Another merging from sbin/fdisk/fdisk.8.

PR:		109929
Submitted by:	Alex Kozlov

1 files changed, 75 insertions, 68 deletions

diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index 6c444b5..c33e78a 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -1,15 +1,14 @@
 .\" $FreeBSD$
 .\"
-.Dd February 26, 2006
+.Dd April 30, 2007
 .Dt FDISK 8
 .Os
 .Sh NAME
 .Nm fdisk
-.Nd NEC PC-98x1 partition table maintenance program
+.Nd NEC PC-98x1 slice table maintenance utility
 .Sh SYNOPSIS
 .Nm
 .Op Fl BIaistuv
-.Op Fl b Ar bootcode
 .Op Fl 12345678
 .Op Ar disk
 .Nm
@@ -20,23 +19,23 @@
 In order for the BIOS to boot the kernel,
 certain conventions must be adhered to.
 Sector 0 of the disk must contain boot code,
-a partition table,
+a slice table,
 and a magic number.
-BIOS partitions can be used to break the disk up into several pieces.
+BIOS slices can be used to break the disk up into several pieces.
 The BIOS brings in sector 0 and verifies the magic number.
 The sector
-0 boot code then searches the partition table to determine which
-partition is marked
+0 boot code then searches the slice table to determine which
+slice is marked
 .Dq active .
 This boot code then brings in the bootstrap from the
-active partition and, if marked bootable, runs it.
+active slice and, if marked bootable, runs it.
 Under
 .Tn DOS ,
-you can have one or more partitions with one active.
+you can have one or more slices with one active.
 The
 .Tn DOS
 .Nm
-utility can be used to divide space on the disk into partitions and set one
+utility can be used to divide space on the disk into slices and set one
 active.
 .Sh DESCRIPTION
 The
@@ -47,16 +46,16 @@ serves a similar purpose to the
 .Tn DOS
 utility.
 The first form is used to
-display partition information or to interactively edit the partition
+display slice information or to interactively edit the slice
 table.
-The second is used to write a partition table using a
+The second is used to write a slice table using a
 .Ar configfile ,
 and is designed to be used by other scripts/programs.
 .Pp
 Options are:
 .Bl -tag -width indent
 .It Fl a
-Change the active partition only.
+Change the active slice only.
 Ignored if
 .Fl f
 is given.
@@ -66,13 +65,13 @@ Ignored if
 .Fl f
 is given.
 .It Fl f Ar configfile
-Set partition values using the file
+Set slice values using the file
 .Ar configfile .
 The
 .Ar configfile
-always modifies existing partitions, unless
+always modifies existing slices, unless
 .Fl i
-is also given, in which case all existing partitions are deleted (marked
+is also given, in which case all existing slices are deleted (marked
 as
 .Dq unused )
 before the
@@ -90,7 +89,7 @@ below, for file syntax.
 .Em WARNING :
 when
 .Fl f
-is used, you are not asked if you really want to write the partitions
+is used, you are not asked if you really want to write the slices
 table (as you are in the interactive mode).
 Use with caution!
 .It Fl i
@@ -101,36 +100,36 @@ unless
 .Fl f
 is given.
 .It Fl I
-Initialize the partition table
+Initialize sector 0 slice table
 for one
 .Fx
 slice covering the entire disk.
 Some space at the start of the disk will reserved for the IPL program
-and the pc98 partition table itself.
+and the pc98 slice table itself.
 .It Fl s
 Print summary information and exit.
 .It Fl t
-Test mode; do not write partition values.
+Test mode; do not write slice values.
 Generally used with the
 .Fl f
-option to see what would be written to the partition table.
+option to see what would be written to the slice table.
 Implies
 .Fl v .
 .It Fl u
-Update (edit) the disk's partition table.
+Update (edit) the disk's sector 0 slice table.
 Ignored if
 .Fl f
 is given.
 .It Fl v
 Be verbose.
-Partitions that are unused are suppressed unless this flag is specified.
+Slices that are unused are suppressed unless this flag is specified.
 When
 .Fl f
 is used,
 .Nm
-prints out the partition table that is written to the disk.
+prints out the slice table that is written to the disk.
 .It Fl 12345678
-Operate on a single partition table entry only.
+Operate on a single slice table entry only.
 Ignored if
 .Fl f
 is given.
@@ -146,7 +145,7 @@ If omitted,
 tries to figure out the default disk device name from the
 mounted root device.
 .Pp
-When called with no arguments, it prints the partition table.
+When called with no arguments, it prints the sector 0 slice table.
 An example follows:
 .Bd -literal
 	******* Working on device /dev/da0 *******
@@ -201,12 +200,12 @@ An example follows:
 	<UNUSED>
 .Ed
 .Pp
-The disk is divided into three partitions that happen to fill the disk.
-The second partition overlaps the end of the first.
+The disk is divided into three slices that happen to fill the disk.
+The second slice overlaps the end of the first.
 (Used for debugging purposes.)
 .Bl -tag -width ".Em cyl , sector No and Em head"
 .It Em sysmid
-is used to label the partition.
+is used to label the slice.
 .Fx
 reserves the
 magic number 148 decimal (94 in hex).
@@ -216,15 +215,15 @@ and
 .Em size
 .Xc
 fields provide the start address
-and size of a partition in sectors.
+and size of a slice in sectors.
 .It Xo
 .Em cyl , sector
 and
 .Em head
 .Xc
-fields are used to specify the beginning and end addresses of the partition.
+fields are used to specify the beginning and end addresses of the slice.
 .It Em "system Name"
-is the name of the partition.
+is the name of the slice.
 .El
 .Pp
 .Em Note :
@@ -235,7 +234,7 @@ The
 .Fl i
 and
 .Fl u
-flags are used to indicate that the partition data is to be updated.
+flags are used to indicate that the slice data is to be updated.
 Unless the
 .Fl f
 option is also given,
@@ -247,12 +246,12 @@ to.
 .Pp
 The
 .Nm
-utility will display each partition and ask whether you want to edit it.
+utility will display each slice and ask whether you want to edit it.
 If you say yes,
 .Nm
 will step through each field, show you the old value,
 and ask you for a new one.
-When you are done with the partition,
+When you are done with the slice,
 .Nm
 will display it and ask you whether it is correct.
 It will then proceed to the next entry.
@@ -265,10 +264,10 @@ fields correct is tricky, so by default,
 they will be calculated for you;
 you can specify them if you choose to though.
 .Pp
-After all the partitions are processed,
+After all the slices are processed,
 you are given the option to change the
 .Dq active
-partition.
+slice.
 Finally, when all the new data for sector 0 has been accumulated,
 you are asked to confirm whether you really want to rewrite it.
 .Pp
@@ -279,13 +278,13 @@ and
 flags is that
 the
 .Fl u
-flag edits (updates) the existing partition parameters
+flag edits (updates) the existing slice parameters
 while the
 .Fl i
 flag is used to
 .Dq initialize
 them (old values will be ignored);
-it will setup the last BIOS partition to use the whole disk for
+it will setup the last BIOS slice to use the whole disk for
 .Fx ;
 and make it active.
 .Sh NOTES
@@ -302,10 +301,10 @@ that use geometry translation under the BIOS.
 If you hand craft your disk layout,
 please make sure that the
 .Fx
-partition starts on a cylinder boundary.
+slice starts on a cylinder boundary.
 .Pp
-Editing an existing partition will most likely result in the loss of
-all data in that partition.
+Editing an existing slice will most likely result in the loss of
+all data in that slice.
 .Pp
 You should run
 .Nm
@@ -318,7 +317,7 @@ detects that are not fully explained in this manual page.
 .Sh CONFIGURATION FILE
 When the
 .Fl f
-option is given, a disk's partition table can be written using values
+option is given, a disk's slice table can be written using values
 from a
 .Ar configfile .
 The syntax of this file is very simple;
@@ -347,7 +346,7 @@ Set the number of sectors/track to
 These specs can occur in any order, as the leading letter determines
 which value is which; however, all three must be specified.
 .Pp
-This line must occur before any lines that specify partition
+This line must occur before any lines that specify slice
 information.
 .Pp
 It is an error if the following is not true:
@@ -361,11 +360,11 @@ The number of cylinders should be less than or equal to 1024, but this
 is not enforced, although a warning will be printed.
 Note that bootable
 .Fx
-partitions (the
+slices (the
 .Dq Pa /
 file system) must lie completely within the
 first 1024 cylinders; if this is not true, booting may fail.
-Non-bootable partitions do not have this restriction.
+Non-bootable slices do not have this restriction.
 .Pp
 Example (all of these are equivalent), for a disk with 1019 cylinders,
 39 heads, and 63 sectors:
@@ -374,9 +373,9 @@ g       c1019   h39     s63
 g       h39     c1019   s63
 g       s63     h39     c1019
 .Ed
-.It Ic p Ar partition type start length
-Set the partition given by
-.Ar partition
+.It Ic p Ar slice type start length
+Set the slice given by
+.Ar slice
 (1-8) to type
 .Ar type ,
 starting at sector
@@ -385,32 +384,32 @@ for
 .Ar length
 sectors.
 .Pp
-Only those partitions explicitly mentioned by these lines are modified;
-any partition not referenced by a
+Only those slices explicitly mentioned by these lines are modified;
+any slice not referenced by a
 .Ic p
 line will not be modified.
-However, if an invalid partition table is present, or the
+However, if an invalid slice table is present, or the
 .Fl i
-option is specified, all existing partition entries will be cleared
+option is specified, all existing slice entries will be cleared
 (marked as unused), and these
 .Ic p
 lines will have to be used to
-explicitly set partition information.
-If multiple partitions need to be
+explicitly set slice information.
+If multiple slices need to be
 set, multiple
 .Ic p
-lines must be specified; one for each partition.
+lines must be specified; one for each slice.
 .Pp
-These partition lines must occur after any geometry specification lines,
+These slice lines must occur after any geometry specification lines,
 if one is present.
 .Pp
 The
 .Ar type
 is 165 for
 .Fx
-partitions.
-Specifying a partition type of zero is
-the same as clearing the partition and marking it as unused; however,
+slices.
+Specifying a slice type of zero is
+the same as clearing the slice and marking it as unused; however,
 dummy values (such as
 .Dq 0 )
 must still be specified for
@@ -422,25 +421,25 @@ Note: the start offset will be rounded upwards to a head boundary if
 necessary, and the end offset will be rounded downwards to a cylinder
 boundary if necessary.
 .Pp
-Example: to clear partition 4 and mark it as unused:
+Example: to clear slice 4 and mark it as unused:
 .Pp
 .Dl "p       4       0       0       0"
 .Pp
-Example: to set partition 1 to a
+Example: to set slice 1 to a
 .Fx
-partition, starting at sector 1
+slice, starting at sector 1
 for 2503871 sectors (note: these numbers will be rounded upwards and
 downwards to correspond to head and cylinder boundaries):
 .Pp
 .Dl "p       1       165     1       2503871"
-.It Ic a Ar partition
+.It Ic a Ar slice
 Make
-.Ar partition
-the active partition.
+.Ar slice
+the active slice.
 Can occur anywhere in the config file, but only
 one must be present.
 .Pp
-Example: to make partition 1 the active partition:
+Example: to make slice 1 the active slice:
 .Pp
 .Dl "a       1"
 .El
@@ -449,13 +448,21 @@ Example: to make partition 1 the active partition:
 .Xr bsdlabel 8 ,
 .Xr newfs 8
 .Sh BUGS
-The default boot code will not necessarily handle all partition types
+The default boot code will not necessarily handle all slice types
 correctly, in particular those introduced since
 .Tn MS-DOS
 6.x.
 .Pp
 The entire utility should be made more user-friendly.
 .Pp
+Most users new to
+.Fx
+do not understand the difference between
+.Dq slice
+and
+.Dq partition ,
+causing difficulty to adjust.
+.Pp
 You cannot use this command to completely dedicate a disk to
 .Fx .
 The