unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH 1/5] NEWS, python: update pointer to online documentation
@ 2016-06-02 16:26 Daniel Kahn Gillmor
  2016-06-02 16:26 ` [PATCH 2/5] completion: update the location of the bash-completion project Daniel Kahn Gillmor
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Daniel Kahn Gillmor @ 2016-06-02 16:26 UTC (permalink / raw)
  To: Notmuch Mail

Currently, http://packages.python.org/notmuch/ goes through a series
of redirections and ends up pointing to readthedocs.  Since we're
using readthedocs directly anyway, just point to it directly.

readthedocs are also now sensibly using a separate domain
(readthedocs.io) for their hosted documentation as distinct from their
own domain (readthedocs.org), so use the correct tld.
---
 NEWS                     | 2 +-
 bindings/python/README   | 2 +-
 bindings/python/setup.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 90e233b..cb6e21c 100644
--- a/NEWS
+++ b/NEWS
@@ -2361,7 +2361,7 @@ Ruby bindings are now much more complete
 
 Python bindings have been updated and extended
 
-  (docs online at http://packages.python.org/notmuch/)
+  (docs online at https://notmuch.readthedocs.io/)
 
   New bindings:
 
diff --git a/bindings/python/README b/bindings/python/README
index b20ae07..695b5bd 100644
--- a/bindings/python/README
+++ b/bindings/python/README
@@ -10,7 +10,7 @@ If you have downloaded the full source tarball, you can create the
 documentation with sphinx installed, go to the docs directory and
 "make html". A static version of the documentation is available at:
 
-  https://notmuch.readthedocs.org/projects/notmuch-python/
+  https://notmuch.readthedocs.io/projects/notmuch-python/
 
 To build the python bindings, do
 
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index f4c338e..ba95d95 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -48,7 +48,7 @@ for extremely quick searching and filtering of your email according to
 various criteria.
 
 The documentation for the latest notmuch release can be `viewed
-online <http://notmuch.readthedocs.org/>`_.
+online <https://notmuch.readthedocs.io/>`_.
 
 Requirements
 ------------
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/5] completion: update the location of the bash-completion project
  2016-06-02 16:26 [PATCH 1/5] NEWS, python: update pointer to online documentation Daniel Kahn Gillmor
@ 2016-06-02 16:26 ` Daniel Kahn Gillmor
  2016-06-02 16:26 ` [PATCH 3/5] update link to Chip Rosenthal article about reply-to munging Daniel Kahn Gillmor
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Daniel Kahn Gillmor @ 2016-06-02 16:26 UTC (permalink / raw)
  To: Notmuch Mail

Alioth currently redirects to github, so point there instead.
---
 completion/README                  | 2 +-
 completion/notmuch-completion.bash | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/completion/README b/completion/README
index e200c18..89805c7 100644
--- a/completion/README
+++ b/completion/README
@@ -9,7 +9,7 @@ notmuch-completion.bash
   bash-completion package [1] version 2.0, which depends on bash
   version 3.2 or later.
 
-  [1] http://bash-completion.alioth.debian.org/
+  [1] https://github.com/scop/bash-completion
 
 notmuch-completion.zsh
 
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index cc58392..29cdf43 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -3,7 +3,7 @@
 # Copyright © 2013 Jani Nikula
 #
 # Based on the bash-completion package:
-# http://bash-completion.alioth.debian.org/
+# https://github.com/scop/bash-completion
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/5] update link to Chip Rosenthal article about reply-to munging
  2016-06-02 16:26 [PATCH 1/5] NEWS, python: update pointer to online documentation Daniel Kahn Gillmor
  2016-06-02 16:26 ` [PATCH 2/5] completion: update the location of the bash-completion project Daniel Kahn Gillmor
@ 2016-06-02 16:26 ` Daniel Kahn Gillmor
  2016-06-02 16:26 ` [PATCH 4/5] nmbug: updated to modern URL for PEP 343 Daniel Kahn Gillmor
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Daniel Kahn Gillmor @ 2016-06-02 16:26 UTC (permalink / raw)
  To: Notmuch Mail

The original link is currently returning an internal server error :(
---
 notmuch-reply.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notmuch-reply.c b/notmuch-reply.c
index a74194a..457e54a 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -324,7 +324,7 @@ add_recipients_from_message (GMimeMessage *reply,
     unsigned int n = 0;
 
     /* Some mailing lists munge the Reply-To header despite it being A Bad
-     * Thing, see http://www.unicom.com/pw/reply-to-harmful.html
+     * Thing, see http://marc.merlins.org/netrants/reply-to-harmful.html
      *
      * The munging is easy to detect, because it results in a
      * redundant reply-to header, (with an address that already exists
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 4/5] nmbug: updated to modern URL for PEP 343
  2016-06-02 16:26 [PATCH 1/5] NEWS, python: update pointer to online documentation Daniel Kahn Gillmor
  2016-06-02 16:26 ` [PATCH 2/5] completion: update the location of the bash-completion project Daniel Kahn Gillmor
  2016-06-02 16:26 ` [PATCH 3/5] update link to Chip Rosenthal article about reply-to munging Daniel Kahn Gillmor
@ 2016-06-02 16:26 ` Daniel Kahn Gillmor
  2016-06-02 16:26 ` [PATCH 5/5] Use https instead of http where possible Daniel Kahn Gillmor
  2016-06-05 11:41 ` [PATCH 1/5] NEWS, python: update pointer to online documentation David Bremner
  4 siblings, 0 replies; 6+ messages in thread
From: Daniel Kahn Gillmor @ 2016-06-02 16:26 UTC (permalink / raw)
  To: Notmuch Mail

---
 devel/nmbug/nmbug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug
index 0787b2b..e406395 100755
--- a/devel/nmbug/nmbug
+++ b/devel/nmbug/nmbug
@@ -80,7 +80,7 @@ except AttributeError:  # Python < 3.2
 
         See PEP 343 for details on context managers [1].
 
-        [1]: http://legacy.python.org/dev/peps/pep-0343/
+        [1]: https://www.python.org/dev/peps/pep-0343/
         """
         def __init__(self, **kwargs):
             self.name = _tempfile.mkdtemp(**kwargs)
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 5/5] Use https instead of http where possible
  2016-06-02 16:26 [PATCH 1/5] NEWS, python: update pointer to online documentation Daniel Kahn Gillmor
                   ` (2 preceding siblings ...)
  2016-06-02 16:26 ` [PATCH 4/5] nmbug: updated to modern URL for PEP 343 Daniel Kahn Gillmor
@ 2016-06-02 16:26 ` Daniel Kahn Gillmor
  2016-06-05 11:41 ` [PATCH 1/5] NEWS, python: update pointer to online documentation David Bremner
  4 siblings, 0 replies; 6+ messages in thread
From: Daniel Kahn Gillmor @ 2016-06-02 16:26 UTC (permalink / raw)
  To: Notmuch Mail

Many of the external links found in the notmuch source can be resolved
using https instead of http.  This changeset addresses as many as i
could find, without touching the e-mail corpus or expected outputs
found in tests.
---
 COPYING                                        |  2 +-
 COPYING-GPL-3                                  |  8 ++++----
 INSTALL                                        |  4 ++--
 Makefile.local                                 |  4 ++--
 README                                         |  2 +-
 README.rst                                     |  6 +++---
 bindings/go/README                             |  2 +-
 bindings/go/src/notmuch/notmuch.go             |  2 +-
 bindings/python/README                         |  2 +-
 bindings/python/docs/COPYING                   |  6 +++---
 bindings/python/docs/source/index.rst          |  2 +-
 bindings/python/notmuch/__init__.py            |  2 +-
 bindings/python/notmuch/compat.py              |  2 +-
 bindings/python/notmuch/database.py            |  2 +-
 bindings/python/notmuch/directory.py           |  2 +-
 bindings/python/notmuch/errors.py              |  2 +-
 bindings/python/notmuch/filenames.py           |  2 +-
 bindings/python/notmuch/globals.py             |  2 +-
 bindings/python/notmuch/message.py             |  2 +-
 bindings/python/notmuch/messages.py            |  2 +-
 bindings/python/notmuch/query.py               |  2 +-
 bindings/python/notmuch/tag.py                 |  2 +-
 bindings/python/notmuch/thread.py              |  2 +-
 bindings/python/notmuch/threads.py             |  2 +-
 bindings/python/setup.py                       | 10 +++++-----
 bindings/ruby/database.c                       |  2 +-
 bindings/ruby/defs.h                           |  2 +-
 bindings/ruby/directory.c                      |  2 +-
 bindings/ruby/filenames.c                      |  2 +-
 bindings/ruby/init.c                           |  2 +-
 bindings/ruby/message.c                        |  2 +-
 bindings/ruby/messages.c                       |  2 +-
 bindings/ruby/query.c                          |  2 +-
 bindings/ruby/status.c                         |  2 +-
 bindings/ruby/tags.c                           |  2 +-
 bindings/ruby/thread.c                         |  2 +-
 bindings/ruby/threads.c                        |  2 +-
 compat/compat.h                                |  2 +-
 compat/function-attributes.h                   |  2 +-
 completion/notmuch-completion.bash             |  2 +-
 configure                                      |  4 ++--
 contrib/notmuch-mutt/README                    |  6 +++---
 contrib/notmuch-mutt/notmuch-mutt              |  2 +-
 contrib/notmuch-vim/plugin/notmuch.vim         |  4 ++--
 crypto.c                                       |  2 +-
 debian/control                                 |  4 ++--
 debugger.c                                     |  2 +-
 devel/man-to-mdwn.pl                           |  2 +-
 devel/nmbug/doc/man5/notmuch-report.json.5.rst |  2 +-
 devel/nmbug/nmbug                              |  8 ++++----
 devel/nmbug/notmuch-report                     |  2 +-
 devel/nmbug/notmuch-report.json                |  2 +-
 devel/try-emacs-mua                            |  2 +-
 doc/doxygen.cfg                                |  2 +-
 doc/man1/notmuch.rst                           |  4 ++--
 emacs/coolj.el                                 |  2 +-
 emacs/make-deps.el                             |  2 +-
 emacs/notmuch-address.el                       |  2 +-
 emacs/notmuch-company.el                       |  2 +-
 emacs/notmuch-crypto.el                        |  2 +-
 emacs/notmuch-hello.el                         |  4 ++--
 emacs/notmuch-jump.el                          |  2 +-
 emacs/notmuch-lib.el                           |  2 +-
 emacs/notmuch-message.el                       |  2 +-
 emacs/notmuch-mua.el                           |  6 +++---
 emacs/notmuch-parser.el                        |  2 +-
 emacs/notmuch-print.el                         |  2 +-
 emacs/notmuch-query.el                         |  2 +-
 emacs/notmuch-show.el                          |  8 ++++----
 emacs/notmuch-tag.el                           |  2 +-
 emacs/notmuch-tree.el                          |  2 +-
 emacs/notmuch-version.el.tmpl                  |  2 +-
 emacs/notmuch-wash.el                          |  2 +-
 emacs/notmuch.el                               |  6 +++---
 hooks.c                                        |  2 +-
 lib/built-with.c                               |  2 +-
 lib/config.cc                                  |  2 +-
 lib/database-private.h                         |  2 +-
 lib/database.cc                                |  4 ++--
 lib/directory.cc                               |  2 +-
 lib/filenames.c                                |  2 +-
 lib/gen-version-script.sh                      |  2 +-
 lib/index.cc                                   |  2 +-
 lib/message-file.c                             |  2 +-
 lib/message.cc                                 |  2 +-
 lib/messages.c                                 |  2 +-
 lib/notmuch-private.h                          |  2 +-
 lib/notmuch.h                                  |  4 ++--
 lib/parse-time-vrp.cc                          |  2 +-
 lib/parse-time-vrp.h                           |  2 +-
 lib/query-fp.cc                                |  2 +-
 lib/query-fp.h                                 |  2 +-
 lib/query.cc                                   |  2 +-
 lib/sha1.c                                     |  2 +-
 lib/string-list.c                              |  2 +-
 lib/tags.c                                     |  2 +-
 lib/thread.cc                                  |  2 +-
 mime-node.c                                    |  2 +-
 notmuch-client.h                               |  2 +-
 notmuch-compact.c                              |  2 +-
 notmuch-config.c                               |  4 ++--
 notmuch-count.c                                |  2 +-
 notmuch-dump.c                                 |  2 +-
 notmuch-emacs-mua                              |  2 +-
 notmuch-insert.c                               |  2 +-
 notmuch-new.c                                  |  2 +-
 notmuch-reply.c                                |  2 +-
 notmuch-restore.c                              |  2 +-
 notmuch-search.c                               |  2 +-
 notmuch-setup.c                                |  2 +-
 notmuch-show.c                                 |  2 +-
 notmuch-tag.c                                  |  2 +-
 notmuch-time.c                                 |  2 +-
 notmuch.c                                      |  4 ++--
 packaging/fedora/notmuch.spec                  |  4 ++--
 parse-time-string/parse-time-string.c          |  2 +-
 parse-time-string/parse-time-string.h          |  2 +-
 performance-test/Makefile.local                |  4 ++--
 performance-test/README                        |  2 +-
 query-string.c                                 |  2 +-
 sprinter-sexp.c                                |  2 +-
 test/T310-emacs.sh                             |  4 ++--
 test/T360-symbol-hiding.sh                     |  2 +-
 test/database-test.c                           |  2 +-
 test/parse-time.c                              |  2 +-
 test/random-corpus.c                           |  2 +-
 test/smtp-dummy.c                              |  2 +-
 test/test-databases/Makefile.local             |  2 +-
 test/test-lib-common.sh                        |  2 +-
 test/test-lib.el                               |  2 +-
 test/test-lib.sh                               |  2 +-
 util/error_util.c                              |  2 +-
 util/error_util.h                              |  2 +-
 util/hex-escape.c                              |  2 +-
 util/string-util.c                             |  2 +-
 util/xutil.c                                   |  2 +-
 util/xutil.h                                   |  2 +-
 util/zlib-extra.c                              |  2 +-
 138 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/COPYING b/COPYING
index 6dea693..0006a66 100644
--- a/COPYING
+++ b/COPYING
@@ -12,4 +12,4 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program, (in the COPYING-GPL-3 file in this
-directory). If not, see http://www.gnu.org/licenses/ 
+directory). If not, see https://www.gnu.org/licenses/ 
diff --git a/COPYING-GPL-3 b/COPYING-GPL-3
index 4432540..4c49354 100644
--- a/COPYING-GPL-3
+++ b/COPYING-GPL-3
@@ -2,7 +2,7 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -646,7 +646,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -665,12 +665,12 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
 
diff --git a/INSTALL b/INSTALL
index b1b9cd5..6099ed0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -30,7 +30,7 @@ Talloc, and zlib which are each described below:
 	It provides all the real machinery of indexing and searching,
 	(including the very nice parsing of the query string).
 
-	Xapian is available from http://xapian.org
+	Xapian is available from https://xapian.org
 
 	Note: Notmuch will work best with Xapian 1.0.18 (or later) or
 	Xapian 1.1.4 (or later). Previous versions of Xapian (whether
@@ -58,7 +58,7 @@ Talloc, and zlib which are each described below:
 	made development of Notmuch much easier and much less prone to
 	memory leaks.
 
-	Talloc is available from http://talloc.samba.org/
+	Talloc is available from https://talloc.samba.org/
 
 	zlib
 	----
diff --git a/Makefile.local b/Makefile.local
index 066ecf2..cf16185 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -35,7 +35,7 @@ DEB_TAG=debian/$(UPSTREAM_TAG)-1
 
 RELEASE_HOST=notmuchmail.org
 RELEASE_DIR=/srv/notmuchmail.org/www/releases
-RELEASE_URL=http://notmuchmail.org/releases
+RELEASE_URL=https://notmuchmail.org/releases
 TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
 DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz
 SHA1_FILE=$(TAR_FILE).sha1
@@ -191,7 +191,7 @@ release-message:
 	@echo "the Xapian library to provide fast, full-text search with a convenient"
 	@echo "search syntax."
 	@echo ""
-	@echo "For more about notmuch, see http://notmuchmail.org"
+	@echo "For more about notmuch, see https://notmuchmail.org"
 
 # This is a chain of dependencies rather than a simple list simply to
 # avoid the messages getting interleaved in the case of a parallel
diff --git a/README b/README
index d92fcfd..0aa9a08 100644
--- a/README
+++ b/README
@@ -58,7 +58,7 @@ Contacting users and developers
 -------------------------------
 The website for Notmuch is:
 
-	http://notmuchmail.org
+	https://notmuchmail.org
 
 The mailing list address for the notmuch community is:
 
diff --git a/README.rst b/README.rst
index 7417ddc..7ff3198 100644
--- a/README.rst
+++ b/README.rst
@@ -1,11 +1,11 @@
-If you're reading this on http://github.com/notmuch/notmuch, this is a
+If you're reading this on https://github.com/notmuch/notmuch, this is a
 read-only mirror of the notmuch project.
 
-For more information about the project, see http://notmuchmail.org.
+For more information about the project, see https://notmuchmail.org.
 
 Please don't send us pull requests on github. If you have a feature
 branch that you want us to look at, use ``git send-email`` to send it
 to notmuch@notmuchmail.org.
 
 For more information about contributing to the project, see
-http://notmuchmail.org/contributing/.
+https://notmuchmail.org/contributing/.
diff --git a/bindings/go/README b/bindings/go/README
index 18a54b6..1825ae0 100644
--- a/bindings/go/README
+++ b/bindings/go/README
@@ -13,4 +13,4 @@ todo
 
  - improve notmuch-addrlookup regexp
 
-[1] http://notmuchmail.org/
\ No newline at end of file
+[1] https://notmuchmail.org/
diff --git a/bindings/go/src/notmuch/notmuch.go b/bindings/go/src/notmuch/notmuch.go
index 0fff1ab..4d8c2ce 100644
--- a/bindings/go/src/notmuch/notmuch.go
+++ b/bindings/go/src/notmuch/notmuch.go
@@ -351,7 +351,7 @@ func (self *Database) GetAllTags() *Tags {
  * completely in the future, but it's likely to be a specialized
  * version of the general Xapian query syntax:
  *
- * http://xapian.org/docs/queryparser.html
+ * https://xapian.org/docs/queryparser.html
  *
  * As a special case, passing either a length-zero string, (that is ""),
  * or a string consisting of a single asterisk (that is "*"), will
diff --git a/bindings/python/README b/bindings/python/README
index 695b5bd..fe7a218 100644
--- a/bindings/python/README
+++ b/bindings/python/README
@@ -2,7 +2,7 @@ notmuch -- The python interface to notmuch
 ==========================================
 
 This module makes the functionality of the notmuch library
-(`http://notmuchmail.org`_) available to python. Successful import of
+(`https://notmuchmail.org`_) available to python. Successful import of
 this modul depends on a libnotmuch.so|dll being available on the
 user's system.
 
diff --git a/bindings/python/docs/COPYING b/bindings/python/docs/COPYING
index 94a9ed0..2a00065 100644
--- a/bindings/python/docs/COPYING
+++ b/bindings/python/docs/COPYING
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/bindings/python/docs/source/index.rst b/bindings/python/docs/source/index.rst
index 1cece5f..bef7e60 100644
--- a/bindings/python/docs/source/index.rst
+++ b/bindings/python/docs/source/index.rst
@@ -4,7 +4,7 @@ Welcome to :mod:`notmuch`'s documentation
 .. currentmodule:: notmuch
 
 The :mod:`notmuch` module provides an interface to the `notmuch
-<http://notmuchmail.org>`_ functionality, directly interfacing to a
+<https://notmuchmail.org>`_ functionality, directly interfacing to a
 shared notmuch library.  Within :mod:`notmuch`, the classes
 :class:`Database`, :class:`Query` provide most of the core
 functionality, returning :class:`Threads`, :class:`Messages` and
diff --git a/bindings/python/notmuch/__init__.py b/bindings/python/notmuch/__init__.py
index 29416a5..cf627ff 100644
--- a/bindings/python/notmuch/__init__.py
+++ b/bindings/python/notmuch/__init__.py
@@ -47,7 +47,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010-2011 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/compat.py b/bindings/python/notmuch/compat.py
index daa268c..c931329 100644
--- a/bindings/python/notmuch/compat.py
+++ b/bindings/python/notmuch/compat.py
@@ -16,7 +16,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 Copyright 2012 Justus Winter <4winter@informatik.uni-hamburg.de>
diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py
index f304533..67fb1c4 100644
--- a/bindings/python/notmuch/database.py
+++ b/bindings/python/notmuch/database.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/directory.py b/bindings/python/notmuch/directory.py
index 3b0a525..7f86b1a 100644
--- a/bindings/python/notmuch/directory.py
+++ b/bindings/python/notmuch/directory.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/errors.py b/bindings/python/notmuch/errors.py
index abca51d..b7684ef 100644
--- a/bindings/python/notmuch/errors.py
+++ b/bindings/python/notmuch/errors.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/filenames.py b/bindings/python/notmuch/filenames.py
index f8f383e..29f4fdf 100644
--- a/bindings/python/notmuch/filenames.py
+++ b/bindings/python/notmuch/filenames.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py
index 6872a29..b1eec2c 100644
--- a/bindings/python/notmuch/globals.py
+++ b/bindings/python/notmuch/globals.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/message.py b/bindings/python/notmuch/message.py
index d1c1b58..bf80900 100644
--- a/bindings/python/notmuch/message.py
+++ b/bindings/python/notmuch/message.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
                Jesse Rosenthal <jrosenthal@jhu.edu>
diff --git a/bindings/python/notmuch/messages.py b/bindings/python/notmuch/messages.py
index 76100ff..e17f150 100644
--- a/bindings/python/notmuch/messages.py
+++ b/bindings/python/notmuch/messages.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
                Jesse Rosenthal <jrosenthal@jhu.edu>
diff --git a/bindings/python/notmuch/query.py b/bindings/python/notmuch/query.py
index 4327007..a0f4f64 100644
--- a/bindings/python/notmuch/query.py
+++ b/bindings/python/notmuch/query.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/tag.py b/bindings/python/notmuch/tag.py
index 1d52345..3b4a56a 100644
--- a/bindings/python/notmuch/tag.py
+++ b/bindings/python/notmuch/tag.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py
index 0454dbd..cc151f7 100644
--- a/bindings/python/notmuch/thread.py
+++ b/bindings/python/notmuch/thread.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/notmuch/threads.py b/bindings/python/notmuch/threads.py
index a550523..86f1f2c 100644
--- a/bindings/python/notmuch/threads.py
+++ b/bindings/python/notmuch/threads.py
@@ -12,7 +12,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index ba95d95..d986f0c 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -14,7 +14,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
+along with notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
@@ -34,15 +34,15 @@ setup(name='notmuch',
       description='Python binding of the notmuch mail search and indexing library.',
       author='Sebastian Spaeth',
       author_email='Sebastian@SSpaeth.de',
-      url='http://notmuchmail.org/',
-      download_url='http://notmuchmail.org/releases/notmuch-%s.tar.gz' % __VERSION__,
+      url='https://notmuchmail.org/',
+      download_url='https://notmuchmail.org/releases/notmuch-%s.tar.gz' % __VERSION__,
       packages=['notmuch'],
       keywords=['library', 'email'],
       long_description='''Overview
 ========
 
 The notmuch module provides an interface to the `notmuch
-<http://notmuchmail.org>`_ functionality, directly interfacing with a
+<https://notmuchmail.org>`_ functionality, directly interfacing with a
 shared notmuch library. Notmuch provides a maildatabase that allows
 for extremely quick searching and filtering of your email according to
 various criteria.
@@ -66,5 +66,5 @@ python >= 2.5. It will not work on earlier python versions.
                    'Topic :: Software Development :: Libraries'
                    ],
       platforms='',
-      license='http://www.gnu.org/licenses/gpl-3.0.txt',
+      license='https://www.gnu.org/licenses/gpl-3.0.txt',
      )
diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c
index 6deda57..12e6bab 100644
--- a/bindings/ruby/database.c
+++ b/bindings/ruby/database.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index 167250e..48544ca 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/directory.c b/bindings/ruby/directory.c
index 303523c..0f37b39 100644
--- a/bindings/ruby/directory.c
+++ b/bindings/ruby/directory.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/filenames.c b/bindings/ruby/filenames.c
index e278590..656c58e 100644
--- a/bindings/ruby/filenames.c
+++ b/bindings/ruby/filenames.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/init.c b/bindings/ruby/init.c
index 865d6bf..5556b43 100644
--- a/bindings/ruby/init.c
+++ b/bindings/ruby/init.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/message.c b/bindings/ruby/message.c
index 4ff6097..c55cf6e 100644
--- a/bindings/ruby/message.c
+++ b/bindings/ruby/message.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/messages.c b/bindings/ruby/messages.c
index 443a30c..a337fee 100644
--- a/bindings/ruby/messages.c
+++ b/bindings/ruby/messages.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c
index 8cbc73f..ce66926 100644
--- a/bindings/ruby/query.c
+++ b/bindings/ruby/query.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/status.c b/bindings/ruby/status.c
index b11fb9f..a0f8863 100644
--- a/bindings/ruby/status.c
+++ b/bindings/ruby/status.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/tags.c b/bindings/ruby/tags.c
index e8226ad..db8b4cf 100644
--- a/bindings/ruby/tags.c
+++ b/bindings/ruby/tags.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/thread.c b/bindings/ruby/thread.c
index 56616d9..9b29598 100644
--- a/bindings/ruby/thread.c
+++ b/bindings/ruby/thread.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/bindings/ruby/threads.c b/bindings/ruby/threads.c
index 3e1fbf5..ed403a8 100644
--- a/bindings/ruby/threads.c
+++ b/bindings/ruby/threads.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
diff --git a/compat/compat.h b/compat/compat.h
index 634d505..88bc4df 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/compat/function-attributes.h b/compat/function-attributes.h
index 8450a17..1945b5b 100644
--- a/compat/function-attributes.h
+++ b/compat/function-attributes.h
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  */
 
 #ifndef FUNCTION_ATTRIBUTES_H
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 29cdf43..78047b5 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
+# along with this program.  If not, see https://www.gnu.org/licenses/ .
 #
 # Author: Jani Nikula <jani@nikula.org>
 #
diff --git a/configure b/configure
index ce1d698..49fa5b9 100755
--- a/configure
+++ b/configure
@@ -643,7 +643,7 @@ EOF
     fi
     if [ $have_xapian -eq 0 ]; then
 	echo "	Xapian library (including development files such as headers)"
-	echo "	http://xapian.org/"
+	echo "	https://xapian.org/"
     fi
     if [ $have_zlib -eq 0 ]; then
 	echo "	zlib library (>= version 1.2.5.2, including development files such as headers)"
@@ -663,7 +663,7 @@ EOF
     fi
     if [ $have_talloc -eq 0 ]; then
 	echo "	The talloc library (including development files such as headers)"
-	echo "	http://talloc.samba.org/"
+	echo "	https://talloc.samba.org/"
 	echo
     fi
     cat <<EOF
diff --git a/contrib/notmuch-mutt/README b/contrib/notmuch-mutt/README
index 9c3379e..26996c4 100644
--- a/contrib/notmuch-mutt/README
+++ b/contrib/notmuch-mutt/README
@@ -24,8 +24,8 @@ for a --output=symlinks flag to notmuch.
 
 
 [1]: http://www.mutt.org/
-[2]: http://notmuchmail.org/
-[3]: http://upsilon.cc/~zack/blog/posts/2011/01/how_to_use_Notmuch_with_Mutt/
+[2]: https://notmuchmail.org/
+[3]: https://upsilon.cc/~zack/blog/posts/2011/01/how_to_use_Notmuch_with_Mutt/
 
 
 Requirements
@@ -57,5 +57,5 @@ notmuch-mutt is copyright (C) 2011-2012 Stefano Zacchiroli <zack@upsilon.cc>.
 
 notmuch-mutt is released under the terms of the GNU General Public License
 (GPL), version 3 or above. A copy of the license is available online at
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmuch-mutt
index 97fb2d8..0e46a8c 100755
--- a/contrib/notmuch-mutt/notmuch-mutt
+++ b/contrib/notmuch-mutt/notmuch-mutt
@@ -91,7 +91,7 @@ sub get_message_id() {
 	$mid = $1;
     } else {  # Message-ID header not found, synthesize a message id
 	      # based on SHA1, as notmuch would do.  See:
-	      # http://git.notmuchmail.org/git/notmuch/blob/HEAD:/lib/sha1.c
+	      # https://git.notmuchmail.org/git/notmuch/blob/HEAD:/lib/sha1.c
 	my $sha = Digest::SHA->new(1);
 	$sha->add($_) foreach(@headers);
 	$sha->addfile(\*STDIN);
diff --git a/contrib/notmuch-vim/plugin/notmuch.vim b/contrib/notmuch-vim/plugin/notmuch.vim
index 8f27fb9..eaa984b 100644
--- a/contrib/notmuch-vim/plugin/notmuch.vim
+++ b/contrib/notmuch-vim/plugin/notmuch.vim
@@ -15,7 +15,7 @@
 " General Public License for more details.
 "
 " You should have received a copy of the GNU General Public License
-" along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+" along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 "
 " Authors: Bart Trojanowski <bart@jukie.net>
 " Contributors: Felipe Contreras <felipe.contreras@gmail.com>,
@@ -1198,7 +1198,7 @@ function! s:NM_shell_escape(word)
 endfunction
 
 " this function was taken from git.vim, then fixed up
-" http://github.com/motemen/git-vim
+" https://github.com/motemen/git-vim
 function! s:NM_shell_split(cmd)
         let l:split_cmd = []
         let cmd = a:cmd
diff --git a/crypto.c b/crypto.c
index 3dabc97..3e8ce7c 100644
--- a/crypto.c
+++ b/crypto.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Authors: Jameson Rollins <jrollins@finestructure.net>
  */
diff --git a/debian/control b/debian/control
index a46e391..d846119 100644
--- a/debian/control
+++ b/debian/control
@@ -26,9 +26,9 @@ Build-Depends:
  gpgsm <!nocheck>,
  bash-completion (>=1.9.0~)
 Standards-Version: 3.9.6
-Homepage: http://notmuchmail.org/
+Homepage: https://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
-Vcs-Browser: http://git.notmuchmail.org/git/notmuch
+Vcs-Browser: https://git.notmuchmail.org/git/notmuch
 
 Package: notmuch
 Architecture: any
diff --git a/debugger.c b/debugger.c
index e8b9378..0fa0fb6 100644
--- a/debugger.c
+++ b/debugger.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Chris Wilson <chris@chris-wilson.co.uk>
  */
diff --git a/devel/man-to-mdwn.pl b/devel/man-to-mdwn.pl
index ea284d0..f9d31b7 100755
--- a/devel/man-to-mdwn.pl
+++ b/devel/man-to-mdwn.pl
@@ -200,6 +200,6 @@ foreach (sort srt values %fhash)
 print <<'EOF';
 
 The manual pages are licensed under
-[the GNU General Public License](http://www.gnu.org/licenses/gpl.txt),
+[the GNU General Public License](https://www.gnu.org/licenses/gpl.txt),
 either version 3.0 or at your option any later version.
 EOF
diff --git a/devel/nmbug/doc/man5/notmuch-report.json.5.rst b/devel/nmbug/doc/man5/notmuch-report.json.5.rst
index 4b5f84a..1207a4a 100644
--- a/devel/nmbug/doc/man5/notmuch-report.json.5.rst
+++ b/devel/nmbug/doc/man5/notmuch-report.json.5.rst
@@ -92,7 +92,7 @@ EXAMPLE
   {
     "meta": {
       "title": "Notmuch Patches",
-      "blurb": "For more information see <a href=\"http://notmuchmail.org/nmbug\">nmbug</a>",
+      "blurb": "For more information see <a href=\"https://notmuchmail.org/nmbug\">nmbug</a>",
       "header": "<html><head></head><body><h1>{title}</h1><p>{blurb}</p><h2>Views</h2>",
       "footer": "<hr><p>Generated: {datetime}</p></html>",
       "message-url": "http://mid.gmane.org/{message-id}"
diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug
index e406395..1dd5f14 100755
--- a/devel/nmbug/nmbug
+++ b/devel/nmbug/nmbug
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
+# along with this program.  If not, see https://www.gnu.org/licenses/ .
 
 """
 Manage notmuch tags with Git
@@ -119,9 +119,9 @@ def _xapian_quote(string):
     Xapian uses double-quotes for quoting strings.  You can escape
     internal quotes by repeating them [1,2,3].
 
-    [1]: http://trac.xapian.org/ticket/128#comment:2
-    [2]: http://trac.xapian.org/ticket/128#comment:17
-    [3]: http://trac.xapian.org/changeset/13823/svn
+    [1]: https://trac.xapian.org/ticket/128#comment:2
+    [2]: https://trac.xapian.org/ticket/128#comment:17
+    [3]: https://trac.xapian.org/changeset/13823/svn
     """
     return '"{0}"'.format(string.replace('"', '""'))
 
diff --git a/devel/nmbug/notmuch-report b/devel/nmbug/notmuch-report
index 87390c1..a9c2a6e 100755
--- a/devel/nmbug/notmuch-report
+++ b/devel/nmbug/notmuch-report
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
+# along with this program.  If not, see https://www.gnu.org/licenses/ .
 
 """Generate text and/or HTML for one or more notmuch searches.
 
diff --git a/devel/nmbug/notmuch-report.json b/devel/nmbug/notmuch-report.json
index 48b6f19..c5b35b1 100644
--- a/devel/nmbug/notmuch-report.json
+++ b/devel/nmbug/notmuch-report.json
@@ -1,7 +1,7 @@
 {
     "meta": {
         "title": "Notmuch Patches",
-        "blurb": "For more information see <a href=\"http://notmuchmail.org/nmbug\">nmbug</a>"
+        "blurb": "For more information see <a href=\"https://notmuchmail.org/nmbug\">nmbug</a>"
     },
 
     "views": [
diff --git a/devel/try-emacs-mua b/devel/try-emacs-mua
index b0a62c2..041f621 100755
--- a/devel/try-emacs-mua
+++ b/devel/try-emacs-mua
@@ -7,7 +7,7 @@
 ;;
 ;; Authors: Tomi Ollila <tomi.ollila@iki.fi>
 ;;
-;; http://www.emacswiki.org/emacs/EmacsScripts was a useful starting point...
+;; https://www.emacswiki.org/emacs/EmacsScripts was a useful starting point...
 ;;
 ;; Licence: GPLv3+
 ;;
diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg
index c033f34..2ca15d4 100644
--- a/doc/doxygen.cfg
+++ b/doc/doxygen.cfg
@@ -177,7 +177,7 @@ FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 USE_MATHJAX            = NO
 MATHJAX_FORMAT         = HTML-CSS
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH        = https://cdn.mathjax.org/mathjax/latest
 MATHJAX_EXTENSIONS     =
 MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
diff --git a/doc/man1/notmuch.rst b/doc/man1/notmuch.rst
index 3acfbdb..edd04ef 100644
--- a/doc/man1/notmuch.rst
+++ b/doc/man1/notmuch.rst
@@ -29,7 +29,7 @@ While the command-line program ``notmuch`` provides powerful
 functionality, it does not provide the most convenient interface for
 that functionality. More sophisticated interfaces are expected to be
 built on top of either the command-line interface, or more likely, on
-top of the notmuch library interface. See http://notmuchmail.org for
+top of the notmuch library interface. See https://notmuchmail.org for
 more about alternate interfaces to notmuch. The emacs-based interface to
 notmuch (available under **emacs/** in the Notmuch source distribution)
 is probably the most widely used at this time.
@@ -144,7 +144,7 @@ SEE ALSO
 **notmuch-search-terms(7)**, **notmuch-show(1)**, **notmuch-tag(1)**,
 **notmuch-address(1)**
 
-The notmuch website: **http://notmuchmail.org**
+The notmuch website: **https://notmuchmail.org**
 
 CONTACT
 =======
diff --git a/emacs/coolj.el b/emacs/coolj.el
index 7755060..350d537 100644
--- a/emacs/coolj.el
+++ b/emacs/coolj.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/emacs/make-deps.el b/emacs/make-deps.el
index 24c1a45..5b6db69 100644
--- a/emacs/make-deps.el
+++ b/emacs/make-deps.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Austin Clements <aclements@csail.mit.edu>
 
diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 8b79d34..d372fba 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el
index b881d6d..0619c7e 100644
--- a/emacs/notmuch-company.el
+++ b/emacs/notmuch-company.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 004463c..e376aa8 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Jameson Rollins <jrollins@finestructure.net>
 
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 9495c1a..75ccf57 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
@@ -265,7 +265,7 @@ International Bureau of Weights and Measures."
   :group 'notmuch-hello
   :group 'notmuch-hooks)
 
-(defvar notmuch-hello-url "http://notmuchmail.org"
+(defvar notmuch-hello-url "https://notmuchmail.org"
   "The `notmuch' web site.")
 
 (defvar notmuch-hello-custom-section-options
diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el
index fd770f1..963253c 100644
--- a/emacs/notmuch-jump.el
+++ b/emacs/notmuch-jump.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Austin Clements <aclements@csail.mit.edu>
 ;;          David Edmondson <dme@dme.org>
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index f05ded6..1781af4 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Carl Worth <cworth@cworth.org>
 
diff --git a/emacs/notmuch-message.el b/emacs/notmuch-message.el
index d437b85..55e4cfe 100644
--- a/emacs/notmuch-message.el
+++ b/emacs/notmuch-message.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Jesse Rosenthal <jrosenthal@jhu.edu>
 
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 399e138..1ca8056 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
@@ -142,7 +142,7 @@ mutiple parts get a header."
   (let ((notmuch-version (if (string= notmuch-emacs-version "unknown")
 			     (notmuch-cli-version)
 			   notmuch-emacs-version)))
-    (concat "Notmuch/" notmuch-version " (http://notmuchmail.org)")))
+    (concat "Notmuch/" notmuch-version " (https://notmuchmail.org)")))
 
 (defun notmuch-mua-user-agent-emacs ()
   "Generate a `User-Agent:' string suitable for notmuch."
@@ -334,7 +334,7 @@ modified. This function is notmuch addaptation of
 	  ;; C-h f compose-mail says that headers should be specified as
 	  ;; (string . value); however all the rest of message expects
 	  ;; headers to be symbols, not strings (eg message-header-format-alist).
-	  ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
+	  ;; https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
 	  ;; We need to convert any string input, eg from rmail-start-mail.
 	  (dolist (h other-headers other-headers)
 	    (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))))
diff --git a/emacs/notmuch-parser.el b/emacs/notmuch-parser.el
index 620ca89..bb0379c 100644
--- a/emacs/notmuch-parser.el
+++ b/emacs/notmuch-parser.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Austin Clements <aclements@csail.mit.edu>
 
diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el
index 480a0cf..bca759f 100644
--- a/emacs/notmuch-print.el
+++ b/emacs/notmuch-print.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index 8587d88..436ad16 100644
--- a/emacs/notmuch-query.el
+++ b/emacs/notmuch-query.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: David Bremner <david@tethera.net>
 
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index f33096c..fea39fa 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -16,7 +16,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Carl Worth <cworth@cworth.org>
 ;;          David Edmondson <dme@dme.org>
@@ -182,9 +182,9 @@ each attachment handler is logged in buffers with names beginning
 
 (defcustom notmuch-show-stash-mlarchive-link-alist
   '(("Gmane" . "http://mid.gmane.org/")
-    ("MARC" . "http://marc.info/?i=")
-    ("Mail Archive, The" . "http://mid.mail-archive.com/")
-    ("LKML" . "http://lkml.kernel.org/r/")
+    ("MARC" . "https://marc.info/?i=")
+    ("Mail Archive, The" . "https://mid.mail-archive.com/")
+    ("LKML" . "https://lkml.kernel.org/r/")
     ;; FIXME: can these services be searched by `Message-Id' ?
     ;; ("MarkMail" . "http://markmail.org/")
     ;; ("Nabble" . "http://nabble.com/")
diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el
index 98064a3..a3f0c52 100644
--- a/emacs/notmuch-tag.el
+++ b/emacs/notmuch-tag.el
@@ -16,7 +16,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Carl Worth <cworth@cworth.org>
 ;;          Damien Cassou <damien.cassou@gmail.com>
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 4f9ca2d..5231319 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -17,7 +17,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 ;;          Mark Walters <markwalters1009@gmail.com>
diff --git a/emacs/notmuch-version.el.tmpl b/emacs/notmuch-version.el.tmpl
index 88cc01c..abf52f1 100644
--- a/emacs/notmuch-version.el.tmpl
+++ b/emacs/notmuch-version.el.tmpl
@@ -16,7 +16,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index 065af16..57e6dfa 100644
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -16,7 +16,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Carl Worth <cworth@cworth.org>
 ;;          David Edmondson <dme@dme.org>
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index a8a4c8e..8acdef3 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Carl Worth <cworth@cworth.org>
 ;; Homepage: https://notmuchmail.org/
@@ -26,7 +26,7 @@
 ;;
 ;; You will first need to have the notmuch program installed and have a
 ;; notmuch database built in order to use this. See
-;; http://notmuchmail.org for details.
+;; https://notmuchmail.org for details.
 ;;
 ;; To install this software, copy it to a directory that is on the
 ;; `load-path' variable within emacs (a good candidate is
@@ -48,7 +48,7 @@
 ;;
 ;; Have fun, and let us know if you have any comment, questions, or
 ;; kudos: Notmuch list <notmuch@notmuchmail.org> (subscription is not
-;; required, but is available from http://notmuchmail.org).
+;; required, but is available from https://notmuchmail.org).
 
 ;;; Code:
 
diff --git a/hooks.c b/hooks.c
index 662629a..7348d32 100644
--- a/hooks.c
+++ b/hooks.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Jani Nikula <jani@nikula.org>
  */
diff --git a/lib/built-with.c b/lib/built-with.c
index 7ea1d7f..635ed3b 100644
--- a/lib/built-with.c
+++ b/lib/built-with.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: David Bremner <david@tethera.net>
  */
diff --git a/lib/config.cc b/lib/config.cc
index e05e50f..0703b9b 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: David Bremner <david@tethera.net>
  */
diff --git a/lib/database-private.h b/lib/database-private.h
index 1a78b60..ca71a92 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/database.cc b/lib/database.cc
index 9630000..f37cc62 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -217,7 +217,7 @@ typedef struct {
 
 /* With these prefix values we follow the conventions published here:
  *
- * http://xapian.org/docs/omega/termprefixes.html
+ * https://xapian.org/docs/omega/termprefixes.html
  *
  * as much as makes sense. Note that I took some liberty in matching
  * the reserved prefix values to notmuch concepts, (for example, 'G'
diff --git a/lib/directory.cc b/lib/directory.cc
index 78637b3..a19f777 100644
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/filenames.c b/lib/filenames.c
index 4f7c0d8..63e737d 100644
--- a/lib/filenames.c
+++ b/lib/filenames.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh
index 8477001..5f99272 100644
--- a/lib/gen-version-script.sh
+++ b/lib/gen-version-script.sh
@@ -2,7 +2,7 @@ set -eu
 
 # we go through a bit of work to get the unmangled names of the
 # typeinfo symbols because of
-# http://sourceware.org/bugzilla/show_bug.cgi?id=10326
+# https://sourceware.org/bugzilla/show_bug.cgi?id=10326
 
 if [ $# -lt 2 ]; then
     echo Usage: $0 header obj1 obj2 obj3
diff --git a/lib/index.cc b/lib/index.cc
index f166aef..98e4a5d 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/message-file.c b/lib/message-file.c
index ee30520..db18b16 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/message.cc b/lib/message.cc
index 6839305..551bd3b 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/messages.c b/lib/messages.c
index 0eee569..b5363bb 100644
--- a/lib/messages.c
+++ b/lib/messages.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 9280797..5691240 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/notmuch.h b/lib/notmuch.h
index bd977c3..29713ae 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -693,7 +693,7 @@ notmuch_database_get_all_tags (notmuch_database_t *db);
  * completely in the future, but it's likely to be a specialized
  * version of the general Xapian query syntax:
  *
- * http://xapian.org/docs/queryparser.html
+ * https://xapian.org/docs/queryparser.html
  *
  * As a special case, passing either a length-zero string, (that is ""),
  * or a string consisting of a single asterisk (that is "*"), will
diff --git a/lib/parse-time-vrp.cc b/lib/parse-time-vrp.cc
index b15b77c..dd69149 100644
--- a/lib/parse-time-vrp.cc
+++ b/lib/parse-time-vrp.cc
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Jani Nikula <jani@nikula.org>
  */
diff --git a/lib/parse-time-vrp.h b/lib/parse-time-vrp.h
index 3bd12bf..c024dba 100644
--- a/lib/parse-time-vrp.h
+++ b/lib/parse-time-vrp.h
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Jani Nikula <jani@nikula.org>
  */
diff --git a/lib/query-fp.cc b/lib/query-fp.cc
index 4ffcb1e..c39f591 100644
--- a/lib/query-fp.cc
+++ b/lib/query-fp.cc
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: David Bremner <david@tethera.net>
  */
diff --git a/lib/query-fp.h b/lib/query-fp.h
index 67f8705..d6e4b31 100644
--- a/lib/query-fp.h
+++ b/lib/query-fp.h
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: David Bremner <david@tethera.net>
  */
diff --git a/lib/query.cc b/lib/query.cc
index 0875b0e..167661c 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/sha1.c b/lib/sha1.c
index 94060d5..1aeb0b6 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/string-list.c b/lib/string-list.c
index da72746..43ebe49 100644
--- a/lib/string-list.c
+++ b/lib/string-list.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  *         Austin Clements <aclements@csail.mit.edu>
diff --git a/lib/tags.c b/lib/tags.c
index b7e5602..c7d3f66 100644
--- a/lib/tags.c
+++ b/lib/tags.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/lib/thread.cc b/lib/thread.cc
index 0c937d7..84ee529 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/mime-node.c b/mime-node.c
index e96e663..c9b8233 100644
--- a/mime-node.c
+++ b/mime-node.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Authors: Carl Worth <cworth@cworth.org>
  *          Keith Packard <keithp@keithp.com>
diff --git a/notmuch-client.h b/notmuch-client.h
index c130b93..ebc092b 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch-compact.c b/notmuch-compact.c
index 9373721..855545d 100644
--- a/notmuch-compact.c
+++ b/notmuch-compact.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ben Gamari <bgamari.foss@gmail.com>
  */
diff --git a/notmuch-config.c b/notmuch-config.c
index c618f2c..de9a8a4 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -27,7 +27,7 @@
 static const char toplevel_config_comment[] =
     " .notmuch-config - Configuration file for the notmuch mail system\n"
     "\n"
-    " For more information about notmuch, see http://notmuchmail.org";
+    " For more information about notmuch, see https://notmuchmail.org";
 
 static const char database_config_comment[] =
     " Database configuration\n"
diff --git a/notmuch-count.c b/notmuch-count.c
index 0b6e6f5..35a2aa7 100644
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Keith Packard <keithp@keithp.com>
  */
diff --git a/notmuch-dump.c b/notmuch-dump.c
index 8e79511..cae1db8 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index 4404cd7..02d7fd7 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
+# along with this program.  If not, see https://www.gnu.org/licenses/ .
 #
 # Authors: Jani Nikula <jani@nikula.org>
 #
diff --git a/notmuch-insert.c b/notmuch-insert.c
index 5205c17..131f09e 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Peter Wang <novalazy@gmail.com>
  */
diff --git a/notmuch-new.c b/notmuch-new.c
index 8d1545e..799fec2 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch-reply.c b/notmuch-reply.c
index 457e54a..4951373 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Authors: Carl Worth <cworth@cworth.org>
  *	    Keith Packard <keithp@keithp.com>
diff --git a/notmuch-restore.c b/notmuch-restore.c
index 8ad67b5..371237c 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch-search.c b/notmuch-search.c
index 6d08c25..8c65d5a 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch-setup.c b/notmuch-setup.c
index 9aaf928..9a66810 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch-show.c b/notmuch-show.c
index 3d5033d..22fa655 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch-tag.c b/notmuch-tag.c
index 0d15328..18d78dd 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch-time.c b/notmuch-time.c
index e250c3d..2734b36 100644
--- a/notmuch-time.c
+++ b/notmuch-time.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/notmuch.c b/notmuch.c
index ce6c575..38b73c1 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Authors: Carl Worth <cworth@cworth.org>
  *	    Keith Packard <keithp@keithp.com>
@@ -354,7 +354,7 @@ notmuch_command (notmuch_config_t *config,
 	    "You can also use \"notmuch show\" with any of the thread IDs resulting\n"
 	    "from a search. Finally, you may want to explore using a more sophisticated\n"
 	    "interface to notmuch such as the emacs interface implemented in notmuch.el\n"
-	    "or any other interface described at http://notmuchmail.org\n\n"
+	    "or any other interface described at https://notmuchmail.org\n\n"
 	    "And don't forget to run \"notmuch new\" whenever new mail arrives.\n\n"
 	    "Have fun, and may your inbox never have much mail.\n\n",
 	    notmuch_config_get_user_name (config),
diff --git a/packaging/fedora/notmuch.spec b/packaging/fedora/notmuch.spec
index 79994c9..5146edd 100644
--- a/packaging/fedora/notmuch.spec
+++ b/packaging/fedora/notmuch.spec
@@ -21,9 +21,9 @@ Summary:        Thread-based email index, search and tagging
 
 Group:          Applications/Internet
 License:        GPLv3+
-URL:            http://notmuchmail.org/
+URL:            https://notmuchmail.org/
 
-Source0:        http://notmuchmail.org/releases/notmuch-%{version}.tar.gz
+Source0:        https://notmuchmail.org/releases/notmuch-%{version}.tar.gz
 
 BuildRequires:  xapian-core-devel gmime-devel libtalloc-devel
 BuildRequires:  zlib-devel emacs-el emacs-nox python ruby ruby-devel perl
diff --git a/parse-time-string/parse-time-string.c b/parse-time-string/parse-time-string.c
index 1cef47d..48ec5b0 100644
--- a/parse-time-string/parse-time-string.c
+++ b/parse-time-string/parse-time-string.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Author: Jani Nikula <jani@nikula.org>
  */
diff --git a/parse-time-string/parse-time-string.h b/parse-time-string/parse-time-string.h
index bfa4ee3..2063bca 100644
--- a/parse-time-string/parse-time-string.h
+++ b/parse-time-string/parse-time-string.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Author: Jani Nikula <jani@nikula.org>
  */
diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index 3469aa3..9dc260e 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -10,7 +10,7 @@ MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test
 CORPUS_NAME := notmuch-email-corpus-$(PERFTEST_VERSION).tar.xz
 TXZFILE := ${dir}/download/${CORPUS_NAME}
 SIGFILE := ${TXZFILE}.asc
-DEFAULT_URL :=  http://notmuchmail.org/releases/${CORPUS_NAME}
+DEFAULT_URL :=  https://notmuchmail.org/releases/${CORPUS_NAME}
 
 perf-test: time-test memory-test
 
@@ -32,7 +32,7 @@ setup-perf-test: $(TXZFILE)
 $(TXZFILE):
 	@printf "\nPlease download ${TXZFILE} using:\n\n"
 	@printf "\t%% make download-corpus\n\n"
-	@echo or see http://notmuchmail.org/corpus for download locations
+	@echo or see https://notmuchmail.org/corpus for download locations
 	@echo
 	@false
 
diff --git a/performance-test/README b/performance-test/README
index 996724c..fbc6102 100644
--- a/performance-test/README
+++ b/performance-test/README
@@ -37,7 +37,7 @@ To fetch the actual corpus it should work to run
 
 In case that fails or is too slow, check
 
-   http://notmuchmail.org/corpus
+   https://notmuchmail.org/corpus
 
 for a list of mirrors.
 
diff --git a/query-string.c b/query-string.c
index 6536512..cc8b27d 100644
--- a/query-string.c
+++ b/query-string.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/sprinter-sexp.c b/sprinter-sexp.c
index 0aa51e8..08783e1 100644
--- a/sprinter-sexp.c
+++ b/sprinter-sexp.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Peter Feigl <peter.feigl@gmx.at>
  */
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index daa0256..65c1728 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -760,8 +760,8 @@ bought
 inbox,stashtest
 ${gen_msg_filename}
 http://mid.gmane.org/bought
-http://marc.info/?i=bought
-http://mid.mail-archive.com/bought
+https://marc.info/?i=bought
+https://mid.mail-archive.com/bought
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
index 3f18ec1..e681d5b 100755
--- a/test/T360-symbol-hiding.sh
+++ b/test/T360-symbol-hiding.sh
@@ -5,7 +5,7 @@
 
 # This test tests whether hiding Xapian::Error symbols in libnotmuch
 # also hides them for other users of libxapian. This is motivated by
-# the discussion in http://gcc.gnu.org/wiki/Visibility'
+# the discussion in https://gcc.gnu.org/wiki/Visibility'
 
 test_description='exception symbol hiding'
 
diff --git a/test/database-test.c b/test/database-test.c
index b8c3a67..42f6655 100644
--- a/test/database-test.c
+++ b/test/database-test.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: David Bremner <david@tethera.net>
  */
diff --git a/test/parse-time.c b/test/parse-time.c
index 901a4dd..694761c 100644
--- a/test/parse-time.c
+++ b/test/parse-time.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Author: Jani Nikula <jani@nikula.org>
  */
diff --git a/test/random-corpus.c b/test/random-corpus.c
index d74271d..aca694a 100644
--- a/test/random-corpus.c
+++ b/test/random-corpus.c
@@ -19,7 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: David Bremner <david@tethera.net>
  */
diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
index bb13668..a629927 100644
--- a/test/smtp-dummy.c
+++ b/test/smtp-dummy.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Authors: Carl Worth <cworth@cworth.org>
  */
diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local
index ff333a1..dcc8863 100644
--- a/test/test-databases/Makefile.local
+++ b/test/test-databases/Makefile.local
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 
-TEST_DATABASE_MIRROR=http://notmuchmail.org/releases/test-databases
+TEST_DATABASE_MIRROR=https://notmuchmail.org/releases/test-databases
 
 dir := test/test-databases
 
diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index ba4a8e1..fe92cdd 100644
--- a/test/test-lib-common.sh
+++ b/test/test-lib-common.sh
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
+# along with this program.  If not, see https://www.gnu.org/licenses/ .
 
 # This file contains common code to be used by both the regular
 # (correctness) tests and the performance tests.
diff --git a/test/test-lib.el b/test/test-lib.el
index 596a705..496626f 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -16,7 +16,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
 
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 201d0eb..29ec008 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
+# along with this program.  If not, see https://www.gnu.org/licenses/ .
 
 if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
     echo "Error: The notmuch test suite requires a bash version >= 4.0"
diff --git a/util/error_util.c b/util/error_util.c
index d6e60fc..778bbd5 100644
--- a/util/error_util.c
+++ b/util/error_util.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/util/error_util.h b/util/error_util.h
index 17c8727..4bb338a 100644
--- a/util/error_util.h
+++ b/util/error_util.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/util/hex-escape.c b/util/hex-escape.c
index b4a2a02..8883ff9 100644
--- a/util/hex-escape.c
+++ b/util/hex-escape.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: David Bremner <david@tethera.net>
  */
diff --git a/util/string-util.c b/util/string-util.c
index 92af937..1812530 100644
--- a/util/string-util.c
+++ b/util/string-util.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Jani Nikula <jani@nikula.org>
  */
diff --git a/util/xutil.c b/util/xutil.c
index ac496da..f211eaa 100644
--- a/util/xutil.c
+++ b/util/xutil.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/util/xutil.h b/util/xutil.h
index b84e0e2..4829f33 100644
--- a/util/xutil.h
+++ b/util/xutil.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
diff --git a/util/zlib-extra.c b/util/zlib-extra.c
index 2e70445..2b2cd8f 100644
--- a/util/zlib-extra.c
+++ b/util/zlib-extra.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: David Bremner <david@tethera.net>
  */
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/5] NEWS, python: update pointer to online documentation
  2016-06-02 16:26 [PATCH 1/5] NEWS, python: update pointer to online documentation Daniel Kahn Gillmor
                   ` (3 preceding siblings ...)
  2016-06-02 16:26 ` [PATCH 5/5] Use https instead of http where possible Daniel Kahn Gillmor
@ 2016-06-05 11:41 ` David Bremner
  4 siblings, 0 replies; 6+ messages in thread
From: David Bremner @ 2016-06-05 11:41 UTC (permalink / raw)
  To: Daniel Kahn Gillmor, Notmuch Mail

Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:

> Currently, http://packages.python.org/notmuch/ goes through a series
> of redirections and ends up pointing to readthedocs.  Since we're
> using readthedocs directly anyway, just point to it directly.

pushed this series

d

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-06-05 11:41 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-02 16:26 [PATCH 1/5] NEWS, python: update pointer to online documentation Daniel Kahn Gillmor
2016-06-02 16:26 ` [PATCH 2/5] completion: update the location of the bash-completion project Daniel Kahn Gillmor
2016-06-02 16:26 ` [PATCH 3/5] update link to Chip Rosenthal article about reply-to munging Daniel Kahn Gillmor
2016-06-02 16:26 ` [PATCH 4/5] nmbug: updated to modern URL for PEP 343 Daniel Kahn Gillmor
2016-06-02 16:26 ` [PATCH 5/5] Use https instead of http where possible Daniel Kahn Gillmor
2016-06-05 11:41 ` [PATCH 1/5] NEWS, python: update pointer to online documentation David Bremner

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).