grammar

[obsolete/notmuch-wiki] / emacstips.mdwn

diff --git a/emacstips.mdwn b/emacstips.mdwn
index db1655019831ef436b299c97bd03b8270649d2e3..0a40f64962b34fc9df496713888abc48e97f2d6e 100644 (file)
--- a/emacstips.mdwn
+++ b/emacstips.mdwn
@@ -47,15 +47,16 @@ messages.  When in message mode, you can type `C-c ?` for help.
 If you would like to use address autocompletion when composing
 messages, see [address completion](#address_completion).
 
-When you are ready to send a message, type `C-c C-c`.  By default
+When you are ready to send a message, type `C-c C-c`. By default
 message mode will use your sendmail command to send mail, so make sure
-that works.  One annoying standard configuration of message mode is
+that works. One annoying standard configuration of message mode is
 that it will hide the sent mail in your emacs frame stack, but it will
 not close it. If you type several mails in an emacs session they will
 accumulate and make switching between buffers more annoying. You can
 avoid that behavior by adding `(setq message-kill-buffer-on-exit t)`
-in your `.emacs` file which will really close the mail window after
-sending it.
+in your `.emacs` file (or doing `M-x customize-variable
+message-kill-buffer-on-exit`) which will really close the mail window
+after sending it.
 
 ## Attaching files
 
@@ -222,13 +223,13 @@ don't know why."
 
 ## msmtp, message mode and multiple accounts
 
-As an alternative to running a mail server such as sendmail or
-postfix just to send email, it is possible to use
-[msmtp](http://msmtp.sourceforge.net/).  This small application will
+As an alternative to running a mail server such as sendmail or postfix
+just to send email, it is possible to use
+[msmtp](http://msmtp.sourceforge.net/). This small application will
 look like `/usr/bin/sendmail` to a MUA such as emacs message mode, but
-will just forward the email to an external SMTP server.  It's fairly
-easy to set up and it support several account for using different
-SMTP servers.  The msmtp pages have several examples.
+will just forward the email to an external SMTP server. It's fairly
+easy to set up and it supports several accounts for using different
+SMTP servers. The msmtp pages have several examples.
 
 A typical scenario is that you want to use the company SMTP server
 for email coming from your company email address, and your personal
@@ -263,7 +264,7 @@ candidates based on a search string.  There are currently two
 available:
 
   * The python tool `notmuch_address.py` (`git clone
-    http://jkr.acm.jhu.edu/git/notmuch_addresses.git`) (slower, but
+    http://commonmeasure.org/~jkr/git/notmuch_addresses.git`) (slower, but
     no compilation required so good for testing the setup)
 
   * The vala-based
@@ -275,10 +276,12 @@ available:
 
                     cc -o addrlookup addrlookup.c `pkg-config --cflags --libs gobject-2.0` -lnotmuch
 
-EUDC is integrated into emacs and is needed for tab completion of
-email addresses. See [this
-mail](http://mid.gmane.org/87fx3uflkx.fsf@jhu.edu)
-(id:87fx3uflkx.fsf@jhu.edu) for more information.
+You can perform tab-completion using either of these programs. Just add the following to your .emacs:
+
+    (require 'notmuch-address)
+    (setq notmuch-address-command "/path/to/address_fetching_program")
+    (notmuch-address-message-insinuate)
+
 
 ## How to sign/encrypt messages with gpg