From 6d5d5c7b24679226039c83380c707b6045366cd0 Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Sat, 8 Aug 2015 08:47:33 +0700 Subject: [PATCH 1/2] Fix incorrect ChangeLog. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a93ddcd5..eee38d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1 +1 @@ -Please use the 'git log' to see the ChangeLog +See NEWS.org From b45904112626db4fbc9060ee7733d944e07c9c6c Mon Sep 17 00:00:00 2001 From: David C Sterratt Date: Wed, 12 Aug 2015 17:06:18 +0100 Subject: [PATCH 2/2] Follow-up to commit #630: Clarify bbdb setup comes after mu4e setup --- mu4e/mu4e.texi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index 71e8f51b..e73372ef 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -2779,7 +2779,9 @@ is also possible to manage your addresses with the current (2015-06-23) development release of @t{BBDB}, or releases of @t{BBDB} after 3.1.2.@footnote{@url{http://savannah.nongnu.org/projects/bbdb/}}. -To enable BBDB, add to your configuration something like: +To enable BBDB, add to your @file{~/.emacs} (or its moral equivalent, +such as @file{~/.emacs.d/init.el}) the following @emph{after} the +@code{(require 'mu4e)} line: @lisp ;; Load BBDB (Method 1)