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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 581-597)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 133-141)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

2 files changed, 13 insertions, 8 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index c07a955b1c9..897d4a0aec2 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-08  Kim F. Storm  <storm@cua.dk>
+
+        * windows.texi (Window Tree): Rename window-split-tree to window-tree.
+        Rename manual section accordingly.
+
 2005-10-04  Kim F. Storm  <storm@cua.dk>
 
         * windows.texi (Window Split Tree): New section describing
diff --git a/lispref/windows.texi b/lispref/windows.texi
index c806577c4b8..0ca7d69c9f9 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -30,7 +30,7 @@ displayed in windows.
 * Size of Window::          Accessing the size of a window.
 * Resizing Windows::        Changing the size of a window.
 * Coordinates and Windows:: Converting coordinates to windows.
-* Window Split Tree::       The layout and sizes of all windows in a frame.
+* Window Tree::             The layout and sizes of all windows in a frame.
 * Window Configurations::   Saving and restoring the state of the screen.
 * Window Hooks::            Hooks for scrolling, window size changes,
                               redisplay going past a certain point,
@@ -2168,19 +2168,19 @@ The function @code{coordinates-in-window-p} does not require a frame as
 argument because it always uses the frame that @var{window} is on.
 @end defun
 
-@node Window Split Tree
-@section The Window Split Tree
-@cindex window split tree
+@node Window Tree
+@section The Window Tree
+@cindex window tree
 
-  A @dfn{window split tree} specifies the layout, size, and relationship
+  A @dfn{window tree} specifies the layout, size, and relationship
 between all windows in one frame.
 
-@defun split-window-tree &optional frame
-This function returns the window split tree for frame @var{frame}.
+@defun window-tree &optional frame
+This function returns the window tree for frame @var{frame}.
 If @var{frame} is omitted, the selected frame is used.
 
 The return value is a list of the form @code{(@var{root} @var{mini})},
-where @var{root} represents the window split tree of the frame's
+where @var{root} represents the window tree of the frame's
 root window, and @var{mini} is the frame's minibuffer window.
 
 If the root window is not split, @var{root} is the root window itself.