Merge from trunkpending

1 files changed, 5 insertions, 5 deletions

diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 74082bfd3b1..d322ca7c3e1 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -8,7 +8,7 @@
 @copying
 This manual is for Eshell, the Emacs shell.
 
-Copyright @copyright{} 1999-2011 Free Software Foundation, Inc.
+Copyright @copyright{} 1999-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -61,7 +61,7 @@ developing GNU and promoting software freedom.''
 @node Top, What is Eshell?, (dir), (dir)
 @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},
@@ -94,7 +94,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.
 
@@ -379,7 +379,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
 
@@ -608,7 +608,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