diff options
| author | Glenn Morris | 2014-10-01 19:29:46 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-10-01 19:29:46 -0400 |
| commit | 2ff7916ad51681dd9d7f0c534e5bc8991faa178c (patch) | |
| tree | b6c1b2070d5e516011826c8dd4e13beb87520562 | |
| parent | e694e2a9b05e75a31c209c499400a2cb0fade2e9 (diff) | |
| download | emacs-2ff7916ad51681dd9d7f0c534e5bc8991faa178c.tar.gz emacs-2ff7916ad51681dd9d7f0c534e5bc8991faa178c.zip | |
* emacs/package.texi (Package Installation): Mention etc/package-keyring.gpg.
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/package.texi | 3 |
2 files changed, 4 insertions, 3 deletions
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 @@ | |||
| 1 | 2014-10-01 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * package.texi (Package Installation): Mention etc/package-keyring.gpg. | ||
| 4 | |||
| 1 | 2014-07-21 Glenn Morris <rgm@gnu.org> | 5 | 2014-07-21 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug. (Bug#18040) | 7 | * 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/}. | |||
| 184 | Use @kbd{M-x package-import-keyring} to import the key into Emacs. | 184 | Use @kbd{M-x package-import-keyring} to import the key into Emacs. |
| 185 | Emacs stores package keys in the @file{gnupg} subdirectory | 185 | Emacs stores package keys in the @file{gnupg} subdirectory |
| 186 | of @code{package-user-dir}. | 186 | of @code{package-user-dir}. |
| 187 | @c Uncomment this if it becomes true. | ||
| 188 | @ignore | ||
| 189 | The public key for the GNU package archive is distributed with Emacs, | 187 | The public key for the GNU package archive is distributed with Emacs, |
| 190 | in the @file{etc/package-keyring.gpg}. Emacs uses it automatically. | 188 | in the @file{etc/package-keyring.gpg}. Emacs uses it automatically. |
| 191 | @end ignore | ||
| 192 | 189 | ||
| 193 | @vindex package-check-signature | 190 | @vindex package-check-signature |
| 194 | @vindex package-unsigned-archives | 191 | @vindex package-unsigned-archives |