diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-10-08 21:23:09 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-10-08 21:23:09 -0700 |
| commit | 32ade3f01a0185f2a836c313d9d50564abe4e254 (patch) | |
| tree | 195ed03adf2f7757d67caf79dd2baff44911748c /doc/emacs | |
| parent | fdcb06012a36a8ec800e33554ae94c26e43a7c05 (diff) | |
| parent | 942a57a2a5c56575a15dd22e1feebd1825f281b0 (diff) | |
| download | emacs-32ade3f01a0185f2a836c313d9d50564abe4e254.tar.gz | |
Merge from emacs-24; up to 2014-07-22T06:37:31Z!yamaoka@jpl.org
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/package.texi | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 59d4280e789..cafe925dec0 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2014-10-09 Glenn Morris <rgm@gnu.org> + + * package.texi (Package Menu): The package list was changed to not + say "unsigned" any more. + 2014-10-05 Glenn Morris <rgm@gnu.org> * misc.texi (Sorting): diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi index 1af90edd953..136eff7e2fe 100644 --- a/doc/emacs/package.texi +++ b/doc/emacs/package.texi @@ -60,7 +60,7 @@ The package's version number (e.g., @samp{11.86}). @item The package's status---normally one of @samp{available} (can be downloaded from the package archive), @samp{installed}, -@samp{unsigned} (installed, but not signed; @pxref{Package Signing}), +@c @samp{unsigned} (installed, but not signed; @pxref{Package Signing}), or @samp{built-in} (included in Emacs by default). The status can also be @samp{new}. This is equivalent to |