From: Glenn Morris <rgm@gnu.org>
Date: Wed, 1 Oct 2014 23:29:46 +0000 (-0400)
Subject: * emacs/package.texi (Package Installation): Mention etc/package-keyring.gpg.
X-Git-Tag: emacs-24.3.94~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ff7916ad51681dd9d7f0c534e5bc8991faa178c;p=emacs.git

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

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3a4f67bf4b2..b4d13d24325 100644
--- 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 90bdafe456a..1af90edd953 100644
--- 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