From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cantor2.suse.de ([195.135.220.15]:60944 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753978Ab3LPPrM (ORCPT ); Mon, 16 Dec 2013 10:47:12 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 4AD3AABC7 for ; Mon, 16 Dec 2013 15:47:11 +0000 (UTC) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH] btrfs-progs: update send help strings and manpage Date: Mon, 16 Dec 2013 16:47:10 +0100 Message-Id: <1387208830-10879-1-git-send-email-dsterba@suse.cz> Sender: linux-btrfs-owner@vger.kernel.org List-ID: - send accepts multiple subvolumes - add missing option -e to man - minor man formating fix Signed-off-by: David Sterba --- cmds-send.c | 6 +++--- man/btrfs.8.in | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cmds-send.c b/cmds-send.c index 85461d5b0283..fc9a01ee8892 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -728,9 +728,9 @@ out: } const char * const cmd_send_usage[] = { - "btrfs send [-ve] [-p ] [-c ] [-f ] ", - "Send the subvolume to stdout.", - "Sends the subvolume specified by to stdout.", + "btrfs send [-ve] [-p ] [-c ] [-f ] [...]", + "Send the subvolume(s) to stdout.", + "Sends the subvolume(s) specified by to stdout.", "By default, this will send the whole subvolume. To do an incremental", "send, use '-p '. If you want to allow btrfs to clone from", "any additional local snapshots, use '-c ' (multiple times", diff --git a/man/btrfs.8.in b/man/btrfs.8.in index d5515e0af977..72c04df648fa 100644 --- a/man/btrfs.8.in +++ b/man/btrfs.8.in @@ -85,7 +85,7 @@ btrfs \- control a btrfs filesystem \fBbtrfs\fP \fBinspect-internal rootid\fP \fI\fP .PP .PP -\fBbtrfs\fP \fBsend\fP [-v] [-p \fI\fP] [-c \fI\fP] [-f \fI\fP] \fI\fP +\fBbtrfs\fP \fBsend\fP [-ve] [-p \fI\fP] [-c \fI\fP] [-f \fI\fP] \fI\fP [\fI\fP...] .PP \fBbtrfs\fP \fBreceive\fP [-ve] [-f \fI\fP] \fI\fP .PP @@ -610,16 +610,16 @@ subvolume return it's own tree id. The result is undefined for the so-called empty subvolumes (identified by inode number 2). .TP -\fBsend\fP [-v] [-p \fI\fP] [-c \fI\fP] [-f \fI\fP] \fI\fP -Send the subvolume to stdout. -Sends the subvolume specified by \fI\fR to stdout. +\fBsend\fP [-ve] [-p \fI\fP] [-c \fI\fP] [-f \fI\fP] \fI\fP [\fI...\fP] +Send the subvolume(s) to stdout. +Sends the subvolume(s) specified by \fI\fR to stdout. By default, this will send the whole subvolume. To do an incremental send, use '\fI-p \fR'. If you want to allow btrfs to clone from any additional local snapshots, use '\fI-c \fR' (multiple times where applicable). You must not specify clone sources unless you guarantee that these snapshots are exactly in the same state on both -sides, the sender and the receiver. It is allowed to omit the -'\fI-p \fR' option when '\fI-c \fR' options are given, in +sides, the sender and the receiver. It is allowed to omit the '\fI-p \fR' +option when '\fI-c \fR' options are given, in which case '\fBbtrfs send\fP' will determine a suitable parent among the clone sources itself. .RS @@ -628,6 +628,8 @@ clone sources itself. .IP "\fB-v\fP" 5 Enable verbose debug output. Each occurrence of this option increases the verbose level more. +.IP "\fB-e\fP" 5 +If sending multiple subvols at once, use the new format and omit the between the subvols. .IP "\fB-p \fI\fP" 5 Send an incremental stream from \fI\fR to \fI\fR. .IP "\fB-c \fI\fP" 5 -- 1.8.5