emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Prefer HTTPS to HTTP for links to gnu.org
@ 2021-03-20  7:39 Stefan Kangas
  2021-03-21 18:40 ` Kyle Meyer
  0 siblings, 1 reply; 4+ messages in thread
From: Stefan Kangas @ 2021-03-20  7:39 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 137 bytes --]

The attached patch updates all links to gnu.org to use https instead of
http.  (Such a change was made in Emacs itself already in 2017.)

[-- Attachment #2: 0001-Prefer-HTTPS-to-HTTP-for-links-to-gnu.org.patch --]
[-- Type: text/x-diff, Size: 70977 bytes --]

From b68b11fcb6d840fdc9046c4b8ddee34e28665f72 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 20 Mar 2021 08:27:57 +0100
Subject: [PATCH] Prefer HTTPS to HTTP for links to gnu.org

---
 COPYING                                     | 6 +++---
 contrib/lisp/ob-arduino.el                  | 2 +-
 contrib/lisp/ob-clojure-literate.el         | 2 +-
 contrib/lisp/ob-csharp.el                   | 2 +-
 contrib/lisp/ob-eukleides.el                | 2 +-
 contrib/lisp/ob-mathomatic.el               | 2 +-
 contrib/lisp/ob-sclang.el                   | 2 +-
 contrib/lisp/ob-spice.el                    | 2 +-
 contrib/lisp/ob-tcl.el                      | 2 +-
 contrib/lisp/ob-vbnet.el                    | 2 +-
 contrib/lisp/ol-elisp-symbol.el             | 2 +-
 contrib/lisp/ol-git-link.el                 | 2 +-
 contrib/lisp/ol-man.el                      | 2 +-
 contrib/lisp/ol-mew.el                      | 2 +-
 contrib/lisp/ol-notmuch.el                  | 2 +-
 contrib/lisp/ol-vm.el                       | 2 +-
 contrib/lisp/ol-wl.el                       | 2 +-
 contrib/lisp/org-attach-embedded-images.el  | 2 +-
 contrib/lisp/org-bibtex-extras.el           | 2 +-
 contrib/lisp/org-checklist.el               | 2 +-
 contrib/lisp/org-collector.el               | 2 +-
 contrib/lisp/org-contacts.el                | 2 +-
 contrib/lisp/org-depend.el                  | 2 +-
 contrib/lisp/org-effectiveness.el           | 2 +-
 contrib/lisp/org-eldoc.el                   | 2 +-
 contrib/lisp/org-eval-light.el              | 2 +-
 contrib/lisp/org-eval.el                    | 2 +-
 contrib/lisp/org-expiry.el                  | 2 +-
 contrib/lisp/org-interactive-query.el       | 2 +-
 contrib/lisp/org-learn.el                   | 2 +-
 contrib/lisp/org-license.el                 | 2 +-
 contrib/lisp/org-mac-iCal.el                | 2 +-
 contrib/lisp/org-mac-link.el                | 2 +-
 contrib/lisp/org-mairix.el                  | 2 +-
 contrib/lisp/org-notify.el                  | 2 +-
 contrib/lisp/org-panel.el                   | 2 +-
 contrib/lisp/org-passwords.el               | 2 +-
 contrib/lisp/org-registry.el                | 2 +-
 contrib/lisp/org-screen.el                  | 2 +-
 contrib/lisp/org-screenshot.el              | 4 ++--
 contrib/lisp/org-secretary.el               | 2 +-
 contrib/lisp/org-static-mathjax.el          | 2 +-
 contrib/lisp/org-sudoku.el                  | 2 +-
 contrib/lisp/org-toc.el                     | 2 +-
 contrib/lisp/org-track.el                   | 4 ++--
 contrib/lisp/org-velocity.el                | 2 +-
 contrib/lisp/org-wikinodes.el               | 2 +-
 contrib/lisp/orgtbl-sqlinsert.el            | 2 +-
 contrib/lisp/ox-confluence.el               | 2 +-
 contrib/lisp/ox-deck.el                     | 2 +-
 contrib/lisp/ox-extra.el                    | 2 +-
 contrib/lisp/ox-freemind.el                 | 2 +-
 contrib/lisp/ox-groff.el                    | 2 +-
 contrib/lisp/ox-koma-letter.el              | 2 +-
 contrib/lisp/ox-rss.el                      | 2 +-
 contrib/lisp/ox-s5.el                       | 2 +-
 contrib/lisp/ox-taskjuggler.el              | 2 +-
 contrib/scripts/org-docco.org               | 2 +-
 contrib/scripts/org2hpda                    | 2 +-
 doc/fdl.org                                 | 2 +-
 doc/htmlxref.cnf                            | 4 ++--
 doc/org-manual.org                          | 2 +-
 doc/pdflayout.sty                           | 2 +-
 doc/texinfo.tex                             | 6 +++---
 mk/orgcard2txt.pl                           | 2 +-
 testing/lisp/test-ob-C.el                   | 2 +-
 testing/lisp/test-ob-R.el                   | 2 +-
 testing/lisp/test-ob-awk.el                 | 2 +-
 testing/lisp/test-ob-clojure.el             | 2 +-
 testing/lisp/test-ob-emacs-lisp.el          | 2 +-
 testing/lisp/test-ob-eshell.el              | 2 +-
 testing/lisp/test-ob-exp.el                 | 2 +-
 testing/lisp/test-ob-fortran.el             | 2 +-
 testing/lisp/test-ob-header-arg-defaults.el | 2 +-
 testing/lisp/test-ob-java.el                | 2 +-
 testing/lisp/test-ob-lilypond.el            | 2 +-
 testing/lisp/test-ob-lob.el                 | 2 +-
 testing/lisp/test-ob-lua.el                 | 2 +-
 testing/lisp/test-ob-maxima.el              | 2 +-
 testing/lisp/test-ob-octave.el              | 2 +-
 testing/lisp/test-ob-perl.el                | 2 +-
 testing/lisp/test-ob-plantuml.el            | 2 +-
 testing/lisp/test-ob-python.el              | 2 +-
 testing/lisp/test-ob-ruby.el                | 2 +-
 testing/lisp/test-ob-scheme.el              | 2 +-
 testing/lisp/test-ob-sed.el                 | 2 +-
 testing/lisp/test-ob-shell.el               | 2 +-
 testing/lisp/test-ob-sqlite.el              | 2 +-
 testing/lisp/test-ob-table.el               | 2 +-
 testing/lisp/test-ob-tangle.el              | 2 +-
 testing/lisp/test-ob-vala.el                | 2 +-
 testing/lisp/test-ob.el                     | 2 +-
 testing/lisp/test-ol-bbdb.el                | 2 +-
 testing/lisp/test-org-agenda.el             | 2 +-
 testing/lisp/test-org-archive.el            | 2 +-
 testing/lisp/test-org-attach-git.el         | 2 +-
 testing/lisp/test-org-attach.el             | 2 +-
 testing/lisp/test-org-capture.el            | 2 +-
 testing/lisp/test-org-clock.el              | 2 +-
 testing/lisp/test-org-colview.el            | 2 +-
 testing/lisp/test-org-datetree.el           | 2 +-
 testing/lisp/test-org-duration.el           | 2 +-
 testing/lisp/test-org-element.el            | 2 +-
 testing/lisp/test-org-feed.el               | 2 +-
 testing/lisp/test-org-footnote.el           | 2 +-
 testing/lisp/test-org-info.el               | 2 +-
 testing/lisp/test-org-inlinetask.el         | 2 +-
 testing/lisp/test-org-lint.el               | 2 +-
 testing/lisp/test-org-list.el               | 2 +-
 testing/lisp/test-org-macro.el              | 2 +-
 testing/lisp/test-org-macs.el               | 2 +-
 testing/lisp/test-org-pcomplete.el          | 2 +-
 testing/lisp/test-org-protocol.el           | 2 +-
 testing/lisp/test-org-src.el                | 2 +-
 testing/lisp/test-org-table.el              | 2 +-
 testing/lisp/test-org-tempo.el              | 2 +-
 testing/lisp/test-org-timer.el              | 2 +-
 testing/lisp/test-org.el                    | 2 +-
 testing/lisp/test-ox-publish.el             | 2 +-
 testing/lisp/test-ox.el                     | 2 +-
 testing/lisp/test-property-inheritance.el   | 2 +-
 testing/org-test.el                         | 4 ++--
 122 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/COPYING b/COPYING
index 94a9ed024..2a000655e 100644
--- a/COPYING
+++ b/COPYING
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/contrib/lisp/ob-arduino.el b/contrib/lisp/ob-arduino.el
index 8a1fd76d6..ff1964467 100644
--- a/contrib/lisp/ob-arduino.el
+++ b/contrib/lisp/ob-arduino.el
@@ -7,7 +7,7 @@
 ;; homepage: https://github.com/stardiviner/arduino-mode
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;; 
diff --git a/contrib/lisp/ob-clojure-literate.el b/contrib/lisp/ob-clojure-literate.el
index cd2dcff97..172f7c0a8 100644
--- a/contrib/lisp/ob-clojure-literate.el
+++ b/contrib/lisp/ob-clojure-literate.el
@@ -7,7 +7,7 @@
 ;; homepage: https://github.com/stardiviner/ob-clojure-literate
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/ob-csharp.el b/contrib/lisp/ob-csharp.el
index a6a253c60..1a0be1582 100644
--- a/contrib/lisp/ob-csharp.el
+++ b/contrib/lisp/ob-csharp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ob-eukleides.el b/contrib/lisp/ob-eukleides.el
index fc5e7d43d..b1cc91b64 100644
--- a/contrib/lisp/ob-eukleides.el
+++ b/contrib/lisp/ob-eukleides.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ob-mathomatic.el b/contrib/lisp/ob-mathomatic.el
index a79831215..adc7c376a 100644
--- a/contrib/lisp/ob-mathomatic.el
+++ b/contrib/lisp/ob-mathomatic.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ob-sclang.el b/contrib/lisp/ob-sclang.el
index 0b01fc5a9..a72b7c4ed 100644
--- a/contrib/lisp/ob-sclang.el
+++ b/contrib/lisp/ob-sclang.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ob-spice.el b/contrib/lisp/ob-spice.el
index c452c993f..3139d0eba 100644
--- a/contrib/lisp/ob-spice.el
+++ b/contrib/lisp/ob-spice.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ob-tcl.el b/contrib/lisp/ob-tcl.el
index 2d8b0e43f..627004732 100644
--- a/contrib/lisp/ob-tcl.el
+++ b/contrib/lisp/ob-tcl.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ob-vbnet.el b/contrib/lisp/ob-vbnet.el
index 3c6e9fe0c..1ea572d51 100644
--- a/contrib/lisp/ob-vbnet.el
+++ b/contrib/lisp/ob-vbnet.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ol-elisp-symbol.el b/contrib/lisp/ol-elisp-symbol.el
index 72e0be33a..6215b0f4c 100644
--- a/contrib/lisp/ol-elisp-symbol.el
+++ b/contrib/lisp/ol-elisp-symbol.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/ol-git-link.el b/contrib/lisp/ol-git-link.el
index 4076e24ce..9d236cfed 100644
--- a/contrib/lisp/ol-git-link.el
+++ b/contrib/lisp/ol-git-link.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ol-man.el b/contrib/lisp/ol-man.el
index b21ed9eba..f676579e7 100644
--- a/contrib/lisp/ol-man.el
+++ b/contrib/lisp/ol-man.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/ol-mew.el b/contrib/lisp/ol-mew.el
index c3d78f666..a8aa5d0af 100644
--- a/contrib/lisp/ol-mew.el
+++ b/contrib/lisp/ol-mew.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/ol-notmuch.el b/contrib/lisp/ol-notmuch.el
index 0fa0c5a2c..47882e245 100644
--- a/contrib/lisp/ol-notmuch.el
+++ b/contrib/lisp/ol-notmuch.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ol-vm.el b/contrib/lisp/ol-vm.el
index 1ec053102..a07342b4e 100644
--- a/contrib/lisp/ol-vm.el
+++ b/contrib/lisp/ol-vm.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/ol-wl.el b/contrib/lisp/ol-wl.el
index 5ceba3572..9449aaf63 100644
--- a/contrib/lisp/ol-wl.el
+++ b/contrib/lisp/ol-wl.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-attach-embedded-images.el b/contrib/lisp/org-attach-embedded-images.el
index adbbfbae2..45fd0047b 100644
--- a/contrib/lisp/org-attach-embedded-images.el
+++ b/contrib/lisp/org-attach-embedded-images.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 \f
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/org-bibtex-extras.el b/contrib/lisp/org-bibtex-extras.el
index 8c62ef794..d7e9e468a 100644
--- a/contrib/lisp/org-bibtex-extras.el
+++ b/contrib/lisp/org-bibtex-extras.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/org-checklist.el b/contrib/lisp/org-checklist.el
index 2bc00c0b9..2b050171a 100644
--- a/contrib/lisp/org-checklist.el
+++ b/contrib/lisp/org-checklist.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/org-collector.el b/contrib/lisp/org-collector.el
index ace631329..c6d2204b1 100644
--- a/contrib/lisp/org-collector.el
+++ b/contrib/lisp/org-collector.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el
index cd10e4874..3a30cefdc 100644
--- a/contrib/lisp/org-contacts.el
+++ b/contrib/lisp/org-contacts.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-depend.el b/contrib/lisp/org-depend.el
index 8cbf000ae..5d0df0315 100644
--- a/contrib/lisp/org-depend.el
+++ b/contrib/lisp/org-depend.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-effectiveness.el b/contrib/lisp/org-effectiveness.el
index 28793b8af..e6673a6fa 100644
--- a/contrib/lisp/org-effectiveness.el
+++ b/contrib/lisp/org-effectiveness.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el
index 78f595c26..8f6c2f5e7 100644
--- a/contrib/lisp/org-eldoc.el
+++ b/contrib/lisp/org-eldoc.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/org-eval-light.el b/contrib/lisp/org-eval-light.el
index 6af47365a..5c8404faa 100644
--- a/contrib/lisp/org-eval-light.el
+++ b/contrib/lisp/org-eval-light.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/org-eval.el b/contrib/lisp/org-eval.el
index fc878a959..1deccca91 100644
--- a/contrib/lisp/org-eval.el
+++ b/contrib/lisp/org-eval.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-expiry.el b/contrib/lisp/org-expiry.el
index 7db002c0d..9c2bdaec3 100644
--- a/contrib/lisp/org-expiry.el
+++ b/contrib/lisp/org-expiry.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/org-interactive-query.el b/contrib/lisp/org-interactive-query.el
index 56b9a6d80..dba053f4c 100644
--- a/contrib/lisp/org-interactive-query.el
+++ b/contrib/lisp/org-interactive-query.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/org-learn.el b/contrib/lisp/org-learn.el
index 5e39b15eb..5cbf22d20 100644
--- a/contrib/lisp/org-learn.el
+++ b/contrib/lisp/org-learn.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-license.el b/contrib/lisp/org-license.el
index 0f95ea551..1bdbea2cf 100644
--- a/contrib/lisp/org-license.el
+++ b/contrib/lisp/org-license.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-mac-iCal.el b/contrib/lisp/org-mac-iCal.el
index 937b6dd7d..88e84008f 100644
--- a/contrib/lisp/org-mac-iCal.el
+++ b/contrib/lisp/org-mac-iCal.el
@@ -19,7 +19,7 @@
 ;; for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/org-mac-link.el b/contrib/lisp/org-mac-link.el
index ec004d8b9..6809e841d 100644
--- a/contrib/lisp/org-mac-link.el
+++ b/contrib/lisp/org-mac-link.el
@@ -43,7 +43,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/org-mairix.el b/contrib/lisp/org-mairix.el
index 1037328ce..66efee57d 100644
--- a/contrib/lisp/org-mairix.el
+++ b/contrib/lisp/org-mairix.el
@@ -22,7 +22,7 @@
 ;; License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; USAGE NOTE
 ;;
diff --git a/contrib/lisp/org-notify.el b/contrib/lisp/org-notify.el
index 4796f3e58..7f9a81473 100644
--- a/contrib/lisp/org-notify.el
+++ b/contrib/lisp/org-notify.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/org-panel.el b/contrib/lisp/org-panel.el
index dec724103..bec913d0a 100644
--- a/contrib/lisp/org-panel.el
+++ b/contrib/lisp/org-panel.el
@@ -50,7 +50,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
diff --git a/contrib/lisp/org-passwords.el b/contrib/lisp/org-passwords.el
index 4bdd80491..870483b74 100644
--- a/contrib/lisp/org-passwords.el
+++ b/contrib/lisp/org-passwords.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-registry.el b/contrib/lisp/org-registry.el
index 83ec7e5c4..005a00ae0 100644
--- a/contrib/lisp/org-registry.el
+++ b/contrib/lisp/org-registry.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/org-screen.el b/contrib/lisp/org-screen.el
index 948e93adf..e2489948b 100644
--- a/contrib/lisp/org-screen.el
+++ b/contrib/lisp/org-screen.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-screenshot.el b/contrib/lisp/org-screenshot.el
index f9512ee6b..1e8e1e900 100644
--- a/contrib/lisp/org-screenshot.el
+++ b/contrib/lisp/org-screenshot.el
@@ -8,7 +8,7 @@
 ;; Version: 8.0
 ;;
 ;; Released under the GNU General Public License version 3
-;; see: http://www.gnu.org/licenses/gpl-3.0.html
+;; see: https://www.gnu.org/licenses/gpl-3.0.html
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-secretary.el b/contrib/lisp/org-secretary.el
index 654fcc1a0..bba5e8b8e 100644
--- a/contrib/lisp/org-secretary.el
+++ b/contrib/lisp/org-secretary.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-static-mathjax.el b/contrib/lisp/org-static-mathjax.el
index ac13ee2dd..aed3e30df 100644
--- a/contrib/lisp/org-static-mathjax.el
+++ b/contrib/lisp/org-static-mathjax.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; This elisp code integrates Static MathJax into the
diff --git a/contrib/lisp/org-sudoku.el b/contrib/lisp/org-sudoku.el
index fd7076378..ca6eb4e12 100644
--- a/contrib/lisp/org-sudoku.el
+++ b/contrib/lisp/org-sudoku.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-toc.el b/contrib/lisp/org-toc.el
index 042d50312..62b8b1851 100644
--- a/contrib/lisp/org-toc.el
+++ b/contrib/lisp/org-toc.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/org-track.el b/contrib/lisp/org-track.el
index 044707ebf..e0913a39e 100644
--- a/contrib/lisp/org-track.el
+++ b/contrib/lisp/org-track.el
@@ -11,7 +11,7 @@
 ;; Version: 6.29a
 ;;
 ;; Released under the GNU General Public License version 3
-;; see: http://www.gnu.org/licenses/gpl-3.0.html
+;; see: https://www.gnu.org/licenses/gpl-3.0.html
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/contrib/lisp/org-velocity.el b/contrib/lisp/org-velocity.el
index bfc4d6c3e..f1b12c36b 100644
--- a/contrib/lisp/org-velocity.el
+++ b/contrib/lisp/org-velocity.el
@@ -18,7 +18,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; Org-Velocity.el is an interface for Org inspired by the minimalist
diff --git a/contrib/lisp/org-wikinodes.el b/contrib/lisp/org-wikinodes.el
index 676f8a38d..e45654c88 100644
--- a/contrib/lisp/org-wikinodes.el
+++ b/contrib/lisp/org-wikinodes.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (require 'org)
diff --git a/contrib/lisp/orgtbl-sqlinsert.el b/contrib/lisp/orgtbl-sqlinsert.el
index 6e1fcba5b..66cc13308 100644
--- a/contrib/lisp/orgtbl-sqlinsert.el
+++ b/contrib/lisp/orgtbl-sqlinsert.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ox-confluence.el b/contrib/lisp/ox-confluence.el
index 4f40eec18..2abd1559b 100644
--- a/contrib/lisp/ox-confluence.el
+++ b/contrib/lisp/ox-confluence.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/ox-deck.el b/contrib/lisp/ox-deck.el
index 3b911e16e..207d57606 100644
--- a/contrib/lisp/ox-deck.el
+++ b/contrib/lisp/ox-deck.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ox-extra.el b/contrib/lisp/ox-extra.el
index 9cd6980d9..e8728b274 100644
--- a/contrib/lisp/ox-extra.el
+++ b/contrib/lisp/ox-extra.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ox-freemind.el b/contrib/lisp/ox-freemind.el
index 11aa14808..21ce73167 100644
--- a/contrib/lisp/ox-freemind.el
+++ b/contrib/lisp/ox-freemind.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el
index edf80a4d1..5c18085fc 100644
--- a/contrib/lisp/ox-groff.el
+++ b/contrib/lisp/ox-groff.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ;;; Commentary:
 ;;
 ;; This library implements a Groff Memorandum Macro back-end for Org
diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el
index a386048ec..003df3133 100644
--- a/contrib/lisp/ox-koma-letter.el
+++ b/contrib/lisp/ox-koma-letter.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index 299d22086..5269e1691 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el
index 243332519..4b5ae7c73 100644
--- a/contrib/lisp/ox-s5.el
+++ b/contrib/lisp/ox-s5.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el
index b4391e803..43de39433 100644
--- a/contrib/lisp/ox-taskjuggler.el
+++ b/contrib/lisp/ox-taskjuggler.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/contrib/scripts/org-docco.org b/contrib/scripts/org-docco.org
index bfa5040c5..4e9b65995 100644
--- a/contrib/scripts/org-docco.org
+++ b/contrib/scripts/org-docco.org
@@ -155,7 +155,7 @@ and code on the right side.  This function has two parts.
             (error "leftover points")))))))
 #+end_src
 
-We'll use Emacs [[http://www.gnu.org/software/emacs/manual/html_node/emacs/Specifying-File-Variables.html][File Local Variables]] and the
+We'll use Emacs [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Specifying-File-Variables.html][File Local Variables]] and the
 =org-export-html-final-hook= to control which buffers have
 =org-docco-buffer= run as part of their export process.
 #+begin_src emacs-lisp
diff --git a/contrib/scripts/org2hpda b/contrib/scripts/org2hpda
index 07f29d926..93b12aa5e 100755
--- a/contrib/scripts/org2hpda
+++ b/contrib/scripts/org2hpda
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 # Commentary:
 # ===========
diff --git a/doc/fdl.org b/doc/fdl.org
index 30c7d93b3..a1c8e542d 100644
--- a/doc/fdl.org
+++ b/doc/fdl.org
@@ -404,7 +404,7 @@ of this license document, but changing it is not allowed.
     the GNU Free Documentation License from time to time.  Such new
     versions will be similar in spirit to the present version, but may
     differ in detail to address new problems or concerns.  See
-    http://www.gnu.org/copyleft/.
+    https://www.gnu.org/copyleft/.
 
     Each version of the License is given a distinguishing version
     number.  If the Document specifies that a particular numbered
diff --git a/doc/htmlxref.cnf b/doc/htmlxref.cnf
index 13aa8ce45..a5eb5844a 100644
--- a/doc/htmlxref.cnf
+++ b/doc/htmlxref.cnf
@@ -1,2 +1,2 @@
-calc		mono	http://www.gnu.org/software/emacs/manual/html_mono/calc.html
-calc		node	http://www.gnu.org/software/emacs/manual/html_node/calc/
+calc		mono	https://www.gnu.org/software/emacs/manual/html_mono/calc.html
+calc		node	https://www.gnu.org/software/emacs/manual/html_node/calc/
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 04c51544a..760d4dfe5 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -3309,7 +3309,7 @@ A link should be enclosed in double brackets and may contain
 descriptive text to be displayed instead of the URL (see [[*Link
 Format]]), for example:
 
-: [[http://www.gnu.org/software/emacs/][GNU Emacs]]
+: [[https://www.gnu.org/software/emacs/][GNU Emacs]]
 
 If the description is a file name or URL that points to an image, HTML
 export (see [[*HTML Export]]) inlines the image as a clickable button.  If
diff --git a/doc/pdflayout.sty b/doc/pdflayout.sty
index 16b7ecbf2..7fb6afd22 100644
--- a/doc/pdflayout.sty
+++ b/doc/pdflayout.sty
@@ -13,7 +13,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 % This file defines `\pdflayout':
 %  - \pdflayout=(0) is A4 portrait,
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 5f5818da2..481cd02cc 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -20,7 +20,7 @@
 % General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+% along with this program.  If not, see <https://www.gnu.org/licenses/>.
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
@@ -31,7 +31,7 @@
 % reports; you can get the latest version from:
 %   http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
 %   http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
-%   http://www.gnu.org/software/texinfo/ (the Texinfo home page)
+%   https://www.gnu.org/software/texinfo/ (the Texinfo home page)
 % The texinfo.tex in any given distribution could well be out
 % of date, so if that's what you're using, please check.
 %
@@ -55,7 +55,7 @@
 % extent.  You can get the existing language-specific files from the
 % full Texinfo distribution.
 %
-% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
+% The GNU Texinfo home page is https://www.gnu.org/software/texinfo.
 
 
 \message{Loading texinfo [version \texinfoversion]:}
diff --git a/mk/orgcard2txt.pl b/mk/orgcard2txt.pl
index 3cd62d043..4f7c2f37f 100755
--- a/mk/orgcard2txt.pl
+++ b/mk/orgcard2txt.pl
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 # Usage:
 # ======
diff --git a/testing/lisp/test-ob-C.el b/testing/lisp/test-ob-C.el
index 6b6b728a2..12a5e549b 100644
--- a/testing/lisp/test-ob-C.el
+++ b/testing/lisp/test-ob-C.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (unless (featurep 'ob-C)
diff --git a/testing/lisp/test-ob-R.el b/testing/lisp/test-ob-R.el
index 7ce340ba4..62d25ba56 100644
--- a/testing/lisp/test-ob-R.el
+++ b/testing/lisp/test-ob-R.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (org-test-for-executable "R")
diff --git a/testing/lisp/test-ob-awk.el b/testing/lisp/test-ob-awk.el
index 491380b23..7f3c0f349 100644
--- a/testing/lisp/test-ob-awk.el
+++ b/testing/lisp/test-ob-awk.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (org-test-for-executable "awk")
diff --git a/testing/lisp/test-ob-clojure.el b/testing/lisp/test-ob-clojure.el
index d114a7442..921b9fe41 100644
--- a/testing/lisp/test-ob-clojure.el
+++ b/testing/lisp/test-ob-clojure.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comments:
 
diff --git a/testing/lisp/test-ob-emacs-lisp.el b/testing/lisp/test-ob-emacs-lisp.el
index 9bdd6dcfd..5f79c3338 100644
--- a/testing/lisp/test-ob-emacs-lisp.el
+++ b/testing/lisp/test-ob-emacs-lisp.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comments:
 
diff --git a/testing/lisp/test-ob-eshell.el b/testing/lisp/test-ob-eshell.el
index 5b0eb27c1..d74742690 100644
--- a/testing/lisp/test-ob-eshell.el
+++ b/testing/lisp/test-ob-eshell.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comment:
 
diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el
index f6be51ffe..7f6fd1a38 100644
--- a/testing/lisp/test-ob-exp.el
+++ b/testing/lisp/test-ob-exp.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comments:
 
diff --git a/testing/lisp/test-ob-fortran.el b/testing/lisp/test-ob-fortran.el
index 0dc7793ec..79a35d58e 100644
--- a/testing/lisp/test-ob-fortran.el
+++ b/testing/lisp/test-ob-fortran.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (org-test-for-executable "gfortran")
diff --git a/testing/lisp/test-ob-header-arg-defaults.el b/testing/lisp/test-ob-header-arg-defaults.el
index b625d6908..1106892d5 100644
--- a/testing/lisp/test-ob-header-arg-defaults.el
+++ b/testing/lisp/test-ob-header-arg-defaults.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-ob-java.el b/testing/lisp/test-ob-java.el
index 69357338a..cc3bc5a6a 100644
--- a/testing/lisp/test-ob-java.el
+++ b/testing/lisp/test-ob-java.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'org-test "../testing/org-test")
diff --git a/testing/lisp/test-ob-lilypond.el b/testing/lisp/test-ob-lilypond.el
index 7de16ed47..1c1d73309 100644
--- a/testing/lisp/test-ob-lilypond.el
+++ b/testing/lisp/test-ob-lilypond.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (unless (featurep 'ob-lilypond)
diff --git a/testing/lisp/test-ob-lob.el b/testing/lisp/test-ob-lob.el
index bf3398077..c661d5a3e 100644
--- a/testing/lisp/test-ob-lob.el
+++ b/testing/lisp/test-ob-lob.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 (eval-and-compile (require 'cl-lib))
 
diff --git a/testing/lisp/test-ob-lua.el b/testing/lisp/test-ob-lua.el
index 581a09e66..7d82dd923 100644
--- a/testing/lisp/test-ob-lua.el
+++ b/testing/lisp/test-ob-lua.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (unless (featurep 'ob-lua)
diff --git a/testing/lisp/test-ob-maxima.el b/testing/lisp/test-ob-maxima.el
index d7893dc8a..08f7dc04d 100644
--- a/testing/lisp/test-ob-maxima.el
+++ b/testing/lisp/test-ob-maxima.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 (org-test-for-executable "maxima")
 (unless (featurep 'ob-maxima)
diff --git a/testing/lisp/test-ob-octave.el b/testing/lisp/test-ob-octave.el
index 4a1063a01..7e20add99 100644
--- a/testing/lisp/test-ob-octave.el
+++ b/testing/lisp/test-ob-octave.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 (org-test-for-executable "octave")
 (unless (featurep 'ob-octave)
diff --git a/testing/lisp/test-ob-perl.el b/testing/lisp/test-ob-perl.el
index 0e80e8827..38521dbba 100644
--- a/testing/lisp/test-ob-perl.el
+++ b/testing/lisp/test-ob-perl.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (org-test-for-executable "perl")
diff --git a/testing/lisp/test-ob-plantuml.el b/testing/lisp/test-ob-plantuml.el
index b4ae0e82c..bdbd1a74b 100644
--- a/testing/lisp/test-ob-plantuml.el
+++ b/testing/lisp/test-ob-plantuml.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (unless (featurep 'ob-plantuml)
diff --git a/testing/lisp/test-ob-python.el b/testing/lisp/test-ob-python.el
index a2cc7b79c..cf320b662 100644
--- a/testing/lisp/test-ob-python.el
+++ b/testing/lisp/test-ob-python.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (org-test-for-executable "python")
diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el
index 4d676fe19..9f224a765 100644
--- a/testing/lisp/test-ob-ruby.el
+++ b/testing/lisp/test-ob-ruby.el
@@ -14,7 +14,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (org-test-for-executable "ruby")
diff --git a/testing/lisp/test-ob-scheme.el b/testing/lisp/test-ob-scheme.el
index da8ddf6ee..132914a9f 100644
--- a/testing/lisp/test-ob-scheme.el
+++ b/testing/lisp/test-ob-scheme.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/testing/lisp/test-ob-sed.el b/testing/lisp/test-ob-sed.el
index 2d6899c33..d8e5cacb2 100644
--- a/testing/lisp/test-ob-sed.el
+++ b/testing/lisp/test-ob-sed.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 0aadb355d..2f346f699 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comment:
 
diff --git a/testing/lisp/test-ob-sqlite.el b/testing/lisp/test-ob-sqlite.el
index f6ffa6ab4..8fe7e2c45 100644
--- a/testing/lisp/test-ob-sqlite.el
+++ b/testing/lisp/test-ob-sqlite.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (org-test-for-executable "sqlite3")
diff --git a/testing/lisp/test-ob-table.el b/testing/lisp/test-ob-table.el
index bfa017391..3f450c2d7 100644
--- a/testing/lisp/test-ob-table.el
+++ b/testing/lisp/test-ob-table.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comments:
 
diff --git a/testing/lisp/test-ob-tangle.el b/testing/lisp/test-ob-tangle.el
index cfdf16d40..42c02da9c 100644
--- a/testing/lisp/test-ob-tangle.el
+++ b/testing/lisp/test-ob-tangle.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comments:
 
diff --git a/testing/lisp/test-ob-vala.el b/testing/lisp/test-ob-vala.el
index 8f1cf54b8..364f2e9cf 100644
--- a/testing/lisp/test-ob-vala.el
+++ b/testing/lisp/test-ob-vala.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (unless (featurep 'ob-vala)
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index df4b13498..88ecb62b5 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-ol-bbdb.el b/testing/lisp/test-ol-bbdb.el
index 9c6885fb9..114e46218 100644
--- a/testing/lisp/test-ol-bbdb.el
+++ b/testing/lisp/test-ol-bbdb.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/testing/lisp/test-org-agenda.el b/testing/lisp/test-org-agenda.el
index 3c0479bcc..57cc18b43 100644
--- a/testing/lisp/test-org-agenda.el
+++ b/testing/lisp/test-org-agenda.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 \f
 ;;; Commentary:
 
diff --git a/testing/lisp/test-org-archive.el b/testing/lisp/test-org-archive.el
index d24a54794..cd8cbe81b 100644
--- a/testing/lisp/test-org-archive.el
+++ b/testing/lisp/test-org-archive.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-attach-git.el b/testing/lisp/test-org-attach-git.el
index 36cb83bb0..4254a15cf 100644
--- a/testing/lisp/test-org-attach-git.el
+++ b/testing/lisp/test-org-attach-git.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (org-test-for-executable "git-annex")
diff --git a/testing/lisp/test-org-attach.el b/testing/lisp/test-org-attach.el
index 851bb111e..6caf93861 100644
--- a/testing/lisp/test-org-attach.el
+++ b/testing/lisp/test-org-attach.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/testing/lisp/test-org-capture.el b/testing/lisp/test-org-capture.el
index d76277fb8..ea42fa374 100644
--- a/testing/lisp/test-org-capture.el
+++ b/testing/lisp/test-org-capture.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/testing/lisp/test-org-clock.el b/testing/lisp/test-org-clock.el
index 771a777f0..d2179e1ec 100644
--- a/testing/lisp/test-org-clock.el
+++ b/testing/lisp/test-org-clock.el
@@ -5,7 +5,7 @@
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 
 ;; Released under the GNU General Public License version 3
-;; see: http://www.gnu.org/licenses/gpl-3.0.html
+;; see: https://www.gnu.org/licenses/gpl-3.0.html
 
 ;;;; Comments
 
diff --git a/testing/lisp/test-org-colview.el b/testing/lisp/test-org-colview.el
index 7612074b5..64da5611d 100644
--- a/testing/lisp/test-org-colview.el
+++ b/testing/lisp/test-org-colview.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-datetree.el b/testing/lisp/test-org-datetree.el
index daebcaace..45604f0bb 100644
--- a/testing/lisp/test-org-datetree.el
+++ b/testing/lisp/test-org-datetree.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-duration.el b/testing/lisp/test-org-duration.el
index 981c00f03..0a0d2b7d1 100644
--- a/testing/lisp/test-org-duration.el
+++ b/testing/lisp/test-org-duration.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 78703467a..9003b3c7a 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-feed.el b/testing/lisp/test-org-feed.el
index 49c6feb19..83f7ccb09 100644
--- a/testing/lisp/test-org-feed.el
+++ b/testing/lisp/test-org-feed.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/testing/lisp/test-org-footnote.el b/testing/lisp/test-org-footnote.el
index 50a430785..9f2307637 100644
--- a/testing/lisp/test-org-footnote.el
+++ b/testing/lisp/test-org-footnote.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-info.el b/testing/lisp/test-org-info.el
index fd5662081..94923169c 100644
--- a/testing/lisp/test-org-info.el
+++ b/testing/lisp/test-org-info.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-inlinetask.el b/testing/lisp/test-org-inlinetask.el
index 017369cc0..db4637679 100644
--- a/testing/lisp/test-org-inlinetask.el
+++ b/testing/lisp/test-org-inlinetask.el
@@ -14,7 +14,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comments:
 
diff --git a/testing/lisp/test-org-lint.el b/testing/lisp/test-org-lint.el
index f5d28b00f..29bd942eb 100644
--- a/testing/lisp/test-org-lint.el
+++ b/testing/lisp/test-org-lint.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-list.el b/testing/lisp/test-org-list.el
index 078e59655..3689a172f 100644
--- a/testing/lisp/test-org-list.el
+++ b/testing/lisp/test-org-list.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-macro.el b/testing/lisp/test-org-macro.el
index 5ff37f11f..1b4b791ca 100644
--- a/testing/lisp/test-org-macro.el
+++ b/testing/lisp/test-org-macro.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-macs.el b/testing/lisp/test-org-macs.el
index efa992a03..214766c49 100644
--- a/testing/lisp/test-org-macs.el
+++ b/testing/lisp/test-org-macs.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-pcomplete.el b/testing/lisp/test-org-pcomplete.el
index 2de4f4934..34969f284 100644
--- a/testing/lisp/test-org-pcomplete.el
+++ b/testing/lisp/test-org-pcomplete.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Comments:
 
diff --git a/testing/lisp/test-org-protocol.el b/testing/lisp/test-org-protocol.el
index 6ee368dcf..b5df7c132 100644
--- a/testing/lisp/test-org-protocol.el
+++ b/testing/lisp/test-org-protocol.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-src.el b/testing/lisp/test-org-src.el
index 8fdcd6d6a..16283b597 100644
--- a/testing/lisp/test-org-src.el
+++ b/testing/lisp/test-org-src.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-table.el b/testing/lisp/test-org-table.el
index 1c930c8d0..310844c94 100644
--- a/testing/lisp/test-org-table.el
+++ b/testing/lisp/test-org-table.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;;; Comments:
 
diff --git a/testing/lisp/test-org-tempo.el b/testing/lisp/test-org-tempo.el
index cee5da857..e4c2b9184 100644
--- a/testing/lisp/test-org-tempo.el
+++ b/testing/lisp/test-org-tempo.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org-timer.el b/testing/lisp/test-org-timer.el
index 27156dfa9..5d938f22e 100644
--- a/testing/lisp/test-org-timer.el
+++ b/testing/lisp/test-org-timer.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 2d727ba7a..f6fb4b3ca 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Template test file for Org tests
 
diff --git a/testing/lisp/test-ox-publish.el b/testing/lisp/test-ox-publish.el
index ad5509329..35031742f 100644
--- a/testing/lisp/test-ox-publish.el
+++ b/testing/lisp/test-ox-publish.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el
index a5b3bd770..062008652 100644
--- a/testing/lisp/test-ox.el
+++ b/testing/lisp/test-ox.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/testing/lisp/test-property-inheritance.el b/testing/lisp/test-property-inheritance.el
index 1d0dcfbe1..c00ad6c58 100644
--- a/testing/lisp/test-property-inheritance.el
+++ b/testing/lisp/test-property-inheritance.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (defmacro test-org-in-property-buffer (&rest body)
diff --git a/testing/org-test.el b/testing/org-test.el
index 61fbe60dd..ade212440 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -7,7 +7,7 @@
 ;;     David Maus, Brunswick, Germany, dmaus ictsoc de
 
 ;; Released under the GNU General Public License version 3
-;; see: http://www.gnu.org/licenses/gpl-3.0.html
+;; see: https://www.gnu.org/licenses/gpl-3.0.html
 
 ;; Definition of `special-mode' copied from Emacs23's simple.el to be
 ;; provide a testing environment for Emacs22.
@@ -313,7 +313,7 @@ setting `pp-escape-newlines' to nil manually."
 	 " " user-full-name "\n"
 	 ";; Authors: " user-full-name "\n\n"
 	 ";; Released under the GNU General Public License version 3\n"
-	 ";; see: http://www.gnu.org/licenses/gpl-3.0.html\n\n"
+	 ";; see: https://www.gnu.org/licenses/gpl-3.0.html\n\n"
 	 ";;;; Comments:\n\n"
 	 ";; Template test file for Org tests\n\n"
 	 "\f\n"
-- 
2.30.2


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

* Re: [PATCH] Prefer HTTPS to HTTP for links to gnu.org
  2021-03-20  7:39 [PATCH] Prefer HTTPS to HTTP for links to gnu.org Stefan Kangas
@ 2021-03-21 18:40 ` Kyle Meyer
  2021-03-21 19:11   ` Stefan Kangas
  0 siblings, 1 reply; 4+ messages in thread
From: Kyle Meyer @ 2021-03-21 18:40 UTC (permalink / raw)
  To: Stefan Kangas; +Cc: emacs-orgmode

Stefan Kangas writes:

> The attached patch updates all links to gnu.org to use https instead of
> http.

Pushed (8cc992f7b).

> (Such a change was made in Emacs itself already in 2017.)

Yep, I believe those came into Org's tree with ff0dcf52a (Backport
commit bc511a64f from Emacs, 2017-09-13) and d4d7cda57 (Backport commit
5da53a019 from Emacs, 2017-09-13).  I should have taken the time then to
do a tree-wide update of Org files that are not included with Emacs.

Thanks.


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

* Re: [PATCH] Prefer HTTPS to HTTP for links to gnu.org
  2021-03-21 18:40 ` Kyle Meyer
@ 2021-03-21 19:11   ` Stefan Kangas
  2021-03-21 19:29     ` Kyle Meyer
  0 siblings, 1 reply; 4+ messages in thread
From: Stefan Kangas @ 2021-03-21 19:11 UTC (permalink / raw)
  To: Kyle Meyer; +Cc: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

Kyle Meyer <kyle@kyleam.com> writes:

> Pushed (8cc992f7b).

Thanks.  Here's a followup patch that converts most remaining http-links
to https.  All of them have been manually tested to avoid breakage.

[-- Attachment #2: 0001-Prefer-HTTPS-to-HTTP-in-most-links.patch --]
[-- Type: text/x-diff, Size: 60860 bytes --]

From 0f5a6cd7dcd540daf529a23da6a59a31f2723e87 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sun, 21 Mar 2021 19:55:14 +0100
Subject: [PATCH] Prefer HTTPS to HTTP in most links

---
 COPYING                                  |   2 +-
 README_ELPA                              |   2 +-
 contrib/lisp/ob-eukleides.el             |   2 +-
 contrib/lisp/ob-smiles.el                |   2 +-
 contrib/lisp/ob-spice.el                 |   4 +-
 contrib/lisp/ob-stata.el                 |   4 +-
 contrib/lisp/ol-wl.el                    |   2 +-
 contrib/lisp/org-contacts.el             |   2 +-
 contrib/lisp/org-eldoc.el                |   2 +-
 contrib/lisp/org-learn.el                |   4 +-
 contrib/lisp/org-license.el              | 164 +++++++++++------------
 contrib/lisp/ox-bibtex.el                |   4 +-
 contrib/lisp/ox-rss.el                   |   4 +-
 contrib/lisp/ox-s5.el                    |   2 +-
 contrib/lisp/ox-taskjuggler.el           |   2 +-
 contrib/scripts/org-docco.org            |   2 +-
 contrib/scripts/org2hpda                 |   2 +-
 contrib/scripts/staticmathjax/README.org |   2 +-
 doc/fdl.org                              |   2 +-
 doc/org-manual.org                       |  20 +--
 doc/texinfo.tex                          |   6 +-
 etc/ORG-NEWS                             |   4 +-
 lisp/ob-clojure.el                       |   2 +-
 lisp/ob-dot.el                           |   2 +-
 lisp/ob-gnuplot.el                       |   2 +-
 lisp/ob-haskell.el                       |   6 +-
 lisp/ob-io.el                            |   2 +-
 lisp/ob-lilypond.el                      |   4 +-
 lisp/ob-lisp.el                          |   2 +-
 lisp/ob-mscgen.el                        |   2 +-
 lisp/ob-ocaml.el                         |   2 +-
 lisp/ob-picolisp.el                      |   4 +-
 lisp/ob-processing.el                    |   2 +-
 lisp/ob-ruby.el                          |   2 +-
 lisp/ob-sass.el                          |   2 +-
 lisp/ol-bibtex.el                        |   2 +-
 lisp/org-protocol.el                     |   2 +-
 lisp/org-table.el                        |   2 +-
 lisp/ox-html.el                          |   2 +-
 lisp/ox-latex.el                         |   2 +-
 lisp/ox.el                               |   2 +-
 41 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/COPYING b/COPYING
index 2a000655e..e60008693 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/README_ELPA b/README_ELPA
index 7640a4498..73447bcd9 100644
--- a/README_ELPA
+++ b/README_ELPA
@@ -10,7 +10,7 @@ This distribution contains an ELPA packaged version of Org.
 "ELPA" stands for the "Emacs Lisp Package Archive".
 
 The GNU ELPA is at:
-  http://elpa.gnu.org
+  https://elpa.gnu.org
 
 It contains the org-*.tar package, containing only the org files
 that are also part of GNU Emacs.
diff --git a/contrib/lisp/ob-eukleides.el b/contrib/lisp/ob-eukleides.el
index b1cc91b64..be3f1fd1c 100644
--- a/contrib/lisp/ob-eukleides.el
+++ b/contrib/lisp/ob-eukleides.el
@@ -26,7 +26,7 @@
 ;; Org-Babel support for evaluating eukleides script.
 ;;
 ;; Inspired by Ian Yang's org-export-blocks-format-eukleides
-;; http://www.emacswiki.org/emacs/org-export-blocks-format-eukleides.el
+;; https://www.emacswiki.org/emacs/org-export-blocks-format-eukleides.el
 
 ;;; Requirements:
 
diff --git a/contrib/lisp/ob-smiles.el b/contrib/lisp/ob-smiles.el
index 5a0fbf61a..9b1ac6840 100644
--- a/contrib/lisp/ob-smiles.el
+++ b/contrib/lisp/ob-smiles.el
@@ -8,7 +8,7 @@
 ;;; Commentary:
 
 ;;; I copy code from:
-;;; http://kitchingroup.cheme.cmu.edu/blog/2016/03/26/A-molecule-link-for-org-mode
+;;; https://kitchingroup.cheme.cmu.edu/blog/2016/03/26/A-molecule-link-for-org-mode
 
 ;; Author: John Kitchin [jkitchin@andrew.cmu.edu]
 ;; Maintainer: stardiviner [numbchild@gmail.com]
diff --git a/contrib/lisp/ob-spice.el b/contrib/lisp/ob-spice.el
index 3139d0eba..e8ea87af5 100644
--- a/contrib/lisp/ob-spice.el
+++ b/contrib/lisp/ob-spice.el
@@ -5,7 +5,7 @@
 ;; Maintainer: stardiviner (numbchild@gmail.com)
 ;; Version: 0.4
 ;; Package-Requires: ((spice-mode "0.0.1") (org "8"))
-;; Homepage: http://tiagoweber.github.io
+;; Homepage: https://tiagoweber.github.io
 
 ;; License: GPL v3, or any later version
 ;;
@@ -25,7 +25,7 @@
 ;;; Commentary:
 
 ;; Org-Babel support for evaluating spice script.
-;; Inspired by Ian Yang's org-export-blocks-format-plantuml (http://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el)
+;; Inspired by Ian Yang's org-export-blocks-format-plantuml (https://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el)
 
 ;;; Requirements:
 ;;
diff --git a/contrib/lisp/ob-stata.el b/contrib/lisp/ob-stata.el
index d8cf52a3f..f78346408 100644
--- a/contrib/lisp/ob-stata.el
+++ b/contrib/lisp/ob-stata.el
@@ -37,8 +37,8 @@
 ;; --Ista, 07/30/2014
 
 ;;; Requirements:
-;; Stata: http://stata.com
-;; ESS: http://ess.r-project.org
+;; Stata: https://stata.com
+;; ESS: https://ess.r-project.org
 
 ;;; Code:
 (require 'ob)
diff --git a/contrib/lisp/ol-wl.el b/contrib/lisp/ol-wl.el
index 9449aaf63..cc122c551 100644
--- a/contrib/lisp/ol-wl.el
+++ b/contrib/lisp/ol-wl.el
@@ -225,7 +225,7 @@ ENTITY is a message entity."
 		    (format
 		     (if (string-match-p "gmane\\." folder-name)
 			 "http://mid.gmane.org/%s"
-		       "http://groups.google.com/groups/search?as_umsgid=%s")
+                       "https://groups.google.com/groups/search?as_umsgid=%s")
 		     (url-encode-url message-id)))
 	      (org-store-link-props :type "http" :link link :description subject
 				    :from from :to to :message-id message-id
diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el
index 3a30cefdc..57368e9cd 100644
--- a/contrib/lisp/org-contacts.el
+++ b/contrib/lisp/org-contacts.el
@@ -976,7 +976,7 @@ address."
 (defun org-contacts-vcard-escape (str)
   "Escape ; , and \n in STR for the VCard format."
   ;; Thanks to this library for the regexp:
-  ;; http://www.emacswiki.org/cgi-bin/wiki/bbdb-vcard-export.el
+  ;; https://www.emacswiki.org/cgi-bin/wiki/bbdb-vcard-export.el
   (when str
     (replace-regexp-in-string
      "\n" "\\\\n"
diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el
index 8f6c2f5e7..7a6885160 100644
--- a/contrib/lisp/org-eldoc.el
+++ b/contrib/lisp/org-eldoc.el
@@ -154,7 +154,7 @@
 		   (let (eldoc-documentation-function)
 		     (eldoc-print-current-symbol-info)))))
            ((or
-             (string= lang "c") ;; http://github.com/nflath/c-eldoc
+             (string= lang "c") ;; https://github.com/nflath/c-eldoc
              (string= lang "C")) (when (require 'c-eldoc nil t)
                                    (c-eldoc-print-current-symbol-info)))
            ;; https://github.com/zenozeng/css-eldoc
diff --git a/contrib/lisp/org-learn.el b/contrib/lisp/org-learn.el
index 5cbf22d20..897216dc6 100644
--- a/contrib/lisp/org-learn.el
+++ b/contrib/lisp/org-learn.el
@@ -26,9 +26,9 @@
 ;;; Commentary:
 
 ;; The file implements the learning algorithm described at
-;; http://supermemo.com/english/ol/sm5.htm, which is a system for reading
+;; https://supermemo.com/english/ol/sm5.htm, which is a system for reading
 ;; material according to "spaced repetition".  See
-;; http://en.wikipedia.org/wiki/Spaced_repetition for more details.
+;; https://en.wikipedia.org/wiki/Spaced_repetition for more details.
 ;;
 ;; To use, turn on state logging and schedule some piece of information you
 ;; want to read.  Then in the agenda buffer type
diff --git a/contrib/lisp/org-license.el b/contrib/lisp/org-license.el
index 1bdbea2cf..4d61ae3bc 100644
--- a/contrib/lisp/org-license.el
+++ b/contrib/lisp/org-license.el
@@ -57,51 +57,51 @@ El text està disponible sota la [[" org-license-cc-url "][Reconeixement 3.0 Esp
 	 (insert (concat "* Lizenz
 Dieses Werk bzw. Inhalt steht unter einer [[" org-license-cc-url "][Lizenz Creative Commons Namensnennung 3.0 Deutschland]]\n")))
 	((equal language "eo")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by/3.0/eo/deed.eo")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by/3.0/eo/deed.eo")
 	 (insert (concat "* Licenco
 Ĉi tiu verko estas disponebla laŭ la permesilo [[" org-license-cc-url "][Krea Komunaĵo Atribuite 3.0 Neadaptita]]\n")))
 	 ((equal language "es")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/3.0/es/deed.es")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/3.0/es/deed.es")
 	  (insert (concat "* Licencia
 Este documento está bajo una [[" org-license-cc-url "][Licencia Creative Commons Atribución 3.0 España]]\n")))
 	 ((equal language "eu")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/3.0/es/deed.eu")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/3.0/es/deed.eu")
 	  (insert (concat "* Licenzua
 Testua [[" org-license-cc-url "][Aitortu 3.0 Espainia]] lizentziari jarraituz erabil daiteke\n")))
 	 ((equal language "fi")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/1.0/fi/deed.fi")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/1.0/fi/deed.fi")
 	  (insert (concat "* Lisenssi
 Teksti on saatavilla [[" org-license-cc-url "][Nimeä 1.0 Suomi]] lisenssillä\n")))
 	 ((equal language "fr")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/3.0/fr/deed.fr")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/3.0/fr/deed.fr")
 	  (insert (concat "* Licence
 Ce(tte) œuvre est mise à disposition selon les termes de la [[" org-license-cc-url "][Licence Creative Commons Attribution 3.0 France]]\n")))
 	 ((equal language "gl")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/3.0/es/deed.gl")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/3.0/es/deed.gl")
 	  (insert (concat "* Licenza
 Todo o texto está dispoñible baixo a [[" org-license-cc-url "][licenza Creative Commons recoñecemento compartir igual 3.0]].\n")))
 	 ((equal language "it")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/3.0/it/deed.it")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/3.0/it/deed.it")
 	  (insert (concat "* Licenza
 Quest'opera e distribuita con Licenza [[" org-license-cc-url "][Licenza Creative Commons Attribuzione 3.0 Italia]]\n")))
 	 ((equal language "jp")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/2.1/jp/deed.en")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/2.1/jp/deed.en")
 	  (insert (concat "* ライセンス
 この文書は [[" org-license-cc-url "][Creative Commons Attribution 2.1 ]] ライセンスの下である\n")))
 	 ((equal language "nl")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/3.0/nl/deed.nl")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/3.0/nl/deed.nl")
 	  (insert (concat "* Licentie
 Dit werk is valt onder een [[" org-license-cc-url "][Creative Commons Naamsvermelding 3.0 Nederland]]\n")))
 	 ((equal language "pt")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/3.0/pt/deed.pt")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/3.0/pt/deed.pt")
 	  (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição 3.0 Portugal]]\n")))
 	 (t
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by/4.0/deed") 
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by/4.0/deed")
 	  (concat (insert "* License
 This document is under a [[" org-license-cc-url "][Creative Commons Attribution 4.0 International]]\n"))))
   (if (string= "" org-license-images-directory)
-      (insert (concat "\n[[" org-license-cc-url "][file:http://i.creativecommons.org/l/by/3.0/80x15.png]]\n"))
+      (insert (concat "\n[[" org-license-cc-url "][file:https://i.creativecommons.org/l/by/3.0/80x15.png]]\n"))
     (insert (concat "\n[[" org-license-cc-url "][file:" org-license-images-directory "/by/3.0/80x15.png]]\n"))))
 
 (defun org-license-cc-by-sa (language)
@@ -111,55 +111,55 @@ This document is under a [[" org-license-cc-url "][Creative Commons Attribution
 	 (concat (insert "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição Compartil ha Igual 3.0 Brasil]]\n")))
 	((equal language "ca")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/es/deed.ca")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/es/deed.ca")
 	 (insert (concat "* Licència
 El text està disponible sota la [[" org-license-cc-url "][Reconeixement-CompartirIgual 3.0 Espanya]]\n")))
 	((equal language "de")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/de/deed.de")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/de/deed.de")
 	 (insert (concat "* Lizenz
 Dieses Werk bzw. Inhalt steht unter einer [[" org-license-cc-url "][Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 Deutschland]]\n")))
 	((equal language "es") 
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/es/deed.es") 
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/es/deed.es")
 	 (concat (insert "* Licencia
 Este documento está bajo una [[" org-license-cc-url "][Licencia Creative Commons Atribución Compartir por Igual 3.0 España]]\n")))
 	((equal language "eu")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/es/deed.eu")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/es/deed.eu")
 	 (concat (insert "* Licenzua
 Testua [[" org-license-cc-url "][Aitortu-PartekatuBerdin 3.0 Espainia]] lizentziari jarraituz erabil daiteke\n")))
 	((equal language "fi")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/1.0/fi/deed.fi")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/1.0/fi/deed.fi")
 	  (insert (concat "* Lisenssi
 Teksti on saatavilla [[" org-license-cc-url "][Nimeä-JaaSamoin 1.0 Suomi]] lisenssillä\n")))
 	((equal language "fr")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/fr/deed.fr")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/fr/deed.fr")
 	 (concat (insert "* Licence
 Ce(tte) œuvre est mise à disposition selon les termes de la [[" org-license-cc-url "][Licence Creative Commons Attribution - Partage dans les Mêmes Conditions 3.0 France]]\n")))
 	((equal language "gl")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/es/deed.gl")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/es/deed.gl")
 	 (insert (concat "* Licenza
 Todo o texto está dispoñible baixo a [[" org-license-cc-url "][licenza Creative Commons recoñecemento compartir igual 3.0]].\n")))
 	((equal language "it")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/it/deed.it")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/it/deed.it")
 	 (insert (concat "* Licenza
 Quest'opera e distribuita con Licenza [[" org-license-cc-url "][Licenza Creative Commons Attribuzione - Condividi allo stesso modo 3.0 Italia]]\n")))
 	((equal language "jp")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/2.1/jp/deed.en")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/2.1/jp/deed.en")
 	 (insert (concat "* ライセンス
 この文書は、[[" org-license-cc-url "][Creative Commons Attribution 2.1 ]] ライセンスの下である\n")))
 	((equal language "nl")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/nl/deed.nl")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/nl/deed.nl")
 	  (insert (concat "* Licentie
 Dit werk is valt onder een [[" org-license-cc-url "][Creative Commons Naamsvermelding Gelijk Delen 3.0 Nederland]]\n")))
 	((equal language "pt")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/3.0/pt/deed.pt")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/3.0/pt/deed.pt")
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição-CompartilhaIgual 3.0 Portugal]]\n")))
 	(t
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-sa/4.0/deed")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-sa/4.0/deed")
 	 (insert (concat "* License
 This document is under a [[" org-license-cc-url "][Creative Commons Attribution-ShareAlike 4.0 International]]\n"))))
   (if (string= "" org-license-images-directory)
-      (insert (concat "\n[[" org-license-cc-url "][file:http://i.creativecommons.org/l/by-sa/3.0/80x15.png]]\n"))
+      (insert (concat "\n[[" org-license-cc-url "][file:https://i.creativecommons.org/l/by-sa/3.0/80x15.png]]\n"))
     (insert (concat "\n[[" org-license-cc-url "][file:" org-license-images-directory "/by-sa/3.0/80x15.png]]\n"))))
 
 (defun org-license-cc-by-nd (language)
@@ -169,55 +169,55 @@ This document is under a [[" org-license-cc-url "][Creative Commons Attribution-
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição Compartil ha Igual 3.0 Brasil]]\n")))
 	((equal language "ca")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/es/deed.ca")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/es/deed.ca")
 	 (insert (concat "* Licència
 El text està disponible sota la [[" org-license-cc-url "][Reconeixement-SenseObraDerivada 3.0 Espanya]]\n")))
 	((equal language "de")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/de/deed.de")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/de/deed.de")
 	 (insert (concat "* Lizenz
 Dieses Werk bzw. Inhalt steht unter einer [[" org-license-cc-url "][Namensnennung-Keine Bearbeitung 3.0 Deutschland]]\n")))
 	((equal language "es")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/es/deed.es") 
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/es/deed.es")
 	 (insert (concat "* Licencia
 Este documento está bajo una [[" org-license-cc-url "][Licencia Creative Commons Atribución-SinDerivadas 3.0]]\n")))
 	((equal language "eu")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/es/deed.eu")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/es/deed.eu")
 	 (insert (concat "* Licenzua
 Testua [[" org-license-cc-url "][Aitortu-LanEratorririkGabe 3.0 Espainia]] lizentziari jarraituz erabil daiteke\n")))
 	((equal language "fi")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/1.0/fi/deed.fi")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/1.0/fi/deed.fi")
 	  (insert (concat "* Lisenssi
 Teksti on saatavilla [[" org-license-cc-url "][Nimeä-JaaSamoin 1.0 Suomi]] lisenssillä\n")))
 	((equal language "fr")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/fr/deed.fr")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/fr/deed.fr")
 	 (insert (concat "* Licence
 Ce(tte) œuvre est mise à disposition selon les termes de la [[" org-license-cc-url "][Licence Creative Commons Attribution - Pas de Modification 3.0 France]]\n")))
 	((equal language "gl")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/es/deed.gl")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/es/deed.gl")
 	 (insert (concat "* Licenza
 Todo o texto está dispoñible baixo a [[" org-license-cc-url "][licenza Creative Commons recoñecemento compartir igual 3.0]].\n")))
 	((equal language "it")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/it/deed.it")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/it/deed.it")
 	 (insert (concat "* Licenza
 Quest'opera e distribuita con Licenza [[" org-license-cc-url "][Licenza Creative Commons Attribuzione - Non opere derivate 3.0 Italia]]\n")))
 	((equal language "jp")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/2.1/jp/deed.en")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/2.1/jp/deed.en")
 	 (insert (concat "* ライセンス
 この文書は、[[" org-license-cc-url "][Creative Commons No Derivatives 2.1]] ライセンスの下である\n")))
 	((equal language "nl")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/nl/deed.nl")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/nl/deed.nl")
 	  (insert (concat "* Licentie
 Dit werk is valt onder een [[" org-license-cc-url "][Creative Commons Naamsvermelding GeenAfgeleideWerken 3.0 Nederland]]\n")))
 	((equal language "pt")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/3.0/pt/deed.pt")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/3.0/pt/deed.pt")
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição Sem Derivados 3.0 Portugal]]\n")))
 	(t
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nd/4.0/deed")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nd/4.0/deed")
 	 (insert (concat "* License
 This document is under a [[" org-license-cc-url "][Creative Commons No Derivatives 4.0 International]]\n"))))
   (if (string= "" org-license-images-directory)
-      (insert (concat "\n[[" org-license-cc-url "][file:http://i.creativecommons.org/l/by-nd/3.0/80x15.png]]\n"))
+      (insert (concat "\n[[" org-license-cc-url "][file:https://i.creativecommons.org/l/by-nd/3.0/80x15.png]]\n"))
     (insert (concat "\n[[" org-license-cc-url "][file:" org-license-images-directory "/by-nd/3.0/80x15.png]]\n"))))
 
 
@@ -228,55 +228,55 @@ This document is under a [[" org-license-cc-url "][Creative Commons No Derivativ
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição Não Comercial 3.0 Brasil]]\n")))
 	((equal language "ca")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/es/deed.ca")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/es/deed.ca")
 	 (insert (concat "* Licència
 El text està disponible sota la [[" org-license-cc-url "][Reconeixement-NoComercial 3.0 Espanya]]\n")))
 	((equal language "de")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/de/deed.de")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/de/deed.de")
 	 (insert (concat "* Lizenz
 Dieses Werk bzw. Inhalt steht unter einer [[" org-license-cc-url "][Namensnennung-Nicht-kommerziell 3.0 Deutschland]]\n")))
 	((equal language "es")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/es/deed.es")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/es/deed.es")
 	 (insert (concat "* Licencia
 Este documento está bajo una [[" org-license-cc-url "][Licencia Creative Commons Reconocimiento-NoComercial 3.0]]\n")))
 	((equal language "eu")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/es/deed.eu")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/es/deed.eu")
 	 (insert "* Licenzua
 Testua [[" org-license-cc-url "][Aitortu-EzKomertziala 3.0 Espainia]] lizentziari jarraituz erabil daiteke\n"))
 	((equal language "fi")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/1.0/fi/deed.fi")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/1.0/fi/deed.fi")
 	  (insert (concat "* Lisenssi
 Teksti on saatavilla [[" org-license-cc-url "][Nimeä-Epäkaupallinen 1.0 Suomi]] lisenssillä\n")))
 	((equal language "fr")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/fr/deed.fr")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/fr/deed.fr")
 	 (insert (concat "* Licence
 Ce(tte) œuvre est mise à disposition selon les termes de la [[" org-license-cc-url "][Licence Creative Commons Attribution - Pas d'Utilisation Commerciale 3.0 France]]\n")))
 	((equal language "gl")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/es/deed.gl")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/es/deed.gl")
 	 (insert (concat "* Licenza
 Todo o texto está dispoñible baixo a [[" org-license-cc-url "][licenza Creative Commons recoñecemento compartir igual 3.0]].\n")))
 	((equal language "it")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/it/deed.it")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/it/deed.it")
 	 (insert (concat "* Licenza
 Quest'opera e distribuita con Licenza [[" org-license-cc-url "][Licenza Creative Commons Attribuzione - Non commerciale 3.0 Italia]]\n")))
 	((equal language "jp")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/2.1/jp/deed.en")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/2.1/jp/deed.en")
 	 (insert (concat "* ライセンス
 この文書は、[[" org-license-cc-url "][Creative Commons Attribution-NonCommercial 2.1 ]] ライセンスの下である\n")))
 	((equal language "nl")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/nl/deed.nl")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/nl/deed.nl")
 	  (insert (concat "* Licentie
 Dit werk is valt onder een [[" org-license-cc-url "][Creative Commons Naamsvermelding NietCommercieel 3.0 Nederland 3.0 Nederland]]\n")))
 	((equal language "pt")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/pt/deed.pt")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/pt/deed.pt")
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição Não Comercial 3.0 Portugal]]\n")))
 	(t 
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/4.0/deed")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/4.0/deed")
 	 (insert (concat "* License 
 This document is under a [[" org-license-cc-url "][Creative Commons Attribution-NonCommercial 4.0 International]]\n"))))
   (if (string= "" org-license-images-directory)
-      (insert (concat "\n[[" org-license-cc-url "][file:http://i.creativecommons.org/l/by-nc/3.0/80x15.png]]\n"))
+      (insert (concat "\n[[" org-license-cc-url "][file:https://i.creativecommons.org/l/by-nc/3.0/80x15.png]]\n"))
     (insert (concat "\n[[" org-license-cc-url "][file:" org-license-images-directory "/by-nc/3.0/80x15.png]]\n"))))
 
 (defun org-license-cc-by-nc-sa (language)
@@ -286,113 +286,113 @@ This document is under a [[" org-license-cc-url "][Creative Commons Attribution-
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição Não Comercial - Compartil ha Igual 3.0 Brasil]]\n")))
 	((equal language "ca")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/3.0/es/deed.ca")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/3.0/es/deed.ca")
 	 (insert (concat "* Licència
 El text està disponible sota la [[" org-license-cc-url "][Reconeixement-NoComercial 3.0 Espanya]]\n")))
 	((equal language "de")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/3.0/de/deed.de")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/3.0/de/deed.de")
 	 (insert (concat "* Lizenz
 Dieses Werk bzw. Inhalt steht unter einer [[" org-license-cc-url "][Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 Deutschland]]\n")))
 	((equal language "es")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/3.0/es/deed.es") 
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/3.0/es/deed.es")
 	 (insert (concat "* Licencia
 Este documento está bajo una [[" org-license-cc-url "][Licencia Creative Commons Reconocimiento-NoComercial 3.0]]\n")))
 	((equal language "eu")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/3.0/es/deed.eu")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/3.0/es/deed.eu")
 	 (insert "* Licenzua
 Testua [[" org-license-cc-url "][Aitortu-EzKomertziala-PartekatuBerdin 3.0 Espainia]] lizentziari jarraituz erabil daiteke\n"))
 	((equal language "fi")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/1.0/fi/deed.fi")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/1.0/fi/deed.fi")
 	  (insert (concat "* Lisenssi
 Teksti on saatavilla [[" org-license-cc-url "][Nimeä-Epäkaupallinen-JaaSamoin 1.0 Suomi]] lisenssillä\n")))
 	((equal language "fr")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/3.0/fr/deed.fr")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/3.0/fr/deed.fr")
 	 (insert (concat "* Licence
 Ce(tte) œuvre est mise à disposition selon les termes de la [[" org-license-cc-url "][Licence Creative Commons Attribution - Pas d’Utilisation Commerciale - Partage dans les Mêmes Conditions 3.0 France]]\n")))
 	((equal language "gl")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/3.0/es/deed.gl")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/3.0/es/deed.gl")
 	 (insert (concat "* Licenza
 Todo o texto está dispoñible baixo a [[" org-license-cc-url "][licenza Creative Commons recoñecemento compartir igual 3.0]].\n")))
 	((equal language "it")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/3.0/it/deed.it")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/3.0/it/deed.it")
 	 (insert (concat "* Licenza
 Quest'opera e distribuita con Licenza [[" org-license-cc-url "][Licenza Creative Commons Attribuzione - Non opere derivate 3.0 Italia]]\n")))
 	((equal language "jp")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/2.1/jp/deed.en")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/2.1/jp/deed.en")
 	 (insert (concat "* ライセンス
 この文書は、[[" org-license-cc-url "][License Creative Commons Attribution Non Commercial Share Alike 2.1 ]] ライセンスの下である\n")))
 	((equal language "nl")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/3.0/nl/deed.nl")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/3.0/nl/deed.nl")
 	 (insert (concat "* Licentie
 Dit werk is valt onder een [[" org-license-cc-url "][Creative Commons Naamsvermelding NietCommercieel GelijkDelen 3.0 Nederland]]\n")))
 	((equal language "pt")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc/3.0/pt/deed.pt")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc/3.0/pt/deed.pt")
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição NãoComercial Compartil ha Igual 3.0 Portugal]]\n")))
 	(t 
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-sa/4.0/deed")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-sa/4.0/deed")
 	 (insert (concat "* License
 This document is under a [[" org-license-cc-url "][License Creative Commons Attribution Non Commercial Share Alike 4.0 International]]\n"))))
   (if (string= "" org-license-images-directory)
-      (insert (concat "\n[[" org-license-cc-url  "][file:http://i.creativecommons.org/l/by-nc-sa/3.0/80x15.png]]\n"))
+      (insert (concat "\n[[" org-license-cc-url  "][file:https://i.creativecommons.org/l/by-nc-sa/3.0/80x15.png]]\n"))
     (insert (concat "\n[[" org-license-cc-url "][file:" org-license-images-directory "/by-nc-sa/3.0/80x15.png]]\n"))))
 
 (defun org-license-cc-by-nc-nd (language)
   (interactive "MLanguage ( br | ca | de | en | es | eu | fi | fr | gl | it | pt ): " language)
   (cond ((equal language "br")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/pt/deed.pt")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/pt/deed.pt")
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição Não Comercial Sem Derivados 3.0 Brasil]]\n")))
 	((equal language "ca")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/es/deed.ca")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/es/deed.ca")
 	 (insert (concat "* Licència
 El text està disponible sota la [[" org-license-cc-url "][Reconeixement-NoComercial-SenseObraDerivada 3.0 Espanya]]\n")))
 	((equal language "de")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.de")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.de")
 	 (insert (concat "* Lizenz
 Dieses Werk bzw. Inhalt steht unter einer [[" org-license-cc-url "][Namensnennung-NichtKommerziell-KeineBearbeitung 3.0 Deutschland]]\n")))
 	((equal language "es")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/es/deed.es")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/es/deed.es")
 	 (insert (concat "* Licencia 
 Este documento está bajo una [[" org-license-cc-url "][Licencia Creative Commons Reconocimiento-NoComercial-SinObraDerivada 3.0]]\n")))
 	((equal language "eu")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/es/deed.eu")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/es/deed.eu")
 	 (insert (concat "* Licenzua
 Testua [[" org-license-cc-url "][Aitortu-LanEratorririkGabe 3.0 Espainia]] lizentziari jarraituz erabil daiteke\n")))
 	((equal language "fi")
-	  (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/1.0/fi/deed.fi")
+          (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/1.0/fi/deed.fi")
 	  (insert (concat "* Lisenssi
 Teksti on saatavilla [[" org-license-cc-url "][Nimeä-Ei muutoksia-Epäkaupallinen 1.0 Suomi]] lisenssillä\n")))
 	((equal language "fr")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/fr/deed.fr")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/fr/deed.fr")
 	 (insert (concat "* Licence
 Ce(tte) œuvre est mise à disposition selon les termes de la [[" org-license-cc-url "][Licence Creative Commons Attribution - Pas de Modification 3.0 France]]\n")))
 	((equal language "gl")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/es/deed.gl")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/es/deed.gl")
 	 (insert (concat "* Licenza
 Todo o texto está dispoñible baixo a [[" org-license-cc-url "][licenza Creative Commons recoñecemento compartir igual 3.0]].\n")))
 	((equal language "it")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/it/deed.it")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/it/deed.it")
 	 (insert (concat "* Licenza
 Quest'opera e distribuita con Licenza [[" org-license-cc-url "][Licenza Creative Commons Attribuzione - Non opere derivate 3.0 Italia]]\n")))
 	((equal language "jp")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/2.1/jp/deed.en")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/2.1/jp/deed.en")
 	 (insert (concat "* ライセンス
 この文書は [[" org-license-cc-url "][License Creative Commons Attribution Non Commercial - No Derivs 2.1]] ライセンスの下である\n")))
 	((equal language "nl")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.nl")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.nl")
 	 (insert (concat "* Licentie
 Dit werk is valt onder een [[" org-license-cc-url "][Creative Commons Naamsvermelding NietCommercieel GeenAfgeleideWerken 3.0 Nederland]]\n")))
 	((equal language "pt")
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/3.0/pt/deed.pt")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/3.0/pt/deed.pt")
 	 (insert (concat "* Licença
 Este texto é disponibilizado nos termos da licença [[" org-license-cc-url "][Atribuição Não Comercial Sem Derivados 3.0 Portugal]]\n")))
 	(t 
-	 (setq org-license-cc-url "http://creativecommons.org/licenses/by-nc-nd/4.0/deed")
+         (setq org-license-cc-url "https://creativecommons.org/licenses/by-nc-nd/4.0/deed")
 	 (insert (concat "* License
 This document is under a [[" org-license-cc-url "][License Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International]]\n"))))
   (if (string= "" org-license-images-directory)
-      (insert (concat "\n[[" org-license-cc-url "][file:http://i.creativecommons.org/l/by-nc-nd/3.0/80x15.png]]\n"))
+      (insert (concat "\n[[" org-license-cc-url "][file:https://i.creativecommons.org/l/by-nc-nd/3.0/80x15.png]]\n"))
     (insert (concat "\n[[" org-license-cc-url "][file:" org-license-images-directory "/by-nc-nd/3.0/80x15.png]]\n"))))
 
 (defun org-license-gfdl (language)
@@ -418,7 +418,7 @@ Copyright (C) " (format-time-string "%Y") " " user-full-name
 
 (defun org-license-publicdomain-zero (language)
   (interactive "MLanguage ( en | es ): " language)
-  (setq org-license-pd-url "http://creativecommons.org/publicdomain/zero/1.0/")
+  (setq org-license-pd-url "https://creativecommons.org/publicdomain/zero/1.0/")
   (setq org-license-pd-file "zero/1.0/80x15.png")
   (if (equal language "es")
          (insert (concat "* Licencia
@@ -426,12 +426,12 @@ Este documento está bajo una licencia [[" org-license-pd-url "][Public Domain Z
     (insert (concat "* License
 This documento is under a [[" org-license-pd-url "][Public Domain Zero]] license\n")))
   (if (string= "" org-license-images-directory)
-      (insert (concat "\n[[" org-license-pd-url "][file:http://i.creativecommons.org/p/zero/1.0/80x15.png]]\n"))
+      (insert (concat "\n[[" org-license-pd-url "][file:https://i.creativecommons.org/p/zero/1.0/80x15.png]]\n"))
     (insert (concat "\n[[" org-license-pd-url "][file:" org-license-images-directory org-license-pd-file "]]\n"))))
 
 (defun org-license-publicdomain-mark (language)
   (interactive "MLanguage ( en | es ): " language)
-  (setq org-license-pd-url "http://creativecommons.org/publicdomain/mark/1.0/")
+  (setq org-license-pd-url "https://creativecommons.org/publicdomain/mark/1.0/")
   (setq org-license-pd-file "mark/1.0/80x15.png")
   (if (equal language "es")
          (insert (concat "* Licencia
@@ -439,7 +439,7 @@ Este documento está bajo una licencia [[" org-license-pd-url "][Etiqueta de Dom
     (insert (concat "* License
 This documento is under a [[" org-license-pd-url "][Public Domain Mark]] license\n")))
   (if (string= "" org-license-images-directory)
-      (insert (concat "\n[[" org-license-pd-url "][file:http://i.creativecommons.org/p/mark/1.0/80x15.png]]\n"))
+      (insert (concat "\n[[" org-license-pd-url "][file:https://i.creativecommons.org/p/mark/1.0/80x15.png]]\n"))
     (insert (concat "\n[[" org-license-pd-url "][file:" org-license-images-directory org-license-pd-file "]]\n"))))
 
 (defun org-license-print-all ()
diff --git a/contrib/lisp/ox-bibtex.el b/contrib/lisp/ox-bibtex.el
index 54f446d32..c7096ccb6 100644
--- a/contrib/lisp/ox-bibtex.el
+++ b/contrib/lisp/ox-bibtex.el
@@ -26,11 +26,11 @@
 ;; This is an utility to handle BibTeX export to LaTeX, html and ascii
 ;; exports.  For HTML and ascii it uses the bibtex2html software from:
 ;;
-;;   http://www.lri.fr/~filliatr/bibtex2html/
+;;   https://www.lri.fr/~filliatr/bibtex2html/
 ;;
 ;; For ascii it uses the pandoc software from:
 ;;
-;;   http://johnmacfarlane.net/pandoc/
+;;   https://pandoc.org/
 ;;
 ;; It also introduces "cite" syntax for Org links.
 ;;
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index 5269e1691..53f341b47 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -34,8 +34,8 @@
 ;; This backend understands three new option keywords:
 ;;
 ;; #+RSS_EXTENSION: xml
-;; #+RSS_IMAGE_URL: http://myblog.org/mypicture.jpg
-;; #+RSS_FEED_URL: http://myblog.org/feeds/blog.xml
+;; #+RSS_IMAGE_URL: https://myblog.org/mypicture.jpg
+;; #+RSS_FEED_URL: https://myblog.org/feeds/blog.xml
 ;;
 ;; It uses #+HTML_LINK_HOME: to set the base url of the feed.
 ;;
diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el
index 4b5ae7c73..748101703 100644
--- a/contrib/lisp/ox-s5.el
+++ b/contrib/lisp/ox-s5.el
@@ -28,7 +28,7 @@
 ;; Installation
 ;; ------------
 ;; Get the s5 scripts from
-;;    http://meyerweb.com/eric/tools/s5/
+;;    https://meyerweb.com/eric/tools/s5/
 ;; (Note that the default s5 version is set for using the alpha, 1.2a2.
 ;; Copy the ui dir to somewhere reachable from your published presentation
 ;; The default (`org-s5-ui-url') is set to "ui" (e.g., in the
diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el
index 43de39433..50014d89f 100644
--- a/contrib/lisp/ox-taskjuggler.el
+++ b/contrib/lisp/ox-taskjuggler.el
@@ -64,7 +64,7 @@
 ;; should end up with something similar to the example by Peter Jones
 ;; in:
 ;;
-;;   http://www.devalot.com/assets/articles/2008/07/project-planning/project-planning.org.
+;;   https://www.devalot.com/assets/articles/2008/07/project-planning/project-planning.org.
 ;;
 ;; Now mark the top node of your tasks with a tag named
 ;; "taskjuggler_project" (or whatever you customized
diff --git a/contrib/scripts/org-docco.org b/contrib/scripts/org-docco.org
index 4e9b65995..ed8714f1a 100644
--- a/contrib/scripts/org-docco.org
+++ b/contrib/scripts/org-docco.org
@@ -3,7 +3,7 @@
 #+Style: <link rel="stylesheet" href="docco.css" type="text/css">
 #+Property: tangle yes
 
-The =docco= tool (see http://jashkenas.github.com/docco/) generates
+The =docco= tool (see https://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 [[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
diff --git a/contrib/scripts/org2hpda b/contrib/scripts/org2hpda
index 93b12aa5e..01dac897a 100755
--- a/contrib/scripts/org2hpda
+++ b/contrib/scripts/org2hpda
@@ -32,7 +32,7 @@
 # two PDFs containing nicely printed weekly and monthly calendars. One
 # is done in the style of a pocketMod (http://www.pocketmod.com/) and
 # the other is done in the style of the Hipster PDA
-# (http://en.wikipedia.org/wiki/Hipster_PDA). 
+# (https://en.wikipedia.org/wiki/Hipster_PDA). 
 #
 # Requirements:
 # =============
diff --git a/contrib/scripts/staticmathjax/README.org b/contrib/scripts/staticmathjax/README.org
index d15bf9517..e813eaf26 100644
--- a/contrib/scripts/staticmathjax/README.org
+++ b/contrib/scripts/staticmathjax/README.org
@@ -12,7 +12,7 @@ current Org development version.)
 
 Optionally, references to the math fonts used will be converted to
 "data:" URIs, thus embedding the font data into the HTML file itself.
-(see [[http://en.wikipedia.org/wiki/Data_URI_scheme]])
+(see [[https://en.wikipedia.org/wiki/Data_URI_scheme]])
 
 The code is licensed under the GNU General Public License version
 2, or, at your option, any later version.
diff --git a/doc/fdl.org b/doc/fdl.org
index a1c8e542d..2cc082bbd 100644
--- a/doc/fdl.org
+++ b/doc/fdl.org
@@ -7,7 +7,7 @@ Version 1.3, 3 November 2008
 
 #+begin_verse
 Copyright \copy{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-http://fsf.org/
+https://fsf.org/
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 12b0bf0a1..0dbc5e205 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -2826,7 +2826,7 @@ either graphically or in ASCII art.
 
 #+cindex: @samp{PLOT}, keyword
 Org Plot can produce 2D and 3D graphs of information stored in Org
-tables using [[http://www.gnuplot.info/][Gnuplot]] and [[http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html][Gnuplot mode]].  To see this in action, ensure
+tables using [[https://www.gnuplot.info/][Gnuplot]] and [[http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html][Gnuplot mode]].  To see this in action, ensure
 that you have both Gnuplot and Gnuplot mode installed on your system,
 then call {{{kbd(C-c \quot g)}}} or {{{kbd(M-x org-plot/gnuplot)}}} on the
 following table.
@@ -8331,7 +8331,7 @@ variable has detailed information.  With the following
 #+begin_src emacs-lisp
 (setq org-feed-alist
       '(("Slashdot"
-         "http://rss.slashdot.org/Slashdot/slashdot"
+         "https://rss.slashdot.org/Slashdot/slashdot"
          "~/txt/org/feeds.org" "Slashdot Entries")))
 #+end_src
 
@@ -10935,7 +10935,7 @@ pretty output for a number of export back-ends.
 Org mode can contain LaTeX math fragments, and it supports ways to
 process these for several export back-ends.  When exporting to LaTeX,
 the code is left as it is.  When exporting to HTML, Org can use either
-[[http://www.mathjax.org][MathJax]] (see [[*Math formatting in HTML export]]) or transcode the math
+[[https://www.mathjax.org][MathJax]] (see [[*Math formatting in HTML export]]) or transcode the math
 into images (see [[*Previewing LaTeX fragments]]).
 
 LaTeX fragments do not need any special marking at all.  The following
@@ -13000,7 +13000,7 @@ as-is.
 
 #+vindex: org-html-mathjax-options~
 LaTeX math snippets (see [[*LaTeX fragments]]) can be displayed in two
-different ways on HTML pages.  The default is to use the [[http://www.mathjax.org][MathJax]],
+different ways on HTML pages.  The default is to use the [[https://www.mathjax.org][MathJax]],
 which should work out of the box with Org[fn:129][fn:130].  Some MathJax
 display options can be configured via ~org-html-mathjax-options~, or
 in the buffer.  For example, with the following settings,
@@ -17627,7 +17627,7 @@ follows from the type specified above.
 
   #+begin_example
   ,#+begin_src shell :results file link :file "download.tar.gz"
-  wget -c "http://example.com/download.tar.gz"
+  wget -c "https://example.com/download.tar.gz"
   ,#+end_src
   #+end_example
 
@@ -19707,13 +19707,13 @@ click the bookmark and start editing.
 #+cindex: rewritten URL in open-source protocol
 #+cindex: protocol, open-source rewritten URL
 However, such mapping may not always yield the desired results.
-Suppose you maintain an online store located at =http://example.com/=.
+Suppose you maintain an online store located at =https://example.com/=.
 The local sources reside in =/home/user/example/=.  It is common
 practice to serve all products in such a store through one file and
 rewrite URLs that do not match an existing file on the server.  That
-way, a request to =http://example.com/print/posters.html= might be
+way, a request to =https://example.com/print/posters.html= might be
 rewritten on the server to something like
-=http://example.com/shop/products.php/posters.html.php=.  The
+=https://example.com/shop/products.php/posters.html.php=.  The
 ~open-source~ handler probably cannot find a file named
 =/home/user/example/print/posters.html.php= and fails.
 
@@ -19728,7 +19728,7 @@ adding ~:rewrites~ rules like this:
 #+begin_src emacs-lisp
 (setq org-protocol-project-alist
       '(("example.com"
-         :base-url "http://example.com/"
+         :base-url "https://example.com/"
          :working-directory "/home/user/example/"
          :online-suffix ".php"
          :working-suffix ".php"
@@ -21840,7 +21840,7 @@ to make it visible.  The tag serves as a visual aid and has no
 semantic relevance.
 
 [fn:129] By default Org loads MathJax from [[https://cdnjs.com][cdnjs.com]] as recommended by
-[[http://www.mathjax.org][MathJax]].
+[[https://www.mathjax.org][MathJax]].
 
 [fn:130] Please note that exported formulas are part of an HTML
 document, and that signs such as =<=, =>=, or =&= have special
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 481cd02cc..f3c25b92d 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -29,8 +29,8 @@
 %
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
-%   http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
-%   http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
+%   https://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
+%   https://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
 %   https://www.gnu.org/software/texinfo/ (the Texinfo home page)
 % The texinfo.tex in any given distribution could well be out
 % of date, so if that's what you're using, please check.
@@ -3101,7 +3101,7 @@ end
 % We use the free feym* fonts from the eurosym package by Henrik
 % Theiling, which support regular, slanted, bold and bold slanted (and
 % "outlined" (blackboard board, sort of) versions, which we don't need).
-% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
+% It is available from https://www.ctan.org/tex-archive/fonts/eurosym.
 %
 % Although only regular is the truly official Euro symbol, we ignore
 % that.  The Euro is designed to be slightly taller than the regular
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 9fc126b2f..6e3c06f32 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -4488,8 +4488,8 @@ found here: https://orgmode.org/worg/org-tutorials/org-outside-org.html
 
 Here are two screencasts demonstrating Thorsten's tools:
 
-- [[http://youtu.be/nqE6YxlY0rw]["Modern conventions for Emacs Lisp files"]]
-- [[http://www.youtube.com/watch?v%3DII-xYw5VGFM][Exploring Bernt Hansen's Org-mode tutorial with 'navi-mode']]
+- [[https://youtu.be/nqE6YxlY0rw]["Modern conventions for Emacs Lisp files"]]
+- [[https://www.youtube.com/watch?v%3DII-xYw5VGFM][Exploring Bernt Hansen's Org-mode tutorial with 'navi-mode']]
 
 *** MobileOrg for iOS
 
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 1cc0010aa..3b995d94c 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -39,7 +39,7 @@
 
 ;; For SLIME, the best way to install these components is by following
 ;; the directions as set out by Phil Hagelberg (Technomancy) on the
-;; web page: http://technomancy.us/126
+;; web page: https://technomancy.us/126
 
 ;;; Code:
 (require 'ob)
diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el
index a8cd7d1eb..8e05a59f2 100644
--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@@ -26,7 +26,7 @@
 
 ;; Org-Babel support for evaluating dot source code.
 ;;
-;; For information on dot see http://www.graphviz.org/
+;; For information on dot see https://www.graphviz.org/
 ;;
 ;; This differs from most standard languages in that
 ;;
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 02f3c9518..c0a9ff13a 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -33,7 +33,7 @@
 
 ;;; Requirements:
 
-;; - gnuplot :: http://www.gnuplot.info/
+;; - gnuplot :: https://www.gnuplot.info/
 ;;
 ;; - gnuplot-mode :: you can search the web for the latest active one.
 
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index 03f4d907f..c8d2809f4 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -34,9 +34,9 @@
 
 ;;; Requirements:
 
-;; - haskell-mode: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
-;; - inf-haskell: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
-;; - (optionally) lhs2tex: http://people.cs.uu.nl/andres/lhs2tex/
+;; - haskell-mode: https://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
+;; - inf-haskell: https://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
+;; - (optionally) lhs2tex: https://people.cs.uu.nl/andres/lhs2tex/
 
 ;;; Code:
 (require 'ob)
diff --git a/lisp/ob-io.el b/lisp/ob-io.el
index 63d2b6cf3..a366d6d74 100644
--- a/lisp/ob-io.el
+++ b/lisp/ob-io.el
@@ -27,7 +27,7 @@
 ;; :results output repl -- runs in repl mode
 
 ;;; Requirements:
-;; - Io language :: http://iolanguage.org/
+;; - Io language :: https://iolanguage.org/
 ;; - Io major mode :: Can be installed from Io sources
 ;;  https://github.com/stevedekorte/io/blob/master/extras/SyntaxHighlighters/Emacs/io-mode.el
 
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index 47397e662..0ed191982 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -27,9 +27,9 @@
 ;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
 ;;
 ;; Lilypond documentation can be found at
-;; http://lilypond.org/manuals.html
+;; https://lilypond.org/manuals.html
 ;;
-;; This depends on epstopdf --- See http://www.ctan.org/pkg/epstopdf.
+;; This depends on epstopdf --- See https://www.ctan.org/pkg/epstopdf.
 
 ;;; Code:
 (require 'ob)
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 87b9241e7..b32b122cd 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -33,7 +33,7 @@
 ;; Requires SLY (Sylvester the Cat's Common Lisp IDE) or SLIME
 ;; (Superior Lisp Interaction Mode for Emacs).  See:
 ;; - https://github.com/capitaomorte/sly
-;; - http://common-lisp.net/project/slime/
+;; - https://common-lisp.net/project/slime/
 
 ;;; Code:
 (require 'ob)
diff --git a/lisp/ob-mscgen.el b/lisp/ob-mscgen.el
index 2cd68958d..5ec082aec 100644
--- a/lisp/ob-mscgen.el
+++ b/lisp/ob-mscgen.el
@@ -29,7 +29,7 @@
 ;; sequence definition, and must therefore be installed in the system.
 ;;
 ;; Mscgen is available and documented at
-;; http://www.mcternan.me.uk/mscgen/index.html
+;; https://www.mcternan.me.uk/mscgen/index.html
 ;;
 ;; This code is directly inspired by Eric Schulte's ob-dot.el
 ;;
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index 0aa91afdb..5fd6d1e09 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -32,7 +32,7 @@
 
 ;;; Requirements:
 
-;; - tuareg-mode :: http://www-rocq.inria.fr/~acohen/tuareg/
+;; - tuareg-mode :: https://www-rocq.inria.fr/~acohen/tuareg/
 
 ;;; Code:
 (require 'ob)
diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el
index b1587f2b8..a867523f3 100644
--- a/lisp/ob-picolisp.el
+++ b/lisp/ob-picolisp.el
@@ -32,9 +32,9 @@
 ;; read Paul Grahams essay "The hundred year language"
 ;; (http://www.paulgraham.com/hundred.html) and then study the various
 ;; documents and essays published in the PicoLisp wiki
-;; (http://picolisp.com/5000/-2.html). PicoLisp is included in some
+;; (https://picolisp.com/5000/-2.html). PicoLisp is included in some
 ;; GNU/Linux Distributions, and can be downloaded here:
-;; http://software-lab.de/down.html.  It ships with a picolisp-mode and
+;; https://software-lab.de/down.html.  It ships with a picolisp-mode and
 ;; an inferior-picolisp-mode for Emacs (to be found in the /lib/el/
 ;; directory).
 
diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el
index 9e6572a5f..84fd6a296 100644
--- a/lisp/ob-processing.el
+++ b/lisp/ob-processing.el
@@ -47,7 +47,7 @@
 ;;; Requirements:
 
 ;; - processing2-emacs mode :: https://github.com/ptrv/processing2-emacs
-;; - Processing.js module :: http://processingjs.org/
+;; - Processing.js module :: https://processingjs.org/
 
 ;;; Code:
 (require 'ob)
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index ccc746e8d..b2483f1aa 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -27,7 +27,7 @@
 
 ;;; Requirements:
 
-;; - ruby and irb executables :: http://www.ruby-lang.org/
+;; - ruby and irb executables :: https://www.ruby-lang.org/
 ;;
 ;; - ruby-mode :: Can be installed through ELPA, or from
 ;;   https://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el
index 76cdfd806..c8762caba 100644
--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;; For more information on sass see http://sass-lang.com/
+;; For more information on sass see https://sass-lang.com/
 ;;
 ;; This accepts a 'file' header argument which is the target of the
 ;; compiled sass.  The default output type for sass evaluation is
diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el
index 6b591218c..57b240d92 100644
--- a/lisp/ol-bibtex.el
+++ b/lisp/ol-bibtex.el
@@ -88,7 +88,7 @@
 ;;
 ;; - All Bibtex information is taken from the document compiled by
 ;;   Andrew Roberts from the Bibtex manual, available at
-;;   http://www.andy-roberts.net/res/writing/latex/bibentries.pdf
+;;   https://www.andy-roberts.net/res/writing/latex/bibentries.pdf
 ;;
 ;;; History:
 ;;
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 726c1ca2b..6f8cf00e9 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -176,7 +176,7 @@ Possible properties are:
 
   :online-suffix     - the suffix to strip from the published URLs
   :working-suffix    - the replacement for online-suffix
-  :base-url          - the base URL, e.g. http://www.example.com/project/
+  :base-url          - the base URL, e.g. https://www.example.com/project/
                        Last slash required.
   :working-directory - the local working directory.  This is, what base-url will
                        be replaced with.
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 4262718e6..143ed0f8a 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -6089,7 +6089,7 @@ supported.  It is also possible to use the following ones:
 
   When non-nil, use \"ascii-art-to-unicode\" package to translate
   the table.  You can download it here:
-  http://gnuvola.org/software/j/aa2u/ascii-art-to-unicode.el.
+  https://gnuvola.org/software/j/aa2u/ascii-art-to-unicode.el.
 
 :narrow
 
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 6cb9a3bf4..80ad95c6c 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1191,7 +1191,7 @@ You can also customize this for each buffer, using something like
 
 For further information about MathJax options, see the MathJax documentation:
 
-  http://docs.mathjax.org/"
+  https://docs.mathjax.org/"
   :group 'org-export-html
   :package-version '(Org . "8.3")
   :type '(list :greedy t
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 376d27a07..da3c3f815 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -932,7 +932,7 @@ using customize, or with
   (add-to-list \\='org-latex-packages-alist \\='(\"newfloat\" \"minted\"))
 
 In addition, it is necessary to install pygments
-\(URL `http://pygments.org>'), and to configure the variable
+\(URL `https://pygments.org>'), and to configure the variable
 `org-latex-pdf-process' so that the -shell-escape option is
 passed to pdflatex.
 
diff --git a/lisp/ox.el b/lisp/ox.el
index 2c812ec9b..0253c1617 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -5483,7 +5483,7 @@ transcoding it."
      (apostrophe :utf-8 "’" :html "&rsquo;"))
     ("ru"
      ;; https://ru.wikipedia.org/wiki/%D0%9A%D0%B0%D0%B2%D1%8B%D1%87%D0%BA%D0%B8#.D0.9A.D0.B0.D0.B2.D1.8B.D1.87.D0.BA.D0.B8.2C_.D0.B8.D1.81.D0.BF.D0.BE.D0.BB.D1.8C.D0.B7.D1.83.D0.B5.D0.BC.D1.8B.D0.B5_.D0.B2_.D1.80.D1.83.D1.81.D1.81.D0.BA.D0.BE.D0.BC_.D1.8F.D0.B7.D1.8B.D0.BA.D0.B5
-     ;; http://www.artlebedev.ru/kovodstvo/sections/104/
+     ;; https://www.artlebedev.ru/kovodstvo/sections/104/
      (primary-opening :utf-8 "«" :html "&laquo;" :latex "{}<<"
 		      :texinfo "@guillemetleft{}")
      (primary-closing :utf-8 "»" :html "&raquo;" :latex ">>{}"
-- 
2.30.2


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

* Re: [PATCH] Prefer HTTPS to HTTP for links to gnu.org
  2021-03-21 19:11   ` Stefan Kangas
@ 2021-03-21 19:29     ` Kyle Meyer
  0 siblings, 0 replies; 4+ messages in thread
From: Kyle Meyer @ 2021-03-21 19:29 UTC (permalink / raw)
  To: Stefan Kangas; +Cc: emacs-orgmode

Stefan Kangas writes:

> Thanks.  Here's a followup patch that converts most remaining http-links
> to https.  All of them have been manually tested to avoid breakage.

Great, thank you.  Pushed (2e1c98415).


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

end of thread, other threads:[~2021-03-21 19:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-20  7:39 [PATCH] Prefer HTTPS to HTTP for links to gnu.org Stefan Kangas
2021-03-21 18:40 ` Kyle Meyer
2021-03-21 19:11   ` Stefan Kangas
2021-03-21 19:29     ` Kyle Meyer

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

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

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