Synch with the semi-1_14 branch.

diff --git a/mime-ui-en.sgml b/mime-ui-en.sgml
index 7a02f72..f0b5548 100644 (file)
--- a/mime-ui-en.sgml
+++ b/mime-ui-en.sgml
@@ -83,7 +83,7 @@ message \e$B$r1\Mw$9$k$?$a$N\e(B mode \e$B$rDs6!$7$^$9!#MxMQ<T$O$3$3$G3F\e(B entity
 <h2> Presentation of mime-preview-buffer
 <node> MIME-Preview
 <p>
-mime-view-mode \e$B$G$O3F\e(B entity \e$B$KBP$7$F\e(B
+mime-view-mode displays information about each entity as
 <p>
 <verb>
        [entity-button]
@@ -94,15 +94,15 @@ mime-view-mode \e$B$G$O3F\e(B entity \e$B$KBP$7$F\e(B
 </verb>
 <p>
 <noindent>
-\e$B$H$$$&>pJs$rI=<($7$^$9!#$3$l$i$O>r7o$K=>$C$F\e(B design \e$B$rJQ99$7$?$j!"I=<(\e(B
-\e$B$rM^@)$9$k$3$H$b$G$-$^$9!#\e(B
+You can change their design or inhibit showing some of them, according
+to some condition
 <p>
-\e$B0J2<$K!"I=<(Nc$r<($7$^$9!#\e(B
+See following example
 
 
 <verb>
-From: morioka@jaist.ac.jp (\e$B<i2,\e(B \e$BCNI'\e(B / MORIOKA Tomohiko)
-Subject: Re: \e$B<ALd!)\e(B
+From: morioka@jaist.ac.jp (MORIOKA Tomohiko)
+Subject: Re: question?
 Newsgroups: zxr.message.mime
 Date: 22 Oct 93 11:02:44
 Mime-Version: 1.0
@@ -110,9 +110,9 @@ Organization: Japan Advanced Institute of Science and Technology,
         Ishikawa, Japan
 
 [1  (text/plain)]
-  MIME-Edit mode \e$B$K$*$1$k!"\e(BMIME message \e$B$N:n$jJ}!#\e(B
+  How to compose MIME message in MIME-Edit mode.
 
-  C-c C-x ? \e$B$r2!$9$H\e(B help \e$B$,=P$F$/$k!#\e(B
+  C-c C-x ? shows its help.
 
 C-c C-x C-t    insert a text message.
 C-c C-x TAB    insert a (binary) file.
@@ -132,15 +132,16 @@ C-c C-x C-k       insert PGP public key.
 C-c C-x C-p    preview editing MIME message.
 ...
 
-\e$B$C$FLu$G!"\e(BC-c C-x C-i \e$B$r2!$7$F!"A^F~$7$?$$\e(B binary file \e$B$r;XDj$7$^$9!#\e(B
+therefore, you should type C-c C-x C-i and specify the binary file
+which you want to insert.
 
-  binary file \e$B$N\e(B MIME encoding \e$B$K$O!"IaDL!"\e(BBase64 \e$B$r;XDj$7$^$9!#\e(B
+  You should select Base64 as MIME encoding for binary file.
 
 [2  (image/gif)]
 
 [3  (text/plain)]
 
-  \e$B$3$s$JIw$K!"3(F~$j\e(B message \e$B$N$G$->e$,$j!#\e(B
+  Like above, you can compose the message with image.
 
 \e$B".".".".".".".".".".".\e(B \e$B%m%7%"%s!&%F%#!<$r0lGU!#\e(B \e$B".".".".".".".".".".".\e(B
 \e$B".".".".".\e(B  \e$B!y\e(B \e$B%8%c%`$G$O$J$/%^!<%^%l!<%I$G$b$J$/K*L*$G\e(B \e$B!y\e(B  \e$B".".".".".\e(B
@@ -152,61 +153,61 @@ C-c C-x C-p       preview editing MIME message.
 <h3> entity-button
 <node> entity-button
 <p>
-<concept>entity-button</concept> \e$B$O\e(B entity \e$B$N@hF,$K$"$C$F!"$=$N\e(B entity 
-\e$B$K4X$9$kBg$^$+$J>pJs$rI=<($9$kItJ,$G$9!#\e(B
+<concept>entity-button</concept> is a tag on the top of the entity
+which shows brief information of the part.
 <p>
-\e$BI8=`$G$O\e(B
+Normally, it appears as
 
 <verb>
         [1.3 test (text/plain)]
 </verb>
 
-<noindent>
-\e$B$N$h$&$J46$8$KI=<($5$l$^$9!#\e(B
 <p>
-\e$B:G=i$N?t;z$O\e(B message \e$BCf$N$3$N\e(B entity \e$B$N0LCV$r@aHV9f$N$h$&$KI=$7$?$b$N\e(B
-\e$B$G!"\e(B<concept>entity-number</concept> \e$B$H8F$S$^$9!#\e(B
+The number on the head describes the place of the entity in the
+message (like the section number) and it is called as
+<concept>entity-number</concept>.
 <p>
-\e$B#2HVL\$NJ8;zNs$OI=Bj$rI=$7$^$9!#$3$N>pJs$O!"\e(B
+The string in the next describes its title. This information is
+taken from
 
 <ol>
-<li>Content-Description field \e$B$b$7$/$O\e(B Subject field \e$B$K=q$+$l$?I=Bj\e(B
-<li>Content-Disposition field \e$B$N\e(B filename parameter \e$B$K=q$+$l$?\e(B file \e$BL>\e(B
-<li>Content-Type field \e$B$N\e(B name parameter \e$B$K=q$+$l$?\e(B file \e$BL>\e(B
-<li> uuencode \e$B$N>l9g$N\e(B file \e$BL>\e(B
+<li>Title described in Content-Description field or Subject field
+<li>File name specified by filename parameter in Content-Disposition field
+<li>File name specified by name parameter in Content-Type field
+<li>File name for uuencode'ing
 </ol>
 
 <noindent>
-\e$B$+$i:n$j$^$9!#$I$l$bB8:_$7$J$$>l9g$O6uGr$,I=<($5$l$^$9!#\e(B
+If none of them are specified, displays a blank.
 <p>
-\e$B#3HVL\$N3g8L$NCf$N>pJs$O$=$N\e(B entity \e$B$N\e(B media-type/subtype \e$B$rI=$7$^$9!#\e(B
-\e$BHs\e(B MIME entity \e$B$N>l9g!"\e(B<code>nil</code> \e$B$,I=<($5$l$^$9!#\e(B
+The 3rd item in the parenthesis describes media-type/subtype of
+the entity. If it is is not MIME entity, it displays <code>nil</code>.
 <p>
-\e$B$3$N\e(B entity-button \e$B$O\e(B entity \e$B$NFbMF$r>]D'$9$k\e(B icon \e$B$N$h$&$JLr3d$r2L$?\e(B
-\e$B$7$^$9!#Nc$($P!"\e(B
+This entity-button plays a role like icon that symbolically
+shows the content of the entity. For example, push <kbd>v</kbd> on
 
 <verb>
         [2  (image/gif)]
 </verb>
 
 <noindent>
-\e$B$N>e$G\e(B <kbd>v</kbd> \e$B$r2!$;$P$3$3$KF~$C$F$$$k3($,I=<($5$l$^$9!#\e(B
+shows up the image contained there.
 <p>
-\e$B$^$?!"\e(Bmouse \e$BA`:n$,2DG=$J>l9g!"\e(Bentity-button \e$B$rBh#2%\%?%s!J\e(B3 button
-mouse \e$B$N>l9g!"Cf1{$N%\%?%s!K$G2!$;$P!"F1MM$K$=$N3($,I=<($5$l$^$9!#\e(B
+If the mouse operation is possible, you can display the image
+by pushing 2nd button (the middle button for 3 button mouse) too.
 
 
 <h3> entity-header
 <node> entity-header
 <p>
-<concept>entity-header</concept> \e$B$O$"$k\e(B entity \e$B$N\e(B header \e$B$rI=<($9$kIt\e(B
-\e$BJ,$G$9!J!V$=$N$^$^$d$s$1!W$C$FE\$i$J$$$G!#$=$&$$$&$b$s$J$s$G$9!K!#\e(B
+<concept>entity-header</concept> is the header of the entity.
+\e$B!J!V$=$N$^$^$d$s$1!W$C$FE\$i$J$$$G!#$=$&$$$&$b$s$J$s$G$9!K!#\e(B
 
 
 <h3> entity-body
 <node> entity-body
 <p>
-<concept>entity-body</concept> \e$B$O\e(B part \e$B$NFbMF$rI=<($9$kItJ,$G$9!#\e(B
+<concept>entity-body</concept> is the content of the part.
 <p>
 \e$B$3$l$b$R$M$j$,B-$j$J$$$G$9$,!"$^$"!"$=$&$$$&$b$s$G$9!#\e(B
 <p>
@@ -215,7 +216,7 @@ mouse \e$B$N>l9g!"Cf1{$N%\%?%s!K$G2!$;$P!"F1MM$K$=$N3($,I=<($5$l$^$9!#\e(B
 text entity \e$B$N>l9g$O\e(B charset \e$B$K1~$8$F\e(B code \e$BJQ49$7$?$j$7$^$9$7!"\e(BXEmacs 
 \e$B$G$O\e(B image entity \e$B$rJQ49$7$J$$$H$$$1$J$$$7!#\e(B
 <p>
-\e$B>\$7$/$O$^$?8e$G!#\e(B
+Details will be described later.
 
 
 <h2> Operation in mime-preview-buffer

diff --git a/mime-ui-en.texi b/mime-ui-en.texi
index 2cde0f9..4e99021 100644 (file)
--- a/mime-ui-en.texi
+++ b/mime-ui-en.texi
@@ -98,7 +98,7 @@ message \e$B$r1\Mw$9$k$?$a$N\e(B mode \e$B$rDs6!$7$^$9!#MxMQ<T$O$3$3$G3F\e(B entity
 @node MIME-Preview, mime-view-mode, Overview of MIME-View, MIME-View
 @section Presentation of mime-preview-buffer
 
-mime-view-mode \e$B$G$O3F\e(B entity \e$B$KBP$7$F\e(B@refill
+mime-view-mode displays information about each entity as@refill
 
 @example
        [entity-button]
@@ -109,15 +109,15 @@ mime-view-mode \e$B$G$O3F\e(B entity \e$B$KBP$7$F\e(B@refill
 @end example
 
 @noindent
-\e$B$H$$$&>pJs$rI=<($7$^$9!#$3$l$i$O>r7o$K=>$C$F\e(B design \e$B$rJQ99$7$?$j!"I=<(\e(B
-\e$B$rM^@)$9$k$3$H$b$G$-$^$9!#\e(B
+You can change their design or inhibit showing some of them, according
+to some condition.
 
-\e$B0J2<$K!"I=<(Nc$r<($7$^$9!#\e(B
+See following example
 
 
 @example
-From: morioka@@jaist.ac.jp (\e$B<i2,\e(B \e$BCNI'\e(B / MORIOKA Tomohiko)
-Subject: Re: \e$B<ALd!)\e(B
+From: morioka@@jaist.ac.jp (MORIOKA Tomohiko)
+Subject: Re: question?
 Newsgroups: zxr.message.mime
 Date: 22 Oct 93 11:02:44
 Mime-Version: 1.0
@@ -125,9 +125,9 @@ Organization: Japan Advanced Institute of Science and Technology,
         Ishikawa, Japan
 
 [1  (text/plain)]
-  MIME-Edit mode \e$B$K$*$1$k!"\e(BMIME message \e$B$N:n$jJ}!#\e(B
+  How to compose MIME message in MIME-Edit mode.
 
-  C-c C-x ? \e$B$r2!$9$H\e(B help \e$B$,=P$F$/$k!#\e(B
+  C-c C-x ? shows its help.
 
 C-c C-x C-t    insert a text message.
 C-c C-x TAB    insert a (binary) file.
@@ -147,15 +147,16 @@ C-c C-x C-k       insert PGP public key.
 C-c C-x C-p    preview editing MIME message.
 ...
 
-\e$B$C$FLu$G!"\e(BC-c C-x C-i \e$B$r2!$7$F!"A^F~$7$?$$\e(B binary file \e$B$r;XDj$7$^$9!#\e(B
+therefore, you should type C-c C-x C-i and specify the binary file
+which you want to insert.
 
-  binary file \e$B$N\e(B MIME encoding \e$B$K$O!"IaDL!"\e(BBase64 \e$B$r;XDj$7$^$9!#\e(B
+  You should select Base64 as MIME encoding for binary file.
 
 [2  (image/gif)]
 
 [3  (text/plain)]
 
-  \e$B$3$s$JIw$K!"3(F~$j\e(B message \e$B$N$G$->e$,$j!#\e(B
+  Like above, you can compose the message with image.
 
 \e$B".".".".".".".".".".".\e(B \e$B%m%7%"%s!&%F%#!<$r0lGU!#\e(B \e$B".".".".".".".".".".".\e(B
 \e$B".".".".".\e(B  \e$B!y\e(B \e$B%8%c%`$G$O$J$/%^!<%^%l!<%I$G$b$J$/K*L*$G\e(B \e$B!y\e(B  \e$B".".".".".\e(B
@@ -176,67 +177,69 @@ C-c C-x C-p       preview editing MIME message.
 @cindex entity-number
 @cindex entity-button
 
-@strong{entity-button} \e$B$O\e(B entity \e$B$N@hF,$K$"$C$F!"$=$N\e(B entity \e$B$K4X$9$kBg\e(B
-\e$B$^$+$J>pJs$rI=<($9$kItJ,$G$9!#\e(B@refill
+@strong{entity-button} is a tag on the top of the entity
+which shows brief information of the part.@refill
 
-\e$BI8=`$G$O\e(B
+Normally, it appears as
 
 @example
         [1.3 test (text/plain)]
 @end example
 
 @noindent
-\e$B$N$h$&$J46$8$KI=<($5$l$^$9!#\e(B
 
-\e$B:G=i$N?t;z$O\e(B message \e$BCf$N$3$N\e(B entity \e$B$N0LCV$r@aHV9f$N$h$&$KI=$7$?$b$N$G!"\e(B
-@strong{entity-number} \e$B$H8F$S$^$9!#\e(B@refill
+The number on the head describes the place of the entity in the
+message (like the section number) and it is called as
+@strong{entity-number}.@refill
 
-\e$B#2HVL\$NJ8;zNs$OI=Bj$rI=$7$^$9!#$3$N>pJs$O!"\e(B
+The string in the next describes its title. This information is
+taken from
 
 @enumerate
 @item
-Content-Description field \e$B$b$7$/$O\e(B Subject field \e$B$K=q$+$l$?I=Bj\e(B
+Title described in Content-Description field or Subject field
 @item
-Content-Disposition field \e$B$N\e(B filename parameter \e$B$K=q$+$l$?\e(B file \e$BL>\e(B
+File name specified by filename parameter in Content-Disposition field
 @item
-Content-Type field \e$B$N\e(B name parameter \e$B$K=q$+$l$?\e(B file \e$BL>\e(B
+File name specified by name parameter in Content-Type field
 @item
- uuencode \e$B$N>l9g$N\e(B file \e$BL>\e(B
+File name for uuencode'ing
 @end enumerate
 
 @noindent
-\e$B$+$i:n$j$^$9!#$I$l$bB8:_$7$J$$>l9g$O6uGr$,I=<($5$l$^$9!#\e(B
+If none of them are specified, displays a blank.
 
-\e$B#3HVL\$N3g8L$NCf$N>pJs$O$=$N\e(B entity \e$B$N\e(B media-type/subtype \e$B$rI=$7$^$9!#Hs\e(B 
-MIME entity \e$B$N>l9g!"\e(B@code{nil} \e$B$,I=<($5$l$^$9!#\e(B@refill
+The 3rd item in the parenthesis describes media-type/subtype of
+the entity. If it is is not MIME entity, it displays @code{nil}.
+@refill
 
-\e$B$3$N\e(B entity-button \e$B$O\e(B entity \e$B$NFbMF$r>]D'$9$k\e(B icon \e$B$N$h$&$JLr3d$r2L$?\e(B
-\e$B$7$^$9!#Nc$($P!"\e(B
+This entity-button plays a role like icon that symbolically
+shows the content of the entity. For example, push @kbd{v} on
 
 @example
         [2  (image/gif)]
 @end example
 
 @noindent
-\e$B$N>e$G\e(B @kbd{v} \e$B$r2!$;$P$3$3$KF~$C$F$$$k3($,I=<($5$l$^$9!#\e(B
+shows up the image contained there.
 
-\e$B$^$?!"\e(Bmouse \e$BA`:n$,2DG=$J>l9g!"\e(Bentity-button \e$B$rBh#2%\%?%s!J\e(B3 button
-mouse \e$B$N>l9g!"Cf1{$N%\%?%s!K$G2!$;$P!"F1MM$K$=$N3($,I=<($5$l$^$9!#\e(B
+If the mouse operation is possible, you can display the image
+by pushing 2nd button (the middle button for 3 button mouse) too.
 
 
 @node entity-header, entity-body, entity-button, MIME-Preview
 @subsection entity-header
 @cindex entity-header
 
-@strong{entity-header} \e$B$O$"$k\e(B entity \e$B$N\e(B header \e$B$rI=<($9$kIt\e(B
-\e$BJ,$G$9!J!V$=$N$^$^$d$s$1!W$C$FE\$i$J$$$G!#$=$&$$$&$b$s$J$s$G$9!K!#\e(B
+@strong{entity-header} is the header of the entity.
+\e$B!J!V$=$N$^$^$d$s$1!W$C$FE\$i$J$$$G!#$=$&$$$&$b$s$J$s$G$9!K!#\e(B
 
 
 @node entity-body,  , entity-header, MIME-Preview
 @subsection entity-body
 @cindex entity-body
 
-@strong{entity-body} \e$B$O\e(B part \e$B$NFbMF$rI=<($9$kItJ,$G$9!#\e(B@refill
+@strong{entity-body} is the content of the part.@refill
 
 \e$B$3$l$b$R$M$j$,B-$j$J$$$G$9$,!"$^$"!"$=$&$$$&$b$s$G$9!#\e(B@refill
 
@@ -245,72 +248,72 @@ mouse \e$B$N>l9g!"Cf1{$N%\%?%s!K$G2!$;$P!"F1MM$K$=$N3($,I=<($5$l$^$9!#\e(B
 text entity \e$B$N>l9g$O\e(B charset \e$B$K1~$8$F\e(B code \e$BJQ49$7$?$j$7$^$9$7!"\e(BXEmacs \e$B$G\e(B
 \e$B$O\e(B image entity \e$B$rJQ49$7$J$$$H$$$1$J$$$7!#\e(B@refill
 
-\e$B>\$7$/$O$^$?8e$G!#\e(B
+Details will be described later.
 
 
 @node mime-view-mode,  , MIME-Preview, MIME-View
 @section Operation in mime-preview-buffer
 
-mime-preview-buffer \e$B$K$O0J2<$N5!G=$,$"$j$^$9!#\e(B@refill
+mime-preview-buffer posesses following functionalities.@refill
 
 @table @kbd
 @item @key{u}
-\e$B>e$N\e(B part \e$B$KLa$k!J\e(Bmessage \e$B$N0lHV>e$N\e(B part \e$B$G$3$l$r9T$J$&$H\e(B Summary
-mode \e$B$KLa$k\e(B (*1)\e$B!K\e(B
+go back to upper part (in the first part of the message,
+go back to the Summary mode (*1))
 
 @item @key{p}
-\e$BA0$N\e(B part \e$B$K0\F0$9$k\e(B
+go to previous part
 
 @item @key{M-TAB}
-\e$BA0$N\e(B part \e$B$K0\F0$9$k\e(B
+go to previous part
 
 @item @key{n}
-\e$B<!$N\e(B part \e$B$K0\F0$9$k\e(B
+go to next part
 
 @item @key{TAB}
-\e$B<!$N\e(B part \e$B$K0\F0$9$k\e(B
+go to next part
 
 @item @key{SPC}
-scroll up \e$B$9$k\e(B
+scroll up
 
 @item @key{M-SPC}
-scroll down \e$B$9$k\e(B
+scroll down
 
 @item @key{DEL}
-scroll down \e$B$9$k\e(B
+scroll down
 
 @item @key{RET}
-\e$B<!$N9T$K0\F0$9$k\e(B
+go to next line
 
 @item @key{M-RET}
-\e$BA0$N9T$K0\F0$9$k\e(B
+go to previous line
 
 @item @key{v}
-part \e$B$r:F@8$9$k\e(B (*2)
+play current part (*2)
 
 @item @key{e}
-part \e$B$+$i\e(B file \e$B$r<h$j=P$9\e(B (*2)
+extract file from current part (*2)
 
 @item @key{C-c C-p}
-part \e$B$r0u:~$9$k\e(B (*2)
+print current part (*2)
 
 @item @key{mouse-button-2}
-preview-buffer \e$BCf$N\e(B mouse button \e$B$r5/F0$9$k\e(B
+start the mouse button in preview-buffer
 
-content-button \e$B$r2!$;$P!"$=$N\e(B part \e$B$,:F@8$5$l$k\e(B(*2)@refill
+on content-button, play current part (*2)@refill
 
-URL-button \e$B$r2!$;$P!"$=$N\e(B WWW browser \e$B$,5/F0$5$l$k\e(B@refill
+on URL-button, start WWW browser@refill
 
 @end table
 
 @noindent
-@strong{[\e$BCm0U\e(B]}
+@strong{[Notice]}
 @quotation
 
-(*1) MUA \e$B$G\e(B mime-view \e$B$N@_Dj$r$7$F$$$J$$>l9g!"\e(BSummary mode \e$B$K$OLa$j$^$;\e(B
-\e$B$s!#\e(B@refill
+(*1) Do not go back to Summary mode unless appropriately
+configured for mime-view in the MUA.@refill
 
-(*2) \e$B<B:]$NF0:n$OBP1~$9$k\e(B method \e$B$K0M$j$^$9!#\e(B
+(*2) actual behavior depends on the associated method
 @end quotation