Synch to Gnus 200307221351.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index f18b077..b2c0235 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-22  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Top): Menu fixes and additions.
+
 2003-07-19  Jesper Harder  <harder@ifa.au.dk>
 
        * emacs-mime.texi (Encoding Customization): Fix.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index e391771..d792bf6 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -626,9 +626,6 @@ Marking Articles
 * Unread Articles::             \e$BL$FI5-;v$X$N0u\e(B
 * Read Articles::               \e$B4{FI5-;v$X$N0u\e(B
 * Other Marks::                 \e$B9XFIEY$K1F6A$7$J$$0u\e(B
-
-Marking Articles
-
 * Setting Marks::               \e$B0u$NIU$1J}$H>C$7J}\e(B
 * Generic Mark Commands::       \e$B0u$r$I$N$h$&$K%+%9%?%^%$%:$9$k$+\e(B
 * Setting Process Marks::       \e$B8e$N<B9T$N$?$a$N5-;v$N0u$NIU$1J}\e(B
@@ -908,9 +905,10 @@ Formatting Variables
 
 Image Enhancements
 
-* Picons::                      \e$B$"$J$?$,FI$s$G$$$k$b$N$N3($rI=<($9$kJ}K!\e(B
-* Smileys::                     \e$BI=<($5$l$k$Y$/@8$^$l$?9,$;$=$&$J4i$rI=<($9$kJ}K!\e(B
 * X-Face::                      \e$B%U%!%s%-!<$J$A$C$A$c$JGr9u$N3($rI=<($9$k\e(B
+* Face::                        \e$B$h$j%U%!%s%-!<$G$A$C$A$c$J%+%i!<$N3($rI=<($9$k\e(B
+* Smileys::                     \e$BI=<($5$l$k$Y$/@8$^$l$?9,$;$=$&$J4i$rI=<($9$kJ}K!\e(B
+* Picons::                      \e$B$"$J$?$,FI$s$G$$$k$b$N$N3($rI=<($9$kJ}K!\e(B
 * XVarious::                    \e$B$=$NB>$N\e(B XEmacs \e$B$G\e(B Gnus \e$B$JJQ?t\e(B
 
 Thwarting Email Spam
@@ -922,6 +920,26 @@ Thwarting Email Spam
 * Filtering Spam Using The Spam ELisp Package::
 * Filtering Spam Using Statistics with spam-stat::
 
+Filtering Spam Using The Spam ELisp Package
+
+* Blacklists and Whitelists::
+* BBDB Whitelists::
+* Gmane Spam Reporting::
+* Anti-spam Hashcash Payments::
+* Blackholes::
+* Regular Expressions Header Matching::
+* Bogofilter::
+* ifile spam filtering::
+* spam-stat spam filtering::
+* SpamOracle::
+* Extending the spam elisp package::
+
+Filtering Spam Using Statistics with spam-stat
+
+* Creating a spam-stat dictionary::
+* Splitting mail using spam-stat::
+* Low-level interface to the spam-stat dictionary::
+
 Appendices
 
 * XEmacs::                      XEmacs \e$B$G%$%s%9%H!<%k$9$k$?$a$NMW7o\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 8f99ceb..261150c 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -573,15 +573,9 @@ Marking Articles
 * Unread Articles::             Marks for unread articles.
 * Read Articles::               Marks for read articles.
 * Other Marks::                 Marks that do not affect readedness.
-* Setting Marks::
-* Generic Marking Commands::
-* Setting Process Marks::
-
-Marking Articles
-
-* Setting Marks::             How to set and remove marks.
-* Generic Marking Commands::  How to customize the marking.
-* Setting Process Marks::     How to mark articles for later processing.
+* Setting Marks::               How to set and remove marks.
+* Generic Marking Commands::    How to customize the marking.
+* Setting Process Marks::       How to mark articles for later processing.
 
 Threading
 
@@ -856,9 +850,10 @@ Formatting Variables
 
 Image Enhancements
 
-* Picons::                      How to display pictures of what you're reading.
-* Smileys::                     Show all those happy faces the way they were meant to be shown.
 * X-Face::                      Display a funky, teensy black-and-white image.
+* Face::                        Display a funkier, teensier colored image.
+* Smileys::                     Show all those happy faces the way they were meant to be shown.
+* Picons::                      How to display pictures of what you're reading.
 * XVarious::                    Other XEmacsy Gnusey variables.
 
 Thwarting Email Spam
@@ -870,6 +865,26 @@ Thwarting Email Spam
 * Filtering Spam Using The Spam ELisp Package::
 * Filtering Spam Using Statistics with spam-stat::
 
+Filtering Spam Using The Spam ELisp Package
+
+* Blacklists and Whitelists::
+* BBDB Whitelists::
+* Gmane Spam Reporting::
+* Anti-spam Hashcash Payments::
+* Blackholes::
+* Regular Expressions Header Matching::
+* Bogofilter::
+* ifile spam filtering::
+* spam-stat spam filtering::
+* SpamOracle::
+* Extending the spam elisp package::
+
+Filtering Spam Using Statistics with spam-stat
+
+* Creating a spam-stat dictionary::
+* Splitting mail using spam-stat::
+* Low-level interface to the spam-stat dictionary::
+
 Appendices
 
 * XEmacs::                      Requirements for installing under XEmacs.