upstream

4 files changed, 15 insertions, 1 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5fba9eda3b0..d87493d57b3 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * package.texi (Package Menu): Add package-menu-mark-upgrades.
+
 2011-09-12  Eric Hanchrow  <eric.hanchrow@gmail.com>
 
         * frames.texi (Frame Commands): Note that delete-other-frames only
diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index 739a8ce6c65..b342cbbf18c 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -107,6 +107,12 @@ entails.
 Remove any installation or deletion mark previously added to the
 current line by an @kbd{i} or @kbd{d} command.
 
+@item U
+Mark all package with a newer available version for ``upgrading''
+(@code{package-menu-mark-upgrades}).  This places an installation mark
+on the new available versions, and a deletion mark on the old
+installed versions.
+
 @item x
 Download and install all packages marked with @kbd{i}, and their
 dependencies; also, delete all packages marked with @kbd{d}
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4873680d0a1..71dc8a8ff89 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-14  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
+
+        * lists.texi (Sets And Lists): Fix typo.  (Bug#9393)
+
 2011-09-11  Juanma Barranquero  <lekktu@gmail.com>
 
         * processes.texi (Network Servers): Clarify what the process
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi
index 7a530b602e0..056c924e72c 100644
--- a/doc/lispref/lists.texi
+++ b/doc/lispref/lists.texi
@@ -1454,7 +1454,7 @@ For example:
 l
      @result{} ((2) (1))
 ;; @r{If you want to change @code{l} reliably,}
-;; @r{write @code{(setq l (delete elt l))}.}
+;; @r{write @code{(setq l (delete '(2) l))}.}
 @end group
 @group
 (setq l '((2) (1) (2)))