Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / lispref / windows.texi

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 589f4623b69f6f67baa37a3bc0dd58cd5202e9a8..b3c143496dd68da279779619dfc1dd336c029a85 100644 (file)
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1084,7 +1084,7 @@ including the space earlier stolen from @var{W3}.
 @end smallexample
 
 @noindent
-This can be counterintutive, in particular if @var{W4} were used for
+This can be counterintuitive, in particular if @var{W4} were used for
 displaying a buffer only temporarily (@pxref{Temporary Displays}), and
 you want to continue working with the initial layout.
 
@@ -2443,7 +2443,7 @@ buffer previously shown no longer exists, this function calls
 @code{switch-to-prev-buffer} (@pxref{Window History}) to show some other
 buffer instead.
 
-The optional argument @var{bury-or-kill} specifes how to deal with
+The optional argument @var{bury-or-kill} specifies how to deal with
 @var{window}'s buffer.  The following values are handled:
 
 @table @code