From: yamaoka <yamaoka>
Date: Tue, 22 Jul 2003 22:19:55 +0000 (+0000)
Subject: Synch to Gnus 200307221351.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f77cca00e9a21966a473a2d4f24f0c6b8a3e06df;p=elisp%2Fgnus.git-

Synch to Gnus 200307221351.
---

diff --git a/texi/ChangeLog b/texi/ChangeLog
index f18b077..b2c0235 100644
--- 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
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -626,9 +626,6 @@ Marking Articles
 * Unread Articles::             未読記事への印
 * Read Articles::               既読記事への印
 * Other Marks::                 購読度に影響しない印
-
-Marking Articles
-
 * Setting Marks::               印の付け方と消し方
 * Generic Mark Commands::       印をどのようにカスタマイズするか
 * Setting Process Marks::       後の実行のための記事の印の付け方
@@ -908,9 +905,10 @@ Formatting Variables
 
 Image Enhancements
 
-* Picons::                      あなたが読んでいるものの絵を表示する方法
-* Smileys::                     表示されるべく生まれた幸せそうな顔を表示する方法
 * X-Face::                      ファンキーなちっちゃな白黒の絵を表示する
+* Face::                        よりファンキーでちっちゃなカラーの絵を表示する
+* Smileys::                     表示されるべく生まれた幸せそうな顔を表示する方法
+* Picons::                      あなたが読んでいるものの絵を表示する方法
 * XVarious::                    その他の XEmacs で Gnus な変数
 
 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 でインストールするための要件
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 8f99ceb..261150c 100644
--- 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.