[PATCH v4 1/5] man: clean up notmuch-emacs-mua man page

diff --git a/94/4a0cabe8f6b464d639b5b1500c606216e257fd b/94/4a0cabe8f6b464d639b5b1500c606216e257fd
new file mode 100644 (file)
index 0000000..80061b1
--- /dev/null
+++ b/94/4a0cabe8f6b464d639b5b1500c606216e257fd
@@ -0,0 +1,107 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id F1DE56DE1A20\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:16 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.012\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.012 tagged_above=-999 required=5 tests=[AWL=0.708,\r
+  RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id hQ4WADsEOorf for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Aug 2015 02:05:15 -0700 (PDT)\r
+Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com\r
+ [209.85.212.182])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id DD78D6DE190D\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:14 -0700 (PDT)\r
+Received: by wicne3 with SMTP id ne3so35938367wic.0\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:13 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=/0DWc74mT3njTuk1qjSapUkMo+3c6BLsmPt0IPYfEu0=;\r
+ b=f+XQ6JhqkNOiAK7bXnW0BhmOCXY3E4ZwZXJBzrrYx2Cs93Imp5WlWqsx3CZgsXrKA9\r
+ F7/90MNkk8Sr5zfymREucj0hoTrVJqoiIRxWUQVO1PHsONeE2WwTGaS7kx8YkVsK3lP8\r
+ lwSxrerTxxQQ4B9NWWQo/AOHSxA24bisljRp1AkhG5ZgZhjgP9h70/d76d5prlG0PLx3\r
+ vpdw99t1Uc6+OBztskuxLElOF8Ru0pqmY1HIpqwn/hBfABJzR+NrXyQr3E3OZdfGlRB3\r
+ 9bdpVSQpHy5TRGBEfxfjWl6WOn5I/gbJ+Uic/JCtJBS4TiCiYOhwc9DQlfBX0VLmWnw4\r
+ 1/+A==\r
+X-Gm-Message-State:\r
+ ALoCoQki2Zt3XC2wsUfRgDt2tyY/dxbfUHLJjZEPGfZ+ExZH71rl+CTUQZntRbBt/PCnxn4LI9z6\r
+X-Received: by 10.194.120.230 with SMTP id lf6mr8954128wjb.41.1439629513267;\r
+ Sat, 15 Aug 2015 02:05:13 -0700 (PDT)\r
+Received: from localhost (mobile-access-bcee4f-131.dhcp.inet.fi.\r
+ [188.238.79.131])\r
+ by smtp.gmail.com with ESMTPSA id s16sm6878243wib.16.2015.08.15.02.05.12\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 15 Aug 2015 02:05:12 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 1/5] man: clean up notmuch-emacs-mua man page\r
+Date: Sat, 15 Aug 2015 12:05:11 +0300\r
+Message-Id:\r
+ <ea162dfbeeaed038e55c73a11e92d19da2c1e630.1439629384.git.jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <cover.1439629384.git.jani@nikula.org>\r
+References: <cover.1439629384.git.jani@nikula.org>\r
+In-Reply-To: <cover.1439629384.git.jani@nikula.org>\r
+References: <cover.1439629384.git.jani@nikula.org>\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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: Sat, 15 Aug 2015 09:05:17 -0000\r
+\r
+Move --client description to a more suitable location, stylistic\r
+changes.\r
+---\r
+ doc/man1/notmuch-emacs-mua.rst | 10 +++++-----\r
+ 1 file changed, 5 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst\r
+index 36b51cdc3b18..7c2f5c24f1c0 100644\r
+--- a/doc/man1/notmuch-emacs-mua.rst\r
++++ b/doc/man1/notmuch-emacs-mua.rst\r
+@@ -18,10 +18,6 @@ Supported options for **notmuch-emacs-mua** include\r
+     ``-h, --help``\r
+         Display help.\r
+ \r
+-    ``--client``\r
+-        Use emacsclient, rather than emacs. This will start\r
+-        an emacs daemon process if necessary.\r
+-\r
+     ``-s, --subject=``\ <subject>\r
+         Specify the subject of the message.\r
+ \r
+@@ -38,7 +34,11 @@ Supported options for **notmuch-emacs-mua** include\r
+         Specify a file to include into the body of the message.\r
+ \r
+     ``--no-window-system``\r
+-        Even if a window system is available, use the current terminal\r
++        Even if a window system is available, use the current terminal.\r
++\r
++    ``--client``\r
++        Use **emacsclient**, rather than **emacs**. This will start\r
++        an Emacs daemon process if necessary.\r
+ \r
+     ``--print``\r
+         Output the resulting elisp to stdout instead of evaluating it.\r
+-- \r
+2.1.4\r
+\r