[Emacs-diffs] emacs-24 r117199: * emacs/package.texi (Package Installation): Mention package-pinned-packages.

[Glenn Morris]

------------------------------------------------------------
revno: 117199
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-06-02 21:45:56 -0700
message:
  * emacs/package.texi (Package Installation): Mention package-pinned-packages.
  
  * etc/NEWS: Related markup.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/package.texi         package.texi-20110825190024-lpvyu1zke977csqu-1
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-06-02 01:14:08 +0000
+++ b/doc/emacs/ChangeLog       2014-06-03 04:45:56 +0000
@@ -1,3 +1,7 @@
+2014-06-03  Glenn Morris  <address@hidden>
+
+       * package.texi (Package Installation): Mention package-pinned-packages.
+
 2014-06-02  Glenn Morris  <address@hidden>
 
        * misc.texi [iftex]: Update chapter summary.

=== modified file 'doc/emacs/package.texi'
--- a/doc/emacs/package.texi    2014-02-12 01:20:34 +0000
+++ b/doc/emacs/package.texi    2014-06-03 04:45:56 +0000
@@ -167,6 +167,13 @@
 wish to use third party package archives---but do so at your own risk,
 and use only third parties that you think you can trust!
 
address@hidden package-pinned-packages
+  If you have more than one package archive enabled, and some of them
+offer different versions of the same package, you may find the option
address@hidden useful.  You can add package/archive
+pairs to this list, to ensure that the specified package is only ever
+downloaded from the specified archive.
+
   Once a package is downloaded and installed, it is @dfn{loaded} into
 the current Emacs session.  Loading a package is not quite the same as
 loading a Lisp library (@pxref{Lisp Libraries}); its effect varies

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-06-03 04:41:20 +0000
+++ b/etc/NEWS  2014-06-03 04:45:56 +0000
@@ -816,6 +816,7 @@
 
 ** Package
 
++++
 *** New option `package-pinned-packages'.  This is useful if you have multiple
 archives enabled, with more than one offering a package that you want.