Change example format.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 2c2f8cb..3c4c2fe 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -321,6 +321,7 @@ Please install latest APEL 7.3 or later.
 Wanderlust \e$BK\BN$O0J2<$N>l=j$+$i%@%&%s%m!<%I$G$-$^$9!#\e(B
 
 \e$B0l<!G[I[85\e(B:
+
 @example
 ftp://ftp.gohome.org/wl/
 @end example
@@ -762,9 +763,11 @@ Multi, Filter, Pipe, Internal \e$B$N\e(B 10 \e$B<oN`$G$9!#\e(B
 
 RFC 2060 \e$B$G5,Dj$5$l$?\e(B IMAP4rev1 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
 @group
-\e$B=q<0\e(B: @samp{%} @var{\e$B%a!<%k%\%C%/%9L>\e(B} [@samp{:} @var{\e$B%f!<%6L>\e(B} [@samp{/} @var{\e$BG'>ZK!\e(B}]][@samp{@@} @var{\e$B%[%9%HL>\e(B}][@samp{:} @var{\e$B%]!<%HHV9f\e(B}][@samp{!}]
+@samp{%} @var{\e$B%a!<%k%\%C%/%9L>\e(B} [@samp{:} @var{\e$B%f!<%6L>\e(B} [@samp{/} @var{\e$BG'>ZK!\e(B}]][@samp{@@} @var{\e$B%[%9%HL>\e(B}][@samp{:} @var{\e$B%]!<%HHV9f\e(B}][@samp{!}]
 @end group
 @end example
 
@@ -813,16 +816,18 @@ SSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 \e$B$K@ZBX$($^$9!#JQ?t\e(B @code{elmo-imap4-force-login} \e$B$,\e(B non-nil \e$B$J$i$P!"\e(B
 \e$B3NG'L5$7$K\e(B "login" \e$B$K@ZBX$($^$9\e(B(\e$B=i4|@_Dj$O\e(B nil)\e$B!#\e(B
 
+\e$BNc\e(B:
+
 @example
 @group
-\e$BNc\e(B: %inbox     -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"inbox"
-    %#mh/inbox -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"#mh/inbox"
-
-    %inbox:hoge -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"inbox" \e$B$X%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
-    %inbox:hoge/login@@server1
-                -> server1 \e$B>e$N\e(B IMAP \e$B$N%a!<%k%\%C%/%9\e(B "inbox" \e$B$X\e(B
-                   \e$B%f!<%6\e(B "hoge" \e$B$G!"@8%Q%9%o!<%I$rAw$C$F\e(B("login"\e$B$G\e(B)
-                   \e$B%"%/%;%9!#\e(B
+%inbox     -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"inbox"
+%#mh/inbox -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"#mh/inbox"
+
+%inbox:hoge -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"inbox" \e$B$X%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
+%inbox:hoge/login@@server1
+            -> server1 \e$B>e$N\e(B IMAP \e$B$N%a!<%k%\%C%/%9\e(B "inbox" \e$B$X\e(B
+               \e$B%f!<%6\e(B "hoge" \e$B$G!"@8%Q%9%o!<%I$rAw$C$F\e(B("login"\e$B$G\e(B)
+               \e$B%"%/%;%9!#\e(B
 @end group
 @end example
 
@@ -880,9 +885,11 @@ ftp://ftp.ifcss.org/pub/software/unix/convert/utf7.tar.gz
 \e$B%M%C%H%K%e!<%9$rFI$`$?$a$N%U%)%k%@$G$9!#\e(B
 \e$B0l$D$N%K%e!<%9%0%k!<%W$,0l$D$N%U%)%k%@$H$7$F07$o$l$^$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
 @group
-\e$B=q<0\e(B: @samp{-} @var{\e$B%K%e!<%9%0%k!<%WL>\e(B} [[@samp{:} @var{\e$B%f!<%6L>\e(B}][@samp{@@} @var{\e$B%[%9%HL>\e(B}][@samp{:} @var{\e$B%]!<%HHV9f\e(B}]][@samp{!}]
+@samp{-} @var{\e$B%K%e!<%9%0%k!<%WL>\e(B} [[@samp{:} @var{\e$B%f!<%6L>\e(B}][@samp{@@} @var{\e$B%[%9%HL>\e(B}][@samp{:} @var{\e$B%]!<%HHV9f\e(B}]][@samp{!}]
 @end group
 @end example
 
@@ -905,10 +912,12 @@ default \e$BCM\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$BNc\e(B:
+
 @example
 @group
-\e$BNc\e(B: -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(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
 @end group
 @end example
 
@@ -922,8 +931,10 @@ default \e$BCM\e(B:
 
 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%)%k%@$G$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
-\e$B=q<0\e(B: @samp{+} @var{\e$B%G%#%l%/%H%jL>\e(B}
+@samp{+} @var{\e$B%G%#%l%/%H%jL>\e(B}
 @end example
 
 @var{\e$B%G%#%l%/%H%jL>\e(B}\e$B$O!"DL>o!"JQ?t\e(B @code{elmo-localdir-folder-path}
@@ -933,14 +944,17 @@ 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%)
 
 \e$B%a%C%;!<%8$,J]B8$5$l$k%U%!%$%k$N%U%!%$%kL>$K$O!"%a%C%;!<%8HV9f$,;HMQ$5$l$^$9!#\e(B
 
+\e$BNc\e(B:
+
 @example
 @group
-\e$BNc\e(B: +inbox         -> "~/Mail/inbox"
-    +from/teranisi -> "~/Mail/from/teranisi"
-    +~/test        -> "~/test"
++inbox         -> "~/Mail/inbox"
++from/teranisi -> "~/Mail/from/teranisi"
++~/test        -> "~/test"
 @end group
 @end example
 
+
 @node Maildir Folder, News Spool Folder, MH Folder, Folders
 @section Maildir \e$B%U%)%k%@\e(B
 @cindex Maildir Folder
@@ -949,8 +963,10 @@ 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%)
 
 Maildir \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%)%k%@$G$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
-\e$B=q<0\e(B: @samp{.} @var{\e$B%G%#%l%/%H%jL>\e(B}
+@samp{.} @var{\e$B%G%#%l%/%H%jL>\e(B}
 @end example
 
 @var{\e$B%G%#%l%/%H%jL>\e(B}\e$B$O!"DL>o!"JQ?t\e(B @code{elmo-maildir-folder-path} (\e$B=i4|@_Dj$O\e(B 
@@ -966,15 +982,18 @@ Maildir \e$B$O!"\e(B@file{cur}, @file{new}, @file{tmp} \e$B$N%G%#%l%/%H%j$r4^$s$G$$
 \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})
 
+\e$BNc\e(B:
+
 @example
 @group
-\e$BNc\e(B: .              -> "~/Maildir"
-    .inbox         -> "~/Maildir/inbox"
-    .from/teranisi -> "~/Maildir/from/teranisi"
-    .~/test        -> "~/test"
+.              -> "~/Maildir"
+.inbox         -> "~/Maildir/inbox"
+.from/teranisi -> "~/Maildir/from/teranisi"
+.~/test        -> "~/test"
 @end group
 @end example
 
+
 @node News Spool Folder, Archive Folder, Maildir Folder, Folders
 @section News Spool \e$B%U%)%k%@\e(B
 @cindex News spool Folder
@@ -985,8 +1004,10 @@ Mew/IM \e$B$,Ds>'$9$k!"%m!<%+%k$KJ]B8$5$l$?%K%e!<%95-;v$rFI$_=q$-$9$k$?$a$N\e(B
 \e$B%U%)%k%@$G$9!#\e(BNNTP \e$B7PM3$G$O$J$/!"\e(Bgnspool \e$B$J$I$r;H$C$F<h$j4s$;$F$$$k$h$&\e(B
 \e$B$J>l9g$K$=$N%9%W!<%k$rD>@\FI$`!"$H$$$&;H$$J}$bA[Dj$7$F$$$^$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
-\e$B=q<0\e(B: @samp{=} @var{\e$B%G%#%l%/%H%jL>\e(B}
+@samp{=} @var{\e$B%G%#%l%/%H%jL>\e(B}
 @end example
 
 @var{\e$B%G%#%l%/%H%jL>\e(B}\e$B$O!"JQ?t\e(B @code{elmo-localnews-folder-path}
@@ -994,10 +1015,12 @@ Mew/IM \e$B$,Ds>'$9$k!"%m!<%+%k$KJ]B8$5$l$?%K%e!<%95-;v$rFI$_=q$-$9$k$?$a$N\e(B
 \e$B$G;XDj$5$l$?%G%#%l%/%H%j$N%5%V%G%#%l%/%H%j$r;X$7$^$9!#\e(B
 \e$B%G%#%l%/%H%j$N6h@Z$j$O\e(B @samp{.} \e$B$G$b2D$G$9!#\e(B
 
+\e$BNc\e(B:
+
 @example
 @group
-\e$BNc\e(B: =fj/os/os2         -> "~/News/fj/os/os2"
-    =fj.os.bsd.freebsd -> "~/News/fj/os/bsd/freebsd"
+=fj/os/os2         -> "~/News/fj/os/os2"
+=fj.os.bsd.freebsd -> "~/News/fj/os/bsd/freebsd"
 @end group
 @end example
 
@@ -1011,9 +1034,11 @@ Mew/IM \e$B$,Ds>'$9$k!"%m!<%+%k$KJ]B8$5$l$?%K%e!<%95-;v$rFI$_=q$-$9$k$?$a$N\e(B
 Info-ZIP \e$B$d\e(B LHA \e$B$J$I$G05=L$5$l$?%"!<%+%$%V%U%!%$%k$r0l$D$N%U%)%k%@$H$7\e(B
 \e$B$F07$$$^$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
 @group
-\e$B=q<0\e(B: @samp{$} @var{\e$B%G%#%l%/%H%jL>\e(B} [@samp{;} @var{\e$B%"!<%+%$%P%?%$%W\e(B} @samp{;} @var{\e$B%W%l%U%#%/%9\e(B}]
+@samp{$} @var{\e$B%G%#%l%/%H%jL>\e(B} [@samp{;} @var{\e$B%"!<%+%$%P%?%$%W\e(B} @samp{;} @var{\e$B%W%l%U%#%/%9\e(B}]
 @end group
 @end example
 
@@ -1040,12 +1065,14 @@ uuencode \e$B$K$h$k%@%$%8%'%9%HG[Aw$rDs6!$7$F$$$k\e(B ML \e$B$N=q8K%U%!%$%k$rE83+$9
 \e$BNc$($P\e(B ML \e$B%5!<%P$,\e(B fml \e$B$N>l9g!"\e(B@file{msend.tar.gz} \e$B$O\e(B @file{spool/1} \e$B$N\e(B
 \e$B$h$&$J9=B$$J$N$G!"\e(B@samp{spool} \e$B$r;XDj$7$^$9!#\e(B
 
+\e$BNc\e(B:
+
 @example
 @group
-\e$BNc\e(B: $teranisi         -> "~/Mail/teranisi/elmo-archive.zip"
-    $bsd/freebsd;lha  -> "~/Mail/bsd/freebsd/elmo-archive.lzh"
-    $/foo@@server:~/bar;zoo     -> server \e$B>e$N\e(B "~/bar/elmo-archive.zoo"
-    $d:/msend.tar.gz;tgz;spool -> "d:/msend.tar.gz"
+$teranisi         -> "~/Mail/teranisi/elmo-archive.zip"
+$bsd/freebsd;lha  -> "~/Mail/bsd/freebsd/elmo-archive.lzh"
+$/foo@@server:~/bar;zoo     -> server \e$B>e$N\e(B "~/bar/elmo-archive.zoo"
+$d:/msend.tar.gz;tgz;spool -> "d:/msend.tar.gz"
 @end group
 @end example
 
@@ -1238,9 +1265,11 @@ OS/2 \e$B$G$O%7%'%k$r2p$5$:$KH/9T$G$-$k%3%^%s%IJ8;zNs$O\e(B 8190 \e$B%P%$%H$^$G$J$N
 
 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(B
 
+\e$B=q<0\e(B:
+
 @example
 @group
-\e$B=q<0\e(B: @samp{&} [@var{\e$B%f!<%6L>\e(B}][[@samp{/} @var{\e$BG'>ZK!\e(B}][@samp{@@} @var{\e$B%[%9%HL>\e(B}][@samp{:} @var{\e$B%]!<%HHV9f\e(B}]][@samp{!}]
+@samp{&} [@var{\e$B%f!<%6L>\e(B}][[@samp{/} @var{\e$BG'>ZK!\e(B}][@samp{@@} @var{\e$B%[%9%HL>\e(B}][@samp{:} @var{\e$B%]!<%HHV9f\e(B}]][@samp{!}]
 @end group
 @end example
 
@@ -1248,6 +1277,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(
 @samp{apop} (APOP \e$B$GG'>Z\e(B) \e$B$N\e(B 2 \e$B<oN`$,$"$j$^$9!#\e(B
 
 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 @env{USER} \e$B$+!"\e(B@env{LOGNAME} \e$B$+!"\e(B
@@ -1260,11 +1290,13 @@ default \e$BCM\e(B:
               \e$B=i4|@_Dj$O\e(B 110\e$B!#\e(B
 @end example
 
+\e$BNc\e(B:
+
 @example
 @group
-\e$BNc\e(B: &hoge@@localhost -> localhost \e$B$X%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
-    &hoge@@popserver:109 -> \e$B%[%9%H\e(B "popserver" \e$B$N%]!<%H\e(B 109 \e$BHV$X\e(B
-                            \e$B%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
+&hoge@@localhost -> localhost \e$B$X%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
+&hoge@@popserver:109 -> \e$B%[%9%H\e(B "popserver" \e$B$N%]!<%H\e(B 109 \e$BHV$X\e(B
+                        \e$B%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
 @end group
 @end example
 
@@ -1297,9 +1329,11 @@ 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$BJ#?t$N%U%)%k%@$r2>A[E*$K0l$D$K8+$($k$h$&$K$9$k%U%)%k%@$G$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
 @group
-\e$B=q<0\e(B: @samp{*} @var{\e$B%U%)%k%@\e(B1} [@samp{,} @var{\e$B%U%)%k%@\e(B2}] @dots{} [@samp{,} @var{\e$B%U%)%k%@\e(BN}]
+@samp{*} @var{\e$B%U%)%k%@\e(B1} [@samp{,} @var{\e$B%U%)%k%@\e(B2}] @dots{} [@samp{,} @var{\e$B%U%)%k%@\e(BN}]
 @end group
 @end example
 
@@ -1308,6 +1342,7 @@ 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;XDj$7$^$9!#\e(B
 
 \e$BNc\e(B:
+
 @example
 @group
 *-fj.editor.xemacs,-fj.editor.mule,-fj.editor.emacs
@@ -1329,8 +1364,10 @@ 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;XDj$7$?>r7o$rK~$?$9%a%C%;!<%8$N$_$r4^$`2>A[E*$J%U%)%k%@$G$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
-\e$B=q<0\e(B: @samp{/} @var{\e$B>r7o\e(B} @samp{/} @var{\e$B%U%)%k%@\e(B}
+@samp{/} @var{\e$B>r7o\e(B} @samp{/} @var{\e$B%U%)%k%@\e(B}
 @end example
 
 @var{\e$B>r7o\e(B}\e$B$K$O!"0J2<$r=q$1$^$9!#\e(B
@@ -1343,6 +1380,7 @@ first: \e$BA4%a%C%;!<%8$N@hF,$+$i\e(B@var{\e$B?t;z\e(B}\e$B$N?t$@$1%a%C%;!<%8$r@Z$j=P
 last: \e$BA4%a%C%;!<%8$NKvHx$+$i\e(B@var{\e$B?t;z\e(B}\e$B$N?t$@$1%a%C%;!<%8$r@Z$j=P$7$^$9!#\e(B
 
 \e$BNc\e(B:
+
 @example
 @group
 /last:10/-fj.os.linux -> -fj.os.linux \e$B$N:G6a$N\e(B 10 \e$B8D$N%a%C%;!<%8\e(B
@@ -1371,6 +1409,7 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 @end example
 
 \e$BNc\e(B:
+
 @example
 @group
 /since:3daysago/+inbox \e$B"*\e(B \e$B:G6a#3F|4V$N\e(B +inbox \e$BCf$N%a%C%;!<%8!#\e(B
@@ -1385,6 +1424,7 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 @var{\e$B%U%#!<%k%IL>\e(B}\e$B!"\e(B@var{\e$BJ8;zNs\e(B}\e$B$KBgJ8;z>.J8;z$N6hJL$O$"$j$^$;$s!#\e(B
 
 \e$BNc\e(B:
+
 @example
 @group
 /from=teranisi/+inbox -> +inbox \e$B$G!"\e(BFrom: \e$B%U%#!<%k%I$K\e(B "teranisi"
@@ -1398,6 +1438,7 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 \e$B$^$?!"\e(B@samp{/tocc=xxxx/} \e$B$O!"\e(B@samp{/to=xxxx|cc=xxxx/} \e$B$HF1$8$K$J$j$^$9!#\e(B
 
 \e$BNc\e(B:
+
 @example
 @group
 /from=teranisi|to=teranisi/+inbox
@@ -1448,8 +1489,10 @@ localdir \e$B$N%U%)%k%@$K$OG$0U$N%U%#!<%k%IL>$r=q$1$^$9!#\e(B
 
 \e$B%U%)%k%@1\Mw;~$K!"<+F0E*$K%a%C%;!<%8$N<h$j9~$_$r<B9T$9$k%U%)%k%@$G$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
-\e$B=q<0\e(B: @samp{|} @var{\e$B<h$j9~$_85\e(B} @samp{|} @var{\e$B<h$j9~$_@h\e(B}
+@samp{|} @var{\e$B<h$j9~$_85\e(B} @samp{|} @var{\e$B<h$j9~$_@h\e(B}
 @end example
 
 \e$B%U%)%k%@1\Mw;~!"\e(B@var{\e$B<h$j9~$_85\e(B}\e$B$+$i\e(B@var{\e$B<h$j9~$_@h\e(B}\e$B$X<+F0E*$K%a%C%;!<%8$,\e(B
@@ -1460,16 +1503,19 @@ localdir \e$B$N%U%)%k%@$K$OG$0U$N%U%#!<%k%IL>$r=q$1$^$9!#\e(B
 |&username@@popserver|+inbox
 @end example
 
+@noindent
 \e$B$N$h$&$K;XDj$9$k$H!"%U%)%k%@$NI=<($r99?7$9$k$H$-$K\e(B
 @samp{&username@@popserver} \e$B$+$i\e(B @samp{+inbox} \e$B$X!"%a%C%;!<%8$,<+F0E*$K<h$j9~$^$l$^$9!#\e(B
 
+\e$BNc\e(B:
+
 @example
 @group
-\e$BNc\e(B: %inbox|%myinbox   -> %inbox \e$B$+$i\e(B %myinbox \e$B$X%a%C%;!<%8$r<h$j9~$s$G\e(B
-                         \e$B1\Mw$9$k%U%)%k%@!#\e(B
-    *&user@@popserver1,&user@@popserver2|+inbox
-    -> &user@@popserver1 \e$B$H\e(B &user@@popserver2 \e$B$+$i\e(B +inbox \e$B$X%a%C%;!<%8$r\e(B
-    \e$B<h$j9~$s$G1\Mw$9$k%U%)%k%@!#\e(B
+%inbox|%myinbox   -> %inbox \e$B$+$i\e(B %myinbox \e$B$X%a%C%;!<%8$r<h$j9~$s$G\e(B
+                       \e$B1\Mw$9$k%U%)%k%@!#\e(B
+*&user@@popserver1,&user@@popserver2|+inbox
+  -> &user@@popserver1 \e$B$H\e(B &user@@popserver2 \e$B$+$i\e(B +inbox \e$B$X%a%C%;!<%8$r\e(B
+  \e$B<h$j9~$s$G1\Mw$9$k%U%)%k%@!#\e(B
 @end group
 @end example
 
@@ -1485,11 +1531,13 @@ localdir \e$B$N%U%)%k%@$K$OG$0U$N%U%#!<%k%IL>$r=q$1$^$9!#\e(B
 
 Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 
+\e$B=q<0\e(B:
+
 @example
 @group
-\e$B=q<0\e(B: 'mark 
-      \e$B$b$7$/$O\e(B
-      'cache/00\e$B!A\e(B1F
+'mark 
+@r{\e$B$b$7$/$O\e(B}
+'cache/00\e$B!A\e(B1F
 @end group
 @end example
 
@@ -1807,6 +1855,7 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 (@var{\e$B%"%/%;%9%0%k!<%W$N@55,I=8=\e(B} . (@var{\e$B9XFI%U%i%0\e(B} @var{\e$B%U%)%k%@$N@55,I=8=\e(B} @dots{}))
 @end example
 
+@noindent
 \e$B$H$J$C$F$$$^$9!#\e(B@var{\e$B9XFI%U%i%0\e(B}\e$B$,\e(B non-nil \e$B$N>l9g$O\e(B@var{\e$B%U%)%k%@$N@55,I=8=\e(B}\e$B$K%^%C%A\e(B
 \e$B$7$?%U%)%k%@$N$_I=<($7!"\e(B@var{\e$B9XFI%U%i%0\e(B}\e$B$,\e(B nil \e$B$N>l9g$O\e(B@var{\e$B%U%)%k%@$N@55,I=8=\e(B}
 \e$B$K%^%C%A$7$?%U%)%k%@$OI=<($5$l$J$/$J$j$^$9!#$?$@$7!"\e(B@var{\e$B9XFI%U%i%0\e(B}\e$B$,\e(B non-nil \e$B$G$b\e(B
@@ -1839,6 +1888,7 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 @end group
 @end lisp
 
+@noindent
 \e$B<!$N$h$&$J3,AX9=B$$K$J$C$?%"%/%;%9%0%k!<%W$,:n$i$l$^$9!#\e(B
 
 @example

diff --git a/doc/wl.texi b/doc/wl.texi
index 774f9cb..c3ce567 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -740,9 +740,11 @@ and Internal folder types.
 
 A folder to access e-mails via IMAP4rev1 protocol (RFC 2060).
 
+Format:
+
 @example
 @group
-Format: @samp{%} @var{mailbox} [@samp{:} @var{username} [@samp{/} @var{authenticate-type}]][@samp{@@} @var{hostname}][@samp{:} @var{port}][@samp{!}]
+@samp{%} @var{mailbox} [@samp{:} @var{username} [@samp{/} @var{authenticate-type}]][@samp{@@} @var{hostname}][@samp{:} @var{port}][@samp{!}]
 @end group
 @end example
 
@@ -785,16 +787,18 @@ in raw format) after confirmation to user. If @code{elmo-imap4-force-login}
 is non-nil, authentication will fall back to "login" without confirmation
 (default value is nil).
 
+Example:
+
 @example
 @group
-Example: %inbox     -> IMAP mailbox "inbox"
-         %#mh/inbox -> IMAP mailbox "#mh/inbox"
-
-         %inbox:hoge -> IMAP mailbox "inbox" of user "hoge".
-         %inbox:hoge/login@@server1
-                     -> server1's IMAP mailbox "inbox"
-                        of user "hoge", with plain password authentication
-                        ("login").
+%inbox     -> IMAP mailbox "inbox"
+%#mh/inbox -> IMAP mailbox "#mh/inbox"
+
+%inbox:hoge -> IMAP mailbox "inbox" of user "hoge".
+%inbox:hoge/login@@server1
+            -> server1's IMAP mailbox "inbox"
+               of user "hoge", with plain password authentication
+               ("login").
 @end group
 @end example
 
@@ -854,9 +858,11 @@ ftp://ftp.ifcss.org/pub/software/unix/convert/utf7.tar.gz
 A folder to access USENET news via NNTP protocol (RFC 977).
 One newsgroup is treated as a folder.
 
+Format:
+
 @example
 @group
-Format: @samp{-} @var{newsgroup} [[@samp{:} @var{username}][@samp{@@} @var{hostname}][@samp{:} @var{port}]][@samp{!}]
+@samp{-} @var{newsgroup} [[@samp{:} @var{username}][@samp{@@} @var{hostname}][@samp{:} @var{port}]][@samp{!}]
 @end group
 @end example
 
@@ -877,10 +883,12 @@ If a folder name ends with @samp{!!}, STARTTLS connection will be established.
 if the value of @code{elmo-default-nntp-ssl} is 'starttls,
 STARTTLS will be the default connection.
 
+Example:
+
 @example
 @group
-Example: -fj.rec.tv            -> Newsgroup `fj.rec.tv'.
-         -fj.rec.tv@@newsserver -> Newsgroup `fj.rec.tv' on newsserver.
+-fj.rec.tv            -> Newsgroup `fj.rec.tv'.
+-fj.rec.tv@@newsserver -> Newsgroup `fj.rec.tv' on newsserver.
 @end group
 @end example
 
@@ -892,8 +900,10 @@ Example: -fj.rec.tv            -> Newsgroup `fj.rec.tv'.
 
 A folder to access MH format mail (1 file is 1 mail).
 
+Format:
+
 @example
-Format: @samp{+} @var{directory-name}
+@samp{+} @var{directory-name}
 @end example
 
 Normally, @var{directory-name} is an relative path to the variable
@@ -903,11 +913,13 @@ starts with @samp{/} or @samp{~}, then it is treated as an absolute path
 
 Message number is used for the name of the message file.
 
+Example:
+
 @example
 @group
-Example: +inbox         -> "~/Mail/inbox"
-         +from/teranisi -> "~/Mail/from/teranisi"
-         +~/test        -> "~/test"
++inbox         -> "~/Mail/inbox"
++from/teranisi -> "~/Mail/from/teranisi"
++~/test        -> "~/test"
 @end group
 @end example
 
@@ -919,8 +931,10 @@ Example: +inbox         -> "~/Mail/inbox"
 
 A folder to access to Maildir format (1 file is 1 mail).
 
+Format:
+
 @example
-Format: @samp{.} [@var{directory-name}]
+@samp{.} [@var{directory-name}]
 @end example
 
 Normally, @var{directory-name} is a relative path to the variable
@@ -936,15 +950,18 @@ the @file{tmp} directory and not accessed for 36 hours are deleted.
 
 This behavior conforms to the @uref{http://cr.yp.to/proto/maildir.html}.
 
+Example:
+
 @example
 @group
-Example: .              -> "~/Maildir"
-         .inbox         -> "~/Maildir/inbox"
-         .from/teranisi -> "~/Maildir/from/teranisi"
-         .~/test        -> "~/test"
+.              -> "~/Maildir"
+.inbox         -> "~/Maildir/inbox"
+.from/teranisi -> "~/Maildir/from/teranisi"
+.~/test        -> "~/test"
 @end group
 @end example
 
+
 @node News Spool Folder, Archive Folder, Maildir Folder, Folders
 @section News Spool Folder
 @cindex News spool Folder
@@ -955,21 +972,26 @@ This folder handles locally saved news articles which are proposed by Mew/IM.
 You can also read articles directly from a spool-file which is retrieved
 by an utility like gnspool.
 
+Format:
+
 @example
-Format: @samp{=} @var{directory-name}
+@samp{=} @var{directory-name}
 @end example
 
 @var{directory-name} is a sub-directory to the directory defined by variable
 @code{elmo-localnews-folder-path} (default is @file{~/News})
 You can use @samp{.} as directory delimiter as well as @samp{/}.
 
+Example:
+
 @example
 @group
-Example: =fj/os/os2         -> "~/News/fj/os/os2"
-         =fj.os.bsd.freebsd -> "~/News/fj/os/bsd/freebsd"
+=fj/os/os2         -> "~/News/fj/os/os2"
+=fj.os.bsd.freebsd -> "~/News/fj/os/bsd/freebsd"
 @end group
 @end example
 
+
 @node Archive Folder, POP Folder, News Spool Folder, Folders
 @section Archive Folder
 @cindex Archive Folder
@@ -979,9 +1001,11 @@ Example: =fj/os/os2         -> "~/News/fj/os/os2"
 This method can handle archive files, which are compressed by utilities
 such as Info-ZIP or LHA, as one folder.
 
+Format:
+
 @example
 @group
-Format: @samp{$} @var{path-name} [@samp{;} @var{archiver-type} @samp{;} @var{prefix}]
+@samp{$} @var{path-name} [@samp{;} @var{archiver-type} @samp{;} @var{prefix}]
 @end group
 @end example
 
@@ -1004,12 +1028,14 @@ If @var{archiver-type} is omitted, @code{elmo-archive-default-type}
 For example, if the ML server is fml, @file{msend.tar.gz} has a structure like 
 @file{spool/1}, so you have to specify @samp{spool} as @var{prefix}.
 
+Example:
+
 @example
 @group
-Example: $teranisi         -> "~/Mail/teranisi/elmo-archive.zip"
-         $bsd/freebsd;lha  -> "~/Mail/bsd/freebsd/elmo-archive.lzh"
-         $/foo@@server:~/bar;zoo     -> "~/bar/elmo-archive.zoo" on ftp server
-         $d:/msend.tar.gz;tgz;spool -> "d:/msend.tar.gz"
+$teranisi         -> "~/Mail/teranisi/elmo-archive.zip"
+$bsd/freebsd;lha  -> "~/Mail/bsd/freebsd/elmo-archive.lzh"
+$/foo@@server:~/bar;zoo     -> "~/bar/elmo-archive.zoo" on ftp server
+$d:/msend.tar.gz;tgz;spool -> "d:/msend.tar.gz"
 @end group
 @end example
 
@@ -1208,9 +1234,11 @@ standard input (@code{rm-pipe}, @code{mv-pipe}, @code{cat-headers} action).
 
 A folder to access e-mails via POP3 protocol (RFC 1939).
 
+Format:
+
 @example
 @group
-Format: @samp{&} [@var{username}][[@samp{/} @var{authenticate-type}][@samp{@@} @var{hostname}][@samp{:} @var{port}]][@samp{!}]
+@samp{&} [@var{username}][[@samp{/} @var{authenticate-type}][@samp{@@} @var{hostname}][@samp{:} @var{port}]][@samp{!}]
 @end group
 @end example
 
@@ -1232,11 +1260,13 @@ default:
               Initial setting is 110.
 @end example
 
+Example:
+
 @example
 @group
-Example: &hoge@@localhost -> access to localhost as user "hoge".
-         &hoge@@popserver:109 -> access to the server "popserver" on port 109
-                                 as user "hoge".
+&hoge@@localhost -> access to localhost as user "hoge".
+&hoge@@popserver:109 -> access to the server "popserver" on port 109
+                        as user "hoge".
 @end group
 @end example
 
@@ -1268,9 +1298,11 @@ STARTTLS will be the default connection.
 A folder to access to a folder which collects messages from
 multiple folders virtually.
 
+Format:
+
 @example
 @group
-Format: @samp{*} @var{folder-1} [@samp{,} @var{folder-2}] @dots{} [@samp{,} @var{folder-N}]
+@samp{*} @var{folder-1} [@samp{,} @var{folder-2}] @dots{} [@samp{,} @var{folder-N}]
 @end group
 @end example
 
@@ -1279,6 +1311,7 @@ separated by ',' like
 @samp{@var{folder-1},@var{folder-2},@dots{},@var{folder-N}}.
 
 Example:
+
 @example
 @group
 *-fj.editor.xemacs,-fj.editor.mule,-fj.editor.emacs
@@ -1301,8 +1334,10 @@ Example:
 A folder to access to a folder which collects all messages that 
 satisfy a condition virtually.
 
+Format:
+
 @example
-Format: @samp{/} @var{condition} @samp{/} @var{target-folder}
+@samp{/} @var{condition} @samp{/} @var{target-folder}
 @end example
 
 In the @var{condition} part, you can specify following.
@@ -1315,6 +1350,7 @@ first: @var{number} messages are picked from top of folder.
 last:  @var{number} messages are picked from bottom of folder.
 
 Example:
+
 @example
 @group
 /last:10/-fj.os.linux -> Latest 10 messages from -fj.os.linux are picked.
@@ -1342,6 +1378,7 @@ lastyear  ->  same day of last year.
 @end example
 
 Example:
+
 @example
 @group
 /since:3daysago/+inbox -> messages arrived since 3 days ago in +inbox
@@ -1358,6 +1395,7 @@ All messages that have @var{field} and its value is @var{value} are picked.
 @var{field} and @var{value} are case insensitive.
 
 Example:
+
 @example
 @group
 /from=teranisi/+inbox -> In +inbox, messages which have From: field
@@ -1371,6 +1409,7 @@ If you can split conditions by character @samp{|}, it is considered as OR condit
 @samp{/tocc=xxxx/} is an abbreviation of @samp{/to=xxxx|cc=xxxx/}.
 
 Example:
+
 @example
 @group
 /from=teranisi|to=teranisi/+inbox
@@ -1423,8 +1462,10 @@ Localdir folder treats arbitrary field name.
 In the pipe folder, messages are automatically transferred from the source
 folder to destination folder.
 
+Format:
+
 @example
-Format: @samp{|} @var{source-folder} @samp{|} @var{destination-folder}
+@samp{|} @var{source-folder} @samp{|} @var{destination-folder}
 @end example
 
 When you access to the pipe folder, messages are automatically transferred
@@ -1439,10 +1480,12 @@ For example, if you specify following
 and access to it, messages are downloaded automatically from
 &username@@popserver to @samp{+inbox}.
 
+Example:
+
 @example
 @group
-Example: %inbox|%myinbox   -> Download %inbox to %myinbox.
-         *&user@@popserver1,&user@@popserver2|+inbox
+%inbox|%myinbox   -> Download %inbox to %myinbox.
+*&user@@popserver1,&user@@popserver2|+inbox
          -> Download from &user@@popserver1 and &user@@popserver2 to +inbox.
 @end group
 @end example
@@ -1457,11 +1500,13 @@ After messages are moved, a hook @code{elmo-pipe-drained-hook} is called.
 
 A folder to access to internal messages of Wanderlust.
 
+Format:
+
 @example
 @group
-Format: 'mark
-        or
-        'cache/00 - 1F
+'mark
+@r{or}
+'cache/00 - 1F
 @end group
 @end example
 
@@ -1784,6 +1829,7 @@ Each element is:
 (@var{regexp-of-access-folder} . (@var{subscribe-flag} @var{regexp-of-folders} @dots{}))
 @end example
 
+@noindent
 If @var{subscribe-flag} is non-nil, folders which have name matched to
 @var{regexp-of-folders} are displayed. Otherwise, hidden.
 However, already unsubscribed folder is not displayed even 
@@ -1815,6 +1861,7 @@ For example, if you specify
 @end group
 @end lisp
 
+@noindent
 such access group hierarchy is obtained.
 
 @example