[illumos-gate merge]

commit 8837b1d0891b79dc11ae1199ea4a100f3f17c7b1
    13143 libc test suite should pass cleanly with unprivileged user
commit 9c562f14f5af5a3d068e998a2ab674ce019cc395
    13043 HPET config register does not change size
commit 92f7b1e23c49ac9522feadd9b58cb103a05a509b
    13039 HPET on AWS EC2 may be Hazard-Prone Error Trigger
commit fdcca78f421670bb8f04d68bc3f2762a4b5342be
    13042 make prom_debug more useful outside startup.c
commit 51706d6c808d070acc209c5894e98814aa259ba6
    12510 prtvtoc columns are not wide enough for modern disks
commit 93dc830ecbbcd243760848e27a0f901125432b04
    13129 libc: gettimeofday() error: unchecked function return
commit 92db730eedd4fcf11958d5b89b6d63f99488d594
    13117 zfs: variable dereferenced before check
commit d96925c4917df4be0de8533ddaa487c9d915b8c5
    11499 default to hires tick
commit db8733f5bbf6e1c41c482d70b2fe49470d1958de
    13110 clean up compiler gags in bhyve kernel
commit 374fc6954a786a037fbb28b1cd6fd62d05d13a37
commit fcfe1af15109d9332f8d8f6330b4eea92effb41d
    13121 mdb smbios dmod could work for libsmbios
commit df8c2508aa717e719c0726c616d47f2c94a58dab
    13119 Want support for SMBIOS 3.4

1 files changed, 28 insertions, 39 deletions

diff --git a/usr/src/man/man1m/prtvtoc.1m b/usr/src/man/man1m/prtvtoc.1m
index 4f883420c1..8b353d750b 100644
--- a/usr/src/man/man1m/prtvtoc.1m
+++ b/usr/src/man/man1m/prtvtoc.1m
@@ -3,28 +3,23 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PRTVTOC 1M "Jul 25, 2002"
+.TH PRTVTOC 1M "Apr 14, 2020"
 .SH NAME
 prtvtoc \- report information about a disk geometry and partitioning
 .SH SYNOPSIS
-.LP
 .nf
 \fBprtvtoc\fR [\fB-fhs\fR] [\fB-t\fR \fIvfstab\fR] [\fB-m\fR \fImnttab\fR] \fIdevice\fR
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The \fBprtvtoc\fR command allows the contents of the label to be viewed. The
 command can be used only by the super-user.
 .sp
 .LP
 The \fIdevice\fR name can be the file name of a raw device in the form of
-\fB/dev/rdsk/c?t?d?s2\fR or can be the file name of a block device in the form
-of \fB/dev/dsk/c?t?d?s2\fR.
+\fB/dev/rdsk/c*t*d*s2\fR or can be the file name of a block device in the form
+of \fB/dev/dsk/c*t*d*s2\fR.
 .SH OPTIONS
-.sp
-.LP
 The following options are supported:
 .sp
 .ne 2
@@ -75,7 +70,6 @@ Use \fIvfstab\fR as the list of filesystem defaults, in place of
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing the \fBprtvtoc\fR Command
 .sp
 .LP
@@ -88,26 +82,25 @@ disk:
 example# prtvtoc /dev/rdsk/c0t3d0s2
 * /dev/rdsk/c0t3d0s2 partition map
 *
-* Dimension:
-*     512 bytes/sector
-*      80 sectors/track
-*       9 tracks/cylinder
-*     720 sectors/cylinder
-*    2500 cylinders
-*    1151 accessible cylinders
+* Dimensions:
+*         512 bytes/sector
+*          80 sectors/track
+*           9 tracks/cylinder
+*         720 sectors/cylinder
+*        2500 cylinders
+*        1151 accessible cylinders
 *
 * Flags:
 *   1: unmountable
 *  10: read-only
-* *                           First    Sector   Last
-* Partition   Tag   Flags   Sector   Count    Sector   Mount Directory
-     0         2     00          0    76320    76319   /
-     1         3     01      76320   132480   208799
-     2         5     00          0   828720   828719
-     5         6     00     208800   131760   340559   /opt
-     6         4     00     340560   447120   787679   /usr
-     7         8     00     787680    41040   828719   /export/home
-example#
+*                            First       Sector      Last
+* Partition  Tag  Flags      Sector       Count      Sector  Mount Directory
+       0       2     00          0       76320       76319   /
+       1       3     01      76320      132480      208799
+       2       5     00          0      828720      828719
+       5       6     00     208800      131760      340559   /opt
+       6       4     00     340560      447120      787679   /usr
+       7       8     00     787680       41040      828719   /export/home
 .fi
 .in -2
 .sp
@@ -133,7 +126,7 @@ BACKUP	0x05
 STAND	0x06
 VAR	0x07
 HOME	0x08
-ALTSCTR	 0x09
+ALTSCTR	0x09
 CACHE	0x0a
 RESERVED	0x0b
 .TE
@@ -185,30 +178,26 @@ example# prtvtoc /dev/rdsk/c1t1d0s2
 * /dev/rdsk/c1t1d0s2 partition map
 *
 * Dimensions:
-*     512 bytes/sector
-* 3187630080 sectors
-* 3187630013 accessible sectors
+*         512 bytes/sector
+*  3187630080 sectors
+*  3187630013 accessible sectors
 *
 * Flags:
 *   1: unmountable
 *  10: read-only
 *
-*                          First     Sector    Last
-* Partition  Tag  Flags    Sector     Count    Sector  Mount Directory
-0      2    00         34    262144    262177
-1      3    01     262178    262144    524321
-6      4    00     524322 3187089340 3187613661
-8     11    00  3187613662     16384 318763004
+*                           First       Sector        Last
+* Partition  Tag  Flags     Sector       Count      Sector  Mount Directory
+       0      2    00          34      262144      262177
+       1      3    01      262178      262144      524321
+       6      4    00      524322  3187089340  3187613661
+       8     11    00  3187613662       16384   318763004
 .fi
 .in -2
 .sp
 
 .SH SEE ALSO
-.sp
-.LP
 \fBdevinfo\fR(1M), \fBfmthard\fR(1M), \fBformat\fR(1M), \fBmount\fR(1M),
 \fBattributes\fR(5)
 .SH WARNINGS
-.sp
-.LP
 The \fBmount\fR command does not check the "not mountable" bit.