[PATCH] Add default configuration values to the man page

diff --git a/ae/e171bce9228458fe14df2ba086c49dd52b7921 b/ae/e171bce9228458fe14df2ba086c49dd52b7921
new file mode 100644 (file)
index 0000000..ce09229
--- /dev/null
+++ b/ae/e171bce9228458fe14df2ba086c49dd52b7921
@@ -0,0 +1,128 @@
+Return-Path: <sshilovsky@gmail.com>\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 1A0BF431FBC\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Oct 2014 13:22:05 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 sNKEUFuhaNXZ for <notmuch@notmuchmail.org>;\r
+       Wed,  1 Oct 2014 13:22:01 -0700 (PDT)\r
+Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com\r
+       [209.85.217.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CB644431FB6\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Oct 2014 13:22:00 -0700 (PDT)\r
+Received: by mail-lb0-f180.google.com with SMTP id f15so1044110lbj.25\r
+       for <notmuch@notmuchmail.org>; Wed, 01 Oct 2014 13:21:59 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:subject:date:message-id;\r
+       bh=9lAxFs85Cl9fIu+t+8XrvP7KpvkHWfCF9EryIhKguKo=;\r
+       b=TwtoqiDu/cpfEAe9DHo8JBg8Jk/3Y4OmLdMEv47gqbkMBFsbYgXX7UbPp/4OvsYIie\r
+       awOi/kTu6nU4K5IS5msqzBz5uXmTLuW6TjxaWttLpsQE3C3BAAhK3znjo7NvXdx1E4fN\r
+       2BaY6bhprq/SM8gnB7KIeyQSdYYqqPY+Lupeybt417PFCzkgZ/3VLdMVi0pBdXb4iCBR\r
+       v3uP1NM/abLsLUBfoJGDlR5Lhj9J4tLGFgWwIId271bL3AF/MYNudqINyyg703ix7bRE\r
+       AgyUQoSpdfKW3AMR6HOXeHOkTxLtKiFhMWKX6y3S/BBoEyocrg+hZesX0skL1CaVCIGR\r
+       edTA==\r
+X-Received: by 10.152.36.4 with SMTP id m4mr58374763laj.17.1412194919278;\r
+       Wed, 01 Oct 2014 13:21:59 -0700 (PDT)\r
+Received: from localhost (shpd-178-69-251-161.vologda.ru. [178.69.251.161])\r
+       by mx.google.com with ESMTPSA id l1sm786829lbj.20.2014.10.01.13.21.57\r
+       for <notmuch@notmuchmail.org>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Wed, 01 Oct 2014 13:21:58 -0700 (PDT)\r
+From: Sergei Shilovsky <sshilovsky@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Add default configuration values to the man page\r
+Date: Thu,  2 Oct 2014 00:20:41 +0400\r
+Message-Id: <1412194841-24303-1-git-send-email-sshilovsky@gmail.com>\r
+X-Mailer: git-send-email 2.1.0\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: Wed, 01 Oct 2014 20:22:05 -0000\r
+\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
+     **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
+     **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
+-- \r
+2.1.0\r
+\r