Synch with Oort Gnus.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 810151f..f96bb77 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-06  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.texi (Gnus Unplugged): Use (setq gnus-agent t).
+       (Example Setup): Ditto.
+       (Category Syntax): Require gnus-agent.
+
 2002-02-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Posting Styles): Addition.
@@ -28,7 +34,6 @@
        * emacs-mime.texi (Customization): Move emacs-w3m stuff backward;
        added documentation for `mm-inline-text-html-with-w3m-keymap'.
 
->>>>>>> 6.280
 2002-01-28  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus.texi (Agent Expiry): Addition.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 6487070..2bb7ce7 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -15517,11 +15517,11 @@ Gnus \e$B$r\e(B ``\e$B%*%U%i%$%s\e(B'' \e$B$N%K%e!<%9%j!<%@!<$H$7$F;H$&$N$O6K$a$F4JC1
 gnus \e$B$r@_Dj$7$^$9!#$^$:$d$C$F$*$$$G!#KM$O$3$3$GBT$C$F$k$+$i!#\e(B
 
 @item
-\e$B$=$7$?$i!"0J2<$NKbK!$N<vJ8$r$"$J$?$N\e(B @file{.gnus.el} \e$B%U%!%$%k$N:G8e$K=q\e(B
-\e$B$$$F$/$@$5$$!#\e(B
+\e$B$=$7$?$i!"0J2<$NKbK!$N<vJ8$r$"$J$?$N\e(B @file{.gnus.el} \e$B%U%!%$%k$K=q$$$F$/\e(B
+\e$B$@$5$$!#\e(B
 
 @lisp
-(gnus-agentize)
+(setq gnus-agent t)
 @end lisp
 @end itemize
 
@@ -15750,10 +15750,10 @@ gnus \e$B%(!<%8%'%s%H$,$=$N5-;v$r\e(B SPAM \e$B$@$H8+Pv$7$?$i??!#$3$NH/8+E*<jK!$O!"
 
 \e$B$b$7$/$O!"\e(B@file{~/.gnus.el} \e$B$d2?$+B>$N$b$N$G$b!"4{Dj\e(B
 \e$B$N\e(B @code{gnus-category-predicate-list} \e$B$K<+J,$N=R8l$rDI2C$9$k$3$H$b$G$-\e(B
-\e$B$^$9!#\e(B(\e$BCm0U\e(B: \e$B$3$l$O!"\e(B@code{gnus-agent} \e$B$G\e(B @code{(gnus-agentize)} \e$B$,FI$_\e(B
-\e$B9~$^$l$?8e$G$"$kI,MW$,$"$k$G$7$g$&\e(B)
+\e$B$^$9!#\e(B
 
 @lisp
+(require 'gnus-agent)
 (setq gnus-category-predicate-alist
       (append gnus-category-predicate-alist
              '((old . my-article-old-p))))
@@ -16279,7 +16279,8 @@ plugged \e$B$N$H$-$K!"%m!<%+%k$K;}$C$F$$$k\e(B NOV \e$B$H5-;v$r;H$&$+$I$&$+$r@)8f$9
 (setq gnus-secondary-select-methods '((nnml "")))
 
 ;;; Gnus \e$B$r%*%U%i%$%s%K%e!<%9%j!<%@!<$K$9$k!#\e(B
-(gnus-agentize)
+;;; (gnus-agentize) ; \e$B5l<0$N@_Dj!#\e(B
+(setq gnus-agent t)
 @end lisp
 
 \e$B4pK\E*$K$O$3$l$@$1$GNI$$$O$:$G$9!#$3$l$r$"$J$?$N\e(B @file{~/.gnus.el} \e$B%U%!\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 0ae64f2..6d9c339 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -15875,11 +15875,11 @@ that has full connection to the net.  Go ahead.  I'll still be waiting
 here.
 
 @item
-Then, put the following magical incantation at the end of your
-@file{.gnus.el} file:
+Then, put the following magical incantation in your @file{.gnus.el}
+file:
 
 @lisp
-(gnus-agentize)
+(setq gnus-agent t)
 @end lisp
 @end itemize
 
@@ -16109,10 +16109,10 @@ with the predicate then defined as:
 
 or you could append your predicate to the predefined
 @code{gnus-category-predicate-alist} in your @file{~/.gnus.el} or
-wherever.  (Note: this would have to be at a point *after*
-@code{gnus-agent} has been loaded via @code{(gnus-agentize)})
+wherever. 
 
 @lisp
+(require 'gnus-agent)
 (setq  gnus-category-predicate-alist
   (append gnus-category-predicate-alist
         '((old . my-article-old-p))))
@@ -16668,7 +16668,8 @@ setup, you may be able to use something like the following as your
 (setq gnus-secondary-select-methods '((nnml "")))
 
 ;;; Make Gnus into an offline newsreader.
-(gnus-agentize)
+;;; (gnus-agentize) ; The obsolete setting.
+(setq gnus-agent t)
 @end lisp
 
 That should be it, basically.  Put that in your @file{~/.gnus.el} file,