* lisp/emacs-lisp/package.el (package-pinned-packages): Doc fix.

* etc/NEWS: Related edit.
author: Glenn Morris 2014-06-02 21:41:20 -0700
committer: Glenn Morris 2014-06-02 21:41:20 -0700
commit: 910dc8d31264e2105e876c686206521c5dc47c64 (patch)
tree: 39d462f102b0215f049073105ad67e6985198b41 /etc
parent: 335908691102a2aad107ce00046ee98e80509ff1 (diff)
download: emacs-910dc8d31264e2105e876c686206521c5dc47c64.tar.gz
emacs-910dc8d31264e2105e876c686206521c5dc47c64.zip
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 368f77bd0f9..44bcb22e85e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -816,8 +816,8 @@ Use `electric-indent-mode' instead.
 ** Package
-FIXME
+*** New option `package-pinned-packages'.  This is useful if you have multiple
-*** New option `package-pinned-packages'.
+archives enabled, with more than one offering a package that you want.
 FIXME
 *** New options `package-check-signature' and `package-unsigned-archives'.
author	Glenn Morris	2014-06-02 21:41:20 -0700
committer	Glenn Morris	2014-06-02 21:41:20 -0700
commit	910dc8d31264e2105e876c686206521c5dc47c64 (patch)
tree	39d462f102b0215f049073105ad67e6985198b41 /etc
parent	335908691102a2aad107ce00046ee98e80509ff1 (diff)
download	emacs-910dc8d31264e2105e876c686206521c5dc47c64.tar.gz emacs-910dc8d31264e2105e876c686206521c5dc47c64.zip

diff --git a/etc/NEWS b/etc/NEWS index 368f77bd0f9..44bcb22e85e 100644 --- a/etc/NEWS +++ b/etc/NEWS
@@ -816,8 +816,8 @@ Use `electric-indent-mode' instead.
816		816
817	** Package	817	** Package
818		818
819	FIXME	819	*** New option `package-pinned-packages'. This is useful if you have multiple
820	*** New option `package-pinned-packages'.	820	archives enabled, with more than one offering a package that you want.
821		821
822	FIXME	822	FIXME
823	*** New options `package-check-signature' and `package-unsigned-archives'.	823	*** New options `package-check-signature' and `package-unsigned-archives'.