Remove verbose comments.

@env, @command, @option, @uref markups.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 6459569..63cde83 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -109,9 +109,6 @@ into another language, under the above conditions for modified versions.
 @end titlepage
 
 
-@c
-@c  Top
-@c 
 @ifinfo
 @node Top, Introduction, (dir), (dir)
 @top Wanderlust \e$B%f!<%6%^%K%e%"%k\e(B
@@ -146,9 +143,6 @@ Kaoru Takahashi   \e$B9b66\e(B  \e$B0j\e(B
 @end menu
 
 
-@c
-@c  Introduction
-@c 
 @node Introduction, Start Me Up, Top, Top
 @chapter \e$B$O$8$a$K\e(B
 @cindex Introduction
@@ -217,9 +211,6 @@ Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B IMAP \e$B%5!<%P$O0J2<$NDL
 @c \e$B$j$G$9!#\e(B
 
 
-@c
-@c  Start Me Up
-@c 
 @node Start Me Up, Folders, Introduction, Top
 @chapter Wanderlust \e$B$r5/F0$9$k\e(B
 @cindex Start up
@@ -252,7 +243,7 @@ Wanderlust \e$B$r@5>o$KF0:n$5$;$k$K$O!"$^$:!"\e(BSEMI \e$B$b$7$/$O\e(B tm \e$B$,%$%s%
 
 Emacs19.28 \e$B0JA0$r%Y!<%9$H$7$?\e(B mule \e$B$r$*;H$$$N>l9g$O\e(B SEMI \e$B$,F0$+$J$$$O$:\e(B
 @footnote{Emacs 19.34 \e$B%Y!<%9$N\e(B Mule \e$B$G$O\e(B SEMI \e$B$rF0:n$5$;$k$3$H$b2DG=$G$9!#\e(B@*
-@samp{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} \e$B$,;29M$K$J$j$^$9!#\e(B}
+@uref{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} \e$B$,;29M$K$J$j$^$9!#\e(B}
 \e$B$J$N$G\e(B tm \e$B$r%$%s%9%H!<%k$7$^$9!#\e(B
 (tm \e$B$O%P!<%8%g%s\e(B 8.7 \e$B0J9_$r$4MxMQ$/$@$5$$!#\e(B)
 
@@ -365,13 +356,13 @@ ftp://opaopa.org/pub/mirror/elisp/wl/
 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
 
-SSL \e$B$NMxMQ7ABV$K$O\e(B2\e$B<oN`$"$j!"\e(B
-\e$B%3%M%/%7%g%s$HF1;~$K\e(B SSL negotiation \e$B$r;O$a$k$b$N$H!"\e(B
-starttls command \e$B$N8e$K\e(B SSL negotiation \e$B$r;O$a$k$b$N$,$"$j$^$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$,$"$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
-@file{ssl.el} \e$B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B
-\e$B$J$*$+$D!"\e(BOpenSSL \e$B$K4^$^$l$k\e(B @file{openssl} \e$B$K%Q%9$,DL$C$F$$$kI,MW$,$"$j$^$9!#\e(B
+@file{ssl.el} \e$B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL \e$B$K4^$^\e(B
+\e$B$l$k\e(B @command{openssl} \e$B$K%Q%9$,DL$C$F$$$kI,MW$,$"$j$^$9!#\e(B
 
 STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls \e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
 \e$B$9$kI,MW$,$"$j$^$9!#\e(B
@@ -417,7 +408,7 @@ Cannot open load file: mime-setup
 
 @noindent
 \e$B$H$$$&%(%i!<$,=P$k$3$H$,$"$j$^$9!#$3$N>l9g$O!"\e(B
-custom, APEL, FLIM, SEMI \e$B$N%$%s%9%H!<%k@h$r4D6-JQ?t\e(B @code{EMACSLOADPATH}
+custom, APEL, FLIM, SEMI \e$B$N%$%s%9%H!<%k@h$r4D6-JQ?t\e(B @env{EMACSLOADPATH}
 \e$B$K2C$($k$+!"E83+%G%#%l%/%H%j$N\e(B @file{WL-CFG} \e$B$H$$$&%U%!%$%kCf$G\e(B
 @code{load-path} \e$B$rDL$7$F$*$/$H$h$$$G$7$g$&!#\e(B
 
@@ -428,7 +419,7 @@ custom, APEL, FLIM, SEMI \e$B$N%$%s%9%H!<%k@h$r4D6-JQ?t\e(B @code{EMACSLOADPATH}
 @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
+\e$B%$%s%9%H!<%k;~$KFI$_9~$^$l$k$h$&$K$J$C$F$$$^$9!#\e(B
 \e$B%$%s%9%H!<%k$G\e(B SEMI \e$BEy$N\e(B @code{load-path} \e$B$N@_Dj$,I,MW$G$"$l$P!"\e(B
 @file{WL-CFG} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
@@ -734,9 +725,6 @@ M-x wl
 \e$B%U%)%k%@$N%A%'%C%/$r>JN,$7$F5/F0$7$^$9!#\e(B
 
 
-@c
-@c  Folders
-@c
 @node Folders, Folder, Start Me Up, Top
 @chapter Wanderlust \e$B$G07$($k%U%)%k%@$?$A\e(B
 @cindex Folder Type
@@ -793,7 +781,7 @@ default \e$BCM\e(B:
 
 @example
 \e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-imap4-user} \e$B$NCM!#\e(B
-             \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @code{USER} \e$B$+!"\e(B@code{LOGNAME} \e$B$+!"\e(B
+             \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @env{USER} \e$B$+!"\e(B@env{LOGNAME} \e$B$+!"\e(B
              @code{(user-login-name)} \e$B$NJV$jCM!#\e(B
 \e$BG'>ZK!\e(B    -> \e$BJQ?t\e(B @code{elmo-default-imap4-authenticate-type} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B "auth"\e$B!#\e(B
@@ -814,11 +802,10 @@ SSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 \e$BJQ?t\e(B @code{elmo-default-imap4-ssl} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
 \e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttls \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 
-(SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9$k\e(B
-\e$BI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @file{openssl} \e$B$K%Q%9$,DL$C$F$$$k\e(B
-\e$BI,MW$,$"$j$^$9!#\e(B
-STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
-\e$B$9$kI,MW$,$"$j$^$9!#\e(B)
+(SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9\e(B
+\e$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,\e(B
+\e$BDL$C$F$$$kI,MW$,$"$j$^$9!#\e(BSTARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C\e(B
+\e$B%1!<%8$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B)
 
 \e$BG'>ZK!$H$7$F!"\e(B"auth" \e$B$b$7$/$O\e(B "cram-md5" \e$B$r;XDj$7$?>l9g!"%Q%9%o!<%I$r\e(B
 \e$B%(%s%3!<%I$7$FAw?.$7$^$9!#$?$@$7!"%5!<%PB&$,%Q%9%o!<%I$r%(%s%3!<%I$7$F\e(B
@@ -912,11 +899,11 @@ default \e$BCM\e(B:
 @samp{!!} \e$B$@$H!"\e(BSTARTTLS\e$B$K$h$j\e(BSSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 \e$BJQ?t\e(B @code{elmo-default-nntp-ssl} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
 \e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttls \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
-(SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9$k\e(B
-\e$BI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @file{openssl} \e$B$K%Q%9$,DL$C$F$$$k\e(B
-\e$BI,MW$,$"$j$^$9!#\e(B
-STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
-\e$B$9$kI,MW$,$"$j$^$9!#\e(B)
+
+(SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9\e(B
+\e$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,\e(B
+\e$BDL$C$F$$$kI,MW$,$"$j$^$9!#\e(BSTARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C\e(B
+\e$B%1!<%8$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B)
 
 @example
 @group
@@ -976,8 +963,8 @@ Maildir \e$B$O!"\e(B@file{cur}, @file{new}, @file{tmp} \e$B$N%G%#%l%/%H%j$r4^$s$G$$
 \e$B%"%/%;%9;~$K\e(B @file{cur} \e$B%G%#%l%/%H%j$X0\F0$5$l$^$9!#\e(B
 \e$B$^$?!"\e(B@file{tmp} \e$B%G%#%l%/%H%j$K4^$^$l!"\e(B36 \e$B;~4V0J>e%"%/%;%9$,L5$$%a%C%;!<%8%U%!%$%k$O:o=|$5$l$^$9!#\e(B
 
-\e$B$3$NF0:n$O\e(B @samp{http://cr.yp.to/proto/maildir.html} \e$B$K=>$C$F$$$^$9!#\e(B@*
-(\e$BF|K\8lLu$O\e(B @samp{http://www.jp.qmail.org/q103/jman5/maildir.html})
+\e$B$3$NF0:n$O\e(B @uref{http://cr.yp.to/proto/maildir.html} \e$B$K=>$C$F$$$^$9!#\e(B@*
+(\e$BF|K\8lLu$O\e(B @uref{http://www.jp.qmail.org/q103/jman5/maildir.html})
 
 @example
 @group
@@ -1136,8 +1123,8 @@ Win32 \e$B$G$O\e(B DOS \e$BHG$G$J$/!"\e(BLHa32 \e$B$G$J$$$HF0$+$J$$$H$N$3$H$G$9!#\e(B
 
 GNU tar \e$B$O=q8K$+$i$N:o=|$KLdBj$,$"$k$b$N$,B?$$$N$G!"FC$KCm0U$7$F$/$@$5$$!#\e(B
 \e$B=q8K$,GK2u$5$l$k4m81@-$,9b$$$N$G!"%U%k%9%Z%C%/$GFI$_=q$-$9$kA0$K\e(B
-@samp{--delete} @samp{-f} \e$B$r=<J,%F%9%H$7$F$*$$$F$/$@$5$$!#\e(B
-\e$B$J$*!">e5-$N$b$N$G$O:#$N$H$3$mLdBj$OJs9p$5$l$F$$$^$;$s!#\e(B
+@option{--delete} @option{-f} \e$B$r=<J,%F%9%H$7$F$*$$$F$/$@$5$$!#$J$*!">e5-\e(B
+\e$B$N$b$N$G$O:#$N$H$3$mLdBj$OJs9p$5$l$F$$$^$;$s!#\e(B
 
 
 @node Archive Tips, Archive Vars, Archiver, Archive Folder
@@ -1263,7 +1250,7 @@ RFC 1939 \e$B$G5,Dj$5$l$?\e(B POP3 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$9!#\e(
 default \e$BCM\e(B:
 @example
 \e$B%f!<%6L>\e(B   -> \e$BJQ?t\e(B @code{elmo-default-pop3-user} \e$B$NCM!#\e(B
-              \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @code{USER} \e$B$+!"\e(B@code{LOGNAME} \e$B$+!"\e(B
+              \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @env{USER} \e$B$+!"\e(B@env{LOGNAME} \e$B$+!"\e(B
               @code{(user-login-name)} \e$B$NJV$jCM!#\e(B
 \e$BG'>ZK!\e(B     -> \e$BJQ?t\e(B @code{elmo-default-pop3-authenticate-type} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B "user"\e$B!#\e(B
@@ -1519,9 +1506,7 @@ Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 \e$B%9$9$k$?$a$N%U%)%k%@$G$9!#\e(B00 \e$B!A\e(B 1F \e$B$K$O!"%-%c%C%7%e%G%#%l%/%H%j\e(B 
 (@file{~/.elmo/cache})\e$B$N%5%V%G%#%l%/%H%jL>$r;XDj$7$^$9!#\e(B
 
-@c
-@c  Folder
-@c
+
 @node Folder, Summary, Folders, Top
 @chapter \e$B%U%)%k%@%b!<%I\e(B
 @cindex Folder
@@ -2245,9 +2230,6 @@ Non-nil \e$B$J$i%a%C%;!<%8$,:o=|$5$l$?$H$-$K%U%)%k%@%b!<%I$GL$FI?t$r%A%'%C%/\e(B
 @end enumerate
 
 
-@c
-@c  Summary
-@c
 @node Summary, Message, Folder, Top
 @chapter \e$B%5%^%j%b!<%I\e(B
 
@@ -3036,7 +3018,6 @@ prefix argument \e$B$D$-$G<B9T$9$k$H2>A[%U%)%k%@$+$iC&=P$7$^$9!#\e(B
 @item r y
 @kindex r y (Summary)
 \e$B;XDj%j!<%8%g%s$K$"$k%a%C%;!<%8$rJ]B8$7$^$9!#\e(B
-\e$B8=:_%+!<%=%k$,$"$k9T$N\e(B
 @findex wl-summary-save-region
 (@code{wl-summary-save-region})
 
@@ -3451,9 +3432,6 @@ nil \e$B$K$9$k$H!"$I$s$JBg$-$5$N%a%C%;!<%8$G$b@hFI$_$r<B9T$7$^$9!#\e(B
 @end table
 
 
-@c
-@c  Message
-@c
 @node Message, Draft, Summary, Top
 @chapter \e$B%a%C%;!<%8%P%C%U%!\e(B
 
@@ -3508,9 +3486,6 @@ nil \e$B$K$9$k$H!"$I$s$JBg$-$5$N%a%C%;!<%8$G$b@hFI$_$r<B9T$7$^$9!#\e(B
 @end table
 
 
-@c
-@c  Draft
-@c
 @node Draft, Disconnected Operations, Message, Top
 @chapter \e$B%I%i%U%H%P%C%U%!\e(B
 
@@ -4141,9 +4116,6 @@ t \e$B$J$i\e(B @file{~/.elmo/sendlog} \e$B$KAw?.%m%0$r=PNO$7$^$9!#\e(B
 @end table
 
 
-@c
-@c  Dsiconnected Operations
-@c
 @node Disconnected Operations, Expire and Archive, Draft, Top
 @chapter \e$B%*%U%i%$%s=hM}\e(B
 @cindex Disconnected Operations
@@ -4411,9 +4383,6 @@ nil \e$B$J$i!"\e(BEmacs \e$B$,F0:n$7$F$$$k4V!"A02s=*N;$7$?;~E@$N%W%i%0>uBV$rJ];}$7$
 @end table
 
 
-@c
-@c  Expire and Archive
-@c
 @node Expire and Archive, Scoring, Disconnected Operations, Top
 @chapter \e$B%a%C%;!<%8$N<+F0:o=|$H%"!<%+%$%V\e(B
 @cindex Expire and Archive
@@ -4949,9 +4918,6 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 @end table
 
 
-@c
-@c  Scoring
-@c
 @node Scoring, Customization, Expire and Archive, Top
 @chapter \e$B%9%3%"\e(B
 @cindex Scoring
@@ -5431,9 +5397,6 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 @end example
 
 
-@c
-@c  Customization
-@c
 @node Customization, Mailing List, Scoring, Top
 @chapter Wanderlust \e$B$N%+%9%?%^%$%:\e(B
 @cindex Customization
@@ -6234,11 +6197,10 @@ Non-nil \e$B$J$i$P%*%U%i%$%s=hM}$GN/$C$?=hM}$r<B9T$9$k$+$I$&$+$r3NG'$7$^$9!#\e(B
 (Not yet written)
 
 
-@c
-@c  Mailing List
-@c
 @node Mailing List, Addition, Customization, Top
 @chapter \e$B%a!<%j%s%0%j%9%H\e(B
+@cindex Bug report
+@cindex Backtrace
 
 @display
 Wanderlust Mailing List @t{<wl@@lists.airs.net>}
@@ -6259,17 +6221,15 @@ Wanderlust \e$B$K4X$9$k5DO@$O$3$N%a!<%j%s%0%j%9%H$G9T$o$l$^$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$N>l9g$O\e(BBacktrace\e$B$r<h$C$FE:IU$9$k$H$h$j860x5fL@\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@samp{http://www.jpl.org/elips/BUGS-ja.html}\e$B$,;29M$K$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
 
-@c
-@c  Addition
-@c
+
 @node Addition, Index, Mailing List, Top
 @chapter \e$B$*$^$1\e(B
 
@@ -6332,7 +6292,7 @@ elmo \e$B$O!"\e(B@samp{Elisp Library for Message Orchestration} \e$B$NN,$G$9!#\e(B
 \e$B3F%P!<%8%g%s$K$O%3!<%I%M!<%`$,$D$$$F$$$^$9\e(B(\e$B$[$H$s$I>iCL$G$9\e(B)\e$B!#\e(B
 \e$B$$$^$N$H$3$m\e(B 1980 \e$BG/Be$NJF%S%k%\!<%I;o%H%C%W\e(B 40 \e$B%R%C%H\e(B
 
-(@samp{http://www.summer.com.br/~pfilho/html/top40/index.html})
+(@uref{http://www.summer.com.br/~pfilho/html/top40/index.html})
 
 \e$B$+$i%"%k%U%!%Y%C%H=g$KE,Ev$K9%$-$J$b$N$r%T%C%/%"%C%W$7$F;H$C$F$$$^$9!#\e(B
 

diff --git a/doc/wl.texi b/doc/wl.texi
index 2873c8a..f4614bb 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -84,9 +84,6 @@ into another language, under the above conditions for modified versions.
 @end titlepage
 
 
-@c
-@c  Top
-@c 
 @ifinfo
 @node Top, Introduction, (dir), (dir)
 @top Wanderlust User's Manual
@@ -123,9 +120,6 @@ This manual is for Wanderlust @value{VERSION}.
 @end menu
 
 
-@c
-@c  Introduction
-@c 
 @node Introduction, Start Me Up, Top, Top
 @chapter Introduction of Wanderlust
 @cindex Introduction
@@ -194,9 +188,6 @@ Wanderlust:
 @c Wanderlust:
 
 
-@c
-@c  Start Me Up
-@c 
 @node Start Me Up, Folders, Introduction, Top
 @chapter Start up Wanderlust
 @cindex Start up
@@ -229,7 +220,7 @@ SEMI or tm must be installed to make Wanderlust work correctly.
 
 SEMI does not run on Emacs19.28 or earlier
 @footnote{SEMI runs on Emacs 19.34. @*
-@samp{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} describes how to.},
+@uref{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} describes how to.},
 so you must install tm, the predecessor of SEMI. (tm version 8.7 or later
 is needed.)
 
@@ -343,10 +334,10 @@ 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 @file{openssl} is also required
-to use @file{ssl.el}. You must set PATH to the directory that OpenSSL
-commands are installed.
+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.
 
 To use the latter SSL(STARTTLS), you must install starttls package in
 addition to above. 
@@ -391,7 +382,7 @@ Cannot open load file: mime-setup
 
 @noindent
 In this case, either add destination directories of custom, APEL, FLIM
-and SEMI to environmental variable @code{EMACSLOADPATH}, or define
+and SEMI to environmental variable @env{EMACSLOADPATH}, or define
 @code{load-path} in @file{WL-CFG} in extracted directory.
 
 If you want to use BBDB, then the necessary modules are byte-compiled and
@@ -711,9 +702,7 @@ That means the folders you defined in the @file{~/.folders} are listed
 If you start Wanderlust with prefix argument like @kbd{C-u M-x wl}, you
 can skip folder checking.
 
-@c
-@c  Folders
-@c
+
 @node Folders, Folder, Start Me Up, Top
 @chapter Wanderlust's folders 
 @cindex Folder Type
@@ -766,8 +755,8 @@ default:
 
 @example
 @var{username}  -> The value of @code{elmo-default-imap4-user}.
-             Initial setting is `USER' environment variable or
-             `LOGNAME' environment variable or return value of
+             Initial setting is @env{USER} environment variable or
+             @env{LOGNAME} environment variable or return value of
              @code{(user-login-name)}.
 @var{authenticate-type} -> The value of @code{elmo-default-imap4-authenticate-type}.
              Initial setting is "auth".
@@ -945,7 +934,7 @@ message files in the @file{new} directory are moved to @file{cur}
 directory when you access to the folder. All message files contained in
 the @file{tmp} directory and not accessed for 36 hours are deleted.
 
-This behavior conforms to the @samp{http://cr.yp.to/proto/maildir.html}.
+This behavior conforms to the @uref{http://cr.yp.to/proto/maildir.html}.
 
 @example
 @group
@@ -1101,7 +1090,7 @@ In Win32, LHa32 is only supported (DOS version is no good).
 You have to take care about GNU tar's version because
 many version has problem on deleting file from archive.
 
-Please test @samp{--delete} @samp{-f} options work. Otherwise, your
+Please test @option{--delete} @option{-f} options work. Otherwise, your
 archive will be destroyed. No problem is reported on above versions of
 GNU tar.
 
@@ -1232,8 +1221,8 @@ as @var{authenticate-type}.
 default:
 @example
 @var{username}   -> The value of @code{elmo-default-pop3-user}.
-              Initial setting is @code{USER} environment variable or
-             @code{LOGNAME} environment variable or return value of
+              Initial setting is @env{USER} environment variable or
+             @env{LOGNAME} environment variable or return value of
              @code{(user-login-name)}.
 @var{authenticate-type} -> The value of @code{elmo-default-pop3-authenticate-type}.
               Initial setting is "user".
@@ -1490,9 +1479,7 @@ You can access to the cached messages fetched via network by accessing
 to the folders named 'cache/00 - 1F. 00 - 1F are the name of the
 subdirectories of the cache directory (@file{~/.elmo/cache}).
 
-@c
-@c  Folder
-@c
+
 @node Folder, Summary, Folders, Top
 @chapter Folder mode
 @cindex Folder
@@ -2223,9 +2210,6 @@ You cannot put same nickname to the different folders.
 @end enumerate
 
 
-@c
-@c  Summary
-@c
 @node Summary, Message, Folder, Top
 @chapter Summary Mode
 
@@ -3458,9 +3442,7 @@ The initial setting is t.
 If non-nil, messages read via POP3 are cached.
 @end table
 
-@c
-@c  Message
-@c
+
 @node Message, Draft, Summary, Top
 @chapter Message Buffer
 
@@ -3515,9 +3497,7 @@ its car and cdr value corresponds to the ratio of Summary and Message
 windows.
 @end table
 
-@c
-@c  Draft
-@c
+
 @node Draft, Disconnected Operations, Message, Top
 @chapter Draft Buffer
 
@@ -4175,9 +4155,6 @@ the size specified by this variable.
 @end table
 
 
-@c
-@c  Disconnected Operations
-@c
 @node Disconnected Operations, Expire and Archive, Draft, Top
 @chapter Off-line Management
 @cindex Disconnected Operations
@@ -4442,9 +4419,7 @@ In other words, they are initialized when Emacs is restarted even if the
 value is nil.
 @end table
 
-@c
-@c  Expire and Archive
-@c
+
 @node Expire and Archive, Scoring, Disconnected Operations, Top
 @chapter Automatic Expiration and Archiving of Messages
 @cindex Expire and Archive
@@ -4993,9 +4968,6 @@ Needless to say, you can use your own function.
 @end table
 
 
-@c
-@c  Scoring
-@c
 @node Scoring, Customization, Expire and Archive, Top
 @chapter Score of the Messages
 @cindex Scoring
@@ -5487,9 +5459,6 @@ pop3                      N     E     E     E
 @end example
 
 
-@c
-@c  Customization
-@c
 @node Customization, Mailing List, Scoring, Top
 @chapter Customizing Wanderlust
 @cindex Customization
@@ -6291,11 +6260,10 @@ this value, display progress gauge.
 (Not yet written)
 
 
-@c
-@c  Mailing List
-@c
 @node Mailing List, Addition, Customization, Top
 @chapter Wanderlust Mailing List
+@cindex Bug report
+@cindex Backtrace
 
 @display
 Wanderlust Mailing List @t{<wl@@lists.airs.net>}
@@ -6314,15 +6282,12 @@ 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{@samp{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.
 
 
-@c
-@c  Addition
-@c
 @node Addition, Index, Mailing List, Top
 @chapter Additional Information
 
@@ -6386,7 +6351,7 @@ Each versions has code names (they are almost jokes).
 Currently they are picked up alphabetically from the top 40 hits of
 U.S. Billboard magazines in 1980s.
 
-(@samp{http://www.summer.com.br/~pfilho/html/top40/index.html})
+(@uref{http://www.summer.com.br/~pfilho/html/top40/index.html})
 
 
 @node Index,  , Addition, Top