svn commit: r286235 - in stable: 10/cddl/contrib/opensolaris/cmd/zfs 9/cddl/contrib/opensolaris/cmd/zfs

[Glen Barber]

Author: gjb
Date: Mon Aug  3 16:30:03 2015
New Revision: 286235
URL: https://svnweb.freebsd.org/changeset/base/286235

Log:
  MFC r286092:
    Fix a rendering issue in the zfs(8) manual.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8
Directory Properties:
  stable/9/cddl/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Aug  3 16:27:36 2015	(r286234)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Aug  3 16:30:03 2015	(r286235)
@@ -27,11 +27,11 @@
 .\" Copyright (c) 2013, Steven Hartland <smh at FreeBSD.org>
 .\" Copyright (c) 2014 Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2014, Xin LI <delphij at FreeBSD.org>
-.\" Copyright (c) 2014, The FreeBSD Foundation, All Rights Reserved.
+.\" Copyright (c) 2014-2015, The FreeBSD Foundation, All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 12, 2014
+.Dd July 30, 2015
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -938,7 +938,7 @@ not be used by any other dataset.
 Disabling checksums is
 .Em NOT
 a recommended practice.
-.It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | zle | Cm lz4
+.It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | Cm zle | Cm lz4
 Controls the compression algorithm used for this dataset. The
 .Cm lzjb
 compression algorithm is optimized for performance while providing decent data