From owner-svn-src-head@FreeBSD.ORG  Sun Nov 25 11:26:36 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CF678E9;
 Sun, 25 Nov 2012 11:26:36 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B47B58FC08;
 Sun, 25 Nov 2012 11:26:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAPBQaEP049347;
 Sun, 25 Nov 2012 11:26:36 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAPBQa3f049346;
 Sun, 25 Nov 2012 11:26:36 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201211251126.qAPBQa3f049346@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 25 Nov 2012 11:26:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243506 - head/cddl/contrib/opensolaris/cmd/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Nov 2012 11:26:36 -0000

Author: mm
Date: Sun Nov 25 11:26:36 2012
New Revision: 243506
URL: http://svnweb.freebsd.org/changeset/base/243506

Log:
  zfs sha256 checksum is missing in zfs.8 manpage
  
  MFC after:	3 days

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs.8

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sun Nov 25 10:53:42 2012	(r243505)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sun Nov 25 11:26:36 2012	(r243506)
@@ -830,7 +830,7 @@ command or unmounted by the
 command.
 .Pp
 This property is not inherited.
-.It Sy checksum Ns = Ns Cm on | off | fletcher2 | fletcher4
+.It Sy checksum Ns = Ns Cm on | off | fletcher2 | fletcher4 | sha256
 Controls the checksum used to verify data integrity. The default value is
 .Cm on ,
 which automatically selects an appropriate algorithm (currently,