1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 5E6FE429E26
\r
6 for <notmuch@notmuchmail.org>; Fri, 21 Oct 2011 15:21:37 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 84lViLvCXY+A for <notmuch@notmuchmail.org>;
\r
16 Fri, 21 Oct 2011 15:21:36 -0700 (PDT)
\r
17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id A5B71431FB6
\r
21 for <notmuch@notmuchmail.org>; Fri, 21 Oct 2011 15:21:36 -0700 (PDT)
\r
22 Received: from zancas.localnet
\r
23 (fctnnbsc36w-156034064058.pppoe-dynamic.High-Speed.nb.bellaliant.net
\r
24 [156.34.64.58]) (authenticated bits=0)
\r
25 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9LMLWJA020089
\r
26 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
\r
27 Fri, 21 Oct 2011 19:21:33 -0300
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.76)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1RHNT2-0001wT-1o; Fri, 21 Oct 2011 19:21:32 -0300
\r
31 From: David Bremner <david@tethera.net>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 1/2] notmuch.1: typo fixes new wording for dump/restore
\r
34 Date: Fri, 21 Oct 2011 19:21:13 -0300
\r
35 Message-Id: <1319235674-7047-1-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.6.3
\r
37 In-Reply-To: <1319226477-4181-7-git-send-email-david@tethera.net>
\r
38 References: <1319226477-4181-7-git-send-email-david@tethera.net>
\r
39 Cc: David Bremner <bremner@debian.org>
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Fri, 21 Oct 2011 22:21:37 -0000
\r
54 From: David Bremner <bremner@debian.org>
\r
56 These changes were included in Thomas's restore --accumulate patch,
\r
57 but are actually more generally applicable.
\r
59 notmuch.1 | 6 ++++--
\r
60 1 files changed, 4 insertions(+), 2 deletions(-)
\r
62 diff --git a/notmuch.1 b/notmuch.1
\r
63 index 10ed32e..4f864a8 100644
\r
66 @@ -454,7 +454,7 @@ section below for details of the supported syntax for <search-terms>.
\r
68 .BR dump " and " restore
\r
69 commands can be used to create a textual dump of email tags for backup
\r
70 -purposes, and to restore from that dump
\r
71 +purposes, and to restore from that dump.
\r
75 @@ -483,7 +483,9 @@ section below for details of the supported syntax for <search-terms>.
\r
76 .BR restore " <filename>"
\r
78 Restores the tags from the given file (see
\r
79 -.BR "notmuch dump" "."
\r
80 +.BR "notmuch dump" ")."
\r
82 +The input is read from the given filename, if any, or from stdin.
\r
84 Note: The dump file format is specifically chosen to be
\r
85 compatible with the format of files produced by sup-dump.
\r