X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=blobdiff_plain;f=index.mdwn;h=dd068159d03cbb87c705fe9a0090418eac6d09d7;hp=547abe3bcc2e2f2838d9cc1f8427f341f95e8816;hb=bbdcbf63583351af9c0954cb92316f5bb3a8509a;hpb=c1a6e2e9216c2e086b1076d9cee31e0f8ba7e24c

diff --git a/index.mdwn b/index.mdwn
index 547abe3..dd06815 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -64,9 +64,10 @@ Notmuch|getting-started]].
 
 ## Email Clients and Front Ends
 
-Notmuch ships with a powerful set of [[command-line tools|manpages]], an
-[[email client for Emacs|notmuch-emacs]], another
-[client for vim](https://git.notmuchmail.org/git/notmuch/blob/HEAD:/vim/README),
+Notmuch ships with a powerful set of [command-line
+tools](https://notmuchmail.org/doc/latest/man1/notmuch.html), an
+[[email client for Emacs|notmuch-emacs]], another [client for
+vim](https://git.notmuchmail.org/git/notmuch/blob/HEAD:/vim/README),
 and a [[Mutt integration script|notmuch-mutt]].
 
 There are also many other [[email clients, frontends and tools|frontends]] based
@@ -74,7 +75,7 @@ on Notmuch.
 
 ## Documentation
 
-  * [[Notmuch manual pages|manpages]]
+  * [Notmuch official documentation (manual pages)](https://notmuchmail.org/doc/latest/)
   * [[Email clients and frontends|frontends]]
   * [[General how-tos|howto]]
   * [[Frequently Asked Questions|faq]]
@@ -109,7 +110,7 @@ distributions:
 * [Gentoo](http://packages.gentoo.org/package/net-mail/notmuch)
 * [NetBSD](http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/mail/notmuch/README.html)
 * [openSUSE](https://build.opensuse.org/search?search_text=notmuch)
-* macOS [Homebrew](https://github.com/Homebrew/homebrew-core/blob/09baa1c3f5a30f8450d2145d4fd988e4b4d48070/Formula/notmuch.rb), [MacPorts](https://www.macports.org/ports.php?by=name&substr=notmuch), or [pkgsrc](http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/mail/notmuch/README.html).
+* macOS [Homebrew](https://github.com/Homebrew/homebrew-core/blob/09baa1c3f5a30f8450d2145d4fd988e4b4d48070/Formula/notmuch.rb), [MacPorts](https://ports.macports.org/port/notmuch), or [pkgsrc](http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/mail/notmuch/README.html).
 * [Slackware](http://slackbuilds.org/repository/13.37/office/notmuch/)
 * [Ubuntu](http://packages.ubuntu.com/search?keywords=notmuch)