Merge some info from etc/MORE.STUFF into efaq.texi

* doc/misc/efaq.texi (Basic editing, Packages that do not come with Emacs):
Merge in some info from etc/MORE.STUFF.

2 files changed, 43 insertions, 25 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 491f9b8d7b1..187493d5557 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-07  Glenn Morris  <rgm@gnu.org>
+
+	* efaq.texi (Basic editing, Packages that do not come with Emacs):
+	Merge in some info from etc/MORE.STUFF.
+
 2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Specify .texi encoding (Bug#16292).
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 1bc69debf55..35fb9c93b2f 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -562,6 +562,9 @@ common) invokes help.
 Emacs help works best if it is invoked by a single key whose value
 should be stored in the variable @code{help-char}.
 
+Some Emacs slides and tutorials can be found at
+@uref{http://web.psung.name/emacs/}.
+
 @node Learning how to do something
 @section How do I find out how to do something in Emacs?
 @cindex Help for Emacs
@@ -3305,31 +3308,41 @@ see @ref{Packages that do not come with Emacs}.
 @cindex Emacs Lisp List
 @cindex Emacs Lisp Archive
 
-Your first port of call should be the @kbd{M-x list-packages} command.
-This connects to the @uref{http:///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.  Select a package
-to get more details about the features that it offers, and then if you
-wish, Emacs can download and automatically install it for you.
-
-@uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.html, The Emacs Lisp
-List (ELL)}, maintained by Stephen Eglen,
-aims to provide one compact list with links to all of the current Emacs
-Lisp files on the Internet.  The ELL can be browsed over the web, or
-from Emacs with @uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.el,
-the @file{ell} package}.
-
-Many authors post their packages to the @uref{news:gnu.emacs.sources,
-Emacs sources newsgroup}.  You can search the archives of this
-group with @uref{http://groups.google.com/group/gnu.emacs.sources, Google},
-or @uref{http://dir.gmane.org/gmane.emacs.sources, Gmane}, for example.
-
-Several packages are stored in
-@uref{http://emacswiki.org/elisp/, the Lisp area of the Emacs Wiki}.
-
-Read the file @file{etc/MORE.STUFF} for more information about
-external packages.
+The easiest way to add more features to your Emacs is to use the
+command @kbd{M-x list-packages}.  This contacts the
+@uref{http:///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{http://melpa.milkbox.net, MELPA}; and
+@uref{http://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.
+
+The @uref{https://lists.gnu.org/mailman/listinfo/gnu-emacs-sources,
+GNU Emacs sources mailing list}, which is gatewayed to the
+@uref{news:gnu.emacs.sources, Emacs sources newsgroup} (although the
+connection between the two can be unreliable) is an official place
+where people can post or announce their extensions to Emacs.
+
+The @uref{http://emacswiki.org, Emacs Wiki} contains pointers to some
+additional extensions.  @uref{http://wikemacs.org, WikEmacs} is an
+alternative wiki for Emacs.
+
+@uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.html, The Emacs
+Lisp List (ELL)}, has pointers to many Emacs Lisp files, but at time
+of writing it is no longer being updated.
+
+It is impossible for us to list here all the sites that offer Emacs
+Lisp packages.  If you are interested in a specific feature, then
+after checking Emacs itself and GNU ELPA, a web search is often the
+best way to find results.
 
 @node Spell-checkers
 @section Spell-checkers