[illumos-gate merge]

commit b325f34d6fd056178a119182f410f157d35a9ea6
    12781 /etc/ppt_aliases needs to be in the boot archive
commit 282a8ecb1f4aca0718d89ef1299b5928e5405bca
    12736 Add DISCARD/TRIM support to bhyve
commit aee33e58f237f0d3cfeab24295f491937f0f7c79
    12766 clean up bhyve lints
commit 00509c829a7bda32eeabfd272e5e6307ed93079e
    12784 Fix errors in plockstat man page
commit c376fe93141769de29a07813de2dfb2c8c4b8481
    12745 man page typos
commit 84659b24a533984de271059abf9a1092835d15a9
    12735 bhyve upstream sync 2019 Sept
commit cf3ec608f736765ec9852eed5e611848a25de9a4
    12768 12392 regressed ftello64 behavior
commit 165c5c6fe7d6c7a95878c8a3aae7da65d1da1d90
    12774 Resilver restarts unnecessarily when it encounters errors
commit 9c3024a3457d2d1269be18124a1ac69e33000da7
    12682 want mdb-bhyve module
commit 88d6421c15f1c4daea9c8128e715662091258054
    12779 mdb str_flags is missing STRXPG4TTY
commit 3579e3c35b601b3f66174315be3026281487541a
    12776 libbe: missing typedef in libbe.h
commit eb9a1df2aeb866bf1de4494433b6d7e5fa07b3ae
    12680 want PCI pass-thru in bhyve

	Conflicts:
	exception_lists/packaging
	usr/src/cmd/bhyve/bhyverun.c
	usr/src/cmd/mdb/i86pc/modules/unix/unix.c
	usr/src/cmd/pptadm/Makefile
	usr/src/lib/libppt/Makefile
	usr/src/lib/libppt/Makefile.com
	usr/src/lib/libvmm/Makefile
	usr/src/lib/libvmm/Makefile.com
	usr/src/uts/i86pc/Makefile.i86pc
	usr/src/uts/i86pc/io/vmm/vm/vm_page.h
	usr/src/uts/i86pc/ppt/Makefile
	usr/src/uts/i86pc/vmm/Makefile
	usr/src/uts/intel/ia32/ml/modstubs.s

1 files changed, 2 insertions, 28 deletions

diff --git a/usr/src/man/man1/mail.1 b/usr/src/man/man1/mail.1
index 8aad4de37e..5d8bc7b84c 100644
--- a/usr/src/man/man1/mail.1
+++ b/usr/src/man/man1/mail.1
@@ -44,12 +44,11 @@
 .\" Portions Copyright (c) 1992, X/Open Company Limited  All Rights Reserved
 .\" Copyright (c) 2008, Sun Microsystems, Inc.  All Rights Reserved
 .\"
-.TH MAIL 1 "Jul 24, 2008"
+.TH MAIL 1 "May 17, 2020"
 .SH NAME
 mail, rmail \- read mail or send mail to users
 .SH SYNOPSIS
 .SS "Sending Mail"
-.LP
 .nf
 \fBmail\fR [\fB-tw\fR] [\fB-m\fR \fImessage_type\fR] \fIrecipient\fR...
 .fi
@@ -60,20 +59,16 @@ mail, rmail \- read mail or send mail to users
 .fi
 
 .SS "Reading Mail"
-.LP
 .nf
 \fBmail\fR [\fB-ehpPqr\fR] [\fB-f\fR \fIfile\fR]
 .fi
 
 .SS "Debugging"
-.LP
 .nf
 \fBmail\fR [\fB-x\fR \fIdebug_level\fR] [\fIother_mail_options\fR] \fIrecipient\fR...
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 A \fIrecipient\fR is usually a domain style address
 ("\fIuser\fR@\fImachine\fR") or a user name recognized by \fBlogin\fR(1). When
 \fIrecipient\fRs are named, \fBmail\fR assumes a message is being sent. It
@@ -119,8 +114,6 @@ consists of only header lines with no message content. Header lines may be
 continued on the following line if that line starts with white space.
 .SH OPTIONS
 .SS "Sending Mail"
-.sp
-.LP
 The following command-line arguments affect sending mail:
 .sp
 .ne 2
@@ -202,8 +195,6 @@ extended network (such as \fBsysa!sysb!sysc!user\fR or
 .RE
 
 .SS "Reading Mail"
-.sp
-.LP
 The following command-line arguments affect reading mail:
 .sp
 .ne 2
@@ -545,8 +536,6 @@ preservation using the \fBDEL_EMPTY_MAILFILE\fR option of \fBmailcnfg\fR.)
 The group \fBID\fR of the mailfile must be \fBmail\fR to allow new messages to
 be delivered, and the mailfile must be writable by group \fBmail\fR.
 .SS "Debugging"
-.sp
-.LP
 The following command-line arguments cause \fBmail\fR to provide debugging
 information:
 .sp
@@ -572,8 +561,6 @@ overrides any specification of \fBDEBUG\fR in \fB/etc/mail/mailcnfg\fR. The
 information provided by the \fB-x\fR option is esoteric and is probably only
 useful to system administrators.
 .SS "Delivery Notification"
-.sp
-.LP
 Several forms of notification are available for mail by including one of the
 following lines in the message header.
 .sp
@@ -640,8 +627,6 @@ Same as \fB/return\fR except that the original message is not returned.
 The default is \fB/nodelivery/return\fR. If contradictory options are used, the
 first is recognized and later, conflicting, terms are ignored.
 .SH OPERANDS
-.sp
-.LP
 The following operand is supported for sending mail:
 .sp
 .ne 2
@@ -654,14 +639,10 @@ recognized by \fBlogin\fR(1).
 .RE
 
 .SH USAGE
-.sp
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBmail\fR and
 \fBrmail\fR when encountering files greater than or equal to 2 Gbyte ( 2^31
 bytes).
 .SH ENVIRONMENT VARIABLES
-.sp
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBmail\fR: \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and
 \fBNLSPATH\fR.
@@ -675,8 +656,6 @@ Determine the timezone used with date and time strings.
 .RE
 
 .SH EXIT STATUS
-.sp
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -706,7 +685,6 @@ An error occurred after initialization.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fBdead.letter\fR\fR
@@ -782,15 +760,13 @@ incoming mail for \fIuser\fR; that is, the \fImailfile\fR
 .sp
 .ne 2
 .na
-\fB\fBvar/tmp/ma\fR*\fR
+\fB\fB/var/tmp/ma\fR*\fR
 .ad
 .RS 20n
 temporary file
 .RE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBchmod\fR(1), \fBcsh\fR(1), \fBlogin\fR(1), \fBmailx\fR(1), \fBuucp\fR(1C),
 \fBuuencode\fR(1C), \fBvacation\fR(1), \fBwrite\fR(1), \fBattributes\fR(5),
 \fBenviron\fR(5), \fBlargefile\fR(5)
@@ -798,8 +774,6 @@ temporary file
 .LP
 \fISolaris Advanced User\&'s Guide\fR
 .SH NOTES
-.sp
-.LP
 The interpretation and resulting action taken because of the header lines
 described in the Delivery Notifications section only occur if this version of
 \fBmail\fR is installed on the system where the delivery (or failure) happens.