Merge from trunk.

2 files changed, 11 insertions, 2 deletions

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index d5968a5f7cd..d2ec2154024 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1374,7 +1374,7 @@ Georges Brun-Cottan, Joe Buehler, Scott Byer, Włodek Bzyl,
 Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob
 Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James
 Clark, Mike Clarkson, Glynn Clements, Andrew Cohen, Daniel Colascione,
-Edward O'Connor, Christoph Conrad, Ludovic Courtès, Andrew Csillag,
+Christoph Conrad, Ludovic Courtès, Andrew Csillag,
 Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki
 Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte, Gary Delp, Nachum
 Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eri
@@ -1421,7 +1421,7 @@ Monnier, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris,
 Don Morrison, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum,
 Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen,
 Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Niksic, Jeff Norden,
-Andrew Norman, Kentaro Ohkouchi, Christian Ohler,
+Andrew Norman, Edward O'Connor, Kentaro Ohkouchi, Christian Ohler,
 Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota,
 Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar,
 Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3e9bcaf1f3e..801cf5aee4c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-27  Aidan Gauland  <aidalgol@no8wireless.co.nz>
+
+        * eshell.texi: Updated manual to reflect changes.
+
 2013-03-18  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Filename Syntax): Host names are not allowed to be
@@ -2409,6 +2413,11 @@
         dired-add-entry, dired-initial-position, dired-clean-up-after-deletion,
         dired-read-shell-command, or dired-find-buffer-nocreate.
 
+2013-02-18  Aidan Gauland  <aidalgol@no8wireless.co.nz>
+
+        * eshell.texi: Added documentation for Eshell insert
+        output redirection operator, >>>.
+
 2011-02-18  Glenn Morris  <rgm@gnu.org>
 
         * dired-x.texi (Optional Installation File At Point): Simplify.