* Re-arranged the front page and moved some stuff out to other pages.

CVS version numbers

japanese/intro/about.wml: 1.11 -> 1.12

1 files changed, 25 insertions, 16 deletions

diff --git a/japanese/intro/about.wml b/japanese/intro/about.wml
index e166fa92e92..8ef07c5b83f 100644
--- a/japanese/intro/about.wml
+++ b/japanese/intro/about.wml
@@ -1,5 +1,5 @@
 #use wml::debian::template title="Debian $B$K$D$$$F(B"
-<!--original_revision: 1.15 :-->
+<!--original_revision: 1.16 :-->
 
 <UL>
 <LI><A href="#what">Debian $B$H$O0lBN2?$G$9$+(B?</A>
@@ -25,24 +25,33 @@
 $B4pK\%W%m%0%i%`$d%f!<%F%#%j%F%#$G9=@.$5$l!"$=$NCf3K$K$O%+!<%M%k$,$"$j$^$9!#(B
 $B%+!<%M%k$H$O!"%3%s%T%e!<%?>e$G:G$b=EMW$J%W%m%0%i%`$G$"$j!"$9$Y$F$N4pK\E*$J(B
 $B%7%9%F%`1?MQ$r9T$$!"B>$N%W%m%0%i%`$N5/F0$r2DG=$K$9$k$b$N$G$9!#(B
-Debian $B$,:NMQ$7$F$$$k%+!<%M%k$O(B <A href="http://www.linux.org/">Linux</A>
-$B$G$9!#$3$A$i$O(B Linus Torvalds $B$K$h$C$F3+H/$,;O$a$i$l!"@$3&Cf$N(B
-($B$*$=$i$/(B 1000 $B?M$r1[$($k(B) $B%W%m%0%i%^$K$h$C$F%5%]!<%H$5$l$F$$$k!"(B
-$B40A4$K%U%j!<$J%=%U%H%&%'%"$G$9!#(B
+Debian $B$O!"8=:_(B <A href="http://www.linux.org/">Linux</A> $B%+!<%M%k$rMxMQ(B
+$B$7$F$$$^$9$,!"FCDj$N%+!<%M%k$K0MB8$7$F$$$k$o$1$G$O$"$j$^$;$s!#(B
+<A href="http://www.gnu.org/software/hurd/hurd.html">Hurd</A> $B$N$h$&$J(B
+$BB>$N%+!<%M%k$r;HMQ$7$?(B Debian $B$rDs6!$9$k7W2h$b?J9TCf$G$9!#(B
 
+<p>Linux $B$O!"(BLinus Torvalds $B$,3+H/$r;O$a$?40A4$K%U%j!<$J%=%U%H%&%'%"$G$9!#(B
+$B8=:_$G$O!"@$3&Cf$N(B ($B$*$=$i$/(B 1000 $B?M0J>e$N(B) $B%W%m%0%i%^$K$h$C$F%5%]!<%H(B
+$B$5$l$F$$$^$9!#(B
+
+<P>Hurd $B$O!"(B(Mach $B$N$h$&$J(B) $B%^%$%/%m%+!<%M%k>e$GF0:n$7!"(B
+$B$5$^$6$^$J5!G=$r<BAu$9$k%5!<%P72$G$9!#(B
+Hurd $B$O(B GNU $B%W%m%8%'%/%H$K$h$C$F3+H/$5$l$F$$$k%U%j!<%=%U%H%&%'%"$G$9!#(B
+
+<P>
 $B$^$?!"%*%Z%l!<%F%#%s%0%7%9%F%`$r=<<B$5$;$k4pK\E*$J%D!<%k72$N$[$H$s$I$O(B 
 <A href="http://www.gnu.org/">GNU $B%W%m%8%'%/%H(B</A>$B$K$h$k$b$N$G!"(B
-$B$3$l$b$^$?%U%j!<$G$9!#(B
-$B$b$A$m$s!"?M!9$,5a$a$k$b$N$O%"%W%j%1!<%7%g%s%=%U%H%&%'%"$G$9!#(B
-$B$D$^$j!"J8=q$rJT=8$9$k$3$H$+$i!";E;v$r$7$?$j!"%2!<%`$r$7$?$j!"(B
-$B$5$i$K?7$7$$%=%U%H%&%'%"$r3+H/$9$k:n6H$K;j$k$^$G!"(B
-$B?M!9$,K>$`$b$N$r$+$J$($k<j=u$1$H$J$k%=%U%H%&%'%"$,I,MW$G$9!#(B
-Debian $B$K$O(B 2250 $B0J>e$N%Q%C%1!<%8$,$"$j$^$9!#(B
-$B$3$l$i$N%Q%C%1!<%8$O!"4JC1$K%$%s%9%H!<%k$d%"%C%W%0%l!<%I$,$G$-$k$h$&$K!"(B
-$B%3%s%Q%$%k:Q$N%=%U%H%&%'%"$r=jDj$N%U%)!<%^%C%H$G$^$H$a$?$b$N$G$"$j!"(B
-$B$9$Y$F(B<A href="free">$B%U%j!<(B</A>$B$G$9!#(B
-
-<P>$B$3$l$O!"0l$D$NEc$KNc$($i$l$k$+$b$7$l$^$;$s!#$=$N4pAC$K$O(B Linux $B$,$"$j$^$9!#(B
+GNU/Linux $B$*$h$S(B GNU/Hurd $B$H$$$&L>A0$O$3$l$KM3Mh$7$F$$$^$9!#(B
+$B$=$7$F!"$3$l$i$N%D!<%k72$bF1MM$K%U%j!<$G$9!#(B 
+$B$b$A$m$s!"?M!9$,5a$a$k$b$N$O%"%W%j%1!<%7%g%s%=%U%H%&%'%"$G$9!#$D$^$j!"(B
+$BJ8=q$rJT=8$9$k$3$H$+$i!";E;v$r$7$?$j!"%2!<%`$r$7$?$j!"99$K?7$7$$%=%U%H(B
+$B%&%'%"$r3+H/$9$k:n6H$K;j$k$^$G!"?M!9$,K>$`$b$N$r$+$J$($k<j=u$1$H$J$k(B
+$B%=%U%H%&%'%"$,I,MW$G$9!#(BDebian $B$K$O(B 2250 $B0J>e$N%Q%C%1!<%8(B
+$B$,$"$j$^$9!#$3$l$i$N%Q%C%1!<%8$O!"4JC1$K%$%s%9%H!<%k$d%"%C%W%0%l!<%I$,(B
+$B$G$-$k$h$&$K!"%3%s%Q%$%k:Q$N%=%U%H%&%'%"$r=jDj$N%U%)!<%^%C%H$G$^$H$a$?(B
+$B$b$N$G$"$j!"$9$Y$F(B<A href="intro/free">$B%U%j!<(B</A>$B$G$9!#(B
+
+<P>$B$3$l$O!"0l$D$NEc$KNc$($i$l$k$+$b$7$l$^$;$s!#$=$N4pAC$K$O%+!<%M%k$,$"$j$^$9!#(B
 $B$=$N>e$K$O$9$Y$F$N4pK\E*$J%D!<%k$,$"$j!"$5$i$K$=$N>e$K$O%3%s%T%e!<%?>e$G<B(B
 $B9T$5$l$k$9$Y$F$N%=%U%H%&%'%"$,$"$j$^$9!#(B
 $B$=$7$F!"$=$NEc$ND:>e$K0LCV$9$k$N$,(B Debian $B$J$N$G$9!#(B