* Based on original revision 1.18.

CVS version numbers

japanese/contact.wml: 1.10 -> 1.11

1 files changed, 55 insertions, 37 deletions

diff --git a/japanese/contact.wml b/japanese/contact.wml
index 833a7c06a67..7865ec5f7f2 100644
--- a/japanese/contact.wml
+++ b/japanese/contact.wml
@@ -1,45 +1,55 @@
 #use wml::debian::template title="$B;d$?$A$H%3%s%?%/%H$r<h$k(B" NOCOMMENTS="yes"
-<!--original_revision: 1.8 :-->
+<!--original_revision: 1.18 :-->
 
 <H2>$B0lHL>pJs(B</H2>
+
 <P>Debian $B$K4X$9$k0lHLE*>pJs$K$D$$$F$O!";d$?$A$N%&%'%V%5%$%H(B
-<A href="http://www.debian.org/">http://www.debian.org/</A>$B$+!"(BFTP $B%5%$%H(B
+<a href="$(HOME)">http://www.debian.org/</a>$B$+!"(BFTP $B%5%$%H(B
 <A href="ftp://ftp.debian.org/debian/">ftp://ftp.debian.org/debian/</A>$B$r$4Mw$/$@$5$$!#(B
 
 <P>$B;d$?$A$NMQ0U$7$?(B FAQ $B=8$O!"B?$/$N5?Ld$K$*Ez$($9$k$G$7$g$&!#(B
-<A href="http://www.debian.org/doc/FAQ/">http://www.debian.org/doc/FAQ/</A>
-$B$+!"$b$7$/$O(B
-<A href="ftp://ftp.debian.org/debian/doc/FAQ/">ftp://ftp.debian.org/debian/doc/FAQ/</A>
-$B$K$F$4Mw$$$?$@$1$^$9!#(B
-FTP $B%5%$%H$K$O(B Postscript$B!"(Btext$B!"(Bhtml$B!"(Binfo $B$N3F<o7A<0$GMQ0U$5$l$F$$$^$9!#(B
+<a href="$(HOME)/doc/FAQ/">http://www.debian.org/doc/FAQ/</a>
+$B$r$4Mw$/$@$5$$!#(B
+FTP $B%5%$%H(B
+<a href="ftp://ftp.debian.org/debian/doc/FAQ/">ftp://ftp.debian.org/debian/doc/FAQ/</a>.
+$B$+$i(B PostScript$B!"(Btext$B!"(BHTML $B$N3F<o7A<0$G$bF~<j$G$-$^$9!#(B
 
 
 <H2>Debian $B$N%$%s%9%H!<%k$HMxMQ(B</H2>
-<P>Debian $B%f!<%6$d3+H/<T$,<ALd$KEz$($k!"$H$F$b3hF0E*$J%f!<%6%a!<%j%s%0%j%9%H$,$"$j$^$9!#C1$K(B
-<EM>debian-user</EM>
-$B$r(B<A href="http://www.debian.org/MailingLists/subscribe">$B9XFI(B</A>$B$7!"(B
-<A href="mailto:debian-user@lists.debian.org">debian-user@lists.debian.org</A>
-$B$K<ALd$rAw$C$F$/$@$5$$!#(B
+
+<p>$B%$%s%9%H!<%k%a%G%#%"$d%&%'%V%5%$%H$K$"$J$?$NLdBj$r2r7h$7$F$/$l$kJ8=q(B
+$B$,$J$$>l9g$O!"Hs>o$K3hH/$J%f!<%6%a!<%j%s%0%j%9%H$G(B
+Debian $B%f!<%6$d3+H/<T$,$"$J$?$N<ALd$KEz$($F$/$l$^$9!#(B
+$BC1$K(B <a href="$(HOME)/MailingLists/subscribe#debian-user">
+<em>debian-user</em> $B%a!<%j%s%0%j%9%H$r9VFI(B</a> $B$7!"<ALd$rAw$C$F$/$@$5$$!#(B
 
 <P>$BF|K\8l$G$NEj9F$,2DG=$J%f!<%6%a!<%j%s%0%j%9%H$O!"(BDebian JP Project $B$K(B
 $B$h$C$F1?1D$5$l$F$$$^$9!#>\$7$/$O!"(B<A
 href="http://www.debian.or.jp/MailingList.html">Debian JP Project $B$N%a!<(B
 $B%j%s%0%j%9%H(B</A>$B$r$4Mw$/$@$5$$!#(B</P>
 
-$B$5$i$K!"$5$^$6$^$J8@8l$NOC<T$N$?$a$N%f!<%6%a!<%j%s%0%j%9%H$b$"$j$^$9!#(B
-$B$=$N0lMw$H9XFI$K4X$9$k>pJs$K$D$$$F$O!"(B
-<a href="http://www.debian.org/MailingLists/subscribe">$B%a!<%j%s%0%j%9%H9XFI%Z!<%8(B</a>
-$B$r$4Mw$/$@$5$$!#(B
 <UL>
 <LI>$B%$%s%9%H!<%k(B
 <LI>$B@_Dj(B
-<LI>$B%5%]!<%H$5$l$k%O!<%I%&%'%"(B
+<LI>$B%5%]!<%H$5$l$F$$$k%O!<%I%&%'%"(B
 <LI>$B%^%7%s$N4IM}(B
 <LI>Debian $B$NMxMQK!(B
 </UL>
 $B$K4X$9$k<ALd$O$9$Y$F!"$3$A$i$KAw$C$F$/$@$5$$!#(B
 
+$B99$K!"MM!9$JJl9q8l$r$b$D%f!<%6$N$?$a$N%a!<%j%s%0%j%9%H$b$"$j$^$9!#(B
+<a href="MailingLists/subscribe#int">$BB?9q8l%a!<%j%s%0%j%9%H$N9VFI(B</a>
+$B$r$4Mw$/$@$5$$!#(B
+
+<p>$B%$%s%9%H!<%k%7%9%F%`$K%P%0$r8+$D$1$?>l9g$O!"(B
+<a href="mailto:debian-boot@lists.debian.org">debian-boot@lists.debian.org</a>
+$B$K>pJs$rCY$k$+!"$^$?$O(B 
+<a href="http://bugs.debian.org/boot-floppies">boot-floppies</a>
+$B5<%Q%C%1!<%8(B(pseudo-package)$B$N%P%0$H$7$F(B
+<a href="Bugs/Reporting">$B%P%0Js9p$rDs=P(B</a>$B$7$F$/$@$5$$!#(B
+
 <H2>Debian $B$N3+H/(B</H2>
+
 <p>$B1Q8l$,Jl9q8l$G$J$$3+H/<T$O$?$/$5$s$$$^$9$,!"(B
 $B3+H/:n6H$9$Y$F$K$*$1$k6&DL8@8l$,1Q8l$G$"$k$3$H$K$O$4Cm0U$/$@$5$$!#(B
 $B$=$N$?$a!"3+H/<T$X$NLd$$9g$o$;$O$^$:1Q8l$G9T$J$C$F$$$?$@$/$h$&$*4j$$$7$^$9!#(B
@@ -47,46 +57,54 @@ href="http://www.debian.or.jp/MailingList.html">Debian JP Project $B$N%a!<(B
 $BLd$$9g$o$;$r9T$J$C$F$/$@$5$$!#(B
 
 <P>$B%Q%C%1!<%8$N3+H/$K4XO"$N9b$$<ALd$K$D$$$F$O!"3+H/<T$,>pJs8r49$9$k%a!<%j%s%0%j%9%H$,$"$j$^$9!#(B
-$BC1$K(B <EM>debian-devel</EM>
-$B$r(B<A href="http://www.debian.org/MailingLists/subscribe">$B9XFI(B</A>$B$7!"(B
+$BC1$K(B <em>debian-devel</em>
+$B$r(B<a href="MailingLists/subscribe#debian-devel">$B9XFI(B</A>$B$7!"(B
 <A href="mailto:debian-devel@lists.debian.org">debian-devel@lists.debian.org</A> $B$K$^$GEE;R%a!<%k$r$*Aw$j$/$@$5$$!#(B
 
 <P>Debian $B%Q%C%1!<%8$N%P%0$rJs9p$9$k>l9g$O!"(B
-<A href="http://www.debian.org/Bugs/">http://www.debian.org/Bugs/</A> $B$+!"(B
+<a href="$(HOME)/Bugs/Reporting">http://www.debian.org/Bugs/Reporting</a> $B$+!"(B
 <A href="ftp://ftp.debian.org/debian/doc/bug-reporting.txt">ftp://ftp.debian.org/debian/doc/bug-reporting.txt</A>
 $B$N@bL@$r$4Mw$/$@$5$$!#(B
-$B$J$*(B <em>bug</em> $B$H$$$&(B Debian $B%Q%C%1!<%8$r%$%s%9%H!<%k$9$l$P!"(B
+$B$J$*!"(BDebian $B%Q%C%1!<%8$H$7$FMQ0U$5$l$F$$$k(B <em>bug</em> $B$^$?$O(B 
+<em>reportbug</em> $B$r%$%s%9%H!<%k$9$k$3$H$K$h$C$F!"(B
 $B$h$j4JC1$K%P%0$NJs9p$,$G$-$^$9!#(B
 
-<P>Debian $B$N%;%-%e%j%F%#!<>e$NLdBj$r?5=E$K3+H/<T$KEA$($?$$>l9g$O!"(B
+<P>Debian $B$N%;%-%e%j%F%#>e$NLdBj$r?5=E$K3+H/<T$KEA$($?$$>l9g$O!"(B
 <A href="mailto:security@debian.org">security@debian.org</A>
 $B$K$^$GEE;R%a!<%k$r$*Aw$j$/$@$5$$!#(B
 
+
 <H2>$B9-Js(B</H2>
+
 <P>$B<h:`$N$?$a$K;qNA$N@A5a$r$44uK>$NJ}$d!"(B
 $B;d$?$A$N%K%e!<%9%Z!<%8$K%K%e!<%9$rDs6!$7$F$/$@$5$kJ}$O!"(B
 <A href="mailto:press@debian.org">$B9-Js2](B</A>$B$^$G$4O"Mm$/$@$5$$!#(B
 
+
 <H2>$B<g$JLd$$9g$o$;@h(B</H2>
+
 <dl>
+<dt>Debian $B%W%m%8%'%/%H$K$D$$$F$N0lHLE*>pJs(B</dt>
+  <dd><a href="mailto:debian-project@lists.debian.org">debian-project@lists.debian.org</a></dd>
 <dt>$B%a!<%j%s%0%j%9%H$N4IM}<T(B
-<dd><a href="mailto:listmaster@lists.debian.org">listmaster@lists.debian.org</a>
+  <dd><a href="mailto:listmaster@lists.debian.org">listmaster@lists.debian.org</a>
 <dt>$B%a!<%j%s%0%j%9%H%"!<%+%$%V(B
-<dd><a href="mailto:listarchives@packages.debian.org">listarchives@packages.debian.org</a>
-<dt>$B%P%0DI@W%7%9%F%`!"%P%0DI@W%&%'%V%Z!<%8(B
-<dd><a href="mailto:owner@bugs.debian.org">owner@bugs.debian.org</a>
+  <dd><a href="mailto:listarchives@packages.debian.org">listarchives@packages.debian.org</a>
+<dt>$B%P%0DI@W%7%9%F%`(B($B$^$?$O!"$=$N%&%'%V%Z!<%8(B)
+  <dd><a href="mailto:owner@bugs.debian.org">owner@bugs.debian.org</a>
 <dt>$B%&%'%V%Z!<%8(B
-<dd><a href="mailto:webmaster@debian.org">webmaster@debian.org</a>
+  <dd><a href="mailto:webmaster@debian.org">webmaster@debian.org</a>
+<dt>$B3+H/<T%G!<%?%Y!<%9%&%'%V%Z!<%8(B
+  <dd><a href="mailto:admin@db.debian.org">admin@db.debian.org</a>
 <dt>Debian $B$N%_%i!<(B
-<dd><a href="mirror/">Debian $B%&%'%V%Z!<%8$N%_%i!<(B</a>$B$r$4Mw$K$J$k$+!"(B
-<a href="mailto:mirrors@debian.org">$B%_%i!<0lMw$N4IM}<T(B</a>$B$K$4O"Mm$/$@$5$$!#(B
+  <dd><a href="mirror/">Debian $B%&%'%V%Z!<%8$N%_%i!<(B</a>$B$r$4Mw$K$J$k$+!"(B
+  <a href="mailto:mirrors@debian.org">$B%_%i!<0lMw$N4IM}<T(B</a>$B$K$4O"Mm$/$@$5$$!#(B
 <dt>Debian CD $B$NHNGd(B
-<dd><a href="distrib/cdinfo">CD $B%Y%s%@>pJs(B</a>$B$r$4Mw$/$@$5$$!#(B
-$B?7$?$J%Y%s%@$K4X$9$k>pJs$O(B
-<a href="mailto:webmaster@debian.org">webmaster@debian.org</a>
-$B$K$^$G$*Aw$j$/$@$5$$!#(B
+  <dd><a href="distrib/cdinfo">CD $B%Y%s%@>pJs(B</a>$B$r$4Mw$/$@$5$$!#(B
+  $B?7$?$J%Y%s%@$K4X$9$k>pJs$O(B
+  <a href="mailto:webmaster@debian.org">webmaster@debian.org</a>
+  $B$K$^$G$*Aw$j$/$@$5$$!#(B
 </dl>
-$B$^$?(B Debian $B$K$*$1$k$5$^$6$^$J4IM}<T$rLVMe$7$?(B
-<a href="devel/maintainer_contacts">$B3+H/<TO"Mm@h$N40A4$J0lMw(B</a>
-$B$bMQ0U$7$F$$$^$9!#(B
- 
+
+<p>$BAH?%$NMM!9$JItLg$HO"Mm$r<h$k$?$a$K!"(B<a href="intro/organization">$B$=$l(B
+$B$>$l$NLr3d$H!";HMQ$9$Y$-(B e-mail</a>$B$N40A4$J%j%9%H$rMQ0U$7$F$$$^$9!#(B