Merge from emacs-24; up to 2012-12-07T08:13:49Z!dmantipov@yandex.ru

[gnu-emacs] / doc / misc / eshell.texi

diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 6ec431dccfd4bc1c8d3ffe19a06dc547377ce44a..504940c5c6b8504c7703ac68a6667bcf1a87c22a 100644 (file)
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -8,8 +8,7 @@
 @copying
 This manual is for Eshell, the Emacs shell.
 
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 1999--2013 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -20,12 +19,11 @@ and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Eshell: (eshell).             A command shell implemented in Emacs Lisp.
 @end direntry
@@ -34,9 +32,9 @@ developing GNU and promoting software freedom.''
 @sp 4
 @c The title is printed in a large font.
 @center @titlefont{User's Guide}
-@sp
+@sp 1
 @center @titlefont{to}
-@sp
+@sp 1
 @center @titlefont{Eshell: The Emacs Shell}
 @ignore
 @sp 2
@@ -59,10 +57,10 @@ developing GNU and promoting software freedom.''
 @c ================================================================
 
 @ifnottex
-@node Top, What is Eshell?, (dir), (dir)
+@node Top
 @top Eshell
 
-Eshell is a shell-like command interpretor
+Eshell is a shell-like command interpreter
 implemented in Emacs Lisp.  It invokes no external processes except for
 those requested by the user.  It is intended to be a functional
 replacement for command shells such as @command{bash}, @command{zsh},
@@ -95,7 +93,7 @@ handling the sort of tasks accomplished by those tools.
 @cindex Eshell, what it is
 
 Eshell is a @dfn{command shell} written in Emacs Lisp.  Everything it
-does, it uses Emacs' facilities to do.  This means that Eshell is as
+does, it uses Emacs's facilities to do.  This means that Eshell is as
 portable as Emacs itself.  It also means that cooperation with Lisp code
 is natural and seamless.
 
@@ -380,7 +378,7 @@ eshell/sudo is a compiled Lisp function in `em-unix.el'
 sudo is an alias, defined as "*sudo $*"
 @end example
 
-Some of the built-in commands have a special behaviour in Eshell:
+Some of the built-in commands have a special behavior in Eshell:
 
 @table @code
 
@@ -609,7 +607,7 @@ scrolls back.
 
 @item Using C-p and C-n with rebind gets into a locked state
 
-This happened a few times in Emacs 21, but has been unreproducible
+This happened a few times in Emacs 21, but has been irreproducible
 since.
 
 @item If an interactive process is currently running, @kbd{M-!} doesn't work
@@ -784,7 +782,7 @@ A special associate array, which can take references of the form
 
 @item Eshell scripts can't execute in the background
 
-@item Support zsh's ``Parameter Expansion'' syntax, i.e. @samp{$@{@var{name}:-@var{val}@}}
+@item Support zsh's ``Parameter Expansion'' syntax, i.e., @samp{$@{@var{name}:-@var{val}@}}
 
 @item Write an @command{info} alias that can take arguments
 
@@ -815,7 +813,7 @@ way@dots{}).  If input redirection is added, also update the
 With the handling of @emph{word} specified by an
 @code{eshell-special-alist}.
 
-@item In @code{eshell-veal-using-options}, allow a @code{:complete} tag
+@item In @code{eshell-eval-using-options}, allow a @code{:complete} tag
 
 It would be used to provide completion rules for that command.  Then the
 macro will automagically define the completion function.
@@ -870,7 +868,7 @@ It would call subcommands with @option{--help}, or @option{-h} or
 
 @item Implement @command{stty} in Lisp
 
-@item Support @command{rc}'s matching operator, e.g. @samp{~ (@var{list}) @var{regexp}}
+@item Support @command{rc}'s matching operator, e.g., @samp{~ (@var{list}) @var{regexp}}
 
 @item Implement @command{bg} and @command{fg} as editors of @code{eshell-process-list}
 
@@ -1015,7 +1013,3 @@ Since it keeps the cursor up where the command was invoked.
 
 @printindex ky
 @bye
-
-@ignore
-   arch-tag: 776409ba-cb15-42b9-b2b6-d2bdc7ebad01
-@end ignore