From owner-cvs-src-old@FreeBSD.ORG  Tue Apr  6 21:39:32 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 07BC510657A5
	for <cvs-src-old@freebsd.org>; Tue,  6 Apr 2010 21:39:32 +0000 (UTC)
	(envelope-from danger@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E923E8FC1A
	for <cvs-src-old@freebsd.org>; Tue,  6 Apr 2010 21:39:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o36LdVx8021691
	for <cvs-src-old@freebsd.org>; Tue, 6 Apr 2010 21:39:31 GMT
	(envelope-from danger@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o36LdVNw021690
	for cvs-src-old@freebsd.org; Tue, 6 Apr 2010 21:39:31 GMT
	(envelope-from danger@repoman.freebsd.org)
Message-Id: <201004062139.o36LdVNw021690@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	danger@repoman.freebsd.org using -f
From: Daniel Gerzo <danger@FreeBSD.org>
Date: Tue, 6 Apr 2010 21:39:18 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/cddl/contrib/opensolaris/cmd/zfs zfs.8
 src/cddl/contrib/opensolaris/cmd/zpool zpool.8
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Apr 2010 21:39:32 -0000

danger      2010-04-06 21:39:18 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    cddl/contrib/opensolaris/cmd/zfs zfs.8 
    cddl/contrib/opensolaris/cmd/zpool zpool.8 
  Log:
  SVN rev 206287 on 2010-04-06 21:39:18Z by danger
  
  Merge r205659:
  - update zfs and zpool manual pages to match the current state of the source
  
  PR:             144984
  Submitted by:   mm@
  Approved by:    pjd@
  Obtained from:  OpenSolaris
  
  Revision  Changes    Path
  1.4.2.2   +487 -511  src/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  1.4.2.1   +92 -113   src/cddl/contrib/opensolaris/cmd/zpool/zpool.8