From 43546a5cbe8ddcc23b5bae415140d2efb7a0b08e Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sat, 15 Oct 2022 10:52:13 +0200 Subject: [PATCH 1/2] Backport commit a95062e03 from Emacs * doc/org-manual.org (Summary): Remove broken link to Network Theory Ltd. Delete broken link to Network Theory Ltd. a95062e036d9d5fc45d9a3ba1c10b0bd9b587399 Stefan Kangas Sat Oct 15 13:06:45 2022 +0200 [ km: Note that this is already covered by Org's 58a46fab0 and that version will be taken in the merge. ] --- doc/org-manual.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index 98e078b4b..818d139d7 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -68,8 +68,8 @@ of Org, as well as additional information, frequently asked questions [[https://orgmode.org]]. #+cindex: print edition -An earlier version (7.3) of this manual is available as a [[http://www.network-theory.co.uk/org/manual/][paperback -book from Network Theory Ltd.]]. +An earlier version (7.3) of this manual was published as a paperback book by +Network Theory Ltd. in 2010. ** Installation :PROPERTIES: From b7aad5b0955d199e716d50d0019cca9bfa2ef83d Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sat, 15 Oct 2022 11:17:51 +0200 Subject: [PATCH 2/2] Backport commit 318722541 from Emacs ; Prefer HTTPS to HTTP in many URLs 3187225416c66061b67e89092addc15cad2202b9 Stefan Kangas Sat Oct 15 13:06:45 2022 +0200 [ km: Note that the staff.science.uva.nl change in the "External Links" table will be discarded in the merge because the value is supposed to be an example of an http link, not an https one (which is covered by the next row). ] --- doc/org-manual.org | 24 ++++++++++++------------ lisp/ob-matlab.el | 2 +- lisp/ob-plantuml.el | 2 +- lisp/org-ctags.el | 2 +- lisp/org-protocol.el | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index 818d139d7..617919fdf 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -3234,7 +3234,7 @@ options: | Link Type | Example | |------------+----------------------------------------------------------| -| http | =http://staff.science.uva.nl/c.dominik/= | +| http | =https://staff.science.uva.nl/c.dominik/= | | https | =https://orgmode.org/= | | doi | =doi:10.1000/182= | | file | =file:/home/dominik/images/jupiter.jpg= | @@ -3567,7 +3567,7 @@ replacement text. Here is an example: '(("bugzilla" . "http://10.1.2.9/bugzilla/show_bug.cgi?id=") ("Nu Html Checker" . "https://validator.w3.org/nu/?doc=%h") ("duckduckgo" . "https://duckduckgo.com/?q=%s") - ("omap" . "http://nominatim.openstreetmap.org/search?q=%s&polygon=1") + ("omap" . "https://nominatim.openstreetmap.org/search?q=%s&polygon=1") ("ads" . "https://ui.adsabs.harvard.edu/search/q=%20author%3A\"%s\""))) #+end_src @@ -3596,7 +3596,7 @@ can define them in the file with #+cindex: @samp{LINK}, keyword #+begin_example -,#+LINK: bugzilla http://10.1.2.9/bugzilla/show_bug.cgi?id= +,#+LINK: bugzilla https://10.1.2.9/bugzilla/show_bug.cgi?id= ,#+LINK: duckduckgo https://duckduckgo.com/?q=%s #+end_example @@ -13642,7 +13642,7 @@ not have descriptions, such as these links =[[file:img.jpg]]= or =[[./img.jpg]]=, as direct image insertions in the final PDF output. In the PDF, they are no longer links but actual images embedded on the page. The LaTeX export back-end uses =\includegraphics= macro to -insert the image. But for TikZ (http://sourceforge.net/projects/pgf/) +insert the image. But for TikZ (https://sourceforge.net/projects/pgf/) images, the back-end uses an ~\input~ macro wrapped within a ~tikzpicture~ environment. @@ -13982,7 +13982,7 @@ some text in German... #+cindex: Markdown export The Markdown export back-end, "md", converts an Org file to Markdown -format, as defined at http://daringfireball.net/projects/markdown/. +format, as defined at https://daringfireball.net/projects/markdown/. Since it is built on top of the HTML back-end (see [[*HTML Export]]), it converts every Org construct not defined in Markdown syntax, such as @@ -22053,7 +22053,7 @@ MathJax are processed. When dvipng, dvisvgm, or ImageMagick suite is used to create images, any LaTeX environment is handled. [fn:112] These are respectively available at -[[http://sourceforge.net/projects/dvipng/]], [[http://dvisvgm.bplaced.net/]] +[[https://sourceforge.net/projects/dvipng/]], [[http://dvisvgm.bplaced.net/]] and from the ImageMagick suite. Choose the converter by setting the variable ~org-preview-latex-default-process~ accordingly. @@ -22123,9 +22123,9 @@ semantic relevance. [fn:130] Please note that exported formulas are part of an HTML document, and that signs such as =<=, =>=, or =&= have special -meanings. See [[http://docs.mathjax.org/en/latest/tex.html#tex-and-latex-in-html-documents][MathJax TeX and LaTeX support]]. +meanings. See [[https://docs.mathjax.org/en/latest/tex.html#tex-and-latex-in-html-documents][MathJax TeX and LaTeX support]]. -[fn:131] See [[http://docs.mathjax.org/en/latest/tex.html#tex-extensions][TeX and LaTeX extensions]] in the [[http://docs.mathjax.org][MathJax manual]] to learn +[fn:131] See [[https://docs.mathjax.org/en/latest/tex.html#tex-extensions][TeX and LaTeX extensions]] in the [[https://docs.mathjax.org][MathJax manual]] to learn about extensions. [fn:132] If the classes on TODO keywords and tags lead to conflicts, @@ -22140,14 +22140,14 @@ as latexmk, can select the correct bibliography compiler. which requires the flag =-shell-escape= to be added to ~org-latex-pdf-process~. -[fn:135] See [[http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html][Open Document Format for Office Applications +[fn:135] See [[https://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html][Open Document Format for Office Applications (OpenDocument) Version 1.2]]. [fn:136] See [[http://www.mathtoweb.com/cgi-bin/mathtoweb_home.pl][MathToWeb]]. -[fn:137] See [[http://dlmf.nist.gov/LaTeXML/]]. +[fn:137] See [[https://dlmf.nist.gov/LaTeXML/]]. -[fn:138] [[http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html][OpenDocument-v1.2 Specification]] +[fn:138] [[https://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html][OpenDocument-v1.2 Specification]] [fn:139] See the == element of the OpenDocument-v1.2 specification. @@ -22170,7 +22170,7 @@ are not evaluated when they appear in a keyword (see [[*Summary of In-Buffer Settings]]). [fn:144] For noweb literate programming details, see -http://www.cs.tufts.edu/~nr/noweb/. +https://www.cs.tufts.edu/~nr/noweb/. [fn:145] For more information, please refer to the commentary section in =org-tempo.el=. diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el index 4ee090e4a..f50da0ea4 100644 --- a/lisp/ob-matlab.el +++ b/lisp/ob-matlab.el @@ -32,7 +32,7 @@ ;; matlab.el required for interactive emacs sessions and matlab-mode ;; major mode for source code editing buffer -;; http://matlab-emacs.sourceforge.net/ +;; https://matlab-emacs.sourceforge.net/ ;;; Code: (require 'ob) diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index ced00fbdd..7a495e8e7 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -30,7 +30,7 @@ ;;; Requirements: -;; plantuml | http://plantuml.sourceforge.net/ +;; plantuml | https://plantuml.com/ ;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file (when exec mode is `jar') ;;; Code: diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el index 6fc97ca39..67db49e9a 100644 --- a/lisp/org-ctags.el +++ b/lisp/org-ctags.el @@ -47,7 +47,7 @@ ;; ;; Install org mode ;; Ensure org-ctags.el is somewhere in your emacs load path. -;; Download and install Exuberant ctags -- "http://ctags.sourceforge.net/" +;; Download and install Exuberant ctags -- "https://ctags.sourceforge.net/" ;; Edit your .emacs file (see next section) and load emacs. ;; To put in your init file (.emacs): diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 7c4de03bc..7a91a33b7 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -66,7 +66,7 @@ ;; ;; ;; As of March 2009 Firefox users follow the steps documented on -;; http://kb.mozillazine.org/Register_protocol, Opera setup is described here: +;; https://kb.mozillazine.org/Register_protocol, Opera setup is described here: ;; http://www.opera.com/support/kb/view/535/ ;; ;;