emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] Bug: Broken orgmode.org links in doc/misc/org.texi and lisp/org


From: Tim Landscheidt
Subject: Re: [O] Bug: Broken orgmode.org links in doc/misc/org.texi and lisp/org
Date: Tue, 16 Jan 2018 20:00:12 +0000
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)

Hi,

attached are five patches mostly related to the http to
https update part of my post.

Patch #1 updates only URLs from http to https that I consid-
er "uncontroversial".

Patch #2 makes some links to the manual and external URLs in
docstrings clickable.

Patch #3 updates URLs from http to https in old entries of
etc/ORG-NEWS.  There is an argument for keeping them as is,
and I have no strong opinion on that.

Patch #4 updates URLs from http to https in source code and
test cases.  These need to be reviewed more carefully, espe-
cially as there probably should remain some test cases for
http URLs.  (I get a test failure for
test-org/timestamp-from-time, but AFAICT this is unrelated.)

Patch #5 just adds a trailing slash to two links to
https://orgmode.org/worg/org-contrib/babel.

Tim
>From eb2208842b3568122ecc9f9936dc255d73b76577 Mon Sep 17 00:00:00 2001
From: Tim Landscheidt <address@hidden>
Date: Tue, 16 Jan 2018 16:22:00 +0000
Subject: [PATCH 1/5] Use https for links to orgmode.org

---
 Makefile                                 |  2 +-
 README_ELPA                              |  4 +-
 README_git                               |  4 +-
 README_maintainer                        |  2 +-
 contrib/lisp/ob-csharp.el                |  2 +-
 contrib/lisp/ob-eukleides.el             |  2 +-
 contrib/lisp/ob-fomus.el                 |  2 +-
 contrib/lisp/ob-mathomatic.el            |  2 +-
 contrib/lisp/ob-oz.el                    |  2 +-
 contrib/lisp/ob-tcl.el                   |  2 +-
 contrib/lisp/ob-vbnet.el                 |  2 +-
 contrib/lisp/org-bibtex-extras.el        |  2 +-
 contrib/lisp/org-collector.el            |  2 +-
 contrib/lisp/org-contribdir.el           |  2 +-
 contrib/lisp/org-depend.el               |  2 +-
 contrib/lisp/org-effectiveness.el        |  2 +-
 contrib/lisp/org-eval-light.el           |  2 +-
 contrib/lisp/org-eval.el                 |  2 +-
 contrib/lisp/org-index.el                |  2 +-
 contrib/lisp/org-learn.el                |  2 +-
 contrib/lisp/org-license.el              |  2 +-
 contrib/lisp/org-link-edit.el            | 16 ++++----
 contrib/lisp/org-mairix.el               |  2 +-
 contrib/lisp/org-man.el                  |  2 +-
 contrib/lisp/org-mew.el                  |  2 +-
 contrib/lisp/org-notmuch.el              |  2 +-
 contrib/lisp/org-passwords.el            |  2 +-
 contrib/lisp/org-screenshot.el           |  2 +-
 contrib/lisp/org-sudoku.el               |  2 +-
 contrib/lisp/org-track.el                |  6 +--
 contrib/lisp/org-vm.el                   |  2 +-
 contrib/lisp/org-wikinodes.el            |  2 +-
 contrib/lisp/org-wl.el                   |  2 +-
 contrib/lisp/ox-rss.el                   |  2 +-
 contrib/scripts/org-docco.org            |  6 +--
 contrib/scripts/staticmathjax/README.org |  2 +-
 doc/orgguide.texi                        | 70 ++++++++++++++++----------------
 etc/ORG-NEWS                             |  4 +-
 etc/styles/README                        |  2 +-
 lisp/ob-C.el                             |  2 +-
 lisp/ob-J.el                             |  2 +-
 lisp/ob-R.el                             |  2 +-
 lisp/ob-asymptote.el                     |  2 +-
 lisp/ob-awk.el                           |  2 +-
 lisp/ob-calc.el                          |  2 +-
 lisp/ob-clojure.el                       |  2 +-
 lisp/ob-comint.el                        |  2 +-
 lisp/ob-coq.el                           |  2 +-
 lisp/ob-core.el                          |  2 +-
 lisp/ob-css.el                           |  2 +-
 lisp/ob-ditaa.el                         |  2 +-
 lisp/ob-dot.el                           |  2 +-
 lisp/ob-ebnf.el                          |  2 +-
 lisp/ob-emacs-lisp.el                    |  2 +-
 lisp/ob-eval.el                          |  2 +-
 lisp/ob-exp.el                           |  2 +-
 lisp/ob-forth.el                         |  2 +-
 lisp/ob-fortran.el                       |  2 +-
 lisp/ob-gnuplot.el                       |  2 +-
 lisp/ob-groovy.el                        |  2 +-
 lisp/ob-haskell.el                       |  2 +-
 lisp/ob-hledger.el                       |  2 +-
 lisp/ob-io.el                            |  2 +-
 lisp/ob-java.el                          |  2 +-
 lisp/ob-js.el                            |  2 +-
 lisp/ob-keys.el                          |  2 +-
 lisp/ob-latex.el                         |  2 +-
 lisp/ob-ledger.el                        |  2 +-
 lisp/ob-lilypond.el                      |  4 +-
 lisp/ob-lisp.el                          |  2 +-
 lisp/ob-lob.el                           |  2 +-
 lisp/ob-lua.el                           |  2 +-
 lisp/ob-makefile.el                      |  2 +-
 lisp/ob-matlab.el                        |  2 +-
 lisp/ob-maxima.el                        |  2 +-
 lisp/ob-mscgen.el                        |  2 +-
 lisp/ob-ocaml.el                         |  2 +-
 lisp/ob-octave.el                        |  2 +-
 lisp/ob-org.el                           |  2 +-
 lisp/ob-perl.el                          |  2 +-
 lisp/ob-picolisp.el                      |  2 +-
 lisp/ob-plantuml.el                      |  2 +-
 lisp/ob-processing.el                    |  2 +-
 lisp/ob-python.el                        |  2 +-
 lisp/ob-ref.el                           |  2 +-
 lisp/ob-ruby.el                          |  2 +-
 lisp/ob-sass.el                          |  2 +-
 lisp/ob-scheme.el                        |  2 +-
 lisp/ob-screen.el                        |  2 +-
 lisp/ob-shell.el                         |  2 +-
 lisp/ob-shen.el                          |  2 +-
 lisp/ob-sql.el                           |  2 +-
 lisp/ob-sqlite.el                        |  2 +-
 lisp/ob-stan.el                          |  4 +-
 lisp/ob-table.el                         |  2 +-
 lisp/ob-tangle.el                        |  2 +-
 lisp/ob-vala.el                          |  2 +-
 lisp/ob.el                               |  2 +-
 lisp/org-agenda.el                       |  2 +-
 lisp/org-archive.el                      |  2 +-
 lisp/org-bbdb.el                         |  2 +-
 lisp/org-capture.el                      |  2 +-
 lisp/org-clock.el                        |  2 +-
 lisp/org-colview.el                      |  2 +-
 lisp/org-compat.el                       |  2 +-
 lisp/org-datetree.el                     |  2 +-
 lisp/org-docview.el                      |  2 +-
 lisp/org-element.el                      |  2 +-
 lisp/org-entities.el                     |  2 +-
 lisp/org-eww.el                          |  2 +-
 lisp/org-faces.el                        |  2 +-
 lisp/org-feed.el                         |  2 +-
 lisp/org-footnote.el                     |  2 +-
 lisp/org-gnus.el                         |  2 +-
 lisp/org-habit.el                        |  2 +-
 lisp/org-id.el                           |  2 +-
 lisp/org-indent.el                       |  2 +-
 lisp/org-info.el                         |  2 +-
 lisp/org-inlinetask.el                   |  2 +-
 lisp/org-list.el                         |  2 +-
 lisp/org-macs.el                         |  2 +-
 lisp/org-mhe.el                          |  2 +-
 lisp/org-mobile.el                       |  2 +-
 lisp/org-mouse.el                        |  2 +-
 lisp/org-pcomplete.el                    |  2 +-
 lisp/org-plot.el                         |  2 +-
 lisp/org-rmail.el                        |  2 +-
 lisp/org-src.el                          |  2 +-
 lisp/org-table.el                        |  4 +-
 lisp/org-tempo.el                        |  2 +-
 lisp/org-timer.el                        |  2 +-
 lisp/org-w3m.el                          |  2 +-
 lisp/org.el                              | 10 ++---
 lisp/ox-html.el                          |  4 +-
 lisp/ox-icalendar.el                     |  2 +-
 lisp/ox-latex.el                         |  2 +-
 lisp/ox-odt.el                           |  2 +-
 lisp/ox.el                               |  2 +-
 mk/eldo.el                               |  6 +--
 mk/guidesplit.pl                         |  4 +-
 mk/manfull.pl                            |  6 +--
 mk/mansplit.pl                           |  6 +--
 mk/org-fixup.el                          |  2 +-
 testing/examples/links.org               |  4 +-
 144 files changed, 208 insertions(+), 208 deletions(-)

diff --git a/Makefile b/Makefile
index f6312f251..f476a3ea7 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ help helpall::
        $(info )
        $(info Full documentation on Worg)
        $(info ==========================)
-       $(info http://orgmode.org/worg/dev/org-build-system.html)
+       $(info https://orgmode.org/worg/dev/org-build-system.html)
        @echo ""
 
  include mk/targets.mk # toplevel make machinery
diff --git a/README_ELPA b/README_ELPA
index be8932439..7640a4498 100644
--- a/README_ELPA
+++ b/README_ELPA
@@ -1,10 +1,10 @@
 This is the Emacs Org project, an Emacs library for organizing your life.
 
 The homepage of Org is at:
-  http://orgmode.org
+  https://orgmode.org
 
 Installations instructions are at:
-  http://orgmode.org/org.html#Installation
+  https://orgmode.org/org.html#Installation
 
 This distribution contains an ELPA packaged version of Org.
 "ELPA" stands for the "Emacs Lisp Package Archive".
diff --git a/README_git b/README_git
index 7fd638c5d..44e4a0d45 100644
--- a/README_git
+++ b/README_git
@@ -1,6 +1,6 @@
 This is the Emacs Org project, an Emacs library for organizing your life.
 
-The homepage of Org is at http://orgmode.org
+The homepage of Org is at https://orgmode.org
 
 This distribution contains:
 
@@ -26,7 +26,7 @@ COPYING
 Makefile
     The makefile to compile and install Org.  For installation
     instructions, see the manual or the more detailed procedure
-    on Worg: http://orgmode.org/worg/dev/org-build-system.html
+    on Worg: https://orgmode.org/worg/dev/org-build-system.html
 
 mk/
     Files needed for building Org.
diff --git a/README_maintainer b/README_maintainer
index 24b7bd0f6..b727a80a1 100644
--- a/README_maintainer
+++ b/README_maintainer
@@ -188,7 +188,7 @@ The assignment form is included in the repository as a file 
that you
 can send to contributors: =request-assign-future.txt=
 
 The list of all contributors from who we have the papers is kept on
-Worg at http://orgmode.org/worg/org-contribute.html, so that
+Worg at https://orgmode.org/worg/org-contribute.html, so that
 committers can check if a patch can go into the core.
 
 The assignment process does not allways go smoothly, and it has
diff --git a/contrib/lisp/ob-csharp.el b/contrib/lisp/ob-csharp.el
index a3bc2e777..526a3ae0e 100644
--- a/contrib/lisp/ob-csharp.el
+++ b/contrib/lisp/ob-csharp.el
@@ -4,7 +4,7 @@
 
 ;; Author: thomas "at" friendlyvillagers.com based on ob-java.el by Eric 
Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/ob-eukleides.el b/contrib/lisp/ob-eukleides.el
index 4f363f536..b6ed7fb50 100644
--- a/contrib/lisp/ob-eukleides.el
+++ b/contrib/lisp/ob-eukleides.el
@@ -4,7 +4,7 @@
 
 ;; Author: Luis Anaya
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/ob-fomus.el b/contrib/lisp/ob-fomus.el
index 30f292f3d..6ff27b604 100644
--- a/contrib/lisp/ob-fomus.el
+++ b/contrib/lisp/ob-fomus.el
@@ -4,7 +4,7 @@
 
 ;; Author: Torsten Anders
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/ob-mathomatic.el b/contrib/lisp/ob-mathomatic.el
index 7081ec2dc..6196001cb 100644
--- a/contrib/lisp/ob-mathomatic.el
+++ b/contrib/lisp/ob-mathomatic.el
@@ -7,7 +7,7 @@
 ;;  Luis Anaya (Mathomatic)
 
 ;; Keywords: literate programming, reproducible research, mathomatic
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/ob-oz.el b/contrib/lisp/ob-oz.el
index 9beadeb07..626c4f316 100644
--- a/contrib/lisp/ob-oz.el
+++ b/contrib/lisp/ob-oz.el
@@ -4,7 +4,7 @@
 
 ;; Author: Torsten Anders and Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 0.02
 
 ;; This file is not part of GNU Emacs.
diff --git a/contrib/lisp/ob-tcl.el b/contrib/lisp/ob-tcl.el
index c6bf2c2d7..45708adfd 100644
--- a/contrib/lisp/ob-tcl.el
+++ b/contrib/lisp/ob-tcl.el
@@ -7,7 +7,7 @@
 ;;   Luis Anaya (tcl)
 ;;
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/ob-vbnet.el b/contrib/lisp/ob-vbnet.el
index 9822c3c4e..f9a762e6b 100644
--- a/contrib/lisp/ob-vbnet.el
+++ b/contrib/lisp/ob-vbnet.el
@@ -4,7 +4,7 @@
 
 ;; Author: thomas "at" friendlyvillagers.com based on ob-java.el by Eric 
Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/org-bibtex-extras.el 
b/contrib/lisp/org-bibtex-extras.el
index 91b6cd346..991946e22 100644
--- a/contrib/lisp/org-bibtex-extras.el
+++ b/contrib/lisp/org-bibtex-extras.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte <eric dot schulte at gmx dot com>
 ;; Keywords: outlines, hypermedia, bibtex, d3
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 0.01
 
 ;; This file is not yet part of GNU Emacs.
diff --git a/contrib/lisp/org-collector.el b/contrib/lisp/org-collector.el
index 08dd22a2d..1d2351923 100644
--- a/contrib/lisp/org-collector.el
+++ b/contrib/lisp/org-collector.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp, experimentation,
 ;;           organization, properties
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 0.01
 
 ;; This file is not yet part of GNU Emacs.
diff --git a/contrib/lisp/org-contribdir.el b/contrib/lisp/org-contribdir.el
index d72feb51a..019305f4d 100644
--- a/contrib/lisp/org-contribdir.el
+++ b/contrib/lisp/org-contribdir.el
@@ -3,7 +3,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 0.01
 ;;
 ;; This file is not yet part of GNU Emacs.
diff --git a/contrib/lisp/org-depend.el b/contrib/lisp/org-depend.el
index ed78d0066..8f99c36a7 100644
--- a/contrib/lisp/org-depend.el
+++ b/contrib/lisp/org-depend.el
@@ -3,7 +3,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 0.08
 ;;
 ;; This file is not part of GNU Emacs.
diff --git a/contrib/lisp/org-effectiveness.el 
b/contrib/lisp/org-effectiveness.el
index 0e12f98ec..2498578c4 100644
--- a/contrib/lisp/org-effectiveness.el
+++ b/contrib/lisp/org-effectiveness.el
@@ -4,7 +4,7 @@
 
 ;; Author: David Arroyo Menéndez <address@hidden>
 ;; Keywords: effectiveness, plot
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is not part of GNU Emacs, yet.
 ;;
diff --git a/contrib/lisp/org-eval-light.el b/contrib/lisp/org-eval-light.el
index 2687e7e9b..0878da404 100644
--- a/contrib/lisp/org-eval-light.el
+++ b/contrib/lisp/org-eval-light.el
@@ -6,7 +6,7 @@
 ;;         Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp, literate programming,
 ;;           reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 0.04
 
 ;; This file is not yet part of GNU Emacs.
diff --git a/contrib/lisp/org-eval.el b/contrib/lisp/org-eval.el
index acb536af1..a5d5bab2b 100644
--- a/contrib/lisp/org-eval.el
+++ b/contrib/lisp/org-eval.el
@@ -3,7 +3,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 0.04
 ;;
 ;; This file is not yet part of GNU Emacs.
diff --git a/contrib/lisp/org-index.el b/contrib/lisp/org-index.el
index 4d37ef07c..853c4313c 100644
--- a/contrib/lisp/org-index.el
+++ b/contrib/lisp/org-index.el
@@ -73,7 +73,7 @@
 ;; Updates:
 ;;
 ;;  The latest published version of this file can always be found at:
-;;    
http://orgmode.org/w/?p=org-mode.git;a=blob_plain;f=contrib/lisp/org-index.el;hb=HEAD
+;;    
https://orgmode.org/w/?p=org-mode.git;a=blob_plain;f=contrib/lisp/org-index.el;hb=HEAD
 ;;  Development version under:
 ;;    https://github.com/marcIhm/org-index
 ;;
diff --git a/contrib/lisp/org-learn.el b/contrib/lisp/org-learn.el
index 41240317d..e932fff82 100644
--- a/contrib/lisp/org-learn.el
+++ b/contrib/lisp/org-learn.el
@@ -4,7 +4,7 @@
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 6.32trans
 ;;
 ;; This file is not part of GNU Emacs.
diff --git a/contrib/lisp/org-license.el b/contrib/lisp/org-license.el
index 3f81fbf64..b411f9be7 100644
--- a/contrib/lisp/org-license.el
+++ b/contrib/lisp/org-license.el
@@ -4,7 +4,7 @@
 
 ;; Author: David Arroyo Menéndez <address@hidden>
 ;; Keywords: licenses, creative commons
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is not part of GNU Emacs, yet.
 ;;
diff --git a/contrib/lisp/org-link-edit.el b/contrib/lisp/org-link-edit.el
index 000dd1c2c..714fb2507 100644
--- a/contrib/lisp/org-link-edit.el
+++ b/contrib/lisp/org-link-edit.el
@@ -136,12 +136,12 @@ movement, return nil.  Otherwise, return t."
 (defun org-link-edit-forward-slurp (&optional n)
   "Slurp N trailing blobs into link's description.
 
-  The \[\[http://orgmode.org/\]\[Org mode\]\] site
+  The \[\[https://orgmode.org/\]\[Org mode\]\] site
 
                         |
                         v
 
-  The \[\[http://orgmode.org/\]\[Org mode site\]\]
+  The \[\[https://orgmode.org/\]\[Org mode site\]\]
 
 A blob is a block of non-whitespace characters.  When slurping
 forward, trailing punctuation characters are not considered part
@@ -180,12 +180,12 @@ If N is negative, slurp leading blobs instead of trailing 
blobs."
 (defun org-link-edit-backward-slurp (&optional n)
   "Slurp N leading blobs into link's description.
 
-  The \[\[http://orgmode.org/\]\[Org mode\]\] site
+  The \[\[https://orgmode.org/\]\[Org mode\]\] site
 
                         |
                         v
 
-  \[\[http://orgmode.org/\]\[The Org mode\]\] site
+  \[\[https://orgmode.org/\]\[The Org mode\]\] site
 
 A blob is a block of non-whitespace characters.
 
@@ -256,12 +256,12 @@ N, 'other' is nil."
 (defun org-link-edit-forward-barf (&optional n)
   "Barf N trailing blobs from link's description.
 
-  The \[\[http://orgmode.org/\]\[Org mode\]\] site
+  The \[\[https://orgmode.org/\]\[Org mode\]\] site
 
                         |
                         v
 
-  The \[\[http://orgmode.org/\]\[Org\]\] mode site
+  The \[\[https://orgmode.org/\]\[Org\]\] mode site
 
 A blob is a block of non-whitespace characters.
 
@@ -295,12 +295,12 @@ If N is negative, barf leading blobs instead of trailing 
blobs."
 (defun org-link-edit-backward-barf (&optional n)
   "Barf N leading blobs from link's description.
 
-  The \[\[http://orgmode.org/\]\[Org mode\]\] site
+  The \[\[https://orgmode.org/\]\[Org mode\]\] site
 
                         |
                         v
 
-  The Org \[\[http://orgmode.org/\]\[mode\]\] site
+  The Org \[\[https://orgmode.org/\]\[mode\]\] site
 
 A blob is a block of non-whitespace characters.
 
diff --git a/contrib/lisp/org-mairix.el b/contrib/lisp/org-mairix.el
index 84c2dfd2b..4678b1a4e 100644
--- a/contrib/lisp/org-mairix.el
+++ b/contrib/lisp/org-mairix.el
@@ -8,7 +8,7 @@
 ;; Author: Georg C. F. Greve <greve at fsfeurope dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp, email, mairix
 ;; Purpose: Integrate mairix email searching into Org mode
-;; See http://orgmode.org and http://www.rpcurnow.force9.co.uk/mairix/
+;; See https://orgmode.org and http://www.rpcurnow.force9.co.uk/mairix/
 ;; Version: 0.5
 ;;
 ;; This file is Free Software; you can redistribute it and/or modify
diff --git a/contrib/lisp/org-man.el b/contrib/lisp/org-man.el
index 1ccd94289..43e20e28d 100644
--- a/contrib/lisp/org-man.el
+++ b/contrib/lisp/org-man.el
@@ -2,7 +2,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 1.0
 ;;
 ;; This file is not yet part of GNU Emacs.
diff --git a/contrib/lisp/org-mew.el b/contrib/lisp/org-mew.el
index 965362205..84cc336cf 100644
--- a/contrib/lisp/org-mew.el
+++ b/contrib/lisp/org-mew.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/org-notmuch.el b/contrib/lisp/org-notmuch.el
index 65d755069..0cddabd77 100644
--- a/contrib/lisp/org-notmuch.el
+++ b/contrib/lisp/org-notmuch.el
@@ -4,7 +4,7 @@
 
 ;; Author: Matthieu Lemerre <address@hidden>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/contrib/lisp/org-passwords.el b/contrib/lisp/org-passwords.el
index 4ebd5a6eb..1f32f9b38 100644
--- a/contrib/lisp/org-passwords.el
+++ b/contrib/lisp/org-passwords.el
@@ -23,7 +23,7 @@
 ;;; Commentary:
 
 ;; This file contains the code for managing your passwords with
-;; Org-mode. It is part of org/contrib (see http://orgmode.org/). If
+;; Org-mode. It is part of org/contrib (see https://orgmode.org/). If
 ;; you want to contribute with development, or have a problem, do it
 ;; here: https://bitbucket.org/alfaromurillo/org-passwords.el
 
diff --git a/contrib/lisp/org-screenshot.el b/contrib/lisp/org-screenshot.el
index a3564bde8..abac4a19c 100644
--- a/contrib/lisp/org-screenshot.el
+++ b/contrib/lisp/org-screenshot.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Max Mikhanosha <address@hidden>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 8.0
 ;;
 ;; Released under the GNU General Public License version 3
diff --git a/contrib/lisp/org-sudoku.el b/contrib/lisp/org-sudoku.el
index 44acd0254..9537c0c0a 100644
--- a/contrib/lisp/org-sudoku.el
+++ b/contrib/lisp/org-sudoku.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp, games
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 0.01
 ;;
 ;; This file is not yet part of GNU Emacs.
diff --git a/contrib/lisp/org-track.el b/contrib/lisp/org-track.el
index dfd112b8d..d6965ed1b 100644
--- a/contrib/lisp/org-track.el
+++ b/contrib/lisp/org-track.el
@@ -5,9 +5,9 @@
 ;; Author: Bastien Guerry <address@hidden>
 ;;         Eric S Fraga   <e.fraga at ucl.ac dot uk>
 ;;         Sebastian Rose <sebastian_rose at gmx dot de>
-;;         The Worg people http://orgmode.org/worg/
+;;         The Worg people https://orgmode.org/worg/
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 6.29a
 ;;
 ;; Released under the GNU General Public License version 3
@@ -83,7 +83,7 @@ Note, that emacs preferes compiled elisp files over
 non-compiled ones."
   :type 'boolean)
 
-(defcustom org-track-org-url "http://orgmode.org/";
+(defcustom org-track-org-url "https://orgmode.org/";
   "The URL where the package to download can be found.
 Please append a slash."
   :type 'string)
diff --git a/contrib/lisp/org-vm.el b/contrib/lisp/org-vm.el
index 2028cb508..1113e29b2 100644
--- a/contrib/lisp/org-vm.el
+++ b/contrib/lisp/org-vm.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; Support for IMAP folders added
 ;; by Konrad Hinsen <konrad dot hinsen at fastmail dot net>
diff --git a/contrib/lisp/org-wikinodes.el b/contrib/lisp/org-wikinodes.el
index 78e8a017b..1761727ea 100644
--- a/contrib/lisp/org-wikinodes.el
+++ b/contrib/lisp/org-wikinodes.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 7.01trans
 ;;
 ;; This file is not part of GNU Emacs.
diff --git a/contrib/lisp/org-wl.el b/contrib/lisp/org-wl.el
index 7f9e608ed..4ac9a5378 100644
--- a/contrib/lisp/org-wl.el
+++ b/contrib/lisp/org-wl.el
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;;         David Maus <dmaus at ictsoc dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index a3ba2740e..10f2cc244 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -84,7 +84,7 @@
   :version "24.4"
   :package-version '(Org . "8.0"))
 
-(defcustom org-rss-image-url "http://orgmode.org/img/org-mode-unicorn-logo.png";
+(defcustom org-rss-image-url 
"https://orgmode.org/img/org-mode-unicorn-logo.png";
   "The URL of the an image for the RSS feed."
   :group 'org-export-rss
   :type 'string)
diff --git a/contrib/scripts/org-docco.org b/contrib/scripts/org-docco.org
index cb75359e4..bfa5040c5 100644
--- a/contrib/scripts/org-docco.org
+++ b/contrib/scripts/org-docco.org
@@ -5,7 +5,7 @@
 
 The =docco= tool (see http://jashkenas.github.com/docco/) generates
 HTML from JavaScript source code providing an attractive side-by-side
-display of source code and comments.  This file (see 
[[http://orgmode.org/cgit.cgi/org-mode.git/plain/contrib/scripts/org-docco.org][org-docco.org]])
+display of source code and comments.  This file (see 
[[https://orgmode.org/cgit.cgi/org-mode.git/plain/contrib/scripts/org-docco.org][org-docco.org]])
 generates the same type of output from Org-mode documents with code
 embedded in code blocks.
 
@@ -18,7 +18,7 @@ document.
 
 A pure source code file can be extracted (or "/tangled/") from the
 Org-mode document using the normal =org-babel-tangle= function.  See
-[[http://orgmode.org/manual/Working-With-Source-Code.html][Working With Source 
Code]] chapter of the Org-mode manual for more
+[[https://orgmode.org/manual/Working-With-Source-Code.html][Working With 
Source Code]] chapter of the Org-mode manual for more
 information on using code blocks in Org-mode files.
 
 *Disclaimer*: this currently only works on /very/ simple Org-mode
@@ -36,7 +36,7 @@ support this code moving forward.  /Caveat Emptor/
 
 ;; Author: Eric Schulte
 ;; Keywords: org-mode, literate programming, html
-;; Homepage: http://orgmode.org/worg/org-contrib/org-mime.php
+;; Homepage: https://orgmode.org/worg/org-contrib/org-mime.php
 ;; Version: 0.01
 
 ;; This file is not part of GNU Emacs.
diff --git a/contrib/scripts/staticmathjax/README.org 
b/contrib/scripts/staticmathjax/README.org
index d28fc9012..d15bf9517 100644
--- a/contrib/scripts/staticmathjax/README.org
+++ b/contrib/scripts/staticmathjax/README.org
@@ -46,7 +46,7 @@ The code is licensed under the GNU General Public License 
version
          if --embed-fonts is not specified, this
       must be the URL to a MathJax installation folder (e.g. "MathJax"
       if MathJax is installed in a subdirectory, or
-      "http://orgmode.org/mathjax"; to use the version hosted on the Org
+      "https://orgmode.org/mathjax"; to use the version hosted on the Org
       website.
          
          All references to math fonts in the output file will point to
diff --git a/doc/orgguide.texi b/doc/orgguide.texi
index 8e4d2c798..a23de58b5 100644
--- a/doc/orgguide.texi
+++ b/doc/orgguide.texi
@@ -11,7 +11,7 @@
 @set txicodequotebacktick
 
 @c Version and Contact Info
address@hidden MAINTAINERSITE @uref{http://orgmode.org,maintainers webpage}
address@hidden MAINTAINERSITE @uref{https://orgmode.org,maintainers webpage}
 @set AUTHOR Carsten Dominik
 @set MAINTAINER Carsten Dominik
 @set MAINTAINEREMAIL @email{carsten at orgmode dot org}
@@ -241,7 +241,7 @@ authoring and publishing system, and it supports working 
with source code for
 literal programming and reproducible research.
 
 @i{This document is a much compressed derivative of the
address@hidden://orgmode.org/index.html#sec-4_1, comprehensive Org-mode manual}.
address@hidden://orgmode.org/index.html#sec-4_1, comprehensive Org-mode manual}.
 It contains all basic features and commands, along with important hints for
 customization.  It is intended for beginners who would shy back from a 200
 page manual because of sheer size.}
@@ -543,7 +543,7 @@ is simply the marker in square brackets, inside text.  For 
example:
 @smallexample
 The Org homepage[fn:1] now looks a lot better than it used to.
 ...
-[fn:1] The link is: http://orgmode.org
+[fn:1] The link is: https://orgmode.org
 @end smallexample
 
 @noindent 
@@ -562,7 +562,7 @@ Jump between definition and reference.
 @end table
 
 @seealso{
address@hidden://orgmode.org/manual/Document-Structure.html#Document-Structure,
address@hidden://orgmode.org/manual/Document-Structure.html#Document-Structure,
 Chapter 2 of the address@hidden
 @uref{http://sachachua.com/wp/2008/01/outlining-your-notes-with-org/,
 Sacha Chua's tutorial}}
@@ -685,13 +685,13 @@ between the nearest horizontal separator lines, or the 
entire table.
 @end table
 
 @seealso{
address@hidden://orgmode.org/manual/Tables.html#Tables, Chapter 3 of the
address@hidden://orgmode.org/manual/Tables.html#Tables, Chapter 3 of the
 address@hidden
address@hidden://orgmode.org/worg/org-tutorials/tables.php, Bastien's
address@hidden://orgmode.org/worg/org-tutorials/tables.php, Bastien's
 table address@hidden
address@hidden://orgmode.org/worg/org-tutorials/org-spreadsheet-intro.php,
address@hidden://orgmode.org/worg/org-tutorials/org-spreadsheet-intro.php,
 Bastien's spreadsheet address@hidden
address@hidden://orgmode.org/worg/org-tutorials/org-plot.php, Eric's plotting 
tutorial}}
address@hidden://orgmode.org/worg/org-tutorials/org-plot.php, Eric's plotting 
tutorial}}
 
 @node Hyperlinks, TODO Items, Tables, Top
 @chapter Hyperlinks
@@ -834,7 +834,7 @@ link, together with an explanation:
 @end smallexample
 
 @seealso{
address@hidden://orgmode.org/manual/Hyperlinks.html#Hyperlinks, Chapter 4 of the
address@hidden://orgmode.org/manual/Hyperlinks.html#Hyperlinks, Chapter 4 of the
 manual}}
 
 @node TODO Items, Tags, Hyperlinks, Top
@@ -1086,8 +1086,8 @@ This works only if the cursor is already in a plain list 
item
 @end table
 
 @seealso{
address@hidden://orgmode.org/manual/TODO-Items.html#TODO-Items, Chapter 5 of 
the address@hidden
address@hidden://orgmode.org/worg/org-tutorials/orgtutorial_dto.php, David
address@hidden://orgmode.org/manual/TODO-Items.html#TODO-Items, Chapter 5 of 
the address@hidden
address@hidden://orgmode.org/worg/org-tutorials/orgtutorial_dto.php, David
 O'Toole's introductory address@hidden
 @uref{http://members.optusnet.com.au/~charles57/GTD/gtd_workflow.html,
 Charles Cave's GTD setup}}
@@ -1249,7 +1249,7 @@ levels and properties.  For a complete description with 
many examples, see
 @ref{Matching tags and properties}.
 
 @seealso{
address@hidden://orgmode.org/manual/Tags.html#Tags, Chapter 6 of the 
address@hidden
address@hidden://orgmode.org/manual/Tags.html#Tags, Chapter 6 of the 
address@hidden
 
@uref{http://sachachua.com/wp/2008/01/tagging-in-org-plus-bonus-code-for-timeclocks-and-tags/,
 Sacha Chua's article about tagging in Org-mode}}
 
@@ -1309,9 +1309,9 @@ properties}.
 @end table
 
 @seealso{
address@hidden://orgmode.org/manual/Properties-and-Columns.html#Properties-and-Columns,
address@hidden://orgmode.org/manual/Properties-and-Columns.html#Properties-and-Columns,
 Chapter 7 of the address@hidden
address@hidden://orgmode.org/worg/org-tutorials/org-column-view-tutorial.php,Bastien
address@hidden://orgmode.org/worg/org-tutorials/org-column-view-tutorial.php,Bastien
 Guerry's column view tutorial}}
 
 @node Dates and Times, Capture - Refile - Archive, Properties, Top
@@ -1528,7 +1528,7 @@ at an existing clock table, just update it.
 #+END: clocktable
 @end smallexample
 @noindent
-For details about how to customize this view, see 
@uref{http://orgmode.org/manual/Clocking-work-time.html#Clocking-work-time,the 
manual}.
+For details about how to customize this view, see 
@uref{https://orgmode.org/manual/Clocking-work-time.html#Clocking-work-time,the 
manual}.
 @item C-c C-c
 Update dynamic block at point.  The cursor needs to be in the
 @code{#+BEGIN} line of the dynamic block.
@@ -1538,7 +1538,7 @@ The @kbd{l} key may be used in the agenda 
(@pxref{Weekly/daily agenda}) to
 show which tasks have been worked on or closed during a day.
 
 @seealso{
address@hidden://orgmode.org/manual/Dates-and-Times.html#Dates-and-Times,
address@hidden://orgmode.org/manual/Dates-and-Times.html#Dates-and-Times,
 Chapter 8 of the address@hidden
 @uref{http://members.optusnet.com.au/~charles57/GTD/org_dates/, Charles
 Cave's Date and Time address@hidden
@@ -1699,9 +1699,9 @@ setting this variable, for example
 @end smallexample
 
 @seealso{
address@hidden://orgmode.org/manual/Capture-_002d-Refile-_002d-Archive.html#Capture-_002d-Refile-_002d-Archive,
address@hidden://orgmode.org/manual/Capture-_002d-Refile-_002d-Archive.html#Capture-_002d-Refile-_002d-Archive,
 Chapter 9 of the address@hidden
address@hidden://orgmode.org/worg/org-tutorials/org-protocol-custom-handler.php,
address@hidden://orgmode.org/worg/org-tutorials/org-protocol-custom-handler.php,
 Sebastian Rose's tutorial for capturing from a web address@hidden@*
 
 @node Agenda Views, Markup, Capture - Refile - Archive, Top
@@ -2043,9 +2043,9 @@ headlines that are also TODO items
 @end table
 
 @seealso{
address@hidden://orgmode.org/manual/Agenda-Views.html#Agenda-Views, Chapter 10 
of
address@hidden://orgmode.org/manual/Agenda-Views.html#Agenda-Views, Chapter 10 
of
 the address@hidden
address@hidden://orgmode.org/worg/org-tutorials/org-custom-agenda-commands.php,
address@hidden://orgmode.org/worg/org-tutorials/org-custom-agenda-commands.php,
 Mat Lundin's tutorial about custom agenda address@hidden
 @uref{http://www.newartisans.com/2007/08/using-org-mode-as-a-day-planner.html,
 John Wiegley's setup}}
@@ -2289,11 +2289,11 @@ address@hidden@}
 @end smallexample
 @noindent  
 With
address@hidden://orgmode.org/manual/LaTeX-fragments.html#LaTeX-fragments,special
address@hidden://orgmode.org/manual/LaTeX-fragments.html#LaTeX-fragments,special
 setup}, @LaTeX{} snippets will be included as images when exporting to HTML.
 
 @seealso{
address@hidden://orgmode.org/manual/Markup.html#Markup, Chapter 11 of the 
manual}}
address@hidden://orgmode.org/manual/Markup.html#Markup, Chapter 11 of the 
manual}}
 
 @node Exporting, Publishing, Markup, Top
 @chapter Exporting
@@ -2421,12 +2421,12 @@ Create a single large iCalendar file from all files in
 @end table
 
 @seealso{
address@hidden://orgmode.org/manual/Exporting.html#Exporting, Chapter 12 of the 
address@hidden
address@hidden://orgmode.org/worg/org-tutorials/images-and-xhtml-export.php,
address@hidden://orgmode.org/manual/Exporting.html#Exporting, Chapter 12 of the 
address@hidden
address@hidden://orgmode.org/worg/org-tutorials/images-and-xhtml-export.php,
 Sebastian Rose's image handling address@hidden
address@hidden://orgmode.org/worg/org-tutorials/org-latex-export.php, Thomas
address@hidden://orgmode.org/worg/org-tutorials/org-latex-export.php, Thomas
 Dye's LaTeX export tutorial}
address@hidden://orgmode.org/worg/org-tutorials/org-beamer/tutorial.php, Eric
address@hidden://orgmode.org/worg/org-tutorials/org-beamer/tutorial.php, Eric
 Fraga's BEAMER presentation tutorial}}
 
 @node Publishing, Working With Source Code, Exporting, Top
@@ -2469,11 +2469,11 @@ publishing of all files by giving a prefix argument to 
any of the commands
 above.
 
 @seealso{
address@hidden://orgmode.org/manual/Publishing.html#Publishing, Chapter 13 of 
the
address@hidden://orgmode.org/manual/Publishing.html#Publishing, Chapter 13 of 
the
 address@hidden
address@hidden://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.php,
address@hidden://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.php,
 Sebastian Rose's publishing address@hidden
address@hidden://orgmode.org/worg/org-tutorials/org-jekyll.php, Ian Barton's
address@hidden://orgmode.org/worg/org-tutorials/org-jekyll.php, Ian Barton's
 Jekyll/blogging setup}}
 
 @node Working With Source Code, Miscellaneous, Publishing, Top
@@ -2537,7 +2537,7 @@ Use @kbd{C-c C-v l} to load the code blocks from an 
Org-mode files into the
 ``Library of Babel'', these blocks can then be evaluated from any Org-mode
 buffer.  A collection of generally useful code blocks is accessible through
 Org-mode’s community-driven documentation on
address@hidden://orgmode.org/worg/library-of-babel.html,Worg}.
address@hidden://orgmode.org/worg/library-of-babel.html,Worg}.
 
 @subheading Header Arguments
 Many aspects of the evaluation and export of code blocks are controlled
@@ -2588,9 +2588,9 @@ Org-mode buffer.
 @end table
 
 @seealso{
address@hidden://orgmode.org/manual/Literal-examples.html#Literal-examples,
address@hidden://orgmode.org/manual/Literal-examples.html#Literal-examples,
 Chapter 11.3 of the address@hidden
address@hidden://orgmode.org/worg/org-contrib/babel/index.php,
address@hidden://orgmode.org/worg/org-contrib/babel/index.php,
 The Babel site on Worg}}
 
 @node Miscellaneous, GNU Free Documentation License, Working With Source Code, 
Top
@@ -2671,11 +2671,11 @@ by Matt Jones.  The two implementations are not 
identical but offer similar
 features.
 
 @seealso{
address@hidden://orgmode.org/manual/Miscellaneous.html#Miscellaneous, Chapter 15
address@hidden://orgmode.org/manual/Miscellaneous.html#Miscellaneous, Chapter 15
 of the address@hidden
address@hidden://orgmode.org/manual/MobileOrg.html#MobileOrg, Appendix B of the
address@hidden://orgmode.org/manual/MobileOrg.html#MobileOrg, Appendix B of the
 address@hidden
address@hidden://orgmode.org/orgcard.pdf,Key reference card}}
address@hidden://orgmode.org/orgcard.pdf,Key reference card}}
 
 
 @node GNU Free Documentation License,  , Miscellaneous, Top
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 67f51401f..c9369d697 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -2,8 +2,8 @@ ORG NEWS -- history of user-visible changes.   -*- mode: org; 
coding: utf-8 -*-
 
 #+STARTUP: overview
 
-#+LINK: doc http://orgmode.org/worg/doc.html#%s
-#+LINK: git http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=%s
+#+LINK: doc https://orgmode.org/worg/doc.html#%s
+#+LINK: git https://orgmode.org/cgit.cgi/org-mode.git/commit/?id=%s
 
 Copyright (C) 2012-2018 Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/etc/styles/README b/etc/styles/README
index 048f84cdc..7c175e342 100644
--- a/etc/styles/README
+++ b/etc/styles/README
@@ -21,7 +21,7 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.
 
 Author: Jambunathan K <kjambunathan at gmail dot com>
 Keywords: outlines, hypermedia, calendar, wp
-Homepage: http://orgmode.org
+Homepage: https://orgmode.org
 
 Commentary:
 
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 092354e9c..ff5be3496 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte
 ;;      Thierry Banel
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-J.el b/lisp/ob-J.el
index 4aec293af..87812213e 100644
--- a/lisp/ob-J.el
+++ b/lisp/ob-J.el
@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 84bb89f6e..d7e936eba 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte
 ;;     Dan Davison
 ;; Keywords: literate programming, reproducible research, R, statistics
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el
index 211eab7f2..84e236480 100644
--- a/lisp/ob-asymptote.el
+++ b/lisp/ob-asymptote.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index 474111f26..1ee4552eb 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index f491a6cde..19479a639 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 852fe08b9..890f60ada 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -5,7 +5,7 @@
 ;; Author: Joel Boehland, Eric Schulte, Oleh Krehel, Frederick Giasson
 ;;
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index 32449753a..e9c6f937b 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-coq.el b/lisp/ob-coq.el
index a52044e8a..875c794b1 100644
--- a/lisp/ob-coq.el
+++ b/lisp/ob-coq.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index d839ae65e..15f999b9e 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -5,7 +5,7 @@
 ;; Authors: Eric Schulte
 ;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-css.el b/lisp/ob-css.el
index 8c0b8d75a..8cabf2bc7 100644
--- a/lisp/ob-css.el
+++ b/lisp/ob-css.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 82cc89d02..9507630ba 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el
index e72dd3cad..31e0a4f32 100644
--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-ebnf.el b/lisp/ob-ebnf.el
index 4e96b2117..8c7c5415e 100644
--- a/lisp/ob-ebnf.el
+++ b/lisp/ob-ebnf.el
@@ -4,7 +4,7 @@
 
 ;; Author: Michael Gauland
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;; Version: 1.00
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el
index 2dc350629..8ea2ec127 100644
--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index 44972f956..2bfaa08a6 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index d2c32fac8..264dc0ed0 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -5,7 +5,7 @@
 ;; Authors: Eric Schulte
 ;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el
index ed14b1873..efd575935 100644
--- a/lisp/ob-forth.el
+++ b/lisp/ob-forth.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, forth
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index dad7eda0c..49e960ff9 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -5,7 +5,7 @@
 ;; Authors: Sergey Litvinov
 ;;       Eric Schulte
 ;; Keywords: literate programming, reproducible research, fortran
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 674627b8f..b2f491331 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el
index 4e10ecd6b..67e7562fb 100644
--- a/lisp/ob-groovy.el
+++ b/lisp/ob-groovy.el
@@ -4,7 +4,7 @@
 
 ;; Author: Miro Bezjak
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index b19ee6d70..e607ee0c5 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-hledger.el b/lisp/ob-hledger.el
index 715890347..727fb1f16 100644
--- a/lisp/ob-hledger.el
+++ b/lisp/ob-hledger.el
@@ -4,7 +4,7 @@
 
 ;; Author: Simon Michael
 ;; Keywords: literate programming, reproducible research, plain text accounting
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-io.el b/lisp/ob-io.el
index 7c7d9df25..4f407cc52 100644
--- a/lisp/ob-io.el
+++ b/lisp/ob-io.el
@@ -4,7 +4,7 @@
 
 ;; Author: Andrzej Lichnerowicz
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-java.el b/lisp/ob-java.el
index 1f2575318..d6301bff2 100644
--- a/lisp/ob-java.el
+++ b/lisp/ob-java.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index 5aa2ed791..38c8c39ac 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, js
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-keys.el b/lisp/ob-keys.el
index 3d8e865a0..fc96df475 100644
--- a/lisp/ob-keys.el
+++ b/lisp/ob-keys.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index 4654ba5d3..6a963e52f 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-ledger.el b/lisp/ob-ledger.el
index 84f0599a4..2a1331441 100644
--- a/lisp/ob-ledger.el
+++ b/lisp/ob-ledger.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric S Fraga
 ;; Keywords: literate programming, reproducible research, accounting
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index 2ae277613..cab1f4834 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -4,7 +4,7 @@
 
 ;; Author: Martyn Jago
 ;; Keywords: babel language, literate programming
-;; Homepage: 
http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
+;; Homepage: 
https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
 
 ;; This file is part of GNU Emacs.
 
@@ -24,7 +24,7 @@
 ;;; Commentary:
 
 ;; Installation, ob-lilypond documentation, and examples are available at
-;; http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
+;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
 ;;
 ;; Lilypond documentation can be found at
 ;; http://lilypond.org/manuals.html
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index c156ca34a..223407e7b 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -6,7 +6,7 @@
 ;;      Eric Schulte
 ;;      David T. O'Toole <address@hidden>
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index 541636e77..ac89141c2 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -5,7 +5,7 @@
 ;; Authors: Eric Schulte
 ;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index ff9aae01f..6ae72c7e5 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -4,7 +4,7 @@
 
 ;; Authors: Dieter Schoen
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-makefile.el b/lisp/ob-makefile.el
index 692ebb6c9..468703782 100644
--- a/lisp/ob-makefile.el
+++ b/lisp/ob-makefile.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte
 ;;        Thomas S. Dye
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el
index da2eadc47..5baac7774 100644
--- a/lisp/ob-matlab.el
+++ b/lisp/ob-matlab.el
@@ -4,7 +4,7 @@
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index fc2471761..b42a4b8af 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -5,7 +5,7 @@
 ;; Author: Eric S Fraga
 ;;     Eric Schulte
 ;; Keywords: literate programming, reproducible research, maxima
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-mscgen.el b/lisp/ob-mscgen.el
index 8f8c8c5dc..b2c2443c8 100644
--- a/lisp/ob-mscgen.el
+++ b/lisp/ob-mscgen.el
@@ -4,7 +4,7 @@
 
 ;; Author: Juan Pechiar
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index b8212b128..90926b5c3 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index 7d7290550..c7339cf99 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -4,7 +4,7 @@
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index e52283848..631a845b7 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index 2b96bf9cd..85806fd53 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -5,7 +5,7 @@
 ;; Authors: Dan Davison
 ;;      Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el
index b6dc8986f..483328982 100644
--- a/lisp/ob-picolisp.el
+++ b/lisp/ob-picolisp.el
@@ -5,7 +5,7 @@
 ;; Authors: Thorsten Jolitz
 ;;      Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index 53ba42ec3..9a9313e7b 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -4,7 +4,7 @@
 
 ;; Author: Zhang Weize
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el
index 83fcadd25..1a8893027 100644
--- a/lisp/ob-processing.el
+++ b/lisp/ob-processing.el
@@ -4,7 +4,7 @@
 
 ;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte)
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 951e4d2a4..9f1234bac 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -5,7 +5,7 @@
 ;; Authors: Eric Schulte
 ;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 872f7f981..3efa17f96 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -5,7 +5,7 @@
 ;; Authors: Eric Schulte
 ;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 6daf52b01..7686ac4e8 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el
index 5b179a6e8..af55d763e 100644
--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index cc78b574d..0efe5f346 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -5,7 +5,7 @@
 ;; Authors: Eric Schulte
 ;;         Michael Gauland
 ;; Keywords: literate programming, reproducible research, scheme
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el
index 4fad849d0..fb7c8e2da 100644
--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@@ -4,7 +4,7 @@
 
 ;; Author: Benjamin Andresen
 ;; Keywords: literate programming, interactive shell
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index c53dd65e6..362dfd520 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-shen.el b/lisp/ob-shen.el
index 9308e5b38..d81e7d60d 100644
--- a/lisp/ob-shen.el
+++ b/lisp/ob-shen.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, shen
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 524e9b73e..959ede3de 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index 4799896f6..42528a387 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-stan.el b/lisp/ob-stan.el
index 6fa9fe5c9..ffc268188 100644
--- a/lisp/ob-stan.el
+++ b/lisp/ob-stan.el
@@ -4,7 +4,7 @@
 
 ;; Author: Kyle Meyer
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
@@ -39,7 +39,7 @@
 ;;    that does not end in ".stan".
 ;;
 ;; For more information and usage examples, visit
-;; http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html
+;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html
 ;;
 ;; [1] http://mc-stan.org/
 
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 9ee0bcc24..f6a5c88e4 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 5fa59ac4d..48eddb73a 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ob-vala.el b/lisp/ob-vala.el
index 02b3bab5b..96c37e3ad 100644
--- a/lisp/ob-vala.el
+++ b/lisp/ob-vala.el
@@ -4,7 +4,7 @@
 
 ;; Author: Christian Garbs <address@hidden>
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;;; License:
 
diff --git a/lisp/ob.el b/lisp/ob.el
index a029da861..35f65ffa8 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -4,7 +4,7 @@
 
 ;; Authors: Eric Schulte
 ;; Keywords: literate programming, reproducible research
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 606346fac..0e42b0f77 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index c8a1b363a..2fcf0b23f 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 1d39efb88..5d36379b5 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -5,7 +5,7 @@
 ;; Authors: Carsten Dominik <carsten at orgmode dot org>
 ;;       Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 5e02f8710..19f195eb7 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 26e102acd..496c4310a 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 4056b940e..29041bc94 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index aa2d9c7ed..4d87777d1 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index a8162fe93..d00bad222 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-docview.el b/lisp/org-docview.el
index 57069b32a..a467212d0 100644
--- a/lisp/org-docview.el
+++ b/lisp/org-docview.el
@@ -4,7 +4,7 @@
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 3deb9dacf..9b6f67ab1 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -22,7 +22,7 @@
 
 ;;; Commentary:
 ;;
-;; See <http://orgmode.org/worg/dev/org-syntax.html> for details about
+;; See <https://orgmode.org/worg/dev/org-syntax.html> for details about
 ;; Org syntax.
 ;;
 ;; Lisp-wise, a syntax object can be represented as a list.
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 65c7d055e..e291b521f 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Ulf Stegemann <ulf at zeitform dot de>
 ;; Keywords: outlines, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-eww.el b/lisp/org-eww.el
index 0792c87a6..46ebccbde 100644
--- a/lisp/org-eww.el
+++ b/lisp/org-eww.el
@@ -4,7 +4,7 @@
 
 ;; Author: Marco Wahl <marcowahlsoft>a<gmailcom>
 ;; Keywords: link, eww
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 83871fb44..750ada1e9 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index f3c8ab893..3a6daf87e 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index be7361602..18d8f8498 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 0f2cdc28f..2354ed472 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index 09f13129e..375714e35 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -4,7 +4,7 @@
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 8725dcd39..2d3330c39 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index ef68c3c4f..84bac2aa7 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-info.el b/lisp/org-info.el
index db5d66ce7..6dde36ceb 100644
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index f75d932f8..554ad277b 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-list.el b/lisp/org-list.el
index c54986212..0a5afa0b3 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;        Bastien Guerry <address@hidden>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 24c44422f..7cb13da7a 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index 32a6ff11b..e74a9ee59 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -4,7 +4,7 @@
 
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 963e8d2b0..ecfd6f113 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -3,7 +3,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 1ad737551..a79cd0057 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -24,7 +24,7 @@
 ;;
 ;; Org-mouse provides mouse support for org-mode.
 ;;
-;; http://orgmode.org
+;; https://orgmode.org
 ;;
 ;; Org mouse implements the following features:
 ;; * following links with the left mouse button
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index 805d13164..0f1d1879c 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 6c74f3e65..ebd7af42a 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index be433f66d..d50fd648b 100644
--- a/lisp/org-rmail.el
+++ b/lisp/org-rmail.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-src.el b/lisp/org-src.el
index b6ccd5b65..dfa2ae3de 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -6,7 +6,7 @@
 ;;        Bastien Guerry <address@hidden>
 ;;         Dan Davison <davison at stats dot ox dot ac dot uk>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index ac0253ff1..6a58ce64c 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -135,7 +135,7 @@ the fixed string \"#+ORGTBL: SEND\", followed by 
instruction on how to
 convert the table into a data structure useful in the
 language of the buffer.  Check the manual for the section on
 \"Translator functions\", and more generally check out
-http://orgmode.org/manual/Tables-in-arbitrary-syntax.html#Tables-in-arbitrary-syntax
+https://orgmode.org/manual/Tables-in-arbitrary-syntax.html#Tables-in-arbitrary-syntax
 
 All occurrences of %n in a template will be replaced with the name of the
 table, obtained by prompting the user."
diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el
index 38d21de5e..6f2df0d58 100644
--- a/lisp/org-tempo.el
+++ b/lisp/org-tempo.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Rasmus Pank Roulund <emacs at pank dot eu>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 3c825e61c..55f8ae4d0 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el
index 706619c5d..9690c8e90 100644
--- a/lisp/org-w3m.el
+++ b/lisp/org-w3m.el
@@ -4,7 +4,7 @@
 
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org.el b/lisp/org.el
index 061776065..7c75dc91c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -48,7 +48,7 @@
 ;; ---------------------------
 ;; See the corresponding sections in the manual at
 ;;
-;;   http://orgmode.org/org.html#Installation
+;;   https://orgmode.org/org.html#Installation
 ;;
 ;; Documentation
 ;; -------------
@@ -59,7 +59,7 @@
 ;; in the doc/ directory.
 ;;
 ;; A list of recent changes can be found at
-;; http://orgmode.org/Changes.html
+;; https://orgmode.org/Changes.html
 ;;
 ;;; Code:
 
@@ -1828,7 +1828,7 @@ See the manual for examples."
 
 (defcustom org-descriptive-links t
   "Non-nil means Org will display descriptive links.
-E.g. [[http://orgmode.org][Org website]] will be displayed as
+E.g. [[https://orgmode.org][Org website]] will be displayed as
 \"Org Website\", hiding the link itself and just displaying its
 description.  When set to nil, Org will display the full links
 literally.
@@ -20965,7 +20965,7 @@ such private information before sending the email.")
      "Remember to cover the basics, that is, what you expected to happen and
 what in fact did happen.  You don't know how to make a good report?  See
 
-     http://orgmode.org/manual/Feedback.html#Feedback
+     https://orgmode.org/manual/Feedback.html#Feedback
 
 Your bug report will be posted to the Org mailing list.
 ------------------------------------------------------------------------")
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index d242c613c..40ebe3d99 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -465,7 +465,7 @@ customize `org-html-head-include-default-style'.")
 ;;;; Handle infojs
 
 (defvar org-html-infojs-opts-table
-  '((path PATH "http://orgmode.org/org-info.js";)
+  '((path PATH "https://orgmode.org/org-info.js";)
     (view VIEW "info")
     (toc TOC :with-toc)
     (ftoc FIXED_TOC "0")
@@ -1324,7 +1324,7 @@ like that: \"%%\"."
   :type 'string)
 
 (defcustom org-html-creator-string
-  (format "<a href=\"https://www.gnu.org/software/emacs/\";>Emacs</a> %s (<a 
href=\"http://orgmode.org\";>Org</a> mode %s)"
+  (format "<a href=\"https://www.gnu.org/software/emacs/\";>Emacs</a> %s (<a 
href=\"https://orgmode.org\";>Org</a> mode %s)"
          emacs-version
          (if (fboundp 'org-version) (org-version) "unknown version"))
   "Information about the creator of the HTML document.
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el
index a87970eb3..7d7c85004 100644
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;      Nicolas Goaziou <n dot goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index a656e065b..105ac0b0c 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -928,7 +928,7 @@ The minted choice has possible repercussions on the preview 
of
 latex fragments (see `org-preview-latex-fragment').  If you run
 into previewing problems, please consult
 
-  http://orgmode.org/worg/org-tutorials/org-latex-preview.html";
+  https://orgmode.org/worg/org-tutorials/org-latex-preview.html";
   :group 'org-export-latex
   :type '(choice
          (const :tag "Use listings" t)
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index e0c51662d..d1b7fc69f 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -4,7 +4,7 @@
 
 ;; Author: Jambunathan K <kjambunathan at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/ox.el b/lisp/ox.el
index 36c8b51ec..f05086427 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -66,7 +66,7 @@
 ;; Eventually, a dispatcher (`org-export-dispatch') is provided in the
 ;; last one.
 ;;
-;; See <http://orgmode.org/worg/dev/org-export-reference.html> for
+;; See <https://orgmode.org/worg/dev/org-export-reference.html> for
 ;; more information.
 
 ;;; Code:
diff --git a/mk/eldo.el b/mk/eldo.el
index 41b590bad..b087a977b 100644
--- a/mk/eldo.el
+++ b/mk/eldo.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Bastien Guerry <address@hidden>
 ;; Keywords: elisp, documentation, org
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
@@ -38,10 +38,10 @@
 (defvar eldo-keymaps nil)
 
 (defvar eldo-git-raw-file
-  "http://orgmode.org/cgit.cgi/org-mode.git/plain/lisp/%s";)
+  "https://orgmode.org/cgit.cgi/org-mode.git/plain/lisp/%s";)
 
 (defvar eldo-git-search-string
-  "http://orgmode.org/cgit.cgi/org-mode.git/log/?qt=grep&q=%s";)
+  "https://orgmode.org/cgit.cgi/org-mode.git/log/?qt=grep&q=%s";)
 
 (defvar eldo-file nil)
 
diff --git a/mk/guidesplit.pl b/mk/guidesplit.pl
index 4a392ec53..eef0f7ca9 100755
--- a/mk/guidesplit.pl
+++ b/mk/guidesplit.pl
@@ -36,8 +36,8 @@ $contents = <<EOF;
 EOF
 
 $script = <<'EOF';
-</style><link rel="stylesheet" href="http://orgmode.org/org.css"; 
type="text/css" />
-<script type="text/javascript" src="http://orgmode.org/org-keys.js";></script>
+</style><link rel="stylesheet" href="https://orgmode.org/org.css"; 
type="text/css" />
+<script type="text/javascript" src="https://orgmode.org/org-keys.js";></script>
 <script type="text/javascript">
   <!--/*--><![CDATA[/*><!--*/
    OrgKeyReader.registerHref('h', 'index.html');
diff --git a/mk/manfull.pl b/mk/manfull.pl
index 628afb3e7..95ffa392c 100755
--- a/mk/manfull.pl
+++ b/mk/manfull.pl
@@ -9,13 +9,13 @@ open OUT,">$page" or die "Cannot write to $page\n";
 while (<IN>) {
   if (/<meta http-equiv="Content-Style-Type" content="text\/css">/) {
     print OUT;
-    print OUT '<link rel="stylesheet" href="http://orgmode.org/org-manual.css"; 
type="text/css" />';
+    print OUT '<link rel="stylesheet" 
href="https://orgmode.org/org-manual.css"; type="text/css" />';
   } elsif (/<div class="contents">/) {
     print OUT;
-    print OUT '<p>This is the official manual for the latest <a 
href="http://orgmode.org";>Org mode</a> release.</p><div 
id="table-of-contents">';
+    print OUT '<p>This is the official manual for the latest <a 
href="https://orgmode.org";>Org mode</a> release.</p><div 
id="table-of-contents">';
   } elsif (/<h2>Table of Contents<\/h2>/) {
     print OUT;
-    print OUT '<a href="http://orgmode.org";>http://orgmode.org</a><br/><div 
id="text-table-of-contents">';
+    print OUT '<a href="https://orgmode.org";>https://orgmode.org</a><br/><div 
id="text-table-of-contents">';
     $toc = 1;
   } elsif (/<\/div>/ and $toc) {
     print OUT "</div></div></div>";
diff --git a/mk/mansplit.pl b/mk/mansplit.pl
index ec381e40a..0bf39b3ad 100755
--- a/mk/mansplit.pl
+++ b/mk/mansplit.pl
@@ -10,7 +10,7 @@
 
 $contents = <<EOF;
 <div id="table-of-contents">
-<p>This is the official manual for the latest <a 
href="http://orgmode.org";>Org-mode</a> release.</p>
+<p>This is the official manual for the latest <a 
href="https://orgmode.org";>Org-mode</a> release.</p>
 <h2>Table of Contents</h2>
 <div id="text-table-of-contents">
 <ul>
@@ -44,8 +44,8 @@ EOF
 
 
 $script = <<'EOF';
-<link rel="stylesheet" href="http://orgmode.org/org-manual.css"; 
type="text/css" />
-<script type="text/javascript" src="http://orgmode.org/org-keys.js";></script>
+<link rel="stylesheet" href="https://orgmode.org/org-manual.css"; 
type="text/css" />
+<script type="text/javascript" src="https://orgmode.org/org-keys.js";></script>
 <script type="text/javascript">
   <!--/*--><![CDATA[/*><!--*/
    OrgKeyReader.registerHref('h', 'index.html');
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index ec571d121..7691c73fa 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -2,7 +2,7 @@
 ;;
 ;; Author: Achim Gratz
 ;; Keywords: orgmode
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
diff --git a/testing/examples/links.org b/testing/examples/links.org
index be0b74275..bf4b22347 100644
--- a/testing/examples/links.org
+++ b/testing/examples/links.org
@@ -2,8 +2,8 @@
 
 * Plain links
 
-- http://orgmode.org
-- [[http://orgmode.org][Org mode website]]
+- https://orgmode.org
+- [[https://orgmode.org][Org mode website]]
 - mailto:address@hidden
 
 * Links to files
-- 
2.13.6

>From 07eb2666690a00966269ed53710cd7877e7f2a2c Mon Sep 17 00:00:00 2001
From: Tim Landscheidt <address@hidden>
Date: Tue, 16 Jan 2018 16:46:46 +0000
Subject: [PATCH 2/5] Make manual and URL links in docstrings clickable

---
 lisp/org-table.el              | 2 +-
 lisp/ox-latex.el               | 5 ++---
 testing/lisp/test-org-table.el | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/org-table.el b/lisp/org-table.el
index 6a58ce64c..196495fd6 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -135,7 +135,7 @@ the fixed string \"#+ORGTBL: SEND\", followed by 
instruction on how to
 convert the table into a data structure useful in the
 language of the buffer.  Check the manual for the section on
 \"Translator functions\", and more generally check out
-https://orgmode.org/manual/Tables-in-arbitrary-syntax.html#Tables-in-arbitrary-syntax
+the Info node `(org)Tables in arbitrary syntax'.
 
 All occurrences of %n in a template will be replaced with the name of the
 table, obtained by prompting the user."
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 105ac0b0c..789982e4f 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -920,15 +920,14 @@ using customize, or with
   (add-to-list \\='org-latex-packages-alist \\='(\"newfloat\" \"minted\"))
 
 In addition, it is necessary to install pygments
-\(http://pygments.org), and to configure the variable
+\(URL `http://pygments.org>'), and to configure the variable
 `org-latex-pdf-process' so that the -shell-escape option is
 passed to pdflatex.
 
 The minted choice has possible repercussions on the preview of
 latex fragments (see `org-preview-latex-fragment').  If you run
 into previewing problems, please consult
-
-  https://orgmode.org/worg/org-tutorials/org-latex-preview.html";
+URL `https://orgmode.org/worg/org-tutorials/org-latex-preview.html'."
   :group 'org-export-latex
   :type '(choice
          (const :tag "Use listings" t)
diff --git a/testing/lisp/test-org-table.el b/testing/lisp/test-org-table.el
index 750290d36..0dcdb929d 100644
--- a/testing/lisp/test-org-table.el
+++ b/testing/lisp/test-org-table.el
@@ -676,7 +676,7 @@ formatter \"%.1f\"."
 
 (ert-deftest test-org-table/org-lookup-all ()
   "Use `org-lookup-all' for several GROUP BY as in SQL and for ranking.
-See also http://orgmode.org/worg/org-tutorials/org-lookups.html ."
+See also URL `https://orgmode.org/worg/org-tutorials/org-lookups.html'."
   (let ((data "
 #+NAME: data
 | Purchase | Product | Shop | Rating |
-- 
2.13.6

>From 809f90b6c741804059c2fbcec0a1c0087c14cc49 Mon Sep 17 00:00:00 2001
From: Tim Landscheidt <address@hidden>
Date: Tue, 16 Jan 2018 18:41:44 +0000
Subject: [PATCH 3/5] Use https for links to orgmode.org in old news entries

---
 etc/ORG-NEWS | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index c9369d697..b51c207c9 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -429,8 +429,8 @@ this ~:prologue "fpprintprec: 2; linel: 50;"~ for 
presenting Maxima
 results in a beamer presentation.
 **** PlantUML: add support for header arguments
 
-[[http://plantuml.com/][Plantuml]] source blocks now support the 
[[http://orgmode.org/manual/prologue.html#prologue][~:prologue~]], 
[[http://orgmode.org/manual/epilogue.html#epilogue][~:epilogue~]] and
-[[http://orgmode.org/manual/var.html#var][~:var~]] header arguments.
+[[http://plantuml.com/][Plantuml]] source blocks now support the 
[[https://orgmode.org/manual/prologue.html#prologue][~:prologue~]], 
[[https://orgmode.org/manual/epilogue.html#epilogue][~:epilogue~]] and
+[[https://orgmode.org/manual/var.html#var][~:var~]] header arguments.
 
 **** SQL: new engine added ~sqsh~
 
@@ -484,7 +484,7 @@ using ~:namespaces~:
 - ~:flags~ passes arguments to the compiler
 - ~:cmdline~ passes commandline arguments to the generated executable
 
-Support for [[http://orgmode.org/manual/var.html#var][~:var~]] does not exist 
yet, also there is no 
[[http://orgmode.org/manual/session.html#session][~:session~]]
+Support for [[https://orgmode.org/manual/var.html#var][~:var~]] does not exist 
yet, also there is no 
[[https://orgmode.org/manual/session.html#session][~:session~]]
 support because Vala is a compiled language.
 
 The Vala compiler binary can be changed via the ~defcustom~
@@ -654,9 +654,9 @@ Call ~org-agenda-set-restriction-lock~ from the agenda.
 
 The library-of-babel.org used to be accessible from the =doc/=
 directory, distributed with Org’s core.  It is now accessible
-from the Worg community-driven documentation 
[[http://orgmode.org/worg/library-of-babel.html][here]].
+from the Worg community-driven documentation 
[[https://orgmode.org/worg/library-of-babel.html][here]].
 
-If you want to contribute to it, please see 
[[http://orgmode.org/worg/org-contribute.html][how to contribute]].
+If you want to contribute to it, please see 
[[https://orgmode.org/worg/org-contribute.html][how to contribute]].
 
 *** Allow multiple columns view
 
@@ -1016,7 +1016,7 @@ Evaluating a Stan block can produce two different results.
    that does not end in ".stan".
 
 For more information and usage examples, visit
-http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html
+https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html
 
 **** Support for Oracle databases via ~sqlplus~
 
@@ -2184,7 +2184,7 @@ This allows to specify the names of automatic bookmarks.
 *** New option 
[[doc:org-agenda-ignore-drawer-properties][org-agenda-ignore-drawer-properties]]
 
 This allows more flexibility when optimizing the agenda generation.
-See http://orgmode.org/worg/agenda-optimization.html for details.
+See https://orgmode.org/worg/agenda-optimization.html for details.
 *** New option: [[doc:org-html-link-use-abs-url][org-html-link-use-abs-url]] 
to force using absolute URLs
 
 This is an export/publishing option, and should be used either within
@@ -2268,7 +2268,7 @@ instructions:
 When in doubt, run =M-x org-version RET= and see if you have a mixed-up
 installation.
 
-See http://orgmode.org/org.html#Installation for details.
+See https://orgmode.org/org.html#Installation for details.
 
 ** Incompatible changes
 
@@ -2281,7 +2281,7 @@ you will have to update them.
 
 Below is a list of changes for which you need to take action.
 
-See http://orgmode.org/worg/org-8.0.html for the most recent version of
+See https://orgmode.org/worg/org-8.0.html for the most recent version of
 this list and for detailed instructions on how to migrate.
 
 **** New export engine
@@ -2303,7 +2303,7 @@ corresponding files start with the =ox-= prefix.
 If you customized an export back-end (like HTML or LaTeX), you will need to
 rename some options so that your customization is not lost.  Typically, an
 option starting with =org-export-html-= is now named =org-html-=.  See the
-manual for details and check [[http://orgmode.org/worg/org-8.0.html][this Worg 
page]] for directions.
+manual for details and check [[https://orgmode.org/worg/org-8.0.html][this 
Worg page]] for directions.
 
 **** New syntax for #+ATTR_HTML/LaTeX/... options
 
@@ -2364,7 +2364,7 @@ manual for details and check 
[[http://orgmode.org/worg/org-8.0.html][this Worg p
      ~ox-taskjuggler.el~ by Nicolas Goaziou and others.
 
      Also, the Taskjuggler exporter now uses TJ3 by default.  John Hendy
-     wrote [[http://orgmode.org/worg/org-tutorials/org-taskjuggler3.html][a 
tutorial on Worg]] for the TJ3 export.
+     wrote [[https://orgmode.org/worg/org-tutorials/org-taskjuggler3.html][a 
tutorial on Worg]] for the TJ3 export.
 
 ** New packages in core
 
@@ -2410,7 +2410,7 @@ manual for details and check 
[[http://orgmode.org/worg/org-8.0.html][this Worg p
 
     Display bullets instead of stars for headlines.
 
-    Also see [[http://orgmode.org/worg/org-faq.html#sec-8-12][this updated 
FAQ]] on how to display another character than "*"
+    Also see [[https://orgmode.org/worg/org-faq.html#sec-8-12][this updated 
FAQ]] on how to display another character than "*"
     for starting headlines.
 
 *** ~org-favtable.el~ by Marc-Oliver Ihm
@@ -2418,7 +2418,7 @@ manual for details and check 
[[http://orgmode.org/worg/org-8.0.html][this Worg p
     ~org-favtable.el~ helps you to create and update a table of favorite
     locations in org, keeping the most frequently visited lines right at
     the top.  This table is called "favtable".  See the documentation on
-    [[http://orgmode.org/worg/org-contrib/org-favtable.html][Worg]].
+    [[https://orgmode.org/worg/org-contrib/org-favtable.html][Worg]].
 
 *** ~ox-confluence.el~ by Sébastien Delafond
 
@@ -2459,7 +2459,7 @@ manual for details and check 
[[http://orgmode.org/worg/org-8.0.html][this Worg p
 
 **** New export generic options
 
-If you use Org exporter, we advise you to re-read 
[[http://orgmode.org/org.html#Exporting][the manual section about
+If you use Org exporter, we advise you to re-read 
[[https://orgmode.org/org.html#Exporting][the manual section about
 it]].  It has been updated and includes new options.
 
 Among the new/updated export options, three are of particular importance:
@@ -2834,7 +2834,7 @@ of those tags.)
 You can use group tags for sparse tree in an Org buffer, for creating
 agenda views, and for filtering.
 
-See http://orgmode.org/org.html#Tag-groups for details.
+See https://orgmode.org/org.html#Tag-groups for details.
 
 *** Links
 
@@ -2842,7 +2842,7 @@ See http://orgmode.org/org.html#Tag-groups for details.
 
 Org knows how to store links from Org buffers, from info files and from
 other Emacs buffers.  Org can be taught how to store links from any buffer
-through new link protocols (see 
[[http://orgmode.org/org.html#Adding-hyperlink-types]["Adding hyperlink 
types"]] in the manual.)
+through new link protocols (see 
[[https://orgmode.org/org.html#Adding-hyperlink-types]["Adding hyperlink 
types"]] in the manual.)
 
 Sometimes you want Org to ignore added link protocols and store the link
 as if the protocol was not known.
@@ -2866,7 +2866,7 @@ with-description and without-description links when 
inserting them.
 
 When storing a link to a headline like
 
-: * See [[http://orgmode.org][Org website]]
+: * See [[https://orgmode.org][Org website]]
 
 [[doc:org-store-link][org-store-link]] used to convert the square brackets 
into curly brackets.
 It does not anymore, taking the link description or the link path, when
@@ -2882,7 +2882,7 @@ those other formulas.
 **** You now use "nan" for empty fields in Calc formulas
 
 If empty fields are of interest, it is recommended to reread the section
-[[http://orgmode.org/org.html#Formula-syntax-for-Calc][3.5.2 Formula syntax 
for Calc]] of the manual because the description for the
+[[https://orgmode.org/org.html#Formula-syntax-for-Calc][3.5.2 Formula syntax 
for Calc]] of the manual because the description for the
 mode strings has been clarified and new examples have been added towards
 the end.
 
@@ -2901,7 +2901,7 @@ There are now three lookup functions:
 - [[doc:org-loopup-last][org-loopup-last]]
 - [[doc:org-loopup-all][org-loopup-all]]
 
-See [[http://orgmode.org/org.html#Lookup-functions][the manual]] for details.
+See [[https://orgmode.org/org.html#Lookup-functions][the manual]] for details.
 *** Startup keywords
 
 These new startup keywords are now available:
@@ -3032,7 +3032,7 @@ instead of requiring each Babel library one by one.
 
 David (and others) translated the Org compact guide in spanish:
 
-You can read the [[http://orgmode.org/worg/orgguide/orgguide.es.pdf][PDF 
guide]].
+You can read the [[https://orgmode.org/worg/orgguide/orgguide.es.pdf][PDF 
guide]].
 
 *** ~poporg.el~ and ~outorg.el~
 
@@ -3043,7 +3043,7 @@ Org-mode available.  ~outorg.el~ comes together with 
~outshine.el~ and
 ~navi-mode.el~, two more libraries by Thorsten Jolitz with the goal to give
 source-code buffers the /look & feel/ of Org-mode buffers while greatly
 improving navigation and structure editing.  A detailed description can be
-found here: http://orgmode.org/worg/org-tutorials/org-outside-org.html
+found here: https://orgmode.org/worg/org-tutorials/org-outside-org.html
 
 Here are two screencasts demonstrating Thorsten's tools:
 
@@ -3112,7 +3112,7 @@ in most environments.
 You can now add the Org ELPA repository like this:
 
 #+BEGIN_SRC emacs-lisp
-(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/";) t)
+(add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/";) t)
 #+END_SRC
 
 It contains both the =org-*.tar= package (the core Org distribution, also
@@ -3120,7 +3120,7 @@ available through https://elpa.gnu.org) and the 
=org-plus*.tar= package (the
 extended Org distribution, with non-GNU packages from the =contrib/=
 directory.)
 
-See http://orgmode.org/elpa/
+See https://orgmode.org/elpa/
 
 ** Overview of the new keybindings
 
@@ -3303,7 +3303,7 @@ See http://orgmode.org/elpa/
 
 **** New =todo-unblocked= and =nottodo-unblocked= skip conditions
 
-     See the [[http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=f426da][git 
commit]] for more explanations.
+     See the 
[[https://orgmode.org/cgit.cgi/org-mode.git/commit/?id=f426da][git commit]] for 
more explanations.
 
 **** Allow category filtering in the agenda
 
@@ -3620,7 +3620,7 @@ See http://orgmode.org/elpa/
      Thanks to Carsten for implementing this.
 
 **** ODT: Add support for ODT export in org-bbdb.el
-**** ODT: Add support for indented tables (see 
[[http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=e9fd33][this commit]] for 
details)
+**** ODT: Add support for indented tables (see 
[[https://orgmode.org/cgit.cgi/org-mode.git/commit/?id=e9fd33][this commit]] 
for details)
 **** ODT: Improve the conversion from ODT to other formats
 **** ASCII: Swap the level-1/level-2 characters to underline the headlines
 **** Support for Chinese, simplified Chinese, Russian, Ukrainian and Japanese
@@ -3753,7 +3753,7 @@ that Calc formulas can operate on them.
 
 *** Emacs 21 support has been dropped
 
-    Do not use Org mode 7.xx with Emacs 21, use 
[[http://orgmode.org/org-6.36c.zip][version 6.36c]] instead.
+    Do not use Org mode 7.xx with Emacs 21, use 
[[https://orgmode.org/org-6.36c.zip][version 6.36c]] instead.
 
 *** XEmacs support requires the XEmacs development version
 
@@ -3903,7 +3903,7 @@ that Calc formulas can operate on them.
     This replaces the earlier system org-remember.  The manual only
     describes org-capture, but for people who prefer to continue to
     use org-remember, we keep a static copy of the former manual
-    section [[http://orgmode.org/org-remember.pdf][chapter about remember]].
+    section [[https://orgmode.org/org-remember.pdf][chapter about remember]].
 
     The new system has a technically cleaner implementation and more
     possibilities for capturing different types of data.  See
@@ -3967,7 +3967,7 @@ that Calc formulas can operate on them.
 **** org-taskjuggler.el (Christian Egli)
 
      Christian Egli's /org-taskjuggler.el/ module is now part of Org.
-     He also wrote a 
[[http://orgmode.org/worg/org-tutorials/org-taskjuggler.php][tutorial]] for it.
+     He also wrote a 
[[https://orgmode.org/worg/org-tutorials/org-taskjuggler.php][tutorial]] for it.
 
 **** org-ctags.el (Paul Sexton)
 
@@ -4187,7 +4187,7 @@ that Calc formulas can operate on them.
      Org-mode documents or subtrees can now be converted directly in
      to BEAMER presentation.  Turning a tree into a simple
      presentations is straight forward, and there is also quite some
-     support to make richer presentations as well.  See the 
[[http://orgmode.org/manual/Beamer-class-export.html#Beamer-class-export][BEAMER
+     support to make richer presentations as well.  See the 
[[https://orgmode.org/manual/Beamer-class-export.html#Beamer-class-export][BEAMER
      section]] in the manual for more details.
 
      Thanks to everyone who has contributed to the discussion about
-- 
2.13.6

>From 5a1bb1253003d779d533932ef57831316712ec72 Mon Sep 17 00:00:00 2001
From: Tim Landscheidt <address@hidden>
Date: Tue, 16 Jan 2018 18:42:57 +0000
Subject: [PATCH 4/5] FIXME: URLs to update in source code or tests

---
 lisp/org-element.el               |  6 ++---
 lisp/org-protocol.el              |  6 ++---
 testing/lisp/test-ob-tangle.el    |  4 ++--
 testing/lisp/test-org-clock.el    | 16 +++++++-------
 testing/lisp/test-org-colview.el  |  2 +-
 testing/lisp/test-org-element.el  | 46 +++++++++++++++++++--------------------
 testing/lisp/test-org-feed.el     |  4 ++--
 testing/lisp/test-org-footnote.el |  2 +-
 testing/lisp/test-org-table.el    |  2 +-
 testing/lisp/test-org.el          | 12 +++++-----
 testing/lisp/test-ox.el           | 16 +++++++-------
 11 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 9b6f67ab1..ec00fbd4c 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3090,7 +3090,7 @@ Assume point is at the beginning of the link."
        (setq path (match-string-no-properties 1))
        (setq contents-begin (match-beginning 1))
        (setq contents-end (match-end 1)))
-       ;; Type 2: Standard link, i.e. [[http://orgmode.org][homepage]]
+       ;; Type 2: Standard link, i.e. [[https://orgmode.org][homepage]]
        ((looking-at org-bracket-link-regexp)
        (setq format 'bracket)
        (setq contents-begin (match-beginning 3))
@@ -3139,14 +3139,14 @@ Assume point is at the beginning of the link."
         (t
          (setq type "fuzzy")
          (setq path raw-link))))
-       ;; Type 3: Plain link, e.g., http://orgmode.org
+       ;; Type 3: Plain link, e.g., https://orgmode.org
        ((looking-at org-plain-link-re)
        (setq format 'plain)
        (setq raw-link (match-string-no-properties 0))
        (setq type (match-string-no-properties 1))
        (setq link-end (match-end 0))
        (setq path (match-string-no-properties 2)))
-       ;; Type 4: Angular link, e.g., <http://orgmode.org>.  Unlike to
+       ;; Type 4: Angular link, e.g., <https://orgmode.org>.  Unlike to
        ;; bracket links, follow RFC 3986 and remove any extra
        ;; whitespace in URI.
        ((looking-at org-angle-link-re)
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 3cbbc78dc..a0e2e4228 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -184,10 +184,10 @@ Possible properties are:
 Example:
 
    (setq org-protocol-project-alist
-       \\='((\"http://orgmode.org/worg/\";
+       \\='((\"https://orgmode.org/worg/\";
           :online-suffix \".php\"
           :working-suffix \".org\"
-          :base-url \"http://orgmode.org/worg/\";
+          :base-url \"https://orgmode.org/worg/\";
           :working-directory \"/home/user/org/Worg/\")
          (\"http://localhost/org-notes/\";
           :online-suffix \".html\"
@@ -688,7 +688,7 @@ the cdr of an element in `org-publish-project-alist', reuse
   (let ((working-dir (expand-file-name
                      (or (plist-get project-plist :base-directory)
                          default-directory)))
-        (base-url "http://orgmode.org/worg/";)
+        (base-url "https://orgmode.org/worg/";)
         (strip-suffix (or (plist-get project-plist :html-extension) ".html"))
         (working-suffix (if (plist-get project-plist :base-extension)
                             (concat "." (plist-get project-plist 
:base-extension))
diff --git a/testing/lisp/test-ob-tangle.el b/testing/lisp/test-ob-tangle.el
index 73b75323e..560cc6c56 100644
--- a/testing/lisp/test-ob-tangle.el
+++ b/testing/lisp/test-ob-tangle.el
@@ -82,9 +82,9 @@
   "Test commenting of links at left margin."
   (should
    (string-match
-    (regexp-quote "# [[http://orgmode.org][Org mode]]")
+    (regexp-quote "# [[https://orgmode.org][Org mode]]")
     (org-test-with-temp-text-in-file
-        "[[http://orgmode.org][Org mode]]
+        "[[https://orgmode.org][Org mode]]
 #+header: :comments org :tangle \"test-ob-tangle.sh\"
 #+begin_src sh
 echo 1
diff --git a/testing/lisp/test-org-clock.el b/testing/lisp/test-org-clock.el
index 1388c50df..6300be856 100644
--- a/testing/lisp/test-org-clock.el
+++ b/testing/lisp/test-org-clock.el
@@ -640,20 +640,20 @@ CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 
26:00"
 |--------------+---------|
 | *Total time* | *26:00* |
 |--------------+---------|
-| [[Foo %5B%5Bhttp://orgmode.org%5D%5BOrg mode%5D%5D][Foo Org mode]] | 26:00   
|"
+| [[Foo %5B%5Bhttps://orgmode.org%5D%5BOrg mode%5D%5D][Foo Org mode]] | 26:00  
 |"
     (org-test-with-temp-text
-       "* Foo [[http://orgmode.org][Org mode]]
+       "* Foo [[https://orgmode.org][Org mode]]
 CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
       (test-org-clock-clocktable-contents ":link t"))))
   (should
    (equal
-    "| Headline               | Time    |
-|------------------------+---------|
-| *Total time*           | *26:00* |
-|------------------------+---------|
-| [[Foo %5B%5Bhttp://orgmode.org%5D%5D][Foo http://orgmode.org]] | 26:00   |"
+    "| Headline                | Time    |
+|-------------------------+---------|
+| *Total time*            | *26:00* |
+|-------------------------+---------|
+| [[Foo %5B%5Bhttps://orgmode.org%5D%5D][Foo https://orgmode.org]] | 26:00   |"
     (org-test-with-temp-text
-       "* Foo [[http://orgmode.org]]
+       "* Foo [[https://orgmode.org]]
 CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
       (test-org-clock-clocktable-contents ":link t")))))
 
diff --git a/testing/lisp/test-org-colview.el b/testing/lisp/test-org-colview.el
index 721aa87fe..fd00a2dde 100644
--- a/testing/lisp/test-org-colview.el
+++ b/testing/lisp/test-org-colview.el
@@ -143,7 +143,7 @@
   (should
    (equal
     '("* [123]" . 7)
-    (org-test-with-temp-text "* [[http://orgmode.org][123]]";
+    (org-test-with-temp-text "* [[https://orgmode.org][123]]";
       (let ((org-columns-default-format "%ITEM")) (org-columns))
       (cons (get-char-property (point) 'org-columns-value-modified)
            (aref org-columns-current-maxwidths 0)))))
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index b17e86b8b..533a317d4 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1722,14 +1722,14 @@ e^{i\\pi}+1=0
   (should
    (equal
     '("Orgmode.org")
-    (org-test-with-temp-text "[[http://orgmode.org][Orgmode.org]]";
+    (org-test-with-temp-text "[[https://orgmode.org][Orgmode.org]]";
       (org-element-contents
        (org-element-map (org-element-parse-buffer) 'link 'identity nil t)))))
   ;; ... without description.
   (should
    (equal
-    "http"
-    (org-test-with-temp-text "[[http://orgmode.org]]";
+    "https"
+    (org-test-with-temp-text "[[https://orgmode.org]]";
       (org-element-property
        :type
        (org-element-map (org-element-parse-buffer) 'link 'identity nil t)))))
@@ -1738,7 +1738,7 @@ e^{i\\pi}+1=0
    (equal
     "//orgmode.org/worg"
     (org-test-with-temp-text "[[Org:worg]]"
-      (let ((org-link-abbrev-alist '(("Org" . "http://orgmode.org/";))))
+      (let ((org-link-abbrev-alist '(("Org" . "https://orgmode.org/";))))
        (org-element-property
         :path
         (org-element-map (org-element-parse-buffer) 'link 'identity nil t))))))
@@ -1746,7 +1746,7 @@ e^{i\\pi}+1=0
   (should
    (equal
     "127.0.0.1"
-    (org-test-with-temp-text "[[http://orgmode.org]]";
+    (org-test-with-temp-text "[[https://orgmode.org]]";
       (let ((org-link-translation-function
             (lambda (type _) (cons type "127.0.0.1"))))
        (org-element-property
@@ -1819,30 +1819,30 @@ e^{i\\pi}+1=0
            (org-element-property :path (org-element-context)))))
   ;; Plain link.
   (should
-   (org-test-with-temp-text "A link: http://orgmode.org";
+   (org-test-with-temp-text "A link: https://orgmode.org";
      (org-element-map (org-element-parse-buffer) 'link 'identity)))
   ;; Angular link.  Follow RFC 3986.
   (should
    (eq 'link
-       (org-test-with-temp-text "A link: <point><http://orgmode.org>"
+       (org-test-with-temp-text "A link: <point><https://orgmode.org>"
         (org-element-type (org-element-context)))))
   (should
    (equal "//orgmode.org"
-         (org-test-with-temp-text "A link: <point><http://orgmode\n.org>"
+         (org-test-with-temp-text "A link: <point><https://orgmode\n.org>"
            (org-element-property :path (org-element-context)))))
   ;; Link abbreviation.
   (should
-   (equal "http"
+   (equal "https"
          (org-test-with-temp-text
-             "#+LINK: orgmode http://www.orgmode.org/\n[[orgmode:#docs]]";
+             "#+LINK: orgmode https://www.orgmode.org/\n[[orgmode:#docs]]";
            (progn (org-mode-restart)
                   (goto-char (1- (point-max)))
                   (org-element-property :type (org-element-context))))))
   ;; Link abbreviation in a secondary string.
   (should
-   (equal "http"
+   (equal "https"
          (org-test-with-temp-text
-             "#+LINK: orgmode http://www.orgmode.org/\n* H [[orgmode:#docs]]"
+             "#+LINK: orgmode https://www.orgmode.org/\n* H [[orgmode:#docs]]"
            (progn (org-mode-restart)
                   (org-element-map (org-element-parse-buffer) 'link
                     (lambda (link) (org-element-property :type link))
@@ -3139,15 +3139,15 @@ DEADLINE: <2012-03-29 thu.> SCHEDULED: <2012-03-29 
thu.> CLOSED: [2012-03-29 thu
                   (org-test-parse-and-interpret "a radio-target"))
                 "a radio-target\n"))
   ;; Links without description.
-  (should (equal (org-test-parse-and-interpret "[[http://orgmode.org]]";)
-                "[[http://orgmode.org]]\n";))
+  (should (equal (org-test-parse-and-interpret "[[https://orgmode.org]]";)
+                "[[https://orgmode.org]]\n";))
   ;; Links with a description, even one containing a link.
   (should (equal (org-test-parse-and-interpret
-                 "[[http://orgmode.org][Org mode]]")
-                "[[http://orgmode.org][Org mode]]\n"))
+                 "[[https://orgmode.org][Org mode]]")
+                "[[https://orgmode.org][Org mode]]\n"))
   (should (equal (org-test-parse-and-interpret
-                 "[[http://orgmode.org][http://orgmode.org]]";)
-                "[[http://orgmode.org][http://orgmode.org]]\n";))
+                 "[[https://orgmode.org][https://orgmode.org]]";)
+                "[[https://orgmode.org][https://orgmode.org]]\n";))
   ;; File links.
   (should
    (equal (org-test-parse-and-interpret "[[file+emacs:todo.org]]")
@@ -3162,11 +3162,11 @@ DEADLINE: <2012-03-29 thu.> SCHEDULED: <2012-03-29 
thu.> CLOSED: [2012-03-29 thu
   ;; Code-ref links.
   (should (equal (org-test-parse-and-interpret "[[(ref)]]") "[[(ref)]]\n"))
   ;; Plain links.
-  (should (equal (org-test-parse-and-interpret "http://orgmode.org";)
-                "http://orgmode.org\n";))
+  (should (equal (org-test-parse-and-interpret "https://orgmode.org";)
+                "https://orgmode.org\n";))
   ;; Angular links.
-  (should (equal (org-test-parse-and-interpret "<http://orgmode.org>")
-                "<http://orgmode.org>\n"))
+  (should (equal (org-test-parse-and-interpret "<https://orgmode.org>")
+                "<https://orgmode.org>\n"))
   ;; Pathological case: link with a %-sign in description.
   (should (equal (org-test-parse-and-interpret "[[file://path][%s]]")
                 "[[file://path][%s]]\n")))
@@ -3589,7 +3589,7 @@ Text
   ;; Special case: objects in inline footnotes.
   (should
    (eq 'link
-       (org-test-with-temp-text "[fn::[[<point>http://orgmode.org]]]";
+       (org-test-with-temp-text "[fn::[[<point>https://orgmode.org]]]";
         (org-element-type (org-element-context)))))
   ;; Special case: tags looking like a link.
   (should-not
diff --git a/testing/lisp/test-org-feed.el b/testing/lisp/test-org-feed.el
index d28abb990..52689673c 100644
--- a/testing/lisp/test-org-feed.el
+++ b/testing/lisp/test-org-feed.el
@@ -37,8 +37,8 @@
          (org-feed-format-entry nil "%(concat \"success\" \"!\")" nil)))
   ;; %a placeholder.
   (should
-   (equal "[[http://orgmode.org]]\n";
-         (org-feed-format-entry '(:link "http://orgmode.org";) "%a" nil)))
+   (equal "[[https://orgmode.org]]\n";
+         (org-feed-format-entry '(:link "https://orgmode.org";) "%a" nil)))
   ;; %t and %T placeholders.
   (should
    (equal (format-time-string (org-time-stamp-format nil nil))
diff --git a/testing/lisp/test-org-footnote.el 
b/testing/lisp/test-org-footnote.el
index 78ff459d3..f5877a861 100644
--- a/testing/lisp/test-org-footnote.el
+++ b/testing/lisp/test-org-footnote.el
@@ -74,7 +74,7 @@
       (let ((org-footnote-auto-label t)) (org-footnote-new))
       (buffer-string))))
   (should-error
-   (org-test-with-temp-text " [[http://orgmode.org][Org mode<point>]]"
+   (org-test-with-temp-text " [[https://orgmode.org][Org mode<point>]]"
      (org-footnote-new)))
   ;; Allow new footnotes in blank lines after an element or white
   ;; spaces after an object.
diff --git a/testing/lisp/test-org-table.el b/testing/lisp/test-org-table.el
index 0dcdb929d..3dd2b2cf1 100644
--- a/testing/lisp/test-org-table.el
+++ b/testing/lisp/test-org-table.el
@@ -2413,7 +2413,7 @@ See also `test-org-table/copy-field'."
   ;; Only overlay visible characters of the field.
   (should
    (equal (concat " htt" org-table-shrunk-column-indicator)
-         (org-test-with-temp-text "| <3> |\n| <point>[[http://orgmode.org]] |"
+         (org-test-with-temp-text "| <3> |\n| <point>[[https://orgmode.org]] |"
            (org-table-toggle-column-width)
            (overlay-get (car (overlays-at (point))) 'display))))
   ;; Before the first column or after the last one, ask for columns
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 2e1d18911..156854dd7 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -1801,12 +1801,12 @@
   (should
    (equal '("Org")
          (org-test-with-temp-text
-             "* [[http://orgmode.org][Org]]\n** S<point>"
+             "* [[https://orgmode.org][Org]]\n** S<point>"
            (org-get-outline-path))))
   (should
-   (equal '("http://orgmode.org";)
+   (equal '("https://orgmode.org";)
          (org-test-with-temp-text
-             "* [[http://orgmode.org]]\n** S<point>"
+             "* [[https://orgmode.org]]\n** S<point>"
            (org-get-outline-path))))
   ;; When WITH-SELF is non-nil, include current heading.
   (should
@@ -3201,12 +3201,12 @@ SCHEDULED: <2017-05-06 Sat>
            (progn (org-beginning-of-line) (looking-at-p "Item"))))))
   ;; Leave point before invisible characters at column 0.
   (should
-   (org-test-with-temp-text "[[http://orgmode.org]]<point>"
+   (org-test-with-temp-text "[[https://orgmode.org]]<point>"
      (let ((org-special-ctrl-a/e nil))
        (org-beginning-of-line)
        (bolp))))
   (should
-   (org-test-with-temp-text "[[http://orgmode.org]]<point>"
+   (org-test-with-temp-text "[[https://orgmode.org]]<point>"
      (let ((org-special-ctrl-a/e t))
        (org-beginning-of-line)
        (bolp))))
@@ -3347,7 +3347,7 @@ SCHEDULED: <2017-05-06 Sat>
        (eobp))))
   ;; Get past invisible characters at the end of line.
   (should
-   (org-test-with-temp-text "[[http://orgmode.org]]";
+   (org-test-with-temp-text "[[https://orgmode.org]]";
      (org-end-of-line)
      (eolp))))
 
diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el
index 1db52c49c..3266a0ccb 100644
--- a/testing/lisp/test-ox.el
+++ b/testing/lisp/test-ox.el
@@ -2843,19 +2843,19 @@ Para2"
   "Test `org-export-insert-image-links' specifications."
   (should-not
    (member "file"
-          (org-test-with-parsed-data "[[http://orgmode.org][file:image.png]]";
+          (org-test-with-parsed-data "[[https://orgmode.org][file:image.png]]";
             (org-element-map tree 'link
               (lambda (l) (org-element-property :type l))))))
   (should
    (member "file"
-          (org-test-with-parsed-data "[[http://orgmode.org][file:image.png]]";
+          (org-test-with-parsed-data "[[https://orgmode.org][file:image.png]]";
             (org-element-map (org-export-insert-image-links tree info) 'link
               (lambda (l) (org-element-property :type l))))))
   ;; Properly set `:parent' property when replace contents with image
   ;; link.
   (should
    (memq 'link
-        (org-test-with-parsed-data "[[http://orgmode.org][file:image.png]]";
+        (org-test-with-parsed-data "[[https://orgmode.org][file:image.png]]";
           (org-element-map (org-export-insert-image-links tree info) 'link
             (lambda (l)
               (org-element-type (org-element-property :parent l)))))))
@@ -2863,12 +2863,12 @@ Para2"
   ;; images.
   (should-not
    (member "file"
-          (org-test-with-parsed-data "[[http://orgmode.org][file:image.xxx]]";
+          (org-test-with-parsed-data "[[https://orgmode.org][file:image.xxx]]";
             (org-element-map (org-export-insert-image-links tree info) 'link
               (lambda (l) (org-element-property :type l))))))
   (should
    (member "file"
-          (org-test-with-parsed-data "[[http://orgmode.org][file:image.xxx]]";
+          (org-test-with-parsed-data "[[https://orgmode.org][file:image.xxx]]";
             (org-element-map
                 (org-export-insert-image-links tree info '(("file" . "xxx")))
                 'link
@@ -4427,7 +4427,7 @@ Another text. (ref:text)
   ;; Replace plain links with contents, or with path.
   (should
    (equal "H Org mode\n"
-         (org-test-with-temp-text "* H [[http://orgmode.org][Org mode]]"
+         (org-test-with-temp-text "* H [[https://orgmode.org][Org mode]]"
            (let (org-export-registered-backends)
              (org-export-define-backend 'test
                '((headline . (lambda (h _c i) (org-export-data-with-backend
@@ -4436,8 +4436,8 @@ Another text. (ref:text)
                                           i)))))
              (org-export-as 'test)))))
   (should
-   (equal "H http://orgmode.org\n";
-         (org-test-with-temp-text "* H [[http://orgmode.org]]";
+   (equal "H https://orgmode.org\n";
+         (org-test-with-temp-text "* H [[https://orgmode.org]]";
            (let (org-export-registered-backends)
              (org-export-define-backend 'test
                '((headline . (lambda (h _c i) (org-export-data-with-backend
-- 
2.13.6

>From 4ab1a9b53dfb5b345974be5bf217381cf4e8e85f Mon Sep 17 00:00:00 2001
From: Tim Landscheidt <address@hidden>
Date: Tue, 16 Jan 2018 18:55:14 +0000
Subject: [PATCH 5/5] Add trailing slash to
 https://orgmode.org/worg/org-contrib/babel

---
 contrib/manual.org | 2 +-
 doc/org.texi       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/manual.org b/contrib/manual.org
index e105e46ff..c6639d32e 100644
--- a/contrib/manual.org
+++ b/contrib/manual.org
@@ -16139,7 +16139,7 @@ Each language can have separate default header 
arguments by
 customizing the variable ~org-babel-default-header-args:<LANG>~, where
 {{{var(<LANG>)}}} is the name of the language.  For details, see the
 language-specific online documentation at
-https://orgmode.org/worg/org-contrib/babel.
+https://orgmode.org/worg/org-contrib/babel/.
 
 *** Header arguments in Org mode properties
 :PROPERTIES:
diff --git a/doc/org.texi b/doc/org.texi
index f1b6535f7..78e31a7d0 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -15718,7 +15718,7 @@ Org expand @code{:noweb} references by default.
 Each language can have separate default header arguments by customizing the
 variable @code{org-babel-default-header-args:<lang>}, where @code{<lang>} is
 the name of the language.  For details, see the language-specific online
-documentation at @uref{https://orgmode.org/worg/org-contrib/babel}.
+documentation at @uref{https://orgmode.org/worg/org-contrib/babel/}.
 
 @node Header arguments in Org mode properties
 @subsubheading Header arguments in Org mode properties
-- 
2.13.6


reply via email to

[Prev in Thread] Current Thread [Next in Thread]