Re: [PATCH] Add default configuration values to the man page

diff --git a/ee/cdda9555e46563e2b9a6be852b611cb9294a89 b/ee/cdda9555e46563e2b9a6be852b611cb9294a89
new file mode 100644 (file)
index 0000000..65e815a
--- /dev/null
+++ b/ee/cdda9555e46563e2b9a6be852b611cb9294a89
@@ -0,0 +1,133 @@
+Return-Path: <sojkam1@fel.cvut.cz>\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 1DF5C431FB6\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Oct 2014 05:29:08 -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 HXKYlX87YRKu for <notmuch@notmuchmail.org>;\r
+       Sun,  5 Oct 2014 05:29:02 -0700 (PDT)\r
+Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7E915431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Oct 2014 05:29:02 -0700 (PDT)\r
+Received: from localhost (unknown [192.168.200.7])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id AE5D43CFEE4;\r
+       Sun,  5 Oct 2014 14:28:57 +0200 (CEST)\r
+X-Virus-Scanned: IMAP STYX AMAVIS\r
+Received: from max.feld.cvut.cz ([192.168.200.1])\r
+       by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new,\r
+       port 10044)\r
+       with ESMTP id WMsIIBee3qVa; Sun,  5 Oct 2014 14:28:52 +0200 (CEST)\r
+Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id D344C3CFE86;\r
+       Sun,  5 Oct 2014 14:28:51 +0200 (CEST)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.84)\r
+       (envelope-from <sojkam1@fel.cvut.cz>)\r
+       id 1Xakvi-0000OJ-4B; Sun, 05 Oct 2014 14:28:50 +0200\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: Sergei Shilovsky <sshilovsky@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] Add default configuration values to the man page\r
+In-Reply-To: <1412194841-24303-1-git-send-email-sshilovsky@gmail.com>\r
+References: <1412194841-24303-1-git-send-email-sshilovsky@gmail.com>\r
+User-Agent: Notmuch/0.18.1+101~g56b0ff0 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 05 Oct 2014 14:28:50 +0200\r
+Message-ID: <87oatq66pp.fsf@steelpick.2x.cz>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 05 Oct 2014 12:29:08 -0000\r
+\r
+On Wed, Oct 01 2014, Sergei Shilovsky wrote:\r
+> ---\r
+>  doc/man1/notmuch-config.rst | 18 ++++++++++++++++++\r
+>  1 file changed, 18 insertions(+)\r
+>\r
+> diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst\r
+> index 3c9a568..9de5534 100644\r
+> --- a/doc/man1/notmuch-config.rst\r
+> +++ b/doc/man1/notmuch-config.rst\r
+> @@ -49,19 +49,31 @@ The available configuration items are described below.\r
+>          within a sub-directory of the path configured here named\r
+>          ``.notmuch``.\r
+>\r
+> +        Default: ``$MAILDIR``, otherwise ``$HOME/mail``.\r
+\r
+To be consistent with the rest, this should be "``$MAILDIR`` variable if\r
+set"\r
+\r
+> +\r
+>      **user.name**\r
+>          Your full name.\r
+>\r
+> +        Default: ``$NAME`` variable if set, otherwise read from\r
+> +        ``/etc/passwd``.\r
+> +\r
+>      **user.primary\_email**\r
+>          Your primary email address.\r
+>\r
+> +        Default: ``$EMAIL`` variable if set, otherwise constructed from the\r
+> +        username and hostname of the current machine.\r
+> +\r
+>      **user.other\_email**\r
+>          A list of other email addresses at which you receive email.\r
+>\r
+> +        Default: not set.\r
+> +\r
+>      **new.tags**\r
+>          A list of tags that will be added to all messages incorporated\r
+>          by **notmuch new**.\r
+>\r
+> +        Default: ``unread;inbox``.\r
+> +\r
+>      **new.ignore**\r
+>          A list of file and directory names, without path, that will not\r
+>          be searched for messages by **notmuch new**. All the files and\r
+> @@ -69,11 +81,15 @@ The available configuration items are described below.\r
+>          ignored, regardless of the location in the mail store directory\r
+>          hierarchy.\r
+>\r
+> +        Default: no tags.\r
+\r
+This should be "empty list".\r
+\r
+> +\r
+>      **search.exclude\_tags**\r
+>          A list of tags that will be excluded from search results by\r
+>          default. Using an excluded tag in a query will override that\r
+>          exclusion.\r
+>\r
+> +        Default: ``deleted;spam``.\r
+> +\r
+>      **maildir.synchronize\_flags**\r
+>          If true, then the following maildir flags (in message filenames)\r
+>          will be synchronized with the corresponding notmuch tags:\r
+> @@ -104,6 +120,8 @@ The available configuration items are described below.\r
+>          are properly synchronized to the maildir flags, as the commands\r
+>          expect the database and maildir to be in sync.\r
+>\r
+> +        Default: ``true``.\r
+> +\r
+>  ENVIRONMENT\r
+>  ===========\r
+\r
+Cheers,\r
+-Michal\r