* emacs/package.texi (Package Installation): Mention package-pinned-packages.

* etc/NEWS: Related markup.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9a332b260d4769730bbe975f4a425d44fdd87f55..27168b0002149228ddd4d4eae70e8fd862b23eb7 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-03  Glenn Morris  <rgm@gnu.org>
+
+       * package.texi (Package Installation): Mention package-pinned-packages.
+
 2014-06-02  Glenn Morris  <rgm@gnu.org>
 
        * misc.texi [iftex]: Update chapter summary.

diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index dee1210086ce41c99c1e71c02b3dc321707b9e0a..98e3c8ac7062ec8122750f0bd61e7814c870ae47 100644 (file)
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -167,6 +167,13 @@ directory name of the package archive.  You can alter this list if you
 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!
 
+@vindex 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
+@code{package-pinned-packages} 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

diff --git a/etc/NEWS b/etc/NEWS
index 44bcb22e85e37cac293207f1d4fe3edaa5a48f0c..bb9784718fcf8d3c577c740c1086f9e483d4da47 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -816,6 +816,7 @@ Use `electric-indent-mode' instead.
 
 ** 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.