From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 May 2020 07:30:43 +0000 (+0300)
Subject: Reflect the emacs-devel ELPA/MELPA dispute in FAQ
X-Git-Tag: emacs-27.1-rc1~125
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=efd4e973a4f0c7fe9442b677c6fdeebb347e2b9d;p=emacs.git

Reflect the emacs-devel ELPA/MELPA dispute in FAQ

* doc/misc/efaq.texi (Packages that do not come with Emacs): Warn
that some MELPA packages may require non-free software.
---

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 962f76d1796..132e8ffaa93 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -3479,7 +3479,10 @@ There are other, non-GNU, Emacs Lisp package servers, including:
 @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.
+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