Merge branch 'release'

[notmuch] / NEWS

diff --git a/NEWS b/NEWS
index fff8a08c6acc3244aa9aa3a38f374badd6d31eda..736d96023e27f9cdef8ea742ab48618e590d9af7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Notmuch 0.26.2 (UNRELEASED)
+===========================
+
+Library Changes
+---------------
+
+Make thread indexing more robust against reference loops
+
+  Choose a thread root by date in case of reference loops. Fix a
+  related abort in `notmuch show`.
+
 Notmuch 0.26.1 (2018-04-02)
 ===========================
 
@@ -1034,7 +1045,7 @@ Path to gpg is now configurable
 Emacs
 -----
 
-Avoid rendering large text attachements.
+Avoid rendering large text attachments.
 
 Improved rendering of CID references in HTML.
 
@@ -1075,7 +1086,7 @@ Documentation
 Sphinx is now mandatory to build docs
 
   Support for using rst2man in place of sphinx to build the
-  docmumentation has been removed.
+  documentation has been removed.
 
 Improved notmuch-search-terms.7