upstream

6 files changed, 12 insertions, 21 deletions

diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index 9df86fd9275..87f9dddbba8 100644
--- a/doc/emacs/emacsver.texi
+++ b/doc/emacs/emacsver.texi
@@ -1,4 +1,4 @@
 @c It would be nicer to generate this using configure and @version@.
 @c However, that would mean emacsver.texi would always be newer
 @c then the info files in release tarfiles.
-@set EMACSVER 24.0.90
+@set EMACSVER 24.0.91
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index acc334ea000..1e86e07998c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-30  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Windows and Frames): Remove "iso-" infix from
+        documentation of window-iso-combined-p.
+
 2011-10-26  Chong Yidong  <cyd@gnu.org>
 
         * modes.texi (Running Hooks): Document with-wrapper-hook.
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 9dd03027ee2..37679aa4a0b 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -309,7 +309,7 @@ W4)} is @code{W6}.
 The following function is useful to determine whether a window is part
 of a vertical or horizontal combination.
 
-@defun window-iso-combined-p &optional window horizontal
+@defun window-combined-p &optional window horizontal
 This function returns non-@code{nil} if and only if @var{window} is
 vertically combined.  The argument @var{window} can specify any window
 and defaults to the selected one.  The actual return value is the first
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 60dfe3806c0..91ef4189b79 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.90"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.91"
 .
 .
 .SH NAME
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 10a0d5e7a91..ddad0b45106 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Other Gnus Versions): Remove.
+
 2011-10-28  Alan Mackenzie  <acm@muc.de>
 
         * cc-mode.texi (Indentation Commands): Mention "macros with semicolons".
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index ad1d45cca1a..70ed62ddfa9 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -891,7 +891,6 @@ Appendices
 History
 
 * Gnus Versions::               What Gnus versions have been released.
-* Other Gnus Versions::         Other Gnus versions that also have been released.
 * Why?::                        What's the point of Gnus?
 * Compatibility::               Just how compatible is Gnus with @sc{gnus}?
 * Conformity::                  Gnus tries to conform to all standards.
@@ -26382,7 +26381,6 @@ renamed it back again to ``Gnus''.  But in mixed case.  ``Gnus'' vs.
 
 @menu
 * Gnus Versions::               What Gnus versions have been released.
-* Other Gnus Versions::         Other Gnus versions that also have been released.
 * Why?::                        What's the point of Gnus?
 * Compatibility::               Just how compatible is Gnus with @sc{gnus}?
 * Conformity::                  Gnus tries to conform to all standards.
@@ -26438,22 +26436,6 @@ you do, don't run.  Walk away, calmly, until you're out of its reach.
 Find a proper released version of Gnus and snuggle up to that instead.
 
 
-@node Other Gnus Versions
-@subsection Other Gnus Versions
-@cindex Semi-gnus
-
-In addition to the versions of Gnus which have had their releases
-coordinated by Lars, one major development has been Semi-gnus from
-Japan.  It's based on a library called @acronym{SEMI}, which provides
-@acronym{MIME} capabilities.
-
-These Gnusae are based mainly on Gnus 5.6 and Pterodactyl Gnus.
-Collectively, they are called ``Semi-gnus'', and different strains are
-called T-gnus, ET-gnus, Nana-gnus and Chaos.  These provide powerful
-@acronym{MIME} and multilingualization things, especially important for
-Japanese users.
-
-
 @node Why?
 @subsection Why?