summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorEli Rosenthal <eli.rosenthal@delphix.com>2016-08-04 16:13:29 -0700
committerMatthew Ahrens <mahrens@delphix.com>2016-08-05 08:15:58 -0700
commit3bc71695036246c52af58ab0ad58a23a0feb5a0c (patch)
tree22ebce866332f81e234d59b5bc6d7778a3bb074b /usr/src
parent48dd5e630c9b1773b7b10d08a3b90b6c9062d713 (diff)
downloadillumos-joyent-3bc71695036246c52af58ab0ad58a23a0feb5a0c.tar.gz
7257 zfs manpage user property length needs to be updated
Reviewed by: Paul Dagnelie <pcd@delphix.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/man/man1m/zfs.1m5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index 0a3b986384..83eaf3d966 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -1629,9 +1629,8 @@ and so forth
.Pc
can be used to manipulate both native properties and user properties. Use the
.Nm zfs Cm inherit
-command to clear a user property . If the property is not defined in any parent
-dataset, it is removed entirely. Property values are limited to 1024
-characters.
+command to clear a user property. If the property is not defined in any parent
+dataset, it is removed entirely. Property values are limited to 8192 bytes.
.Ss ZFS Volumes as Swap or Dump Devices
During an initial installation a swap device and dump device are created on ZFS
volumes in the ZFS root pool. By default, the swap area size is based on 1/2 the