Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-11

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-69
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-71
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72
   src/dispextern.h (xassert): Enable unconditionally.

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-73
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13
   Update from CVS

1 files changed, 1 insertions, 1 deletions

diff --git a/man/basic.texi b/man/basic.texi
index 29bf6d4e207..1598de2632a 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -400,7 +400,7 @@ value of @code{undo-strong-limit} is 30000.
   Regardless of the values of those variables, the most recent change
 is never discarded unless it gets bigger than @code{undo-outer-limit}
 (normally 3,000,000).  At that point, Emacs discards the undo data and
-warns you about it.  This is the only situation in which you can not
+warns you about it.  This is the only situation in which you cannot
 undo the last command.  If this happens, you can increase the value of
 @code{undo-outer-limit} to make it even less likely to happen in the
 future.  But if you didn't expect the command to create such large