aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2016-01-26 13:14:39 +0000
committerAlexander Motin <mav@FreeBSD.org>2016-01-26 13:14:39 +0000
commit75b810aee6f47060efc226cd598bc73c90689197 (patch)
tree0678f1462276d98c1b7765a8f41bf60d4dfddd8e /cddl
parentd2385b31f514afd30bf0dedc860f028aa4f0c397 (diff)
parentcce747b2cb1930592f820c2bbd37881386b6bb9c (diff)
Notes
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs.87
1 files changed, 5 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
index 71ac878e1cbe..dedfc0a31c03 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
@@ -2841,8 +2841,11 @@ Do not actually receive the stream. This can be useful in conjunction with the
option to verify the name the receive operation would use.
.It Fl o Sy origin Ns = Ns Ar snapshot
Forces the stream to be received as a clone of the given snapshot.
-This is only valid if the stream is an incremental stream whose source
-is the same as the provided origin.
+If the stream is a full send stream, this will create the filesystem
+described by the stream as a clone of the specified snapshot. Which
+snapshot was specified will not affect the success or failure of the
+receive, as long as the snapshot does exist. If the stream is an
+incremental send stream, all the normal verification will be performed.
.It Fl F
Force a rollback of the file system to the most recent snapshot before
performing the receive operation. If receiving an incremental replication