From owner-svn-src-stable@FreeBSD.ORG  Fri Jun 15 07:14:17 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0704A1065701;
	Fri, 15 Jun 2012 07:14:17 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id E51458FC12;
	Fri, 15 Jun 2012 07:14:16 +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 q5F7EGxt050185;
	Fri, 15 Jun 2012 07:14:16 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5F7EGtS050182;
	Fri, 15 Jun 2012 07:14:16 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201206150714.q5F7EGtS050182@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Fri, 15 Jun 2012 07:14:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237116 - stable/9/cddl/contrib/opensolaris/cmd/zpool
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jun 2012 07:14:17 -0000

Author: mm
Date: Fri Jun 15 07:14:16 2012
New Revision: 237116
URL: http://svn.freebsd.org/changeset/base/237116

Log:
  MFC r236960:
  Document the -v flag for zpool list.
  
  PR:		168970
  Suggested by:	Marcelo Araujo <araujo@FreeBSD.org>

Modified:
  stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Directory Properties:
  stable/9/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Jun 15 06:38:55 2012	(r237115)
+++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Jun 15 07:14:16 2012	(r237116)
@@ -1301,6 +1301,8 @@ reports are printed.
 .It Fl H
 Scripted mode. Do not display headers, and separate fields by a single tab
 instead of arbitrary space.
+.It Fl v
+Show more detailed information.
 .It Fl o Ar property Ns Op , Ns Ar ...
 Comma-separated list of properties to display. See the
 .Qq Sx Properties

Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Jun 15 06:38:55 2012	(r237115)
+++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Jun 15 07:14:16 2012	(r237116)
@@ -234,7 +234,7 @@ get_usage(zpool_help_t idx) {
 	case HELP_LABELCLEAR:
 		return (gettext("\tlabelclear [-f] <vdev>\n"));
 	case HELP_LIST:
-		return (gettext("\tlist [-H] [-o property[,...]] "
+		return (gettext("\tlist [-Hv] [-o property[,...]] "
 		    "[-T d|u] [pool] ... [interval [count]]\n"));
 	case HELP_OFFLINE:
 		return (gettext("\toffline [-t] <pool> <device> ...\n"));