diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /doc/lispref/package.texi | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'doc/lispref/package.texi')
| -rw-r--r-- | doc/lispref/package.texi | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index e8aaa3ae1d1..9c033fe3df8 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -283,11 +283,14 @@ variable @code{load-file-name} (@pxref{Loading}). Here is an example: @section Creating and Maintaining Package Archives @cindex package archive +@cindex GNU ELPA +@cindex non-GNU ELPA Via the Package Menu, users may download packages from @dfn{package archives}. Such archives are specified by the variable -@code{package-archives}, whose default value contains a single entry: -the archive hosted by the GNU project at @url{https://elpa.gnu.org}. This -section describes how to set up and maintain a package archive. +@code{package-archives}, whose default value lists the archives +hosted on @url{https://elpa.gnu.org, GNU ELPA} and +@url{https://elpa.nongnu.org, non-GNU ELPA}. This section describes +how to set up and maintain a package archive. @cindex base location, package archive @defopt package-archives |