doc: Fix parallel build of roff files

[notmuch] / NEWS

diff --git a/NEWS b/NEWS
index f1d549996abc689a39cf235424bd8d6602af7cd3..4ceff94f5c307e385bc080d9f5fcecb9302f8c3c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ Notmuch 0.18 (UNRELEASED)
 Command-Line Interface
 ----------------------
 
-`notmuch dump` now defaults to `batch-tag` format.
+`notmuch dump` now defaults to `batch-tag` format
 
   The old format is still available with `--format=sup`.
 
@@ -15,6 +15,14 @@ Command-Line Interface
 Emacs Interface
 ---------------
 
+Init file
+
+  If the file pointed by new variable `notmuch-init-file` (typically
+  `~/.emacs.d/notmuch-config.el`) exists, it is loaded at the end of
+  `notmuch.el`. Users can put their personal notmuch emacs lisp based
+  configuration/customization items there instead of filling
+  `~/.emacs` with these.
+
 Changed format for saved searches
 
   The format for `notmuch-saved-searches` has changed, but old style
@@ -38,11 +46,42 @@ Changed format for saved searches
   saved-search :name) and (cdr saved-search) by
   (notmuch-saved-search-get saved-search :query) should be sufficient.
 
+Version variable
+
+  The new, build-time generated variable `notmuch-emacs-version` is used
+  to distinguish between notmuch cli and notmuch emacs versions.
+  The function `notmuch-hello-versions` (bound to 'v' in notmuch-hello
+  window) prints both notmuch cli and notmuch emacs versions in case
+  these differ from each other.
+  This is especially useful when using notmuch remotely.
+
 Bug fix for saved searches with newlines in them
 
   Split lines confuse `notmuch count --batch`, so we remove embedded
   newlines before calling notmuch count.
 
+nmbug
+-----
+
+nmbug adds a `clone` command for setting up the initial repository and
+uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
+
+  The `@{upstream}` change reduces ambiguity when fetching multiple
+  branches, but requires existing users update their `NMBGIT`
+  repository (usually `~/.nmbug`) to distinguish between local and
+  remote-tracking branches.  The easiest way to do this is:
+
+  1. If you have any purely local commits (i.e. they aren't in the
+     nmbug repository on nmbug.tethera.net), push them to a remote
+     repository.  We'll restore them from the backup in step 4.
+  2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
+  3. Use the new `clone` command to create a fresh clone:
+
+        nmbug clone http://nmbug.tethera.net/git/nmbug-tags.git
+
+  4. If you had local commits in step 1, add a remote for that
+     repository and fetch them into the new repository.
+
 Notmuch 0.17 (2013-12-30)
 =========================