Merge from trunk.

6 files changed, 24 insertions, 45 deletions

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 1cfb3d9ffe9..c2242c444dd 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -99,7 +99,7 @@ ERC distribution).
 
 @item
 Scott Bender, Michael Brouwer, Christophe de Dinechin, Carl Edman,
-Christian Limpach and Adrian Robert developed and maintained the 
+Christian Limpach and Adrian Robert developed and maintained the
 NeXTstep port of Emacs.
 
 @item
@@ -576,7 +576,7 @@ Emacs.
 
 @item
 Karel Klí@v{c} contributed SELinux support, for preserving the
-Security-Enchanced Linux context of files on backup and copy.
+Security-Enhanced Linux context of files on backup and copy.
 
 @item
 Shuhei Kobayashi wrote @file{hex-util.el}, for operating on hexadecimal
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 2abed9f870c..a8e1439d242 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Splitting Windows, Deleting Windows): Remove
+        references to splits status of windows.
+
 2011-11-10  Glenn Morris  <rgm@gnu.org>
 
         * buffers.texi (Read Only Buffers): Expand a bit on why
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 71b612c527d..86ecfd122ef 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2827,7 +2827,7 @@ If @code{file-remote-p} returns the same identifier for two different
 filenames, that means they are stored on the same file system and can
 be accessed locally with respect to each other.  This means, for
 example, that it is possible to start a remote process accessing both
-files at the same time.  Implementors of file handlers need to ensure
+files at the same time.  Implementers of file handlers need to ensure
 this principle is valid.
 
 @var{identification} specifies which part of the identifier shall be
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index cf5cfedf5af..b6bacc27684 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -855,42 +855,13 @@ resize all windows that are part of the same combination as
 this may allow @code{split-window} to succeed even if @var{window} is
 a fixed-size window or too small to ordinarily split.
 
-In any case, the value of this variable is assigned to the splits status
-of the new window and, provided old and new window form a new
-combination, of the old window as well.  The splits status of a window
-can be retrieved by invoking the function @code{window-splits} and
-altered by the function @code{set-window-splits} described next.
-
-If @code{window-nest} (see below) is non-@code{nil}, the space for the
-new window is exclusively taken from the old window, but the splits
-status of the involved windows is nevertheless set as described here.
-@end defopt
-
-@defun window-splits &optional window
-This function returns the splits status of @var{window}.  The argument
-@var{window} can be any window and defaults to the selected one.
-
-@cindex splits status
-The @dfn{splits status} of a window specifies how resizing and deleting
-that window may affect the size of other windows in the same window
-combination.  More precisely, if @var{window}'s splits status is
-@code{nil} and @var{window} is resized, the corresponding space is
-preferably taken from (or given to) @var{window}'s right sibling.  When
-@var{window} is deleted, its space is given to its left sibling.  If
-@var{window}'s splits status is non-@code{nil}, resizing and deleting
-@var{window} may resize @emph{all} windows in @var{window}'s
-combination.
-
-The splits status is initially set by @code{split-window}
-from the current value of the variable @code{window-splits} (see above)
-and can be reset by the function @code{set-window-splits} (see below).
-@end defun
+Also if this variable is non-@code{nil}, subsequent resizing and
+deleting @var{window} will usually affect @emph{all} windows in
+@var{window}'s combination.
 
-@defun set-window-splits window &optional status
-This function sets the splits status (see above) of @var{window} to
-@var{status}.  The argument @var{window} can be any window and defaults
-to the selected one.  The return value is @var{status}.
-@end defun
+The setting of this variable has no effect if @code{window-nest} (see
+below) is non-@code{nil}.
+@end defopt
 
 To illustrate the use of @code{window-splits} consider the following
 window configuration:
@@ -1208,12 +1179,11 @@ window parameters.  If the @code{delete-window} parameter specifies a
 function, that function is called with @var{window} as its sole
 argument.
 
-If the splits status of @var{window} (@pxref{Splitting Windows}) is
-@code{nil}, the space @var{window} took up is given to its left sibling
-if such a window exists and to its right sibling otherwise.  If the
-splits status of @var{window} is non-@code{nil}, its space is
-proportionally distributed among the remaining windows in the same
-combination.
+If @code{window-splits} (@pxref{Splitting Windows}) is @code{nil}, the
+space @var{window} took up is given to its left sibling if such a window
+exists and to its right sibling otherwise.  If @code{window-splits} is
+non-@code{nil}, the space of @var{window} is proportionally distributed
+among the remaining windows in the same combination.
 @end deffn
 
 @deffn Command delete-other-windows &optional window
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 029406e2d30..af8d38a077f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic.texi (Tag handling): Fix typo.
+
 2011-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Other Gnus Versions): Remove.
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index f3f11d29f17..f6cf7a07ae8 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -306,7 +306,7 @@ Files associated with tags.  Goto-tag, file for include, and file for
 a prototype.
 
 @item semantic-tag-ls.el
-Language dependant features of a tag, such as parent calculation, slot
+Language dependent features of a tag, such as parent calculation, slot
 protection, and other states like abstract, virtual, static, and leaf.
 
 @item semantic-dep.el