[illumos-gate merge]

commit ffc946bc87951cc850a82348f705c4081080f818
    13900 Update Intel microcode to 20210608
commit afcdc73a9924f4ee06d1c0e75823ab1db7d742c3
    13901 Incorrect calculation of Intel microcode extended patch signature checksum
commit b3d11974d0ef0679e47da102fafb125bb1d94470
    13929 SMB encryption does not work with macOS 11.4
commit 74e12c43fe52f2c30f36e65a4d0fb0e8dfd7068a
    3163 nss: need local netgroup implementation
commit 1a065e93eee983124652c3eb0cfdcb4776cd89ab
    12782 GRUB should pass pool and vdev GUIDs in $ZFS-BOOTFS
commit 3a18338393f3485e50eae6288b6a9ab89e9f715a
    13890 Some manual pages miss spaces next to formatting
commit 88e8a81ba29ce242b8e7eade29af1f3d301ac525
    13889 ctfdump -c should sort output stably
commit 7781236b33d51a2eb1e29bf336bdba8ddfcfff6e
    13884 dis(1) should pick stable names for symbols
commit 1e9e241fbdc7ae75a7b37c1e7afc8c96d2f43e1e
    13905 zfs holds is quadratic
commit 6b641d7a35808436d7283b7057a01791e2e2a4e2
    13861 bhyve apicv logic could take more care

Conflicts:
    exception_lists/copyright
    exception_lists/keywords
    exception_lists/wscheck
    manifest

1 files changed, 2 insertions, 10 deletions

diff --git a/usr/src/man/man1b/lpc.1b b/usr/src/man/man1b/lpc.1b
index 5f6a570001..820d144f88 100644
--- a/usr/src/man/man1b/lpc.1b
+++ b/usr/src/man/man1b/lpc.1b
@@ -1,17 +1,15 @@
 '\" te
 .\" Copyright (c) 1983 Regents of the University of California. All rights reserved. The Berkeley software License Agreement specifies the terms and conditions for redistribution.
 .\" Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
-.TH LPC 1B "Feb 25, 2017"
+.TH LPC 1B "June 20, 2021"
 .SH NAME
 lpc \- line printer control program
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/ucb/lpc\fR [\fIcommand\fR [\fIparameter\fR...]]
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBlpc\fR utility controls the operation of local printers.
 .sp
 .LP
@@ -50,7 +48,6 @@ arguments causes it to run interactively, prompting the user for \fBlpc\fR
 commands with \fBlpc>\fR. By redirecting the standard input, \fBlpc\fR can read
 commands from a file.
 .SH USAGE
-.LP
 \fBlpc\fR commands can be typed in their entirety or abbreviated to an
 unambiguous substring. Some \fBlpc\fR commands are available to all users;
 others are available only to super-users.
@@ -134,7 +131,7 @@ names.
 .sp .6
 .RS 4n
 Turns off the print queue for \fIprinter\fR. Prevents new printer jobs from
-being entered into the print queue for \fIprinter\fRby \fBlpr\fR(1B). \fBall\fR
+being entered into the print queue for \fIprinter\fR by \fBlpr\fR(1B). \fBall\fR
 specifies that this command is performed on all locally attached printers.
 \fIprinter\fR indicates this command is performed on specific printers. Specify
 \fIprinter\fR as an atomic name. See \fBprinters.conf\fR(4) for information
@@ -247,7 +244,6 @@ conventions for atomic names.
 .RE
 
 .SH EXIT STATUS
-.LP
 The following exit values are returned:
 .sp
 .ne 2
@@ -304,7 +300,6 @@ LDAP version of \fB/etc/printers.conf\fR
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -319,16 +314,13 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.LP
 \fBlpq\fR(1B), \fBlpr\fR(1B), \fBlprm\fR(1B), \fBlpstat\fR(1),
 \fBlpsched\fR(1M), \fBlpshut\fR(1M), \fBsvcadm\fR(1M), \fBprinters.conf\fR(4),
 \fBattributes\fR(5)
 .SH DIAGNOSTICS
-.LP
 Use the \fBsvcs\fR(1) utility to check if \fBsvc:/application/print/server\fR
 is running. If it is not running, use \fBsvcadm enable
 svc:/application/print/server\fR to start \fBlpsched\fR. See \fBsvcadm\fR(1M).
 .SH NOTES
-.LP
 When IPP is in use, the user is prompted for a passphrase if the remote print
 service is configured to require authentication.