Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 797, 800, 802)

   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 44-45, 48, 50)

   - Merge from gnus--rel--5.10
   - Gnus ChangeLog tweaks

 * gnus--rel--5.10  (patch 233-234)

   - Merge from emacs--devo--0
   - Update from CVS

2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus-start.el (gnus-level-unsubscribed): Improve doc string.

2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>

   * texi/gnus-faq.texi ([3.2]): Fix locating of environment variables in the
   Control Panel.

   * texi/gnus.texi (Misc Article): Add index entry for
   gnus-single-article-buffer.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-356

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14e534f..285d632 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,6 +15,10 @@
        * gnus-sum.el (gnus-summary-catchup): Don't recognize cached articles
        as unfetched articles.
 
+2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-start.el (gnus-level-unsubscribed): Improve doc string.
+
 2007-07-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnagent.el (nnagent-request-set-mark): Also set the marks for the

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index cae54b5..260c817 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -178,8 +178,13 @@ properly with all servers."
 
 (defconst gnus-level-unsubscribed 7
   "Groups with levels less than or equal to this variable are unsubscribed.
-Groups with levels less than `gnus-level-subscribed', which should be
-less than this variable, are subscribed.")
+
+Groups with levels less than `gnus-level-subscribed', which
+should be less than this variable, are subscribed.  Groups with
+levels from `gnus-level-subscribed' (exclusive) upto this
+variable (inclusive) are unsubscribed.  See also
+`gnus-level-zombie', `gnus-level-killed' and the Info node `Group
+Levels' for details.")
 
 (defconst gnus-level-zombie 8
   "Groups with this level are zombie groups.")

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 797dafe..e457d13 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -11,6 +11,14 @@
 
        * gnus-coding.texi (Gnus Maintainance Guide): Update for Emacs 22.1.
 
+2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-faq.texi ([3.2]): Fix locating of environment variables in the
+       Control Panel.
+
+       * gnus.texi (Misc Article): Add index entry for
+       gnus-single-article-buffer.
+
 2007-06-27  Andreas Seltenreich  <andreas@gate450.dyndns.org>
 
        * gnus.texi (Starting Up): Fix typo.

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index ef91b91..19384f9 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -427,12 +427,11 @@ SET HOME=C:\myhome
 @end example
 @noindent
 
-in your autoexec.bat and reboot.  Under NT, 2000 and XP,
-hit Winkey+Pause/Break to enter system options (if it
-doesn't work, go to Control Panel -> System). There you'll
-find the possibility to set environment variables, create
-a new one with name HOME and value C:\myhome, a reboot is
-not necessary.
+in your autoexec.bat and reboot.  Under NT, 2000 and XP, hit
+Winkey+Pause/Break to enter system options (if it doesn't work, go to
+Control Panel -> System -> Advanced). There you'll find the possibility
+to set environment variables.  Create a new one with name HOME and value
+C:\myhome.  Rebooting is not necessary.
 
 Now to create ~/.gnus.el, say
 @samp{C-x C-f ~/.gnus.el RET C-x C-s}.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 3730fcc..eec748a 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -11747,6 +11747,7 @@ region.
 
 @item gnus-single-article-buffer
 @vindex gnus-single-article-buffer
+@cindex article buffers, several
 If non-@code{nil}, use the same article buffer for all the groups.
 (This is the default.)  If @code{nil}, each group will have its own
 article buffer.