(Displaying Buffers): For switch-to-buffer mention that

it may fall back on pop-to-buffer.
(Window Point): Add entry for window-point-insertion-type.

2 files changed, 19 insertions, 3 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a5f37f98db9..896be8d4a5e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,13 +2,17 @@
 
         * windows.texi (Windows): Update entries.
         (Basic Windows): Remove listing of attributes.  Reword.
-        (Splitting Windows, Deleting Windows, Window Point): Reword.
+        (Splitting Windows, Deleting Windows): Reword.
         (Selecting Windows, Cyclic Window Ordering): Reword with special
         emphasis on order of recently selected windows and buffer list.
-        (Buffers and Windows, Displaying Buffers, Choosing Window):
-        Reword with special emphasis on dedicated windows.
+        (Buffers and Windows, Choosing Window): Reword with special
+        emphasis on dedicated windows.
+        (Displaying Buffers): Reword.  For switch-to-buffer mention that
+        it may fall back on pop-to-buffer.  For other-window try to
+        explain how it treats the cyclic ordering of windows.
         (Dedicated Windows): New node and section discussing dedicated
         windows and associated functions.
+        (Window Point): Add entry for window-point-insertion-type.  Reword.
         (Window Start and End): Rename node and section title.  Reword.
         (Textual Scrolling, Vertical Scrolling, Horizontal Scrolling):
         Minor rewording.
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 77f1f30fc02..6243babaa53 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -790,6 +790,12 @@ that does not identify an existing buffer, then a new buffer by that
 name is created.  The major mode for the new buffer is set according to
 the variable @code{default-major-mode}, @xref{Auto Major Mode}.
 
+When @code{enable-recursive-minibuffers} is non-@code{nil} and the
+selected window is either the minibuffer window or is dedicated to its
+buffer (@pxref{Dedicated Windows}), @code{switch-to-buffer} calls
+@code{pop-to-buffer} (see below) to display the buffer in some other
+window.
+
 Normally the specified buffer is put at the front of the buffer list
 (both the selected frame's buffer list and the frame-independent buffer
 list).  This affects the operation of @code{other-buffer}.  However, if
@@ -1279,6 +1285,12 @@ If @var{window} is selected, and its buffer is current,
 this simply does @code{goto-char}.
 @end defun
 
+@defvar window-point-insertion-type
+This variable specifies the marker insertion type (@pxref{Marker
+Insertion Types}) of @code{window-point}.  The default is @code{nil},
+so @code{window-point} will stay behind text inserted there.
+@end defvar
+
 @node Window Start and End
 @section The Window Start and End Positions
 @cindex window start position