diff options
author | Eli Zaretskii <eliz@gnu.org> | 2020-06-20 10:51:51 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2020-06-20 10:51:51 +0300 |
commit | ed08512978812220045ff12941d78b99ed32323f (patch) | |
tree | b3127987b01d8a4abeb289bee140f4815abddea7 /doc | |
parent | 2fec4c733cfb078de24a9d2dea51b1ff0bc717ca (diff) | |
download | emacs-ed08512978812220045ff12941d78b99ed32323f.tar.gz |
Revert "Don't mention non-GNU package archives."
This reverts commit 5daa7a5fd4aced33a2ae016bde5bb37d1d95edf6.
A proper fix will be committed to the emacs-27 branch, and
will be later merged to master.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/misc/efaq.texi | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 0290e797065..f5f01848f77 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -3463,16 +3463,25 @@ see @ref{Packages that do not come with Emacs}. @cindex Emacs Lisp List @cindex Emacs Lisp Archive -We distribute many packages that extend Emacs, in the -@uref{https://elpa.gnu.org, GNU ELPA} (``Emacs Lisp Package -Archive''). The command @kbd{M-x list-packages} contacts the GNU ELPA -server and fetches the list of packages that it distributes. These -GNU packages are designed for use with Emacs, but we distribute them -separately from Emacs itself, for reasons of space, and convenience of -development. You can browse the resulting @file{*Packages*} buffer to -see what is available, and then Emacs can automatically download and -install the packages that you select. @xref{Packages,,, emacs, The -GNU Emacs Manual}. +The easiest way to add more features to your Emacs is to use the +command @kbd{M-x list-packages}. This contacts the +@uref{https://elpa.gnu.org, GNU ELPA} (``Emacs Lisp Package Archive'') +server and fetches the list of additional packages that it offers. +These are GNU packages that are available for use with Emacs, but are +distributed separately from Emacs itself, for reasons of space, etc. +You can browse the resulting @file{*Packages*} buffer to see what is +available, and then Emacs can automatically download and install the +packages that you select. @xref{Packages,,, emacs, The GNU Emacs Manual}. + +There are other, non-GNU, Emacs Lisp package servers, including: +@uref{https://melpa.org, MELPA}; and +@uref{https://marmalade-repo.org, Marmalade}. To use additional +package servers, customize the @code{package-archives} variable. Be +aware that installing a package can run arbitrary code, so only add +sources that you trust. Also, packages hosted on non-GNU package +servers may encourage or require you to install and use non-free +software; for example, MELPA is known to host some packages that do +this. The @uref{https://lists.gnu.org/mailman/listinfo/gnu-emacs-sources, GNU Emacs sources mailing list}, which is gatewayed to the |