From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 Nov 2022 16:22:04 +0000 (-0800)
Subject: Merge branch 'master' into texinfo-wip
X-Git-Tag: emacs-29.0.90~1306^2~15^2~7^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2efc869866;p=emacs.git

Merge branch 'master' into texinfo-wip
---

2efc8698666de67d07c3d7f21464d6378d18adc3
diff --cc doc/misc/use-package.texi
index 9f5b57fcbaf,de6351c592f..573baac89aa
--- a/doc/misc/use-package.texi
+++ b/doc/misc/use-package.texi
@@@ -124,38 -124,15 +124,15 @@@ its development repository
  * Post-Installation Tasks::
  @end menu
  
- @node Installing from an Elpa Archive
- @section Installing from an Elpa Archive
+ @node Installing from GNU ELPA
+ @section Installing from GNU ELPA
  
- use-package is available from Melpa and Melpa-Stable.  If you haven't used
 -use-package is available from GNU ELPA.  If you haven't used Emacs'
 -package manager before, then it is high time you familiarize yourself
++use-package is available from GNU ELPA.  If you haven't used
 +Emacs' package manager before, then it is high time you familiarize yourself
  with it by reading the documentation in the Emacs manual, see
 -@ref{Packages,,,emacs,}.
 +@ref{Packages,,,emacs,}.  Then add one of the archives to @code{package-archives}:
  
- @itemize
- @item
- To use Melpa:
- @end itemize
- 
- @lisp
- (require 'package)
- (add-to-list 'package-archives
-              '("melpa" . "https://melpa.org/packages/") t)
- @end lisp
- 
- @itemize
- @item
- To use Melpa-Stable:
- @end itemize
- 
- @lisp
- (require 'package)
- (add-to-list 'package-archives
-              '("melpa-stable" . "https://stable.melpa.org/packages/") t)
- @end lisp
- 
- Once you have added your preferred archive, you need to update the
- local package list using:
+ First, you need to update the local package list using:
  
  @example
  M-x package-refresh-contents RET