From de5bdb090d54c2cdbdf162fe6d6778fe6a43b999 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 16 Sep 2022 13:59:51 +0200 Subject: [PATCH 1/2] Backport commit 19de241a7 from Emacs * doc/org-manual.org (Using CDLaTeX to enter math, Footnotes): Recommend NonGNU ELPA over MELPA. Recommend NonGNU ELPA over MELPA 19de241a7dc193c0d0423019824627adb28f8944 Stefan Kangas Fri Sep 16 14:04:27 2022 +0200 --- 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 23d4007d2..97a7db4c1 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -11042,7 +11042,7 @@ a major LaTeX mode like AUCTeX in order to speed-up insertion of environments and math templates. Inside Org mode, you can make use of some of the features of CDLaTeX mode. You need to install =cdlatex.el= and =texmathp.el= (the latter comes also with AUCTeX) -using [[https://melpa.org/][MELPA]] with the [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Package-Installation.html][Emacs packaging system]] or alternatively from +from [[https://elpa.nongnu.org/][NonGNU ELPA]] with the [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Package-Installation.html][Emacs packaging system]] or alternatively from [[https://staff.fnwi.uva.nl/c.dominik/Tools/cdlatex/]]. Do not use CDLaTeX mode itself under Org mode, but use the special version Org CDLaTeX minor mode that comes as part of Org. Turn it on for the @@ -22024,7 +22024,7 @@ a deadline string. See ~org-agenda-entry-types~ on how to set what planning information is taken into account. [fn:104] For HTML you need to install Hrvoje Nikšić's =htmlize.el= -as an Emacs package from MELPA or from [[https://github.com/hniksic/emacs-htmlize][Hrvoje Nikšić's repository]]. +as an Emacs package from [[https://elpa.nongnu.org/][NonGNU ELPA]] or from [[https://github.com/hniksic/emacs-htmlize][Hrvoje Nikšić's repository]]. [fn:105] To create PDF output, the Ghostscript ps2pdf utility must be installed on the system. Selecting a PDF file also creates the From e7572fa86c364699c7ecd28e47fd5ef73eeb21e6 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 20 Sep 2022 12:21:40 +0200 Subject: [PATCH 2/2] Backport commit 616dcf27e from Emacs ; Fix typos in Lisp symbols 616dcf27e57388403d4c28d441bf7310bb665241 Stefan Kangas Tue Sep 20 12:21:40 2022 +0200 --- lisp/ox.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ox.el b/lisp/ox.el index a6209ee98..6316c687d 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -4605,7 +4605,7 @@ from the export back-end." ;; a given element, excluded. Note: "-n" switches reset that count. ;; ;; `org-export-unravel-code' extracts source code (along with a code -;; references alist) from an `element-block' or `src-block' type +;; references alist) from an `example-block' or `src-block' type ;; element. ;; ;; `org-export-format-code' applies a formatting function to each line