* Update.

diff --git a/ChangeLog b/ChangeLog
index 6480061..a92c155 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-06  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * mime-ui-en.texi, mime-ui-ja.texi: Sync up with .sgml files.
+       * mime-ui-en.sgml, mime-ui-ja.sgml (mime-mc-setversion): Use <var>,
+       </var> token in doc string.
+
 1999-04-06  Keiichi Suzuki  <keiichi@nanap.org>
 
        * mime-pgp.el (mime-view-application/pgp): Support PGP5.X and

diff --git a/mime-ui-en.sgml b/mime-ui-en.sgml
index d77f473..446b870 100644 (file)
--- a/mime-ui-en.sgml
+++ b/mime-ui-en.sgml
@@ -647,8 +647,8 @@ Return function to do service <var>method</var>.
 <defun name="mime-mc-setversion">
            <args> version
 <p>
-Select `pgp-version' and `mc-default-scheme' if possible.  VERSION
-should be a string or a symbol.
+Select `pgp-version' and `mc-default-scheme' if possible.
+<var>version</var> should be a string or a symbol.
 <defun/>
 
 

diff --git a/mime-ui-en.texi b/mime-ui-en.texi
index 9946c5f..6065525 100644 (file)
--- a/mime-ui-en.texi
+++ b/mime-ui-en.texi
@@ -458,8 +458,7 @@ Encrypt to specified region. (cf. @ref{PGP})
 
 @item @key{C-c C-x C-q}
 avoid to encode tags in specified region.  In other words, tags is
-interpreted as such string.  (In current version, it may be
-incomplete.  Maybe PGP-signature does not work for this enclosure.)
+interpreted as such string.
 
 @end table
 
@@ -679,24 +678,37 @@ Regular expression to match field-name to be ignored when split sending.
 
 mime-edit provides PGP encryption, signature and inserting public-key
 features based on @strong{PGP/MIME} (RFC 2015) or @strong{PGP-kazu}
-(draft-kazu-pgp-mime-00.txt).@refill
+(draft-kazu-pgp-mime-00.txt).  In current version, PGP 5.0i and GnuPG
+are supported as well.@refill
+
+This feature requires PGP or GnuPG commands and its interface package,
+such as Mailcrypt package (@ref{(mailcrypt)}).
+
+@defvar pgp-version
+
+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{pgp50} or @code{pgp}.@refill
+@end defvar
 
-This feature requires pgp command and pgp interface package, such as
-Mailcrypt package (@ref{(mailcrypt)}).
 
 @defvar pgp-function-alist
 
 Alist of service names vs. corresponding functions and its filenames.
-Each element looks like @code{(SERVICE FUNCTION FILE)}.@refill
+Each element looks like
+@code{(SERVICE FUNCTION FILE [PGP5_FUNCTION PGP5_FILE [GPG_FUNCTION GPG_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
+SERVICE is a symbol of PGP2, PGP5 or GnuPG 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.
+
+PGP5_FUNCTION, PGP5_FILE, GPG_FUNCTION and GPG_FILE are similar to
+FUNCTION and FILE, but they will be used for PGP 5.0i or GnuPG.@refill
+
 @end defvar
 
 
@@ -706,6 +718,13 @@ Return function to do service @var{method}.
 @end defun
 
 
+@defun mime-mc-setversion version
+
+Select `pgp-version' and `mc-default-scheme' if possible.
+@var{version} should be a string or a symbol.
+@end defun
+
+
 
 @node Buttons, Acting-condition configuration, PGP, Various
 @section Mouse button

diff --git a/mime-ui-ja.sgml b/mime-ui-ja.sgml
index a5540ad..2c18352 100644 (file)
--- a/mime-ui-ja.sgml
+++ b/mime-ui-ja.sgml
@@ -662,8 +662,8 @@ Return function to do service <var>method</var>.
 <defun name="mime-mc-setversion">
            <args> version
 <p>
-Select `pgp-version' and `mc-default-scheme' if possible.  VERSION
-should be a string or a symbol.
+Select `pgp-version' and `mc-default-scheme' if possible.
+<var>version</var> should be a string or a symbol.
 <defun/>
 
 

diff --git a/mime-ui-ja.texi b/mime-ui-ja.texi
index 24583c1..9ac5a97 100644 (file)
--- a/mime-ui-ja.texi
+++ b/mime-ui-ja.texi
@@ -472,8 +472,7 @@ enclosure \e$B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
 
 @item @key{C-c C-x C-q}
 \e$B;XDj$7$?\e(B region \e$BFb$N\e(B tag \e$B$rL58z$K$7!"$=$N\e(B tag \e$B$rJ8;zNs$H$7$FMxMQ$G$-$k\e(B
-\e$B$h$&$K$7$^$9!#!J8=:_$NHG$G$O$&$^$/F/$+$J$$$3$H$,$"$j$^$9!#$^$?!"EE;R=p\e(B
-\e$BL>$H$NJ;MQ$K4X$7$F$bIT40A4$G$9!K\e(B
+\e$B$h$&$K$7$^$9!#\e(B
 
 @end table
 
@@ -696,24 +695,36 @@ Regular expression to match field-name to be ignored when split sending.
 
 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=!&EE;R=pL>!&8x3+80$NA^F~5!G=$r\e(B
-\e$BMxMQ$9$k$3$H$,$G$-$^$9!#\e(B@refill
+\e$BMxMQ$9$k$3$H$,$G$-$^$9!#\e(B  \e$B8=:_$NHG$G$O\e(B PGP 5.0i \e$B$H\e(B GnuPG \e$B$b%5%]!<%H$5$l\e(B
+\e$B$F$$$^$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
 
+@defvar pgp-version
+
+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{pgp50} or @code{pgp}.@refill
+@end defvar
+
+
 @defvar pgp-function-alist
 
 Alist of service names vs. corresponding functions and its filenames.
-Each element looks like @code{(SERVICE FUNCTION FILE)}.@refill
+@code{(SERVICE FUNCTION FILE [PGP5_FUNCTION PGP5_FILE [GPG_FUNCTION GPG_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
+SERVICE is a symbol of PGP2, PGP5 or GnuPG 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.
+
+PGP5_FUNCTION, PGP5_FILE, GPG_FUNCTION and GPG_FILE are similar to
+FUNCTION and FILE, but they will be used for PGP 5.0i or GnuPG.@refill
 @end defvar
 
 
@@ -723,6 +734,13 @@ Return function to do service @var{method}.
 @end defun
 
 
+@defun mime-mc-setversion version
+
+Select `pgp-version' and `mc-default-scheme' if possible.
+@var{version} should be a string or a symbol.
+@end defun
+
+
 
 @node Buttons, Acting-condition configuration, PGP, Various
 @section \e$B2!KU\e(B