Synch with No Gnus (201107052233).

[elisp/gnus-doc-ja.git] / sieve-ja.texi

diff --git a/sieve-ja.texi b/sieve-ja.texi
index 767c8a1..0afb1de 100644 (file)
--- a/sieve-ja.texi
+++ b/sieve-ja.texi
@@ -1,5 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
+@include gnus-overrides-ja.texi
+
 @setfilename sieve-ja
 @settitle Emacs Sieve Manual
 @synindex fn cp
@@ -12,8 +14,7 @@
 @copying
 This file documents the Emacs Sieve package.
 
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-Free Software Foundation, Inc.
+Copyright @copyright{} 2001-2011  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -39,9 +40,10 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
-* Sieve-ja: (sieve-ja).         Managing Sieve scripts in Emacs (Japanese).
+* Sieve-ja: (sieve-ja).         Managing Sieve scripts in Emacs
+                                  (Japanese).
 @end direntry
 @iftex
 @finalout
@@ -49,7 +51,12 @@ developing GNU and promoting software freedom.''
 @setchapternewpage odd
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs Sieve Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs Sieve Manual
+@end ifclear
 
 @author by Simon Josefsson
 @page
@@ -237,7 +244,7 @@ Sieve \e$B$r=OCN$7$F$$$J$$$J$i!"$3$N>O$K$[$s$N>/$7$@$1$"$k%3!<%I$NCGJR$rMxMQ\e(B
 require "fileinto";
 
 if address "sender" "owner-w3-beta@@xemacs.org" @{
-       fileinto "INBOX.w3-beta";
+        fileinto "INBOX.w3-beta";
 @}
 @end example
 
@@ -247,7 +254,7 @@ if address "sender" "owner-w3-beta@@xemacs.org" @{
 
 @example
 if header :contains "Delivered-To" "auc-tex@@sunsite.dk" @{
-       fileinto "INBOX.auc-tex";
+        fileinto "INBOX.auc-tex";
 @}
 @end example
 
@@ -258,7 +265,7 @@ if header :contains "Delivered-To" "auc-tex@@sunsite.dk" @{
 
 @example
 if address ["to", "cc"] "kerberos@@mit.edu" @{
-       fileinto "INBOX.kerberos";
+        fileinto "INBOX.kerberos";
 @}
 @end example
 
@@ -273,10 +280,6 @@ if address ["to", "cc"] "kerberos@@mit.edu" @{
 customize-group RET sieve RET}):
 
 @table @code
-@item sieve-manage-default-user
-@vindex sieve-manage-default-user
-\e$B%G%#%U%)%k%H$N%f!<%6!<L>$r@_Dj$7$^$9!#\e(B
-
 @item sieve-manage-default-port
 @vindex sieve-manage-default-port
 \e$B;EMM$9$k%G%#%U%)%k%H$N%]!<%H$r@_Dj$7$^$9!#Ds0F$5$l$F$$$k%]!<%HHV9f\e(B
@@ -306,7 +309,7 @@ API \e$B$N4X?t$K$O0J2<$N$b$N$,$"$j$^$9\e(B:
 
 @item sieve-manage-authenticate
 @findex sieve-manage-authenticate
-\e$B%5!<%P!<$rG'>Z$7$^$9!#\e(B
+\e$B%5!<%P!<$NG'>Z$r<u$1$^$9!#\e(B
 
 @item sieve-manage-capability
 @findex sieve-manage-capability