From owner-svn-src-all@FreeBSD.ORG  Mon Aug 20 13:07:23 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 55A591065676;
	Mon, 20 Aug 2012 13:07:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 26FA98FC17;
	Mon, 20 Aug 2012 13:07:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7KD7N7M037997;
	Mon, 20 Aug 2012 13:07:23 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KD7Mdg037995;
	Mon, 20 Aug 2012 13:07:22 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201208201307.q7KD7Mdg037995@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 20 Aug 2012 13:07:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239420 - releng/9.1/cddl/contrib/opensolaris/cmd/zfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2012 13:07:23 -0000

Author: gjb (doc,ports committer)
Date: Mon Aug 20 13:07:22 2012
New Revision: 239420
URL: http://svn.freebsd.org/changeset/base/239420

Log:
  MFC r239216, r239217:
  
  r239216:
   - Remove a leading space that breaks rendering
  
  r239217:
   - Fix source dataset snapshot name in Example 15.
   - Bump date.
  
  Approved by:	re (kib)

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

Modified: releng/9.1/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- releng/9.1/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Aug 20 13:06:51 2012	(r239419)
+++ releng/9.1/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Aug 20 13:07:22 2012	(r239420)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 26, 2011
+.Dd August 12, 2012
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -2241,7 +2241,7 @@ properties, and current snapshot and fil
 is received. If the
 .Fl F
 flag is specified when this stream is received, snapshots and file systems that
- do not exist on the sending side are destroyed.
+do not exist on the sending side are destroyed.
 .It Fl D
 Generate a deduplicated stream. Blocks which would have been sent multiple
 times in the send stream will only be sent once.  The receiving system must
@@ -3021,9 +3021,9 @@ a new snapshot, as follows:
 .Li # Ic zfs destroy -r pool/users@7daysago
 .Li # Ic zfs rename -r pool/users@6daysago @7daysago
 .Li # Ic zfs rename -r pool/users@5daysago @6daysago
-.Li # Ic zfs rename -r pool/users@yesterday @5daysago
-.Li # Ic zfs rename -r pool/users@yesterday @4daysago
-.Li # Ic zfs rename -r pool/users@yesterday @3daysago
+.Li # Ic zfs rename -r pool/users@4daysago @5daysago
+.Li # Ic zfs rename -r pool/users@3daysago @4daysago
+.Li # Ic zfs rename -r pool/users@2daysago @3daysago
 .Li # Ic zfs rename -r pool/users@yesterday @2daysago
 .Li # Ic zfs rename -r pool/users@today @yesterday
 .Li # Ic zfs snapshot -r pool/users@today