- Merge the following from the English version:

r40536 -> r41232	head/ja_JP.eucJP/htdocs/where.xml
	r41213 -> r41225	head/ja_JP.eucJP/share/xml/news.xml
This commit is contained in:
Ryusuke SUZUKI 2013-03-16 11:47:21 +00:00
parent 8fd2ad8bd3
commit a5a86fd2cf
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=41243
2 changed files with 8 additions and 10 deletions

View file

@ -5,7 +5,7 @@
<!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases"> <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
]> ]>
<!-- The FreeBSD Japanese Documentation Project --> <!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: r40536 --> <!-- Original revision: r41232 -->
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
@ -144,6 +144,7 @@
<td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td>
<td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
</tr> </tr>
<!--
<tr> <tr>
<td colspan="2">FreeBSD &rel3.current;-RELEASE</td> <td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
<td colspan="2"></td> <td colspan="2"></td>
@ -155,27 +156,28 @@
<tr> <tr>
<td></td> <td></td>
<td>amd64</td> <td>amd64</td>
<!-- <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> --> <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td>
<td colspan="2" align="right"><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> <td colspan="2" align="right"><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td>i386</td> <td>i386</td>
<!-- <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> --> <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td>
<td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> <td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td>pc98</td> <td>pc98</td>
<!-- <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> --> <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td>
<td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> <td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td>sparc64</td> <td>sparc64</td>
<!-- <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> --> <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td>
<td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
</tr> </tr>
-->
</tbody> </tbody>
</table> </table>

View file

@ -20,7 +20,7 @@
the contents of <title> will be preferred over <p>. the contents of <title> will be preferred over <p>.
$FreeBSD$ $FreeBSD$
Original revision: r41213 Original revision: r41225
--> -->
<news> <news>
<cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@ -271,10 +271,6 @@
<p>PC-BSD チームから PC-BSD&nbsp;9.1 がリリースされました (<a <p>PC-BSD チームから PC-BSD&nbsp;9.1 がリリースされました (<a
href="http://blog.pcbsd.org/2012/12/pc-bsd-9-1-now-available/">アナウンス</a>)。</p> href="http://blog.pcbsd.org/2012/12/pc-bsd-9-1-now-available/">アナウンス</a>)。</p>
</event> </event>
</day>
<day>
<name>18</name>
<event> <event>
<p>新コミッタ就任: <p>新コミッタ就任: