4 files changed, 68 insertions, 30 deletions
diff --git a/sys/contrib/openzfs/man/man8/zfs-rename.8 b/sys/contrib/openzfs/man/man8/zfs-rename.8
index d8d9f49d7689..78bd8934a00f 100644
--- a/sys/contrib/openzfs/man/man8/zfs-rename.8
+++ b/sys/contrib/openzfs/man/man8/zfs-rename.8
@@ -30,7 +30,7 @@
 .\" Copyright 2018 Nexenta Systems, Inc.
 .\" Copyright 2019 Joyent, Inc.
 .\"
-.Dd June 30, 2019
+.Dd September 1, 2020
 .Dt ZFS-RENAME 8
 .Os
 .Sh NAME
@@ -52,8 +52,11 @@
 .Cm rename
 .Fl u
 .Op Fl f
-.Ar filesystem
-.Ar filesystem
+.Ar filesystem Ar filesystem
+.Nm
+.Cm rename
+.Fl r
+.Ar snapshot Ar snapshot
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
diff --git a/sys/contrib/openzfs/man/man8/zfsprops.8 b/sys/contrib/openzfs/man/man8/zfsprops.8
index a4e2829e3fad..2c4a2af29480 100644
--- a/sys/contrib/openzfs/man/man8/zfsprops.8
+++ b/sys/contrib/openzfs/man/man8/zfsprops.8
@@ -38,7 +38,7 @@
 .\" Copyright 2019 Joyent, Inc.
 .\" Copyright (c) 2019, Kjeld Schouten-Lebbing
 .\"
-.Dd January 30, 2020
+.Dd September 1, 2020
 .Dt ZFSPROPS 8
 .Os
 .Sh NAME
@@ -651,7 +651,7 @@ you must first remove all
 .Tn ACL
 entries which do not represent the current mode.
 .El
-.It Sy acltype Ns = Ns Sy off Ns | Ns Sy noacl Ns | Ns Sy posixacl
+.It Sy acltype Ns = Ns Sy off Ns | Ns Sy posix
 Controls whether ACLs are enabled and if so what type of ACL to use.
 This property is not visible on FreeBSD yet.
 .Bl -tag -width "posixacl"
@@ -662,15 +662,18 @@ property set to off then ACLs are disabled.
 .It Sy noacl
 an alias for
 .Sy off
-.It Sy posixacl
+.It Sy posix
 indicates POSIX ACLs should be used. POSIX ACLs are specific to Linux and are
 not functional on other platforms. POSIX ACLs are stored as an extended
 attribute and therefore will not overwrite any existing NFSv4 ACLs which
 may be set.
+.It Sy posixacl
+an alias for
+.Sy posix
 .El
 .Pp
 To obtain the best performance when setting
-.Sy posixacl
+.Sy posix
 users are strongly encouraged to set the
 .Sy xattr=sa
 property. This will result in the POSIX ACL being stored more efficiently on
@@ -1049,8 +1052,9 @@ In order to provide consistent data protection, encryption must be specified at
 dataset creation time and it cannot be changed afterwards.
 .Pp
 For more details and caveats about encryption see the
-.Sy Encryption
-section.
+.Em Encryption
+section of
+.Xr zfs-load-key 8 .
 .It Sy keyformat Ns = Ns Sy raw Ns | Ns Sy hex Ns | Ns Sy passphrase
 Controls what format the user's encryption key will be provided as. This
 property is only set when the dataset is encrypted.
diff --git a/sys/contrib/openzfs/man/man8/zgenhostid.8 b/sys/contrib/openzfs/man/man8/zgenhostid.8
index ff3d2d960b12..ff198443dd2a 100644
--- a/sys/contrib/openzfs/man/man8/zgenhostid.8
+++ b/sys/contrib/openzfs/man/man8/zgenhostid.8
@@ -21,7 +21,7 @@
 .\"
 .\" Copyright (c) 2017 by Lawrence Livermore National Security, LLC.
 .\"
-.Dd September 16, 2017
+.Dd September 13, 2020
 .Dt ZGENHOSTID 8 SMM
 .Os
 .Sh NAME
@@ -30,42 +30,73 @@
 .Em /etc/hostid
 .Sh SYNOPSIS
 .Nm
+.Op Fl f
+.Op Fl o Ar filename
 .Op Ar hostid
 .Sh DESCRIPTION
-If
-.Em /etc/hostid
-does not exist, create it and store a hostid in it.  If the user provides
-.Op Ar hostid
-on the command line, store that value.  Otherwise, randomly generate a
-value to store.
-.Pp
-This emulates the
-.Xr genhostid 1
-utility and is provided for use on systems which do not include the utility.
-.Sh OPTIONS
+Creates
+.Pa /etc/hostid
+file and stores hostid in it.
+If the user provides
 .Op Ar hostid
+on the command line, validates and stores that value.
+Otherwise, randomly generates a value to store.
+.Bl -tag -width "hostid"
+.It Fl h
+Display a summary of the command-line options.
+.It Fl f
+Force file overwrite.
+.It Fl o Ar filename
+Write to
+.Pa filename
+instead of default
+.Pa /etc/hostd
+.It Ar hostid
 Specifies the value to be placed in
-.Em /etc/hostid .
-It must be a number with a value between 1 and 2^32-1.  This value
+.Pa /etc/hostid .
+It must be a number with a value between 1 and 2^32-1.
+This value
 .Sy must
-be unique among your systems.  It must be expressed in hexadecimal and be
-exactly 8 digits long.
+be unique among your systems.
+It
+.Sy must
+be expressed in hexadecimal and be exactly
+.Em 8
+digits long, optionally prefixed by
+.Em 0x .
+.El
+.Sh FILES
+.Pa /etc/hostid
 .Sh EXAMPLES
-.Bl -tag -width Ds
+.Bl -tag -width Bd
 .It Generate a random hostid and store it
 .Bd -literal
 # zgenhostid
 .Ed
-.It Record the libc-generated hostid in Em /etc/hostid
+.It Record the libc-generated hostid in Pa /etc/hostid
 .Bd -literal
-# zgenhostid $(hostid)
+# zgenhostid "$(hostid)"
 .Ed
-.It Record a custom hostid (0xdeadbeef) in Em etc/hostid
+.It Record a custom hostid (0xdeadbeef) in Pa /etc/hostid
 .Bd -literal
 # zgenhostid deadbeef
 .Ed
+.It Record a custom hostid (0x01234567) in Pa /tmp/hostid
+and ovewrite the file if it exists
+.Bd -literal
+# zgenhostid -f -o /tmp/hostid 0x01234567
+.Ed
 .El
 .Sh SEE ALSO
 .Xr genhostid 1 ,
 .Xr hostid 1 ,
+.Xr sethostid 3 ,
 .Xr spl-module-parameters 5
+.Sh HISTORY
+.Nm
+emulates the
+.Xr genhostid 1
+utility and is provided for use on systems which
+do not include the utility or do not provide
+.Xr sethostid 3
+call.
diff --git a/sys/contrib/openzfs/man/man8/zpoolprops.8 b/sys/contrib/openzfs/man/man8/zpoolprops.8
index 5adbfb321115..3437e48864ce 100644
--- a/sys/contrib/openzfs/man/man8/zpoolprops.8
+++ b/sys/contrib/openzfs/man/man8/zpoolprops.8
@@ -77,7 +77,7 @@ The zpool
 .Sy free
 property is not generally useful for this purpose, and can be substantially more than the zfs
 .Sy available
-space. This discrepancy is due to several factors, including raidz party; zfs
+space. This discrepancy is due to several factors, including raidz parity; zfs
 reservation, quota, refreservation, and refquota properties; and space set aside by
 .Sy spa_slop_shift
 (see