Author: mm
Date: Sun Nov 27 11:46:09 2011
New Revision: 228020
URL: http://svn.freebsd.org/changeset/base/228020
Log:
Fix zfs(8) and zpool(8) context help to repport supported flags.
MFC after: 3 days
Modified:
head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Nov 27 11:44:20
2011 (r228019)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Nov 27 11:46:09
2011 (r228020)
@@ -260,7 +260,8 @@ get_usage(zfs_help_t idx)
case HELP_ROLLBACK:
return (gettext("\trollback [-rRf] <snapshot>\n"));
case HELP_SEND:
- return (gettext("\tsend [-RDp] [-[iI] snapshot] <snapshot>\n"));
+ return (gettext("\tsend [-DvRp] "
+ "[-i snapshot | -I snapshot] <snapshot>\n"));
case HELP_SET:
return (gettext("\tset <property=value> "
"<filesystem|volume|snapshot> ...\n"));
@@ -296,11 +297,11 @@ get_usage(zfs_help_t idx)
"\tunallow [-r] -s @setname [<perm|@setname>[,...]] "
"<filesystem|volume>\n"));
case HELP_USERSPACE:
- return (gettext("\tuserspace [-hniHp] [-o field[,...]] "
+ return (gettext("\tuserspace [-niHp] [-o field[,...]] "
"[-sS field] ... [-t type[,...]]\n"
"\t <filesystem|snapshot>\n"));
case HELP_GROUPSPACE:
- return (gettext("\tgroupspace [-hniHpU] [-o field[,...]] "
+ return (gettext("\tgroupspace [-niHp] [-o field[,...]] "
"[-sS field] ... [-t type[,...]]\n"
"\t <filesystem|snapshot>\n"));
case HELP_HOLD:
Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Nov 27
11:44:20 2011 (r228019)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Nov 27
11:46:09 2011 (r228020)
@@ -228,7 +228,7 @@ get_usage(zpool_help_t idx) {
case HELP_OFFLINE:
return (gettext("\toffline [-t] <pool> <device> ...\n"));
case HELP_ONLINE:
- return (gettext("\tonline <pool> <device> ...\n"));
+ return (gettext("\tonline [-e] <pool> <device> ...\n"));
case HELP_REPLACE:
return (gettext("\treplace [-f] <pool> <device> "
"[new-device]\n"));
@@ -240,8 +240,7 @@ get_usage(zpool_help_t idx) {
return (gettext("\tstatus [-vx] [-T d|u] [pool] ... [interval "
"[count]]\n"));
case HELP_UPGRADE:
- return (gettext("\tupgrade\n"
- "\tupgrade -v\n"
+ return (gettext("\tupgrade [-v]\n"
"\tupgrade [-V version] <-a | pool ...>\n"));
case HELP_GET:
return (gettext("\tget <\"all\" | property[,...]> "
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
