summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2022-09-16 16:27:37 +0200
committerStefan Kangas <stefankangas@gmail.com>2022-09-16 16:27:37 +0200
commit6e4f6e97bf13f096f6e1a300c67b3489e8000a0f (patch)
treefdac08830c80b2241d31da24e097e4aff7f886e0 /doc
parent01ad2a4a926ba56ce370db9e368e72cf824026e5 (diff)
parentf232d989fd90dc35b647da9db152d70b421f35a9 (diff)
downloademacs-6e4f6e97bf13f096f6e1a300c67b3489e8000a0f.tar.gz
emacs-6e4f6e97bf13f096f6e1a300c67b3489e8000a0f.tar.bz2
emacs-6e4f6e97bf13f096f6e1a300c67b3489e8000a0f.zip
Merge from origin/emacs-28
f232d989fd Improve HTML export of NEWS file 397890ba77 Delete "etc/NEWS*.html" from .gitignore 70ca5f6524 ; * etc/NEWS: Fix typos. 19de241a7d Recommend NonGNU ELPA over MELPA f25f9dbf30 Minor doc fixes in picture.el 520b041b54 * lisp/textmodes/page-ext.el: Improve Commentary. # Conflicts: # etc/NEWS
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/org.org4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 7971c417a52..1ce99728c60 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.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