Synch to No Gnus 200603271702.

diff --git a/emacs-mime-ja.texi b/emacs-mime-ja.texi
index e7c3fef..3b1026b 100644 (file)
--- a/emacs-mime-ja.texi
+++ b/emacs-mime-ja.texi
@@ -12,8 +12,8 @@
 @copying
 \e$B$3$N%U%!%$%k$O\e(B Emacs MIME \e$B%$%s%?!<%U%'!<%9$N5!G=$rJ8=q2=$7$?$b$N$G$9!#\e(B
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-          Free Software Foundation, Inc.
+Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/gnus-faq-ja.texi b/gnus-faq-ja.texi
index 3b61c79..ec69e8b 100644 (file)
--- a/gnus-faq-ja.texi
+++ b/gnus-faq-ja.texi
@@ -1210,26 +1210,26 @@ Manual}) \e$B$r;2>H$7$F2<$5$$!#\e(B
 (setq
  nnmail-split-methods
  '(("duplicates" "^Gnus-Warning:.*duplicate")
-   ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.bla.*")
-   ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.bla.*")
-   ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.bla.*")
-   ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.bla.*")
+   ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.invalid.*")
+   ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.invalid.*")
+   ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.invalid.*")
+   ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.invalid.*")
    ("Hamster-src" "^\\(CC:\\|To:\\).*hamster-sourcen@@yahoogroups.\\(de\\|com\\).*")
-   ("Tagesschau" "^From: tagesschau <localpart@@www.tagesschau.bla>$")
-   ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.bla.*")
-   ("EK" "^From:.*\\(localpart@@privateprovider.bla\\|localpart@@workplace.bla\\).*")
+   ("Tagesschau" "^From: tagesschau <localpart@@www.tagesschau.invalid>$")
+   ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.invalid.*")
+   ("EK" "^From:.*\\(localpart@@privateprovider.invalid\\|localpart@@workplace.invalid\\).*")
    ("Spam" "^Content-Type:.*\\(ks_c_5601-1987\\|EUC-KR\\|big5\\|iso-2022-jp\\).*")
    ("Spam" "^Subject:.*\\(This really work\\|XINGA\\|ADV:\\|XXX\\|adult\\|sex\\).*")
    ("Spam" "^Subject:.*\\(\=\?ks_c_5601-1987\?\\|\=\?euc-kr\?\\|\=\?big5\?\\).*")
    ("Spam" "^X-Mailer:\\(.*BulkMailer.*\\|.*MIME::Lite.*\\|\\)")
    ("Spam" "^X-Mailer:\\(.*CyberCreek Avalanche\\|.*http\:\/\/GetResponse\.com\\)")
    ("Spam" "^From:.*\\(verizon\.net\\|prontomail\.com\\|money\\|ConsumerDirect\\).*")
-   ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.bla$")
+   ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.invalid$")
    ("Spam" "^Received: from link2buy.com")
-   ("Spam" "^CC: .*azzrael@@t-online.bla")
+   ("Spam" "^CC: .*azzrael@@t-online.invalid")
    ("Spam" "^X-Mailer-Version: 1.50 BETA")
-   ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.bla.*")
-   ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.bla\\|adress@@two.bla\\)")
+   ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*")
+   ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)")
    ("Spam" "")))
 @end lisp
 
@@ -1339,7 +1339,7 @@ From, Organization, Reply-To \e$B$J$I$N%X%C%@!<$r<+F0@8@.$7$?$j!"Dj7?$N=p\e(B
 (setq gnus-posting-styles
       '((".*"
          (name "Frank Schmitt")
-         (address "me@@there.bla")
+         (address "me@@there.invalid")
          (organization "Hamme net, kren mer och nimmi")
          (signature-file "~/.signature")
          ("X-SampleHeader" "foobar")
@@ -1389,21 +1389,21 @@ From, Organization, Reply-To \e$B$J$I$N%X%C%@!<$r<+F0@8@.$7$?$j!"Dj7?$N=p\e(B
 @lisp
 (setq
  gnus-posting-styles
- '((".*"  ;;default
+ '((".*" ;;default
     (name "Frank Schmitt")
     (organization "Hamme net, kren mer och nimmi")
     (signature-file "~/.signature"))
-   ((message-news-p)  ;;Usenet news?
-    (address "mySpamTrap@@Frank-Schmitt.bla")
-    ("Reply-To" "hereRealRepliesOnlyPlease@@Frank-Schmitt.bla"))
-   ((message-mail-p)  ;;mail?
-    (address "usedForMails@@Frank-Schmitt.bla"))
+   ((message-news-p) ;;Usenet news?
+    (address "mySpamTrap@@Frank-Schmitt.invalid")
+    (reply-to "hereRealRepliesOnlyPlease@@Frank-Schmitt.invalid"))
+   ((message-mail-p) ;;mail?
+    (address "usedForMails@@Frank-Schmitt.invalid"))
    ("^gmane" ;;this is mail, too in fact
-    (address "usedForMails@@Frank-Schmitt.net")
-    ("Reply-To" nil))
-   ("^gmane.mail.spam.spamassassin.general$"
-    (eval (setq mail-envelope-from "Azzrael@@rz-online.de"))
-    (address "Azzrael@@rz-online.de"))))
+    (address "usedForMails@@Frank-Schmitt.invalid")
+    (reply-to nil))
+   ("^gmane\\.mail\\.spam\\.spamassassin\\.general$"
+    (eval (set (make-local-variable 'message-sendmail-envelope-from)
+               "Azzrael@@rz-online.de")))))
 @end lisp
 
 @node [5.5]
@@ -1490,7 +1490,7 @@ flyspell.el} \e$B$rMQ0U$7$F2<$5$$!#\e(B@file{ispell.el} \e$B$O\e(B Emacs \e$B$H$H$b$K
 \e$B%9$rEPO?$7$F$*$/$3$H$,$G$-$^$9\e(B:
 
 @example
-alias al       "Al <al@@english-heritage.bla>"
+alias al       "Al <al@@english-heritage.invalid>"
 @end example
 
 @noindent
@@ -1521,8 +1521,8 @@ Database) \e$B$G$7$g$&!#\e(BXEmacs \e$B$N%Q%C%1!<%8%7%9%F%`$r;H$&$+!"\e(B
 (setq bbdb-north-american-phone-numbers-p nil)
 ;; \e$B$"$J$?$NEE;R%a!<%k%"%I%l%9$r\e(B BBDB \e$B$K65$($^$7$g$&!#\e(B
 (setq bbdb-user-mail-names
-      (regexp-opt '("Your.Email@@here.bla"
-                    "Your.other@@mail.there.bla")))
+      (regexp-opt '("Your.Email@@here.invalid"
+                    "Your.other@@mail.there.invalid")))
 ;; \e$B%a!<%k%"%I%l%9$rJd40$9$k$H$-$K!"8uJd$r%(%s%I%l%9$G=P$7$^$9!#\e(B
 ;; cycling while completing email addresses
 (setq bbdb-complete-name-allow-cycling t)

diff --git a/gnus-ja.texi b/gnus-ja.texi
index 84ab890..51970e5 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -10,8 +10,8 @@
 @end iftex
 
 @copying
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/message-ja.texi b/message-ja.texi
index bb5613a..bca5c23 100644 (file)
--- a/message-ja.texi
+++ b/message-ja.texi
@@ -14,8 +14,8 @@ This file documents Message, the Emacs message composition mode.
 \e$B$3$N%U%!%$%k$O\e(B Emacs \e$B$N%a%C%;!<%8:n@.%b!<%I$G$"$k\e(B Message \e$B$K4X$9$k@bL@J8\e(B
 \e$B=q$G$9!#\e(B
 
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/pgg-ja.texi b/pgg-ja.texi
index 7f08ec7..99fc40f 100644 (file)
--- a/pgg-ja.texi
+++ b/pgg-ja.texi
@@ -8,10 +8,10 @@
 @set VERSION 0.1
 
 @copying
-This file describes the PGG.
+This file describes PGG, an Emacs interface to various PGP implementations.
 
-Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-Copyright (C) 2001 Daiki Ueno.
+Copyright @copyright{} 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2001 Daiki Ueno.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/sasl-ja.texi b/sasl-ja.texi
index f48dcb6..e2b9ec8 100644 (file)
--- a/sasl-ja.texi
+++ b/sasl-ja.texi
@@ -17,7 +17,8 @@
 @ifinfo
 \e$B$3$N%U%!%$%k$O\e(B Emacs SASL \e$B%i%$%V%i%j!<$r@bL@$7$^$9!#\e(B
 
-Copyright (C) 2000 Daiki Ueno.
+Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2000 Daiki Ueno.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or

diff --git a/sieve-ja.texi b/sieve-ja.texi
index 904512a..70e37f2 100644 (file)
--- a/sieve-ja.texi
+++ b/sieve-ja.texi
@@ -12,7 +12,8 @@
 @copying
 This file documents the Emacs Sieve package.
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document