Return-Path: <sshilovsky@gmail.com>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 871D3431FB6
	for <notmuch@notmuchmail.org>; Tue, 14 Oct 2014 07:32:57 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -0.799
X-Spam-Level: 
X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id PImgLE6CEmqL for <notmuch@notmuchmail.org>;
	Tue, 14 Oct 2014 07:32:52 -0700 (PDT)
Received: from mail-la0-f42.google.com (mail-la0-f42.google.com
	[209.85.215.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id BA4D8431FAF
	for <notmuch@notmuchmail.org>; Tue, 14 Oct 2014 07:32:51 -0700 (PDT)
Received: by mail-la0-f42.google.com with SMTP id mk6so8722430lab.1
	for <notmuch@notmuchmail.org>; Tue, 14 Oct 2014 07:32:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id;
	bh=EXtENbDe7+CA0RCHo2/ZplsmbictoNIRuGfG4GyTjqg=;
	b=aIt47UdbGASCD0x7TWUHIR9TdTAwtaVdRh49Z+9xbySmjP9vieMPKH0a+gnN3Ukxpx
	MOVwfzr+dpVEALR2n9bIfUT+iVFQ2LsGQW+p+dAazUo+UYK02TEQR/xgmOhKsXHnGBi+
	ePwlO5mOPoLuIUuN2d8G3qq+6OtcIMSS7CBJqyUU3aamuiWUhTGoHrfnLOItaeMy/Q5X
	3TU/FFGw4dN2QywkbN8mehlNZwa5qU5lSdkhLgWuSo0wgtVT64EvESc300w+q8Ov+CtF
	4dtzjkkPcxyP6g5A1QghifJHf4B4cmeB4+Zn0FYCxmxsbsGetvF3R+k0ZHA6yLlIu0oq
	DZhA==
X-Received: by 10.152.7.7 with SMTP id f7mr5585309laa.57.1413297168346;
	Tue, 14 Oct 2014 07:32:48 -0700 (PDT)
Received: from localhost (shpd-178-69-250-75.vologda.ru. [178.69.250.75])
	by mx.google.com with ESMTPSA id ad3sm5651324lbc.45.2014.10.14.07.32.46
	for <multiple recipients>
	(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Tue, 14 Oct 2014 07:32:47 -0700 (PDT)
From: Sergei Shilovsky <sshilovsky@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v2] Add default configuration values to the man page
Date: Tue, 14 Oct 2014 18:30:56 +0400
Message-Id: <1413297056-18952-1-git-send-email-sshilovsky@gmail.com>
X-Mailer: git-send-email 2.1.0
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Oct 2014 14:32:57 -0000

---
 doc/man1/notmuch-config.rst | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst
index 3c9a568..2676a86 100644
--- a/doc/man1/notmuch-config.rst
+++ b/doc/man1/notmuch-config.rst
@@ -49,19 +49,31 @@ The available configuration items are described below.
         within a sub-directory of the path configured here named
         ``.notmuch``.
 
+        Default: ``$MAILDIR`` variable if set, otherwise ``$HOME/mail``.
+
     **user.name**
         Your full name.
 
+        Default: ``$NAME`` variable if set, otherwise read from
+        ``/etc/passwd``.
+
     **user.primary\_email**
         Your primary email address.
 
+        Default: ``$EMAIL`` variable if set, otherwise constructed from the
+        username and hostname of the current machine.
+
     **user.other\_email**
         A list of other email addresses at which you receive email.
 
+        Default: not set.
+
     **new.tags**
         A list of tags that will be added to all messages incorporated
         by **notmuch new**.
 
+        Default: ``unread;inbox``.
+
     **new.ignore**
         A list of file and directory names, without path, that will not
         be searched for messages by **notmuch new**. All the files and
@@ -69,11 +81,18 @@ The available configuration items are described below.
         ignored, regardless of the location in the mail store directory
         hierarchy.
 
+        Default: empty list.
+
     **search.exclude\_tags**
         A list of tags that will be excluded from search results by
         default. Using an excluded tag in a query will override that
         exclusion.
 
+        Default: empty list. Note that **notmuch-setup(1)** puts
+        ``deleted;spam`` here when creating new configuration file.
+
+
+
     **maildir.synchronize\_flags**
         If true, then the following maildir flags (in message filenames)
         will be synchronized with the corresponding notmuch tags:
@@ -104,6 +123,8 @@ The available configuration items are described below.
         are properly synchronized to the maildir flags, as the commands
         expect the database and maildir to be in sync.
 
+        Default: ``true``.
+
 ENVIRONMENT
 ===========
 
-- 
2.1.0