[illumos-gate merge]

commit a99cb9618990662acbd3bab1b4a5b05a6ca62556
    11531 tools/make should set NATIVE_CCFLAGS
commit 7e6ac63905653744ac6703d7bc31790c363cf5e7
    11539 dboot: build errors with gcc9
commit 889229bb296dd6f2b73fa6bb3247c58a71282836
    4705 fork(2): See "MT-Level of Libraries"
commit a3bfe1dcd8a83b2661def9170b5005a830e8780d
    11497 ddi_device_acc_attr(9S) has the wrong version number
commit 634942f535e93dad348fa175c9bc116e7bf936ba
    11582 3SCF isn't the object-caching memory allocation library
commit 356ba08c15b26adbde3440aa89d8b31cd39fc526
    11533 tools/make: gcc9 build errors
    11534 tools/make: remove sys_nerr
    11535 tools/make: amd64 arch is not supported
    11536 tools/make: getmem() should take size_t
commit 21c878fe36c0151617d2f009615f5d18fddb207e
    11559 zfs: device removal should not block bootability
commit 6af23589e78469fc9f90db8558854d1a822aaa72
    10623 ZFS should be more aggressive in updating vdev devid
commit 0f2f3e995cde8dabd9edf8bb05b957a50bc7cc20
    11517 loader.efi: efipart should be more careful about constructing block device lists
commit a9370e9f996b7ce61bb1a9612a0625161a922320
    9096 passwords (policy.conf) should default to sha512
commit f67950b21e185934ccabe311516f4dcbdb00ef79
    11479 zfs project support

1 files changed, 9 insertions, 9 deletions

diff --git a/usr/src/man/man4/policy.conf.4 b/usr/src/man/man4/policy.conf.4
index 65b6d04494..4c933fbfc4 100644
--- a/usr/src/man/man4/policy.conf.4
+++ b/usr/src/man/man4/policy.conf.4
@@ -13,7 +13,7 @@ policy.conf \- configuration file for security policy
 .fi
 
 .SH DESCRIPTION
-.sp
+
 .LP
 The \fBpolicy.conf\fR file provides the security policy configuration for
 user-level attributes. Each entry consists of a key/value pair in the form:
@@ -132,10 +132,10 @@ another algorithm, such as \fBCRYPT_DEFAULT=1\fR for BSD and Linux MD5.
 .ad
 .sp .6
 .RS 4n
-Specify the default algorithm for new passwords. The Solaris default is the
-traditional UNIX algorithm. This is not listed in \fBcrypt.conf\fR(4) since it
-is internal to \fBlibc\fR. The reserved name \fB__unix__\fR is used to refer to
-it.
+Specify the default algorithm for new passwords. The Solaris default was once
+the traditional UNIX algorithm. This is not listed in \fBcrypt.conf\fR(4) since
+it is internal to \fBlibc\fR. The reserved name \fB__unix__\fR is used to refer
+to it.
 .RE
 
 .sp
@@ -186,7 +186,7 @@ specifications are unaffected by any future addition of privileges that might
 occur.
 
 .SH FILES
-.sp
+
 .ne 2
 .na
 \fB\fB/etc/user_attr\fR\fR
@@ -223,7 +223,7 @@ Defines policy for the system.
 .RE
 
 .SH ATTRIBUTES
-.sp
+
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -239,13 +239,13 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
+
 .LP
 \fBlogin\fR(1), \fBpfexec\fR(1), \fBchkauthattr\fR(3SECDB),
 \fBgetexecuser\fR(3SECDB), \fBauth_attr\fR(4), \fBcrypt.conf\fR(4),
 \fBprof_attr\fR(4), \fBuser_attr\fR(4), \fBattributes\fR(5),
 \fBprivileges\fR(5)
 .SH NOTES
-.sp
+
 .LP
 The \fIconsole user\fR is defined as the owner of \fB/dev/console\fR.