diff options
| author | stephanie scheffler <Stephanie.Scheffler@Sun.COM> | 2010-05-06 15:08:31 -0600 |
|---|---|---|
| committer | stephanie scheffler <Stephanie.Scheffler@Sun.COM> | 2010-05-06 15:08:31 -0600 |
| commit | 9a8685acb1980e757acb4b2fdbb106654ef61317 (patch) | |
| tree | 267ec27366e37f07213478502df02714c92193bb /usr/src/cmd/zfs/zfs_main.c | |
| parent | 6e18d381c642549b8bb1774a803d3510aec6baaf (diff) | |
| download | illumos-gate-9a8685acb1980e757acb4b2fdbb106654ef61317.tar.gz | |
6898657 zfs upgrade -v and zpool upgrade -v version URL has changed
6934885 'zfs recv' not output valid option of '-e'
6732341 gfs.h needs to be marked as Consolidation Private
Diffstat (limited to 'usr/src/cmd/zfs/zfs_main.c')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index 6176a102d3..104d37c802 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -221,9 +221,9 @@ get_usage(zfs_help_t idx) case HELP_PROMOTE: return (gettext("\tpromote <clone-filesystem>\n")); case HELP_RECEIVE: - return (gettext("\treceive [-vnF] <filesystem|volume|" + return (gettext("\treceive [-denuvF] <filesystem|volume|" "snapshot>\n" - "\treceive [-vnF] -d <filesystem>\n")); + "\treceive [-denuvF] -d <filesystem>\n")); case HELP_RENAME: return (gettext("\trename <filesystem|volume|snapshot> " "<filesystem|volume|snapshot>\n" @@ -1716,10 +1716,8 @@ zfs_do_upgrade(int argc, char **argv) "properties\n")); (void) printf(gettext(" 5 System attributes\n")); (void) printf(gettext("\nFor more information on a particular " - "version, including supported releases, see:\n\n")); - (void) printf("http://www.opensolaris.org/os/community/zfs/" - "version/zpl/N\n\n"); - (void) printf(gettext("Where 'N' is the version number.\n")); + "version, including supported releases,\n")); + (void) printf("see the ZFS Administration Guide.\n\n"); ret = 0; } else if (argc || all) { /* Upgrade filesystems */ @@ -2701,7 +2699,7 @@ zfs_do_send(int argc, char **argv) } /* - * zfs receive [-denvF] <fs@snap> + * zfs receive [-denuvF] <fs@snap> * * Restore a backup stream from stdin. */ |