Merge from mainline.

3 files changed, 32 insertions, 10 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index bcd3fe78ae8..4cae3d0a478 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,13 @@
+2013-06-10  Aidan Gauland  <aidalgol@amuri.net>
+
+        * eshell.texi (Input/Output): Expand to cover new visual-command
+        options, eshell-visual-subcommands and eshell-visual-options.
+        Divide into separate Visual Commands and Redirection sections.
+
+2013-06-10  Glenn Morris  <rgm@gnu.org>
+
+        * epa.texi (Cryptographic operations on files): Update epa-decrypt-file.
+
 2013-06-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Article Date):
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index e21851ef37a..adc63cc0bdb 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -240,8 +240,9 @@ you answered yes, it will let you select the signing keys.
 @node Cryptographic operations on files
 @section Cryptographic operations on files
 
-@deffn Command epa-decrypt-file file
-Decrypt @var{file}.
+@deffn Command epa-decrypt-file file &optional output
+Decrypt @var{file}.  If you do not specify the name @var{output} to
+use for the decrypted file, this function prompts for the value to use.
 @end deffn
 
 @deffn Command epa-verify-file file
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index dca95da2d10..0da422fe14f 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -701,14 +701,25 @@ groups ``eshell-glob'' and ``eshell-pred''.
 @node Input/Output
 @chapter Input/Output
 Since Eshell does not communicate with a terminal like most command
-shells, IO is a little different.  If you try to run programs from
-within Eshell that are not line-oriented, such as programs that use
-ncurses, you will just get garbage output, since the Eshell buffer is
-not a terminal emulator.  Eshell solves this problem by running
-specified commands in Emacs's terminal emulator; to let Eshell know
-which commands need to be run in a terminal, add them to the list
-@var{eshell-visual-commands}.
-
+shells, IO is a little different.
+
+@section Visual Commands
+If you try to run programs from within Eshell that are not
+line-oriented, such as programs that use ncurses, you will just get
+garbage output, since the Eshell buffer is not a terminal emulator.
+Eshell solves this problem by running such programs in Emacs's
+terminal emulator.
+
+Programs that need a terminal to display output properly are referred
+to in this manual as ``visual commands,'' because they are not simply
+line-oriented.  You must tell Eshell which commands are visual, by
+adding them to @var{eshell-visual-commands}; for commands that are
+visual for only certain @emph{sub}-commands -- e.g. @samp{git log} but
+not @samp{git status} -- use @var{eshell-visual-subcommands}; and for
+commands that are visual only when passed certain options, use
+@var{eshell-visual-options}.
+
+@section Redirection
 Redirection is mostly the same in Eshell as it is in other command
 shells.  The output redirection operators @code{>} and @code{>>} as
 well as pipes are supported, but there is not yet any support for