More markups.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 4f859db..2997e24 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -290,8 +290,8 @@ APEL, FLIM, SEMI \e$B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
 @item APEL 10.2, SLIM 1.14.3, EMY 1.13.9
 @end itemize
 
-@c APEL, FLIM, SEMI \e$B$+\e(B tm \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(B
-@c Wanderlust \e$B$r%$%s%9%H!<%k$7$J$*$7$F$/$@$5$$!#\e(B
+APEL, FLIM, SEMI \e$B$+\e(B tm \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(BWanderlust \e$B$r%$\e(B
+\e$B%s%9%H!<%k$7$J$*$7$F$/$@$5$$!#\e(B
 
 
 @node Download, Install, MIME Modules, Start Me Up
@@ -333,11 +333,11 @@ ftp://opaopa.org/pub/mirror/elisp/wl/
 @pindex OpenSSL
 @pindex starttls
 
-Wanderlust \e$B$G$O!"\e(BSMTP, IMAP, NNTP, POP \e$B$N%3%M%/%7%g%s$K$*$$$F!"\e(B
-SSL (Secure Socket Layer) \e$B$rMQ$$$k$3$H$,$G$-$^$9!#\e(B
+Wanderlust \e$B$G$O!"\e(BSMTP, IMAP, NNTP, POP \e$B$N%3%M%/%7%g%s$K$*$$$F!"\e(BSSL
+(Secure Socket Layer) \e$B$rMQ$$$k$3$H$,$G$-$^$9!#\e(B
 
 SSL \e$B$NMxMQ7ABV$K$O\e(B2\e$B<oN`$"$j!"%3%M%/%7%g%s$HF1;~$K\e(B SSL negotiation \e$B$r;O$a\e(B
-\e$B$k$b$N$H!"\e(B@command{starttls} command \e$B$N8e$K\e(B SSL negotiation \e$B$r;O$a$k$b$N\e(B
+\e$B$k$b$N$H!"\e(B@command{STARTTLS} command \e$B$N8e$K\e(B SSL negotiation \e$B$r;O$a$k$b$N\e(B
 \e$B$,$"$j$^$9!#\e(B
 
 \e$BDL>o$N\e(B SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils} \e$B%G%#%l%/%H%j$K$"$k\e(B
@@ -689,8 +689,8 @@ Emacsen@{
 
 \e$B$b$&0l$D$O!">e$NNc$N\e(B @samp{+} \e$B$N$h$&$J\e(B @dfn{\e$B%"%/%;%9%0%k!<%W\e(B} \e$B$G$9!#$3$l\e(B
 \e$B$O!"$"$k%U%)%k%@$K4^$^$l$k%5%V%U%)%k%@A4$F$r0l$D$N%0%k!<%W$H$9$k$b$N$G$9!#\e(B
-(\e$B$3$l$O%U%)%k%@$N%?%$%W$K$h$C$F0c$$$^$9!#Nc$($P\e(B @samp{+} \e$B$J$i\e(BMH \e$B$N%5%V%G%#\e(B
-\e$B%l%/%H%j$9$Y$F$,$R$H$D$N%0%k!<%W$H$J$j$^$9!#\e(B)
+(\e$B$3$l$O%U%)%k%@$N%?%$%W$K$h$C$F0c$$$^$9!#Nc$($P\e(B @samp{+} \e$B$J$i\e(B MH \e$B$N%5%V\e(B
+\e$B%G%#%l%/%H%j$9$Y$F$,$R$H$D$N%0%k!<%W$H$J$j$^$9!#\e(B)
 
 \e$B<B:]$K;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,$o$+$j$d$9$$$H;W$o$l$^$9!#\e(B
 \e$B$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%U%)%k%@$NDj5A$r$d$j$J$*$9$N$,$h$$$G$7$g$&!#\e(B
@@ -907,8 +907,8 @@ default \e$BCM\e(B:
 
 @example
 @group
--fj.rec.tv            -> \e$B%K%e!<%9%0%k!<%W!"\e(Bfj.rec.tv\e$B!#\e(B
--fj.rec.tv@@newsserver -> newsserver \e$B>e$N%K%e!<%9%0%k!<%W!"\e(Bfj.rec.tv\e$B!#\e(B
+-fj.rec.tv            -> \e$B%K%e!<%9%0%k!<%W!"\e(B@samp{fj.rec.tv}\e$B!#\e(B
+-fj.rec.tv@@newsserver -> @samp{newsserver} \e$B>e$N%K%e!<%9%0%k!<%W!"\e(B@samp{fj.rec.tv}\e$B!#\e(B
 @end group
 @end example
 
@@ -939,9 +939,9 @@ MH \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$N%U%)
 
 @example
 @group
-+inbox         -> "~/Mail/inbox"
-+from/teranisi -> "~/Mail/from/teranisi"
-+~/test        -> "~/test"
++inbox         -> @file{~/Mail/inbox}
++from/teranisi -> @file{~/Mail/from/teranisi}
++~/test        -> @file{~/test}
 @end group
 @end example
 
@@ -1063,7 +1063,7 @@ ML \e$B$N=q8K%U%!%$%k$rE83+$9$k$3$H$J$/%^%&%s%H$9$k$?$a$N$b$N!"$D$^$j1\Mw;~\e(B
 @group
 $teranisi         -> @file{~/Mail/teranisi/elmo-archive.zip}
 $bsd/freebsd;lha  -> @file{~/Mail/bsd/freebsd/elmo-archive.lzh}
-$/foo@@server:~/bar;zoo     -> server \e$B>e$N\e(B @file{~/bar/elmo-archive.zoo}
+$/foo@@server:~/bar;zoo     -> @samp{server} \e$B>e$N\e(B @file{~/bar/elmo-archive.zoo}
 $d:/msend.tar.gz;tgz;spool -> @file{d:/msend.tar.gz}
 @end group
 @end example
@@ -5927,24 +5927,24 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 \e$B%a%C%;!<%8%X%C%@$NFbMF$N$&$A=EMW$JItJ,$N\e(B face \e$B$=$N#2$G$9!#\e(B
 \e$B%G%U%)%k%H$G$O!"\e(B@samp{From:} \e$B$H\e(B @samp{To:} \e$B$NFbMFItJ,$,@_Dj$5$l$F$$$^$9!#\e(B
 \e$B$3$NCM$O\e(B @code{wl-highlight-message-header-alist}
- \e$B$rJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
+\e$B$rJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
 
 @item wl-highlight-message-unimportant-header-contents
 \e$B%a%C%;!<%8%X%C%@$NFbMF$N$&$A=EMW$G$O$J$$ItJ,$N\e(B face \e$B$G$9!#\e(B
-\e$B%G%U%)%k%H$G$O!"\e(B@samp{X-} \e$B$G;O$^$k%X%C%@$H\e(B @samp{User-Agent:} \e$B$NFbMFItJ,$,@_Dj$5$l$F$$$^$9!#\e(B
-\e$B$3$NCM$O\e(B @code{wl-highlight-message-header-alist}
- \e$B$rJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
+\e$B%G%U%)%k%H$G$O!"\e(B@samp{X-} \e$B$G;O$^$k%X%C%@$H\e(B @samp{User-Agent:} \e$B$NFbMFItJ,\e(B
+\e$B$,@_Dj$5$l$F$$$^$9!#$3$NCM$O\e(B @code{wl-highlight-message-header-alist} \e$B$r\e(B
+\e$BJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
 
 @item wl-highlight-message-citation-header
 \e$B%a%C%;!<%8$N0zMQ%X%C%@ItJ,$N\e(B face \e$B$G$9!#\e(B
 
 @item wl-highlight-message-cited-text-*
 \e$B%a%C%;!<%8$N0zMQ%F%-%9%HItJ,$N\e(B face \e$B$G$9!#\e(B
-\e$B:G8e$K$O?t;z$,$D$-!"\e(B10 \e$BCJ3,$^$G0zMQ$4$H$K?'J,$1$G$-$k$h$&$K$7$F$$$^$9!#\e(B
+\e$B:G8e$K$O\e(B@var{\e$B?t;z\e(B}\e$B$,$D$-!"\e(B10 \e$BCJ3,$^$G0zMQ$4$H$K?'J,$1$G$-$k$h$&$K$7$F$$$^$9!#\e(B
 
 @item wl-highlight-message-signature
-\e$B%a%C%;!<%8$N%7%0%K%A%cItJ,$N\e(B face \e$B$G$9!#\e(B
-\e$B=i4|@_Dj$O!"L@?'%P%C%/$G$O\e(B khaki \e$B0E?'%P%C%/$G$O\e(B DarkSlateBule \e$B$G$9!#\e(B
+\e$B%a%C%;!<%8$N%7%0%K%A%cItJ,$N\e(B face \e$B$G$9!#=i4|@_Dj$O!"L@?'%P%C%/$G$O\e(B 
+@samp{khaki}\e$B!"0E?'%P%C%/$G$O\e(B @samp{DarkSlateBule} \e$B$G$9!#\e(B
 
 @item wl-highlight-header-separator-face
 \e$B%I%i%U%H$N%a%C%;!<%8$N%X%C%@%;%Q%l!<%?$N\e(B face \e$B$G$9!#\e(B
@@ -6011,12 +6011,12 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @item wl-highlight-folder-opened-face
 \e$B%U%)%k%@%b!<%I$G!"3+$$$?%0%k!<%W$K$D$/\e(B face \e$B$G$9!#\e(B
-\e$BJQ?t\e(B @code{wl-highlight-folder-by-numbers} \e$B$,\e(B @code{nil} \e$B$+\e(B @dfn{\e$B?t\e(B} \e$B$N\e(B
+\e$BJQ?t\e(B @code{wl-highlight-folder-by-numbers} \e$B$,\e(B @code{nil} \e$B$+\e(B @var{\e$B?t\e(B} \e$B$N\e(B
 \e$B$H$-M-8z$G$9!#\e(B
 
 @item wl-highlight-folder-closed-face
 \e$B%U%)%k%@%b!<%I$G!"JD$8$?%0%k!<%W$K$D$/\e(B face \e$B$G$9!#\e(B
-\e$BJQ?t\e(B @code{wl-highlight-folder-by-numbers} \e$B$,\e(B @code{nil} \e$B$+\e(B @dfn{\e$B?t\e(B} \e$B$N\e(B
+\e$BJQ?t\e(B @code{wl-highlight-folder-by-numbers} \e$B$,\e(B @code{nil} \e$B$+\e(B @var{\e$B?t\e(B} \e$B$N\e(B
 \e$B$H$-M-8z$G$9!#\e(B
 
 @item wl-highlight-folder-path-face
@@ -6085,8 +6085,9 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 @end lisp
 
 @noindent
-(@samp{X-ML-Name:} \e$B%U%#!<%k%I5Z$S\e(B @samp{Reply-To:} \e$B%U%#!<%k%I$NN>J}$,855-;v$K\e(B
-\e$BB8:_$9$k>l9g$@$1!"\e(B@samp{To:} \e$B$K855-;vCf$N\e(B @samp{Reply-To:} \e$B%U%#!<%k%I$,=`Hw$5$l$^$9!#\e(B)
+(@samp{X-ML-Name:} \e$B%U%#!<%k%I5Z$S\e(B @samp{Reply-To:} \e$B%U%#!<%k%I$NN>J}$,85\e(B
+\e$B5-;v$KB8:_$9$k>l9g$@$1!"\e(B@samp{To:} \e$B$K855-;vCf$N\e(B @samp{Reply-To:} \e$B%U%#!<\e(B
+\e$B%k%I$,=`Hw$5$l$^$9!#\e(B)
 
 @c (\e$B:G8e$N9T$N0UL#$O!"%I%i%U%H$N\e(B @samp{To:} \e$B$K855-;vCf$N\e(B @samp{From:} \e$B%U%#!<\e(B
 @c \e$B%k%I$,!"%I%i%U%H$N\e(B @samp{Cc:} \e$B$K855-;v$N\e(B @samp{To:} \e$B%U%#!<%k%I$*$h$S\e(B 
@@ -6151,7 +6152,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 @cindex User-Agent
 
 @samp{X-Mailer:} \e$B%U%#!<%k%I$d\e(B @samp{User-Agent:} \e$B%U%#!<%k%I$K6E$j$?$$$H\e(B
-\e$B$$$&JQ$o$C$??M$O!"E,Ev$KJ8;zNs$r@8@.$9$k4X?t$r<+J,$N9%$-$J$h$&$KDj5A$7$F\e(B
+\e$B$$$&JQ$o$C$??M$O!"J8;zNs$r@8@.$9$k4X?t$r<+J,$N9%$-$J$h$&$KDj5A$7$F!"JQ?t\e(B 
 @code{wl-generate-mailer-string-func} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @samp{User-Agent:} \e$B%U%#!<%k%I$rC;$/$7$?$$$N$G$"$l$P!"0J2<$N@_Dj$r$7$F$/\e(B
@@ -6171,6 +6172,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @lisp
 @group
+(setq mime-edit-insert-user-agent-field nil)
 (setq wl-generate-mailer-string-func
       (function
        (lambda ()
@@ -6212,7 +6214,7 @@ Non-nil \e$B$J$i$P!"%a!<%kAw?.;~$KK\Ev$KAw?.$7$F$h$$$+$r3NG'$7$^$9!#\e(B
 
 @item wl-folder-sync-range-alist
 @vindex wl-folder-sync-range-alist
-\e$B=i4|@_Dj$O!"0J2<$NCM!#\e(B
+\e$B=i4|@_Dj$O!"0J2<$NO"A[%j%9%H!#\e(B
 
 @lisp
 @group
@@ -6316,7 +6318,7 @@ Non-nil \e$B$J$i$P!"@_Dj$5$l$?CM$r;}$D%U%)%k%@$NL$FI?t$r5/F0;~$K%A%'%C%/$7$^$9!#\e
 
 @item wl-folder-mime-charset-alist
 @vindex wl-folder-mime-charset-alist
-\e$B=i4|@_Dj$O0J2<$N%j%9%H!#\e(B
+\e$B=i4|@_Dj$O0J2<$NO"A[%j%9%H!#\e(B
 
 @lisp
 @group
@@ -6347,7 +6349,7 @@ Non-nil \e$B$J$i$P!"@_Dj$5$l$?CM$r;}$D%U%)%k%@$NL$FI?t$r5/F0;~$K%A%'%C%/$7$^$9!#\e
 
 @item wl-delete-folder-alist
 @vindex wl-delete-folder-alist
-\e$B=i4|@_Dj$O0J2<$N%j%9%H!#\e(B
+\e$B=i4|@_Dj$O0J2<$NO"A[%j%9%H!#\e(B
 
 @lisp
 @group
@@ -6361,9 +6363,9 @@ Non-nil \e$B$J$i$P!"@_Dj$5$l$?CM$r;}$D%U%)%k%@$NL$FI?t$r5/F0;~$K%A%'%C%/$7$^$9!#\e
 \e$B$-$^$9!#\e(B
 
 @example
-'remove or 'null : \e$B%a%C%;!<%8$rB(:o=|$9$k!#\e(B
-string           : \e$B;XDj$7$?%U%)%k%@$K0\F0$9$k!#\e(B
-'trash or \e$B$=$NB>\e(B : `wl-trash-folder'\e$B$K0\F0$9$k!#\e(B
+@code{remove} or @code{null} : \e$B%a%C%;!<%8$rB(:o=|$9$k!#\e(B
+string             : \e$B;XDj$7$?%U%)%k%@$K0\F0$9$k!#\e(B
+@code{trash} or \e$B$=$NB>\e(B  : @code{wl-trash-folder} \e$B$K0\F0$9$k!#\e(B
 @end example
 
 @item wl-refile-policy-alist
@@ -6483,16 +6485,15 @@ Wanderlust \e$B$K4X$9$k5DO@$O$3$N%a!<%j%s%0%j%9%H$G9T$o$l$^$9!#\e(B
 @noindent
 \e$B$H=q$$$?%a!<%k$rAw$k$HF~2q$N%,%$%I$,<+F0E*$K$b$i$($^$9!#\e(B
 
-\e$B%P%0Js9p$d%Q%C%A$NAwIU$b$3$A$i$N%a!<%j%s%0%j%9%H$XAw$C$F$/$@$5$$!#\e(B
-\e$B%a!<%j%s%0%j%9%H$N%a%s%P$G$J$/$H$b!"Aw?.$G$-$k@_Dj$K$J$C$F$$$^$9!#\e(B
+\e$B%P%0Js9p$d%Q%C%A$NAwIU$b$3$A$i$N%a!<%j%s%0%j%9%H$XAw$C$F$/$@$5$$!#%a!<%j\e(B
+\e$B%s%0%j%9%H$N%a%s%P$G$J$/$H$b!"Aw?.$G$-$k@_Dj$K$J$C$F$$$^$9!#\e(B
 
-\e$B$^$?!"%P%0Js9p$N>l9g$O\e(B Backtrace \e$B$r<h$C$FE:IU$9$k$H$h$j860x5fL@\e(B
-\e$B$7$d$9$/$J$j$^$9!#\e(B 
-@footnote{Backtrace \e$B$N<h$jJ}$O\e(B@uref{http://www.jpl.org/elips/BUGS-ja.html}\e$B$,;29M$K$J$j$^$9!#\e(B}
+\e$B$^$?!"%P%0Js9p$N>l9g$O\e(B Backtrace \e$B$r<h$C$FE:IU$9$k$H$h$j860x5fL@$7$d$9$/\e(B
+\e$B$J$j$^$9!#\e(B @footnote{Backtrace \e$B$N<h$jJ}$O\e(B
+@uref{http://www.jpl.org/elips/BUGS-ja.html}\e$B$,;29M$K$J$j$^$9!#\e(B}
 
-\e$B%a!<%j%s%0%j%9%H$N3'MM$K$O5.=E$J8f=u8@!"\e(B
-\e$B%3!<%I$r$?$/$5$s8fDs6!$$$?$@$$$F$*$j$^$9!#\e(B
-\e$B$3$N>l$r<Z$j$F$*Ni?=$7>e$2$^$9!#\e(B
+\e$B%a!<%j%s%0%j%9%H$N3'MM$K$O5.=E$J8f=u8@!"%3!<%I$r$?$/$5$s8fDs6!$$$?$@$$$F\e(B
+\e$B$*$j$^$9!#$3$N>l$r<Z$j$F$*Ni?=$7>e$2$^$9!#\e(B
 
 
 @node Addition, Index, Mailing List, Top

diff --git a/doc/wl.texi b/doc/wl.texi
index d91707d..f4aee63 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -264,8 +264,9 @@ confirmed to work.
 @item APEL 10.2, SLIM 1.14.3, EMY 1.13.9
 @end itemize
 
-@c You have to re-install Wanderlust
-@c if you upgraded APEL, FLIM, SEMI or tm.
+You have to re-install Wanderlust if you upgraded APEL, FLIM, SEMI or
+tm.
+
 
 @node Download, Install, MIME Modules, Start Me Up
 @section Download and Extract the Package
@@ -308,15 +309,14 @@ Extract the obtained package to your working directory:
 SSL (Secure Socket Layer) can be used for 
 SMTP, IMAP, NNTP and POP connections in Wanderlust.
 
-There are two ways to use SSL. One is to start SSL negotiation just after
-the connection establishment (generic way). 
-The other one is to start SSL negotiation by invoking STARTTLS command in
-the each session.
+There are two ways to use SSL. One is to start SSL negotiation just
+after the connection establishment (generic way). The other one is to
+start SSL negotiation by invoking STARTTLS command in the each session.
 
 To use the formar SSL (generic SSL), you must install @file{ssl.el} in
 the @file{utils} directory. OpenSSL command @command{openssl} is also
-required to use @file{ssl.el}. You must set PATH to the directory that
-OpenSSL commands are installed.
+required to use @file{ssl.el}. You must set @env{PATH} to the directory
+that OpenSSL commands are installed.
 
 To use the latter SSL(STARTTLS), you must install starttls package in
 addition to above. 
@@ -497,8 +497,8 @@ The minimal requirement for settings is as the following.
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
 
-;; @r{Directory where icons are placed (XEmacs or Emacs 21). Default value
-;; is @code{nil}.}
+;; @r{Directory where icons are placed (XEmacs or Emacs 21).}
+;; @r{Default: @code{nil}.}
 ;; @r{(This is not required if Wanderlust is installed as XEmacs package)}
 (setq wl-icon-dir "~/work/wl/etc")
 
@@ -601,8 +601,8 @@ If variable @code{wl-use-ldap} is non-nil (initial setting is
 If you use LDAP, you have to set @code{wl-ldap-server},
 @code{wl-ldap-port} and @code{wl-ldap-base} properly. If your emacs does
 not have LDAP feature as built-in feature (Currently only XEmacs can
-have built-in LDAP feature), you have to set command exec PATH to the
-program @command{ldapsearch}.
+have built-in LDAP feature), you have to set command exec @env{PATH} to
+the program @command{ldapsearch}.
 
 @node Folder Definition, Start Wanderlust, Mail Addresses, Start Me Up
 @section Folder Definition
@@ -878,8 +878,8 @@ Example:
 
 @example
 @group
--fj.rec.tv            -> Newsgroup `fj.rec.tv'.
--fj.rec.tv@@newsserver -> Newsgroup `fj.rec.tv' on newsserver.
+-fj.rec.tv            -> Newsgroup @samp{fj.rec.tv}.
+-fj.rec.tv@@newsserver -> Newsgroup @samp{fj.rec.tv} on @samp{newsserver}.
 @end group
 @end example
 
@@ -1526,8 +1526,8 @@ the message is removed.  If you append messages to this folder, the
 message will have @samp{$} mark.
 
 (Can't remove important mark @samp{$} on IMAP server from @samp{'mark}
-folder.  If you want IMAP folder's message remove from @{'mark} folder,
-remove important mark at IMAP Folder.)
+folder.  If you want IMAP folder's message remove from @samp{'mark}
+folder, remove important mark at IMAP Folder.)
 
 You can access to the cached messages fetched via network by accessing
 to the folders named @samp{'cache/00} - @samp{'cache/1F}. 00 - 1F are
@@ -6002,14 +6002,14 @@ Per default, this face is used for bodies of @samp{X-} fields
 The face for headers of quoted messages.
 
 @item wl-highlight-message-cited-text-*
-The face for texts of quoted messages.
-The last @samp{*} is a single figure so that 10 different colors can be used
-according to citation levels.
+The face for texts of quoted messages.  The last @samp{*} is a
+@var{single figure} so that 10 different colors can be used according to
+citation levels.
 
 @item wl-highlight-message-signature
-The face for signatures of messages.
-The initial settings are khaki for light background colors, and
-DarkSlateBlue for dark background colors.
+The face for signatures of messages.  The initial settings are
+@samp{khaki} for light background colors, and @samp{DarkSlateBlue} for
+dark background colors.
 
 @item wl-highlight-header-separator-face
 The face for header separators of draft messages.
@@ -6080,12 +6080,12 @@ folder mode.
 @item wl-highlight-folder-opened-face
 The face for open groups in the folder mode.
 It is meaningful when @code{wl-highlight-group-folder-by-numbers} is
-@code{nil} or a number.
+@code{nil} or a @var{number}.
 
 @item wl-highlight-folder-closed-face
 The face for close groups in the folder mode.
 It is meaningful when @code{wl-highlight-group-folder-by-numbers} is
-@code{nil} or a number.
+@code{nil} or a @var{number}.
 
 @item wl-highlight-folder-path-face
 The face for the path to the currently selected folder in the folder
@@ -6154,9 +6154,9 @@ following settings:
 @end lisp
 
 @noindent
-(Only if there are both of @samp{X-ML-Name} and @samp{Reply-To} fields in the
-original message, @samp{Reply-To} field in the original is copied to @samp{To:}
-field.)
+(Only if there are both of @samp{X-ML-Name:} and @samp{Reply-To:} fields
+in the original message, @samp{Reply-To:} field in the original is
+copied to @samp{To:} field.)
 
 Moreover, the behavior of @kbd{a} with prefix argument can 
 be directed by @code{wl-draft-reply-with-argument-list} as well.
@@ -6216,7 +6216,7 @@ If you do not want to see branches, do the following:
 
 If you are eccentric enough to elaborate @samp{X-Mailer:} or
 @samp{User-Agent:} fields, define a function that generate appropriate
-strings as you like, and set it to
+strings as you like, and set it to variable
 @code{wl-generate-mailer-string-func}.
 
 If you do not want verbose @samp{User-Agent:} field, do the following:
@@ -6235,6 +6235,7 @@ The following is a example:
 
 @lisp
 @group
+(setq mime-edit-insert-user-agent-field nil)
 (setq wl-generate-mailer-string-func
       (function
        (lambda ()
@@ -6276,7 +6277,7 @@ If non-nil, you are asked for confirmation when mail is sent.
 
 @item wl-folder-sync-range-alist
 @vindex wl-folder-sync-range-alist
-The initial setting is the list shown below:
+The initial setting is the alist shown below:
 
 @lisp
 @group
@@ -6285,6 +6286,7 @@ The initial setting is the list shown below:
 @end group
 @end lisp
 
+@noindent
 This is an associative list of regular expressions of folder names and
 update range of the summary.  Update range is one of the @samp{all},
 @samp{update}, @samp{rescan}, @samp{rescan-noscore}, @samp{first} and
@@ -6384,7 +6386,7 @@ This takes precedence over @code{wl-no-save-folder-list}.
 
 @item wl-folder-mime-charset-alist
 @vindex wl-folder-mime-charset-alist
-The initial setting is the list shown below:
+The initial setting is the alist shown below:
 
 @lisp
 @group
@@ -6415,7 +6417,7 @@ It is ignored if @code{wl-folder-init-load-access-folders} is non-nil.
 
 @item wl-delete-folder-alist
 @vindex wl-delete-folder-alist
-The initial setting is the list shown below:
+The initial setting is the alist shown below:
 
 @lisp
 @group
@@ -6429,9 +6431,9 @@ Each item in the list is a folder and destination; you can specify any
 one of the following in the place of destination:
 
 @example
-'remove or 'null : deletes the messages instantly.
-string           : moves the messages to the specific folder.
-'trash or others : moves the messages to `wl-trash-folder'.
+@code{remove} or @code{null} : deletes the messages instantly.
+string             : moves the messages to the specific folder.
+@code{trash} or others  : moves the messages to @code{wl-trash-folder}.
 @end example
 
 @item wl-refile-policy-alist
@@ -6543,11 +6545,12 @@ A guide can be obtained automatically by sending mail to
 @example
 # guide
 @end example
-Please send bug reports or patches to the mailing list.
-You can post to the mailing list even though you are not a member of it.
+Please send bug reports or patches to the mailing list.  You can post to
+the mailing list even though you are not a member of it.
 
 If you send a bug report, please attach Backtrace with it.
-@footnote{@uref{http://www.jpl.org/elips/BUGS-ja.html} describes how to in Japanese.}
+@footnote{@uref{http://www.jpl.org/elips/BUGS-ja.html} describes how to
+in Japanese.}
 
 I would like to express my thanks to the members of the mailing list for 
 valuable advice and many pieces of code they contributed.