X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=blobdiff_plain;f=notmuch-emacs.mdwn;h=f5c8f013867fbb9870ad8e5ae7c22e3e2abc1ca7;hp=24742edef924831e85460de458fa9a32e2e84893;hb=HEAD;hpb=759e2e386f64f7fafc22e386fbf9584134e39a8b

diff --git a/notmuch-emacs.mdwn b/notmuch-emacs.mdwn
index 24742ed..f5c8f01 100644
--- a/notmuch-emacs.mdwn
+++ b/notmuch-emacs.mdwn
@@ -2,9 +2,11 @@
 # Notmuch Emacs Interface
 
 One of the more popular Notmuch message reading clients is **notmuch.el**, or
-`notmuch-emacs`, an [Emacs](http://www.gnu.org/software/emacs/) major mode for
-interacting with Notmuch. It is included in the Notmuch package (`notmuch-emacs`
-in Debian). The [[screenshots|screenshots]] give a good overview of the mode.
+`notmuch-mode`, an [Emacs](https://www.gnu.org/software/emacs/) major mode for
+interacting with Notmuch. It is included in the Notmuch package (as
+`elpa-notmuch` within the `notmuch` package in current Debian or as
+`notmuch-emacs` in Debian 10 or prior). The [[screenshots|screenshots]] give a
+good overview of the mode.
 
 This page is a basic guide for setting up and using Notmuch with Emacs. See also
 the [[tips and tricks page|emacstips]] for more advanced details.
@@ -13,9 +15,10 @@ the [[tips and tricks page|emacstips]] for more advanced details.
 
 ## Prerequisites
 
-The Notmuch Emacs interface uses the Notmuch [[command line interface|manpages]]
-to interact with the Notmuch database and your mail store. Please make sure
-you've [[set up Notmuch|getting-started]] first.
+The Notmuch Emacs interface uses the Notmuch [command line
+interface](https://notmuchmail.org/doc/latest/man1/notmuch.html) to
+interact with the Notmuch database and your mail store. Please make
+sure you've [[set up Notmuch|getting-started]] first.
 
 ## Installation
 
@@ -25,8 +28,8 @@ to ensure this is to use the package(s) in your distribution's package
 repository.
 
 If you've installed Notmuch from a [git
-checkout](http://git.notmuchmail.org/git/notmuch) or a [source
-release](http://notmuchmail.org/releases/), Notmuch Emacs is included by
+checkout](https://git.notmuchmail.org/git/notmuch) or a [source
+release](https://notmuchmail.org/releases/), Notmuch Emacs is included by
 default.
 
 It is **not** recommended to install Notmuch Emacs from the Emacs Lisp Package
@@ -91,7 +94,7 @@ When composing new messages, you will be entered in Emacs's
 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](emacstips#index13h2).
+messages, see [address completion](/emacstips#index13h2).
 
 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
@@ -132,3 +135,7 @@ mentioned as script arguments. (Note: The script expects that you have
             shift
         done
         emacsclient -a '' -c -e "(progn (compose-mail) $attach_cmds)"
+
+Also, if you're the kind of person who forgets to add attachments,
+there's a cure for that disease. See [Never forget
+attachments](/emacstips#index27h2) for all the details.