aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/eshell.texi
diff options
context:
space:
mode:
authorGlenn Morris2014-05-07 20:41:21 -0700
committerGlenn Morris2014-05-07 20:41:21 -0700
commitfb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b (patch)
treef106c360c3aef01bcacdc77b66b7c5b20261502e /doc/misc/eshell.texi
parent1ba38c429fa6ce17568771ef51c8e53b1a72bb94 (diff)
parent606695a67801acfd1792110e4ea3228b50b0117d (diff)
downloademacs-fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b.tar.gz
emacs-fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b.zip
Merge from emacs-24; up to 2014-05-08T03:34:20Z!rgm@gnu.org
Diffstat (limited to 'doc/misc/eshell.texi')
-rw-r--r--doc/misc/eshell.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index d52f3d92747..67aa4799f75 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -16,7 +16,7 @@ Copyright @copyright{} 1999--2014 Free Software Foundation, Inc.
16Permission is granted to copy, distribute and/or modify this document 16Permission is granted to copy, distribute and/or modify this document
17under the terms of the GNU Free Documentation License, Version 1.3 or 17under the terms of the GNU Free Documentation License, Version 1.3 or
18any later version published by the Free Software Foundation; with no 18any later version published by the Free Software Foundation; with no
19Invariant Sections, with the Front-Cover texts being ``A GNU Manual'', 19Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
20and with the Back-Cover Texts as in (a) below. A copy of the license 20and with the Back-Cover Texts as in (a) below. A copy of the license
21is included in the section entitled ``GNU Free Documentation License''. 21is included in the section entitled ``GNU Free Documentation License''.
22 22