[PATCH v2] Add default configuration values to the man page

diff --git a/90/b5fc17dacad3b76347fce318b77c102836fd75 b/90/b5fc17dacad3b76347fce318b77c102836fd75
new file mode 100644 (file)
index 0000000..24a86b0
--- /dev/null
+++ b/90/b5fc17dacad3b76347fce318b77c102836fd75
@@ -0,0 +1,131 @@
+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 871D3431FB6\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Oct 2014 07:32:57 -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 PImgLE6CEmqL for <notmuch@notmuchmail.org>;\r
+       Tue, 14 Oct 2014 07:32:52 -0700 (PDT)\r
+Received: from mail-la0-f42.google.com (mail-la0-f42.google.com\r
+       [209.85.215.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id BA4D8431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Oct 2014 07:32:51 -0700 (PDT)\r
+Received: by mail-la0-f42.google.com with SMTP id mk6so8722430lab.1\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Oct 2014 07:32:49 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id;\r
+       bh=EXtENbDe7+CA0RCHo2/ZplsmbictoNIRuGfG4GyTjqg=;\r
+       b=aIt47UdbGASCD0x7TWUHIR9TdTAwtaVdRh49Z+9xbySmjP9vieMPKH0a+gnN3Ukxpx\r
+       MOVwfzr+dpVEALR2n9bIfUT+iVFQ2LsGQW+p+dAazUo+UYK02TEQR/xgmOhKsXHnGBi+\r
+       ePwlO5mOPoLuIUuN2d8G3qq+6OtcIMSS7CBJqyUU3aamuiWUhTGoHrfnLOItaeMy/Q5X\r
+       3TU/FFGw4dN2QywkbN8mehlNZwa5qU5lSdkhLgWuSo0wgtVT64EvESc300w+q8Ov+CtF\r
+       4dtzjkkPcxyP6g5A1QghifJHf4B4cmeB4+Zn0FYCxmxsbsGetvF3R+k0ZHA6yLlIu0oq\r
+       DZhA==\r
+X-Received: by 10.152.7.7 with SMTP id f7mr5585309laa.57.1413297168346;\r
+       Tue, 14 Oct 2014 07:32:48 -0700 (PDT)\r
+Received: from localhost (shpd-178-69-250-75.vologda.ru. [178.69.250.75])\r
+       by mx.google.com with ESMTPSA id ad3sm5651324lbc.45.2014.10.14.07.32.46\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Tue, 14 Oct 2014 07:32:47 -0700 (PDT)\r
+From: Sergei Shilovsky <sshilovsky@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] Add default configuration values to the man page\r
+Date: Tue, 14 Oct 2014 18:30:56 +0400\r
+Message-Id: <1413297056-18952-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: Tue, 14 Oct 2014 14:32:57 -0000\r
+\r
+---\r
+ doc/man1/notmuch-config.rst | 21 +++++++++++++++++++++\r
+ 1 file changed, 21 insertions(+)\r
+\r
+diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst\r
+index 3c9a568..2676a86 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`` variable if set, 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,18 @@ The available configuration items are described below.\r
+         ignored, regardless of the location in the mail store directory\r
+         hierarchy.\r
+ \r
++        Default: empty list.\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: empty list. Note that **notmuch-setup(1)** puts\r
++        ``deleted;spam`` here when creating new configuration file.\r
++\r
++\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 +123,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