Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d70d66a..6854ab9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,13 @@
+2002-11-26  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnrss.el (nnrss-group-alist): Update links for Jabber.
+
 2002-11-26  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * gnus-sum.el (gnus-summary-insert-old-articles): Remove
        superfluous function call.
+       (gnus-summary-catchup-all, gnus-summary-catchup-all-and-exit):
+       Add warning to docstring.
 
 2002-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 8e9e86a..fd6065b 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9976,7 +9976,9 @@ If ALL is non-nil, also mark ticked and dormant articles as read."
   (gnus-summary-position-point))
 
 (defun gnus-summary-catchup-all (&optional quietly)
-  "Mark all articles in this newsgroup as read."
+  "Mark all articles in this newsgroup as read.
+This command is dangerous.  Normally, you want \\[gnus-summary-catchup]
+instead, which marks only unread articles as read."
   (interactive "P")
   (gnus-summary-catchup t quietly))
 
@@ -9993,7 +9995,9 @@ If QUIETLY is non-nil, no questions will be asked."
       (gnus-summary-exit))))
 
 (defun gnus-summary-catchup-all-and-exit (&optional quietly)
-  "Mark all articles in this newsgroup as read, and then exit."
+  "Mark all articles in this newsgroup as read, and then exit.
+This command is dangerous.  Normally, you want \\[gnus-summary-catchup-and-exit]
+instead, which marks only unread articles as read."
   (interactive "P")
   (gnus-summary-catchup-and-exit t quietly))
 

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 9581e0f..a2181cd 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -159,9 +159,10 @@
     ("Kuro5hin"
      "http://www.kuro5hin.org/backend.rdf"
      "Technology and culture, from the trenches.")
-    ("JabberCentral"
-     "http://www.jabbercentral.com/rss.php"
-     "News around the Jabber instant messaging system.")))
+    ("Jabber Software Foundation News"
+     "http://www.jabber.org/news/rss.xml"
+     "News and announcements from the Jabber Software Foundation.")
+    ))
 
 (defvar nnrss-use-local nil)