From owner-svn-src-all@FreeBSD.ORG Mon Nov 28 09:33:13 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 639FC106566B; Mon, 28 Nov 2011 09:33:13 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 52B9B8FC08; Mon, 28 Nov 2011 09:33:13 +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 pAS9XD6h083112; Mon, 28 Nov 2011 09:33:13 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAS9XDhg083110; Mon, 28 Nov 2011 09:33:13 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201111280933.pAS9XDhg083110@svn.freebsd.org> From: Martin Matuska Date: Mon, 28 Nov 2011 09:33:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228055 - head/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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2011 09:33:13 -0000 Author: mm Date: Mon Nov 28 09:33:13 2011 New Revision: 228055 URL: http://svn.freebsd.org/changeset/base/228055 Log: Use singular form for zfs destroy snapshot in zfs(8). MFC after: 6 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 Mon Nov 28 09:14:51 2011 (r228054) +++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Nov 28 09:33:13 2011 (r228055) @@ -1437,7 +1437,7 @@ behavior for mounted file systems in use .Ar snapshot .Xc .Pp -The given snapshots are destroyed immediately if and only if the +The given snapshot is destroyed immediately if and only if the .Qq Nm Cm destroy command without the .Fl d @@ -1445,7 +1445,7 @@ option would have destroyed it. Such imm example, if the snapshot had no clones and the user-initiated reference count were zero. .Pp -If a snapshot does not qualify for immediate destruction, it is marked for +If the snapshot does not qualify for immediate destruction, it is marked for deferred deletion. In this state, it exists as a usable, visible snapshot until both of the preconditions listed above are met, at which point it is destroyed. .Bl -tag -width indent