Re-arrange notmuch-config comments

1 files changed, 48 insertions, 43 deletions

diff --git a/_notmuch-config b/_notmuch-config
index dea578e..356533c 100644
--- a/_notmuch-config
+++ b/_notmuch-config
@@ -3,9 +3,14 @@
 ## Configuration file for the notmuch mail system
 ## http://notmuchmail.org
 ##
+## IMPORTANT NOTE FOR CJK:
+## | To support correct CJK characters index and search (i.e., proper
+## ! character segmentation), the environment variable 'XAPIAN_CJK_NGRAM'
+## | should be set to non-empty value before notmuch indexing.
+##
 ## Aaron LI <aaronly@gmail.com>
 ## Created: 2015-02-02
-## Updated: 2016-01-14
+## Updated: 2016-01-26
 ##
 
 # Database configuration
@@ -17,9 +22,7 @@
 # configured here named ".notmuch".
 #
 [database]
-# Default: $HOME/mail
-# NOTE: $HOME environment variables are NOT supported.
-path=/home/aly/Mail
+path=/home/aly/mail
 
 # User configuration
 #
@@ -38,59 +41,61 @@ path=/home/aly/Mail
 #
 [user]
 name=Aaron LI
-primary_email=aaronly.me@outlook.com
-other_email=aaronly.me@gmail.com;liweitianux@autistici.org;liweitianux@gmail.com;liweitianux@live.com;
+primary_email=aaronly.me@gmail.com
+other_email=aaronly.me@outlook.com;liweitianux@autistici.org;liweitianux@gmail.com;liweitianux@live.com;liweitianux@sjtu.edu.cn;
+
 
 # Configuration for "notmuch new"
+[new]
 #
-# The following options are supported here:
-#
-#	tags	A list (separated by ';') of the tags that will be
-#		added to all messages incorporated by "notmuch new".
+# A list (separated by ';') of the tags that will be added to all messages
+# incorporated by "notmuch new".
 #
-#	ignore	A list (separated by ';') of file and directory names
-#		that will not be searched for messages by "notmuch new".
+# Required by 'afew'
+#tags=unread;inbox;
+tags=new
 #
-#		NOTE: *Every* file/directory that goes by one of those
-#		names will be ignored, independent of its depth/location
-#		in the mail store.
+# A list (separated by ';') of file and directory names that will not be
+# searched for messages by "notmuch new".
 #
-[new]
-tags=unread;inbox;
-ignore=
+# NOTE: *Every* file/directory that goes by one of those names will be
+# ignored, independent of its depth/location in the mail store.
+ignore=backup;.noindex;
+
 
 # Search configuration
-#
-# The following option is supported here:
-#
-#	exclude_tags
-#		A ;-separated list of tags that will be excluded from
-#		search results by default.  Using an excluded tag in a
-#		query will override that exclusion.
-#
 [search]
+#
+# A ';'-separated list of tags that will be excluded from search results by
+# default.  Using an excluded tag in a query will override that exclusion.
 exclude_tags=deleted;spam;
 
+
 # Maildir compatibility configuration
+[maildir]
 #
-# The following option is supported here:
-#
-#	synchronize_flags      Valid values are true and false.
-#
-#	If true, then the following maildir flags (in message filenames)
-#	will be synchronized with the corresponding notmuch tags:
+# Valid values are true and false.
 #
-#		Flag	Tag
-#		----	-------
-#		D	draft
-#		F	flagged
-#		P	passed
-#		R	replied
-#		S	unread (added when 'S' flag is not present)
+# If true, then the following maildir flags (in message filenames) will be
+# synchronized with the corresponding notmuch tags:
 #
-#	The "notmuch new" command will notice flag changes in filenames
-#	and update tags, while the "notmuch tag" and "notmuch restore"
-#	commands will notice tag changes and update flags in filenames
+# Flag  Tag
+# ----  -------
+# D     draft
+# F     flagged
+# P     passed
+# R     replied
+# S     unread (added when 'S' flag is not present)
 #
-[maildir]
+# The "notmuch new" command will notice flag changes in filenames and update
+# tags, while the "notmuch tag" and "notmuch restore" commands will notice tag
+# changes and update flags in filenames
 synchronize_flags=true
+
+
+[crypto]
+#
+# Name (or full path) of gpg binary to use in verification and
+# decryption of PGP/MIME messages.
+gpg_path=gpg2
+