[PATCH 1/2] notmuch.1: typo fixes new wording for dump/restore

diff --git a/97/31e415deb63b5fd1ce7bfb26738ed07b93c2b6 b/97/31e415deb63b5fd1ce7bfb26738ed07b93c2b6
new file mode 100644 (file)
index 0000000..7c293dc
--- /dev/null
+++ b/97/31e415deb63b5fd1ce7bfb26738ed07b93c2b6
@@ -0,0 +1,88 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5E6FE429E26\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Oct 2011 15:21:37 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 84lViLvCXY+A for <notmuch@notmuchmail.org>;\r
+       Fri, 21 Oct 2011 15:21:36 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A5B71431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Oct 2011 15:21:36 -0700 (PDT)\r
+Received: from zancas.localnet\r
+       (fctnnbsc36w-156034064058.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [156.34.64.58]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9LMLWJA020089\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Fri, 21 Oct 2011 19:21:33 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.76)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1RHNT2-0001wT-1o; Fri, 21 Oct 2011 19:21:32 -0300\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] notmuch.1: typo fixes new wording for dump/restore\r
+Date: Fri, 21 Oct 2011 19:21:13 -0300\r
+Message-Id: <1319235674-7047-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.6.3\r
+In-Reply-To: <1319226477-4181-7-git-send-email-david@tethera.net>\r
+References: <1319226477-4181-7-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 21 Oct 2011 22:21:37 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+These changes were included in Thomas's restore --accumulate patch,\r
+but are actually more generally applicable.\r
+---\r
+ notmuch.1 |    6 ++++--\r
+ 1 files changed, 4 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch.1 b/notmuch.1\r
+index 10ed32e..4f864a8 100644\r
+--- a/notmuch.1\r
++++ b/notmuch.1\r
+@@ -454,7 +454,7 @@ section below for details of the supported syntax for <search-terms>.\r
+ The\r
+ .BR dump " and " restore\r
+ commands can be used to create a textual dump of email tags for backup\r
+-purposes, and to restore from that dump\r
++purposes, and to restore from that dump.\r
+ \r
+ .RS 4\r
+ .TP 4\r
+@@ -483,7 +483,9 @@ section below for details of the supported syntax for <search-terms>.\r
+ .BR restore " <filename>"\r
+ \r
+ Restores the tags from the given file (see\r
+-.BR "notmuch dump" "."\r
++.BR "notmuch dump" ")."\r
++\r
++The input is read from the given filename, if any, or from stdin.\r
+ \r
+ Note: The dump file format is specifically chosen to be\r
+ compatible with the format of files produced by sup-dump.\r
+-- \r
+1.7.6.3\r
+\r