summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2008-01-21 22:32:44 +0000
committerJuanma Barranquero <lekktu@gmail.com>2008-01-21 22:32:44 +0000
commiteb9d158f69e56b4bf23db1f627c6cc1c53953634 (patch)
tree36e8b1025f6a143e3066acc99960ab8c8b170980
parentce4059eea09eec6b083d6546ec8ad177be2c4c4d (diff)
downloademacs-eb9d158f69e56b4bf23db1f627c6cc1c53953634.tar.gz
(Exiting): Fix typo. Reported by D. E. Evans <sinuhe@gnu.org>.
-rw-r--r--man/ChangeLog7
-rw-r--r--man/entering.texi2
2 files changed, 7 insertions, 2 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index c8dd0cf1fda..444ca5c004f 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-21 Juanma Barranquero <lekktu@gmail.com>
+
+ * entering.texi (Exiting): Fix typo.
+ Reported by D. E. Evans <sinuhe@gnu.org>.
+
2007-12-18 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (Group Parameters): Reorder the text and add a note about
@@ -21,7 +26,7 @@
* search.texi (Query Replace): Make exp of query-replace more
self-contained, and clarify.
-
+
* cc-mode.texi (Getting Started): Change @ref to @pxref.
2007-12-14 Sven Joachim <svenjoac@gmx.de>
diff --git a/man/entering.texi b/man/entering.texi
index 3c79a69c084..8a29fd632cf 100644
--- a/man/entering.texi
+++ b/man/entering.texi
@@ -122,7 +122,7 @@ systems, you can only get back to the shell from which Emacs was run
@vindex cannot-suspend
Suspending can fail if you run Emacs under a shell that doesn't
-support suspendion of its subjobs, even if the system itself does
+support suspension of its subjobs, even if the system itself does
support it. In such a case, you can set the variable
@code{cannot-suspend} to a non-@code{nil} value to force @kbd{C-z} to
start an inferior shell.