* emacs/package.texi (Package Installation): Mention etc/package-keyring.gpg.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3a4f67bf4b268156b34a874fc1fe52b2a813977e..b4d13d243254ba52a9a327b4c8547cbc305cb158 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-01  Glenn Morris  <rgm@gnu.org>
+
+       * package.texi (Package Installation): Mention etc/package-keyring.gpg.
+
 2014-07-21  Glenn Morris  <rgm@gnu.org>
 
        * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.  (Bug#18040)

diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index 90bdafe456a9a11d1f4143d42de3d8b1742fe13f..1af90edd953880822d9cd5f3710357f5e62cfd9d 100644 (file)
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -184,11 +184,8 @@ key from a server such as @url{http://pgp.mit.edu/}.
 Use @kbd{M-x package-import-keyring} to import the key into Emacs.
 Emacs stores package keys in the @file{gnupg} subdirectory
 of @code{package-user-dir}.
-@c Uncomment this if it becomes true.
-@ignore
 The public key for the GNU package archive is distributed with Emacs,
 in the @file{etc/package-keyring.gpg}.  Emacs uses it automatically.
-@end ignore
 
 @vindex package-check-signature
 @vindex package-unsigned-archives