Merge remi-1_14_2-1.

[elisp/semi.git] / mime-ui-ja.texi

diff --git a/mime-ui-ja.texi b/mime-ui-ja.texi
index 24583c1..8293821 100644 (file)
--- a/mime-ui-ja.texi
+++ b/mime-ui-ja.texi
@@ -698,29 +698,22 @@ mime-edit \e$B$G$O\e(B @strong{PGP/MIME} (RFC 2015) \e$B$*$h$S\e(B@strong{PGP-kazu}
 (draft-kazu-pgp-mime-00.txt) \e$B$K$h$k0E9f2=!ⅇR=pL>!&8x3+80$NA^F~5!G=$r\e(B
 \e$BMxMQ$9$k$3$H$,$G$-$^$9!#\e(B@refill
 
-\e$BC"$7!"$3$N5!G=$rMxMQ$9$k$K$O\e(B Mailcrypt package (@ref{(mailcrypt)}) \e$B$H\e(B 
-pgp command \e$B$,I,MW$G$9!#\e(B
+\e$BC"$7!"$3$N5!G=$rMxMQ$9$k$K$O3F<o\e(B pgp command \e$B$,I,MW$G$9!#\e(B
 
-@defvar pgp-function-alist
+@defvar pgg-default-scheme
 
-Alist of service names vs. corresponding functions and its filenames.
-Each element looks like @code{(SERVICE FUNCTION FILE)}.@refill
-
-SERVICE is a symbol of PGP processing.  It allows `verify', `decrypt',
-`fetch-key', `snarf-keys', `mime-sign', `traditional-sign', `encrypt' or
-`insert-key'.@refill
-
-Function is a symbol of function to do specified SERVICE.@refill
-
-FILE is string of filename which has definition of corresponding
-FUNCTION.
+Version of PGP or GnuPG command to be used for encryption or sign.
+The value should be a symbol.  Allowed versions are @code{gpg},
+@code{pgp} or @code{pgp5}.@refill
 @end defvar
 
 
-@defun pgp-function method
+@defvar pgg-scheme
 
-Return function to do service @var{method}.
-@end defun
+Version of PGP or GnuPG command to be used for decryption or verification.
+The value should be a symbol.  Allowed versions are @code{gpg},
+@code{pgp} or @code{pgp5}.@refill
+@end defvar