Doc fixed.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index b7dd2ed..c22b319 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -22,10 +22,9 @@ Yet another message interface on Emacsen.
 \e$B$3$N%U%!%$%k$O\e(B Emacs \e$B$GF0$/%a!<%k\e(B/\e$B%K%e!<%94IM}%7%9%F%`\e(B
 Wanderlust \e$B$K4X$9$k@bL@=q$G$9!#\e(B
 
-Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}.
-@c Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, @*
-@c @w{Fujikazu Okunishi}, @w{Masahiro Murata},
-@c @w{Kenichi Okada} and @w{Kaoru Takahashi}.
+Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, @*
+@w{Fujikazu Okunishi}, @w{Masahiro Murata},
+@w{Kenichi Okada} and @w{Kaoru Takahashi}.
 
 This edition is for Wanderlust version @value{version}.
 
@@ -67,7 +66,9 @@ into another language, under the above conditions for modified versions.
 
 @titlepage
 @sp 10
-@title Wanderlust \e$B%f!<%6%^%K%e%"%k\e(B (ver. @value{version})
+@title Wanderlust \e$B%f!<%6%^%K%e%"%k\e(B
+@subtitle Yet Another Message Interface On Emacsen
+@subtitle for version @value{version}
 @author Yuuichi Teranishi \e$B;{@>M50l\e(B
 @author Fujikazu Okunishi \e$B1|@>F#OB\e(B
 @author Masahiro Murata   \e$BB<EDA442\e(B
@@ -76,10 +77,9 @@ into another language, under the above conditions for modified versions.
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}.
-@c Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, @*
-@c @w{Fujikazu Okunishi}, @w{Masahiro Murata},
-@c @w{Kenichi Okada}, and @w{Kaoru Takahashi}.
+Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, @*
+@w{Fujikazu Okunishi}, @w{Masahiro Murata},
+@w{Kenichi Okada}, and @w{Kaoru Takahashi}.
 
 This manual is for Wanderlust version @value{version}.
 
@@ -245,11 +245,11 @@ tm:   http://cvs.m17n.org/tomo/comp/emacsen/tm/tm-8/
 @end example
 
 SEMI \e$B$K$O\e(B APEL, FLIM \e$B$H8F$P$l$k%Q%C%1!<%8$bI,MW$G$9!#\e(B
-FLIM, APEL \e$B$O0J2<$N>l=j$+$i%@%&%s%m!<%I$G$-$^$9!#\e(B
+APEL, FLIM \e$B$O0J2<$N>l=j$+$i%@%&%s%m!<%I$G$-$^$9!#\e(B
 
 @example
-FLIM:     ftp://ftp.m17n.org/mule/flim/
 APEL:     ftp://ftp.m17n.org/mule/apel/
+FLIM:     ftp://ftp.m17n.org/mule/flim/
 @end example
 
 APEL, FLIM, SEMI \e$B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
@@ -269,7 +269,7 @@ APEL 10.2 \e$B$H\e(B FLIM 1.12.7 \e$B$NAH9g$;$G$O!"\e(BFLIM 1.12.7 \e$B$N%3%s%Q%$%k;~
 Please install latest APEL 7.3 or later.
 @end example
    
-\e$B$H$$$&%(%i!<$,H/@8$9$k>l9g$,$"$j$^$9!#$3$N>l9g!"\e(BFLIM-CFG \e$B$N0J2<$N9T$r\e(B
+\e$B$H$$$&%(%i!<$,H/@8$9$k>l9g$,$"$j$^$9!#$3$N>l9g!"\e(B@file{FLIM-CFG} \e$B$N0J2<$N9T$r\e(B
 \e$B%3%a%s%H%"%&%H$7$F2<$5$$!#\e(B
 
 @example
@@ -318,8 +318,8 @@ ftp://opaopa.org/pub/mirror/elisp/wl/
 
 @example
 % cd ~/work
-% tar zxvf wl-(@var{version}).tar.gz
-% cd wl-(@var{version})
+% tar zxvf wl-@var{version}.tar.gz
+% cd wl-@var{version}
 @end example
 
 @subsection SSL (Secure Socket Layer)\e$B$NMxMQ\e(B
@@ -381,7 +381,7 @@ load-path \e$B$rDL$7$F$*$/$H$h$$$G$7$g$&!#\e(B
 \e$B%8%e!<%k$,%P%$%H%3%s%Q%$%k\e(B/\e$B%$%s%9%H!<%k$5$l$^$9!#\e(B
 @xref{BBDB}.
 
-@subsection WL-CFG
+@subsection @file{WL-CFG}
 
 @file{WL-CFG} \e$B$H$$$&%U%!%$%k$,E83+%G%#%l%/%H%j$KB8:_$9$k$H!"\e(B
 \e$B%$%s%9%H!<%k;~$K\e(B load \e$B$5$l$k$h$&$K$J$C$F$$$^$9!#\e(B
@@ -492,7 +492,7 @@ Wanderlust \e$B$N%Q%C%1!<%8$K$OBg$-$/J,$1$FFs$D$N%b%8%e!<%k72$,4^$^$l$F$$$^$9!#\e(
 Wanderlust \e$BK\BN$NF0:n$r7h$a$k%b%8%e!<%k72$G$9!#\e(BELMO \e$B$N%U%m%s%H%(%s%I$G$9!#\e(B
 @end table
 
-\e$B%f!<%6$O\e(B @code{elmo-*}, @code{wl-*} \e$B$G;O$^$kJQ?t$N@_Dj$rJQ$($k$3$H$K$h$C$F\e(B
+\e$B%f!<%6$O\e(B @code{elmo-}, @code{wl-} \e$B$G;O$^$kJQ?t$N@_Dj$rJQ$($k$3$H$K$h$C$F\e(B
 Wanderlust \e$B$NF0:n$r%+%9%?%^%$%:$G$-$^$9!#\e(B
 
 \e$B:GDc8BI,MW$J@_Dj$O0J2<$NDL$j$G$9!#\e(B
@@ -525,7 +525,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B
 (\e$B>e5-$N$&$A!"\e(B@samp{(load "mime-setup")} \e$B$H\e(B autoload \e$B$N@_Dj0J30$O\e(B @file{~/.wl} 
 \e$B$K5-=R$G$-$^$9!#\e(B)
 
-@subsection mail-user-agent
+@subsection @code{mail-user-agent}
 @cindex Default Mailer
 @cindex Mailer, Default
 @vindex mail-user-agent
@@ -535,7 +535,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B
 (@code{compose-mail}) \e$BEy$K$h$C$F\e(B Wanderlust \e$B$N%I%i%U%H%b!<%I$,5/F0$5$l$k\e(B
 \e$B$h$&$K$J$j$^$9!#\e(BWanderlust \e$B$r\e(B Emacs \e$B>e$NI8=`%a!<%i$H$7$F;H$$$?$$>l9g$O\e(B
 \e$B@_Dj$7$F$*$/$H$h$$$G$7$g$&!#\e(B
-\e$B$?$@$7!"$3$l$O\e(B @code{mail-user-agent} \e$B$NDj5A$,2DG=$J\e(B Emacs \e$B$N>l9g$N$_M-8z$G$9!#\e(B
+\e$B$?$@$7!"$3$l$O\e(B @code{mail-user-agent} \e$B$NDj5A$,2DG=$J\e(B Emacsen \e$B$N>l9g$N$_M-8z$G$9!#\e(B
 @c @xref{Mail Methods, , ,emacs}.
 
 @lisp
@@ -1041,7 +1041,7 @@ GNU tar \e$B$O=q8K$+$i$N:o=|$KLdBj$,$"$k$b$N$,B?$$$N$G!"FC$KCm0U$7$F$/$@$5$$!#\e(B
 @subsection TIPS
 @cindex Archive Tips
 
-\e$B2wE,$K0\9T$9$k$K$O!"\e(Bwl-summary-archive() \e$B$r<B9T$9$k\e(B (@pxref{Archive}) \e$B$+!"\e(B
+\e$B2wE,$K0\9T$9$k$K$O!"\e(B@code{wl-summary-archive} \e$B$r<B9T$9$k\e(B (@pxref{Archive}) \e$B$+!"\e(B
 Expire \e$B5!G=\e(B (@pxref{Expire}) \e$B$HAH$_9g$o$;$k$H$$$$$G$7$g$&!#\e(B
 \e$B$?$@$7!"\e(BExpire \e$B5!G=$G:n@.$7$?%"!<%+%$%V%U%)%k%@$r07$&>l9g$O!"\e(B
 \e$BJQ?t\e(B @code{elmo-archive-treat-file} \e$B$r\e(B non-nil \e$B$K@_Dj$9$kI,MW$,$"$j$^$9!#\e(B
@@ -2409,6 +2409,15 @@ prefix argument \e$B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!
 \e$BI=<(Cf$G$J$1$l$P!"I=<($7$^$9!#\e(B
 (@code{wl-summary-next-line-content})
 
+@item -
+@itemx M-@key{RET}
+@kindex - (Summary)
+@kindex M-@key{RET} (Summary)
+@findex wl-summary-prev-line-content
+\e$B%+!<%=%k9T$N%a%C%;!<%8$,I=<(Cf$G$"$l$P%a%C%;!<%8$r0l9T2<$K%9%/%m!<%k$7$^$9!#\e(B
+\e$BI=<(Cf$G$J$1$l$P!"I=<($7$^$9!#\e(B
+(@code{wl-summary-prev-line-content})
+
 @item /
 @kindex / (Summary)
 @findex wl-thread-open-close
@@ -2427,15 +2436,6 @@ prefix argument \e$B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!
 @findex wl-thread-close-all
 (@code{wl-thread-close-all})
 
-@item -
-@itemx M-@key{RET}
-@kindex - (Summary)
-@kindex M-@key{RET} (Summary)
-@findex wl-summary-prev-line-content
-\e$B%+!<%=%k9T$N%a%C%;!<%8$,I=<(Cf$G$"$l$P%a%C%;!<%8$r0l9T2<$K%9%/%m!<%k$7$^$9!#\e(B
-\e$BI=<(Cf$G$J$1$l$P!"I=<($7$^$9!#\e(B
-(@code{wl-summary-prev-line-content})
-
 @item g
 @kindex g (Summary)
 @findex wl-summary-goto-folder
@@ -2563,7 +2563,7 @@ prefix argument \e$B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!
 @findex wl-summary-burst
 \e$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$,\e(B
 MIME \e$B$G%+%W%;%k2=$5$l$?J#?t$N%a%C%;!<%84^$`>l9g!"\e(B
-\e$B$=$l$i$r8=:_$N%U%)%k%@$K$[$I$-$^$9\e(B(\e$BL$<BAu\e(B)\e$B!#\e(B
+\e$B$=$l$i$r8=:_$N%U%)%k%@$K$[$I$-$^$9!#\e(B
 (@code{wl-summary-burst})
 
 @item @@
@@ -4652,10 +4652,10 @@ t \e$B$N>l9g!"%U%)%k%@%b!<%I$G\e(B expire \e$B$r<B9T$9$k$H$-$K!"\e(B
 \e$B$3$N$h$&$K\e(B@samp{\e$B%U%)%k%@$N\e(Bregexp}\e$B$N8e$K$O4X?t$7$+;XDj$G$-$^$;$s!#\e(B
 \e$BI8=`$G$O<!$N\e(B3\e$B$D$N4X?t\e(B
 
-@itemize
-@item wl-archive-number1
-@item wl-archive-number2
-@item wl-archive-date
+@itemize @bullet
+@item @code{wl-archive-number1}
+@item @code{wl-archive-number2}
+@item @code{wl-archive-date}
 @end itemize
 
 \e$B$,MQ0U$5$l$F$*$j!"L>A0$+$i$*2r$j$NDL$j<!$NE@$r=|$$$F\e(B Expire \e$B$GMQ0U$5$l$F\e(B
@@ -4687,12 +4687,12 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 \e$B$$$F$$$k$?$a!"%+%9%?%^%$%:JQ?t$NCf$G<!$K<($9$b$N$,4X78$7$F$-$^$9!#\e(B
 
 @itemize @bullet
-@item wl-expire-archive-files
-@item wl-expire-archive-get-folder-func
-@item wl-expire-archive-folder-name-fmt
-@item wl-expire-archive-folder-type
-@item wl-expire-archive-folder-prefix
-@item wl-expire-archive-folder-num-regexp
+@item @code{wl-expire-archive-files}
+@item @code{wl-expire-archive-get-folder-func}
+@item @code{wl-expire-archive-folder-name-fmt}
+@item @code{wl-expire-archive-folder-type}
+@item @code{wl-expire-archive-folder-prefix}
+@item @code{wl-expire-archive-folder-num-regexp}
 @end itemize
 
 @subsection \e$B%+%9%?%^%$%:JQ?t\e(B
@@ -4720,7 +4720,7 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 \e$B%9%3%"$H$O!"%a%C%;!<%8$K%9%3%"\e(B(\e$BCM\e(B)\e$B$r$D$1!"\e(B
 \e$B$=$NCM$K$h$j4{FI%^!<%/$rIU$1$?$j%5%^%j$+$i>C$7$?$j$9$k5!G=$G$9!#\e(B
 
-\e$B$3$N5!G=$K$h$C$F=EMW$J%a%C%;!<%8$K\e(B temp \e$B%^!<%/$d\e(B important \e$B%^!<%/$r$D$1$?\e(B
+\e$B$3$N5!G=$K$h$C$F=EMW$J%a%C%;!<%8$K\e(B target \e$B%^!<%/$d\e(B important \e$B%^!<%/$r$D$1$?\e(B
 \e$B$j!"\e(Bspam \e$B5-;v$J$I$NFI$_$?$/$J$$%a%C%;!<%8$K4{FI%^!<%/$r$D$1$?$j$9$k$3$H$,\e(B
 \e$B$G$-$^$9!#\e(B
 
@@ -5665,8 +5665,8 @@ Mailng List \e$B$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G\e(B @kbd{a} \e$B$r2!$7$?$@
 (setq wl-generate-mailer-string-func
       (function
        (lambda ()
-         (concat "X-Mailer: "
-                 (format "%s/%s (%s)" wl-appname wl-version wl-codename)))))
+         (format "X-Mailer: %s/%s (%s)"
+                 wl-appname wl-version wl-codename))))
 @end lisp
 
 
@@ -5708,7 +5708,7 @@ Non-nil \e$B$J$i$P!"%a!<%kAw?.;~$KK\Ev$KAw?.$7$F$h$$$+$r3NG'$7$^$9!#\e(B
  ("^\\+draft$\\|^\\+queue$" . "all"))
 @end example
 \e$B%U%)%k%@L>$N@55,I=8=$H%U%)%k%@0\F0;~$N%5%^%j99?7%l%s%8O"A[%j%9%H$G$9!#\e(B
-\e$B99?7%l%s%8$K$O\e(B wl-summary-sync \e$B$GF~NO$G$-$kCM$N$$$:$l$+\e(B
+\e$B99?7%l%s%8$K$O\e(B @code{wl-summary-sync} \e$B$GF~NO$G$-$kCM$N$$$:$l$+\e(B
 (all, update, rescan, rescan-noscore, first, last) \e$B$r;XDj$7$^$9!#\e(B
 \e$B%^%C%A$7$J$+$C$?>l9g$O!"\e(Bupdate \e$B$H$J$j$^$9!#\e(B
 
@@ -5968,6 +5968,10 @@ Wanderlust \e$B$K4X$9$k5DO@$O$3$N%a%$%j%s%0%j%9%H$G9T$o$l$^$9!#\e(B
       4/28    wl-template by \e$BB<ED$5$s!#\e(B
       5/18    1.0.0 stable \e$B%j%j!<%9!#\e(B
       7/05    \e$B%9%3%"5!G=\e(B by \e$BB<ED$5$s\e(B(2.1.0)\e$B!#\e(B
+      9/26    \e$B%W%i%04IM}%7%9%F%`\e(B by \e$BB<ED$5$s\e(B(2.2.2)\e$B!#\e(B
+     12/20    Modified UTF7 \e$BBP1~!#\e(B
+2000  3/24    1.1.0 stable \e$B%j%j!<%9!#\e(B
+      4/03    CVS \e$B%5!<%P$G$N3+H/$r3+;O!#\e(B
 @end example
 
 \e$B$/$o$7$$JQA+$O\e(B @file{ChangeLog} \e$B$r8fMw$/$@$5$$!#\e(B
@@ -5984,11 +5988,11 @@ wanderlust   wan\e$B!&\e(Bder\e$B!&\e(Blust
 
 @noindent
 \e$B$H$$$&0UL#$,$"$j$^$9!#$,!"L>A0$K$?$$$7$F?<$$0U?^$O$"$j$^$;$s!#\e(B
-(\e$B6/$$$F8@$($P!"\e(BIMAP @t{=>} \e$B$I$3$G$b%a!<%k$,FI$a$k\e(B @t{=>} \e$BJ|O2JJ\e(B ?)
+(\e$B6/$$$F8@$($P!"\e(BIMAP \e$B"*\e(B \e$B$I$3$G$b%a!<%k$,FI$a$k\e(B \e$B"*\e(B \e$BJ|O2JJ\e(B ?)
 
 elmo \e$B$O!"\e(B@samp{Elisp Library for Message Orchestration} \e$B$NN,$G$9!#\e(B
 \e$B:G=i$O$"$N@V$$$L$$$0$k$_$N$D$b$j$G$7$?$,!"\e(B
-\e$BJ|O2\e(B @t{=>} \e$BI:N.\e(B @t{=>} \e$BF;I8\e(B @t{=>} St.@: Elmo's fire @t{=>} elmo \e$B$H$$$&!"\e(B
+\e$BJ|O2\e(B \e$B"*\e(B \e$BI:N.\e(B \e$B"*\e(B \e$BF;I8\e(B \e$B"*\e(B St.@: Elmo's fire \e$B"*\e(B elmo \e$B$H$$$&!"\e(B
 \e$B$=$l$C$]$$O"A[$b2DG=$G$9!#\e(B
 
 @section \e$B%3!<%I%M!<%`\e(B

diff --git a/doc/wl.texi b/doc/wl.texi
index 2855176..8b25be3 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -19,11 +19,10 @@
 This file documents Wanderlust,
 Yet another message interface on Emacsen.
 
-Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}.
-@c Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, @*
-@c @w{Fujikazu Okunishi}, @w{Masahiro Murata},
-@c @w{Kenichi Okada}, @w{Kaoru Takahashi}, @w{Bun Mizuhara}
-and @w{Masayuki Osada}.
+Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, @*
+@w{Fujikazu Okunishi}, @w{Masahiro Murata},
+@w{Kenichi Okada}, @w{Kaoru Takahashi},
+@w{Bun Mizuhara} and @w{Masayuki Osada}.
 
 This edition is for Wanderlust version @value{version}.
 
@@ -50,7 +49,9 @@ into another language, under the above conditions for modified versions.
 
 @titlepage
 @sp 10
-@title Wanderlust User's Manual (ver. @value{version})
+@title Wanderlust User's Manual
+@subtitle Yet Another Message Interface On Emacsen
+@subtitle for Version @value{version}
 @author Yuuichi Teranishi
 @author Fujikazu Okunishi
 @author Masahiro Murata
@@ -61,11 +62,10 @@ into another language, under the above conditions for modified versions.
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}.
-@c Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, @*
-@c @w{Fujikazu Okunishi}, @w{Masahiro Murata},
-@c @w{Kenichi Okada}, @w{Kaoru Takahashi}, 
-@c @w{Bun Mizuhara} and @w {Masayuki Osada}
+Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, @*
+@w{Fujikazu Okunishi}, @w{Masahiro Murata},
+@w{Kenichi Okada}, @w{Kaoru Takahashi},
+@w{Bun Mizuhara} and @w{Masayuki Osada}.
 
 This manual is for Wanderlust version @value{version}.
 
@@ -220,11 +220,11 @@ tm:   http://cvs.m17n.org/tomo/comp/emacsen/tm/tm-8/
 @end example
 
 You need packages named APEL and FLIM to use SEMI.
-You can download FLIM and APEL from following URLs.
+You can download APEL and FLIM from following URLs.
 
 @example
-FLIM:     ftp://ftp.m17n.org/mule/flim/
 APEL:     ftp://ftp.m17n.org/mule/apel/
+FLIM:     ftp://ftp.m17n.org/mule/flim/
 @end example
 
 You have to install APEL, FLIM and SEMI in this order.
@@ -245,7 +245,7 @@ while compiling FLIM 1.12.7.
 Please install latest APEL 7.3 or later.
 @end example
 
-In this case, please comment out following lines in FLIM-CFG.
+In this case, please comment out following lines in @file{FLIM-CFG}.
 
 @example
 (or (fboundp 'write-region-as-binary)
@@ -291,8 +291,8 @@ Extract the obtained package to your working directory:
 
 @example
 % cd ~/work
-% tar zxvf wl-(@var{version}).tar.gz
-% cd wl-(@var{version})
+% tar zxvf wl-@var{version}.tar.gz
+% cd wl-@var{version}
 @end example
 
 @subsection To use SSL (Secure Socket Layer)
@@ -358,7 +358,7 @@ If you want to use BBDB, then the necessary modules are byte-compiled and
 installed when BBDB directory is added to load-path.
 @xref{BBDB}.
 
-@subsection WL-CFG
+@subsection @file{WL-CFG}
 
 Contents of the file @file{WL-CFG} is loaded under installation if a file
 with that name exists in extracted directory. You can use @file{WL-CFG} to
@@ -447,7 +447,7 @@ They are also the front-end for ELMO.
 @end table
 
 You can customize the  behavior of Wanderlust by changing the value
-of environmental variables which begins with @code{elmo-*} and @code{wl-*}.
+of environmental variables which begins with @code{elmo-} and @code{wl-}.
 
 The minimal requirement for settings is as the following.
 
@@ -481,7 +481,7 @@ All above described settings except (load "mime-setup") and autoload
 configuration can be written in
 @file{~/.wl}).
 
-@subsection mail-user-agent
+@subsection @code{mail-user-agent}
 @cindex Default Mailer
 @cindex Mailer, Default
 @vindex mail-user-agent
@@ -490,7 +490,7 @@ configuration can be written in
 If you write following setting in you @file{.emacs}, you can
 start Wanderlust draft mode by typing @kbd{C-x m} (@code{compose-mail}). 
 This means it enables you to run Wanderlust as a default mail composer
- of Emacs.
+ of Emacsen.
 
 It is effective only when your Emacs can define @code{mail-user-agent}.
 @c @xref{Mail Methods, , ,emacs}.
@@ -989,7 +989,7 @@ destroyed. No problem is reported on above versions of GNU tar.
 @subsection TIPS
 @cindex Archive Tips
 
-For comfortable migration, usage of wl-summary-archive() (@pxref{Archive}) or 
+For comfortable migration, usage of @code{wl-summary-archive} (@pxref{Archive}) or 
 Expire (@pxref{Expire}) is recommended.
 To treat archive folders created by expiration, 
 you must set non-nil value to @code{elmo-archive-treat-file}.
@@ -2386,6 +2386,15 @@ Display the next line of the message at the current cursor point.
 Display the message at the current cursor point if it is not displayed yet.
 (@code{wl-summary-next-line-content})
 
+@item -
+@itemx M-@key{RET}
+@kindex - (Summary)
+@kindex M-@key{RET} (Summary)
+@findex wl-summary-prev-line-content
+Display the previous line of the message at the current cursor point.
+Display the message at the current cursor point if it is not displayed yet.
+(@code{wl-summary-prev-line-content})
+
 @item /
 @kindex / (Summary)
 @findex wl-thread-open-close
@@ -2404,15 +2413,6 @@ Close all threads.
 @findex wl-thread-close-all
 (@code{wl-thread-close-all})
 
-@item -
-@itemx M-@key{RET}
-@kindex - (Summary)
-@kindex M-@key{RET} (Summary)
-@findex wl-summary-prev-line-content
-Display the previous line of the message at the current cursor point.
-Display the message at the current cursor point if it is not displayed yet.
-(@code{wl-summary-prev-line-content})
-
 @item g
 @kindex g (Summary)
 @findex wl-summary-goto-folder
@@ -4681,9 +4681,9 @@ As you can see, you can only use a function after @samp{folders_regexp}.
 Per default, there are three functions:
 
 @itemize @bullet
-@item wl-archive-number1
-@item wl-archive-number2
-@item wl-archive-date
+@item @code{wl-archive-number1}
+@item @code{wl-archive-number2}
+@item @code{wl-archive-date}
 @end itemize
 
 As inferred from their names, they work similarly to "expire" versions,
@@ -4715,12 +4715,12 @@ The archiving folders are determined by the same logic as in
 relevant:
 
 @itemize @bullet
-@item wl-expire-archive-files
-@item wl-expire-archive-get-folder-func
-@item wl-expire-archive-folder-name-fmt
-@item wl-expire-archive-folder-type
-@item wl-expire-archive-folder-prefix
-@item wl-expire-archive-folder-num-regexp
+@item @code{wl-expire-archive-files}
+@item @code{wl-expire-archive-get-folder-func}
+@item @code{wl-expire-archive-folder-name-fmt}
+@item @code{wl-expire-archive-folder-type}
+@item @code{wl-expire-archive-folder-prefix}
+@item @code{wl-expire-archive-folder-num-regexp}
 @end itemize
 
 @subsection Customizable Variables
@@ -4748,7 +4748,7 @@ Needless to say, you can use your own function.
 Scoring is the function that associates a score (value) with each
 message, and marks as read or deletes from the summary according to it.
 
-You can put temp or important marks on essential messages, or read marks
+You can put target or important marks on essential messages, or read marks
 on the ones you do not want to read, for example spam articles.
 
 This scoring function has a capability and a format similar to the one
@@ -5706,8 +5706,8 @@ The following is an example.
 (setq wl-generate-mailer-string-func
       (function
        (lambda ()
-         (concat "X-Mailer: "
-                 (format "%s/%s (%s)" wl-appname wl-version wl-codename)))))
+         (format "X-Mailer: %s/%s (%s)"
+                 wl-appname wl-version wl-codename))))
 @end lisp
 
 @node Customizable Variables,  , Advanced Settings, Customization
@@ -6008,7 +6008,11 @@ valuable advice and many pieces of code they contributed.
 1999  2/03    auto-refile by Tsumura-san.
       4/28    wl-template by Murata-san.
       5/18    Released 1.0.0 stable.
-      7/5     Scoring by Murata-san (2.1.0).
+      7/05    Scoring by Murata-san (2.1.0).
+      9/26    New plugged system by Murata-san (2.2.2).
+     12/20    Support Modified UTF7.
+2000  3/24    Released 1.1.0 stable.
+      4/03    CVS development started.
 @end example
 
 See @file{ChangeLog} for details.