Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/image.scm

2 files changed, 14 insertions, 14 deletions

diff --git a/doc/emacs.texi b/doc/emacs.texi
index 55feb1bf9f..7616c8f92d 100644
--- a/doc/emacs.texi
+++ b/doc/emacs.texi
@@ -163,11 +163,9 @@ Mark the current entry.
 @item M
 Mark all entries.
 @item u
-Unmark the current entry.
+Unmark the current entry (with prefix, unmark all entries).
 @item @key{DEL}
 Unmark backward.
-@item U
-Unmark all entries.
 @item S
 Sort entries by a specified column.
 @end table
@@ -179,12 +177,16 @@ A ``package-list'' buffer additionally provides the following bindings:
 Describe marked packages (display available information in a
 ``package-info'' buffer).
 @item i
-Mark a package for installation (with prefix, prompt for output(s) to
-install).
+Mark "out" of the current package for installation (with prefix, prompt
+for output(s) to install).
 @item d
-Mark a package for deletion.
+Mark all installed outputs of the current package for deletion (with
+prefix, prompt for output(s) to delete).
+@item U
+Mark all installed outputs of the current package for upgrading (with
+prefix, prompt for output(s) to upgrade).
 @item ^
-Mark a package for upgrading.
+Mark all obsolete packages for upgrading.
 @item x
 Execute actions on marked packages.
 @end table
diff --git a/doc/guix.texi b/doc/guix.texi
index e0251f5ffd..e3b0cf61f0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3616,16 +3616,14 @@ program to run in that initrd.
 
 @deffn {Monadic Procedure} expression->initrd @var{exp} @
        [#:guile %guile-static-stripped] [#:name "guile-initrd"] @
-       [#:modules '()] [#:to-copy '()] [#:linux #f] @
-       [#:linux-modules '()]
+       [#:modules '()]
 Return a derivation that builds a Linux initrd (a gzipped cpio archive)
 containing @var{guile} and that evaluates @var{exp}, a G-expression,
-upon booting.
+upon booting.  All the derivations referenced by @var{exp} are
+automatically copied to the initrd.
 
-@var{linux-modules} is a list of @file{.ko} file names to be copied from
-@var{linux} into the initrd.  @var{to-copy} is a list of additional
-derivations or packages to copy to the initrd.  @var{modules} is a list
-of Guile module names to be embedded in the initrd.
+@var{modules} is a list of Guile module names to be embedded in the
+initrd.
 @end deffn
 
 @node Invoking guix system