Sync up with the latest semi-1_13 branch.

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

diff --git a/mime-ui-en.texi b/mime-ui-en.texi
index 20db91d..6ff13ca 100644 (file)
--- a/mime-ui-en.texi
+++ b/mime-ui-en.texi
@@ -30,17 +30,15 @@ This file documents SEMI, a MIME user interface for GNU Emacs.
 SEMI is a package for GNU Emacs to provide features related with MIME
 user interface.@refill
 
-SEMI \e$B$,Ds6!$9$k\e(B MIME user interface \e$B$O\e(B MIME-View \e$B$H\e(B MIME-Edit \e$B$+$i$J$j$^\e(B
-\e$B$9!#\e(B@refill
+SEMI provides two user interfaces: MIME-View and MIME-Edit.@refill
 
  
-MIME-View \e$B$O\e(B MIME \e$B$d\e(B STD 11 \e$B$*$h$S!XCO0h2=$5$l$?\e(B RFC 822\e$B!Y\e(Bmessage \e$B$rI=<(\e(B
-\e$B$7$?$j!"A`:n$7$?$j$9$k$?$a$N\e(B user interface \e$B$NCf3K$G$9!#\e(B@refill
+MIME-View is a kernel of user interface to display or operate MIME
+messages, STD 11 messages or ``localized RFC 822'' messages.@refill
 
-MIME-Edit \e$B$O\e(B MIME message \e$B$r@8@.$9$k$?$a$N\e(B user interface \e$B$G$9!#\e(B@refill
+MIME-Edit is a user interface to compose MIME messages.@refill
 
-\e$B3F\e(B MUA \e$B$G$3$l$i$N5!G=$rMxMQ$9$k$3$H$K$h$j!"9bEY$J\e(B MIME \e$B5!G=$rMxMQ$9$k$3\e(B
-\e$B$H$,$G$-$^$9!#\e(B
+Each MUA can use powerful MIME features to combine these features.
 
 
 @node MIME-View, MIME-Edit, Introduction, Top
@@ -460,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
 
@@ -681,10 +678,19 @@ 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
 
@@ -708,6 +714,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