From owner-svn-src-all@FreeBSD.ORG  Mon Aug 27 19:52:56 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 5ED89106566B;
	Mon, 27 Aug 2012 19:52:56 +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 49B368FC08;
	Mon, 27 Aug 2012 19:52:56 +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 q7RJqurX048294;
	Mon, 27 Aug 2012 19:52:56 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7RJqu3R048292;
	Mon, 27 Aug 2012 19:52:56 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201208271952.q7RJqu3R048292@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Mon, 27 Aug 2012 19:52:56 +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: r239749 - head/cddl/contrib/opensolaris/cmd/zpool
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, 27 Aug 2012 19:52:56 -0000

Author: mm
Date: Mon Aug 27 19:52:55 2012
New Revision: 239749
URL: http://svn.freebsd.org/changeset/base/239749

Log:
  Add missing parts to zpool-features.5 manual page
  
  Obtained from:	vendor/illumos/dist
  MFC after:	2 weeks

Modified:
  head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5	Mon Aug 27 19:37:02 2012	(r239748)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5	Mon Aug 27 19:52:55 2012	(r239749)
@@ -21,7 +21,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 28, 2012
+.Dd Aug 27, 2012
 .Dt ZPOOL-FEATURES 8
 .Os
 .Sh NAME
@@ -32,8 +32,10 @@ ZFS pool on\-disk format versions are sp
 the old on\-disk format numbers (the last supported on\-disk format number is
 28).
 To enable a feature on a pool use the
+.Cm upgrade
+subcommand of the
 .Xr zpool 8
-command to set the
+command, or set the
 .Sy feature@feature_name
 property to
 .Ar enabled .
@@ -154,6 +156,12 @@ The amount of space remaining to be recl
 available through the
 .Sy freeing
 property.
+.Pp
+This feature is only
+.Sy active
+while
+.Sy freeing
+is non\-zero.
 .Sh SEE ALSO
 .Xr zpool 8
 .Sh AUTHORS