Merge the following from the English version:

1.95 -> 1.96	www/ja/search/web.atoz
	1.389 -> 1.390	www/ja/share/sgml/news.xml
This commit is contained in:
Ryusuke SUZUKI 2011-08-24 16:36:30 +00:00
parent 75703cd7f6
commit 846a76024a
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=37592
2 changed files with 19 additions and 7 deletions

View file

@ -4,10 +4,10 @@
# With the format `<title>|<url>'.
# Empty lines or comments are ignored.
#
# $FreeBSD: www/ja/search/web.atoz,v 1.47 2011/06/17 16:03:13 ryusuke Exp $
# $FreeBSD: www/ja/search/web.atoz,v 1.48 2011/08/10 11:42:37 ryusuke Exp $
#
# The FreeBSD Japanese Documentation Project
# Original revision: 1.95
# Original revision: 1.96
#
# NOTE: the entries should be sorted alphabetically by their relative
# path to www/en. E.g. docs/man.sgml comes after docs/books.sgml,
@ -514,8 +514,6 @@ GNU Info Documents|http://docs.freebsd.org/info/
Logo design competition|http://logo-contest.FreeBSD.org/
# News
BSD News|http://bsdnews.com
Daemon News|http://www.daemonnews.org/
# Security Advisories
Security Advisories|&base;/security/

View file

@ -19,13 +19,13 @@
synopses of this information (e.g., for syndication using RDF files),
the contents of <title> will be preferred over <p>.
$FreeBSD: www/ja/share/sgml/news.xml,v 1.67 2011/08/11 15:16:29 ryusuke Exp $
Original revision: 1.389
$FreeBSD: www/ja/share/sgml/news.xml,v 1.68 2011/08/18 09:54:41 ryusuke Exp $
Original revision: 1.390
-->
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
$FreeBSD: www/ja/share/sgml/news.xml,v 1.67 2011/08/11 15:16:29 ryusuke Exp $
$FreeBSD: www/ja/share/sgml/news.xml,v 1.68 2011/08/18 09:54:41 ryusuke Exp $
</cvs:keyword>
</cvs:keywords>
@ -43,6 +43,20 @@
</event>
</day>
<day>
<name>9</name>
<event>
<title>&os; Foundation ニュースレター (2011 年 8 月) が発行されました</title>
<p>&os; Foundation は、今年初めての <a
href="http://www.freebsdfoundation.org/press/2011Aug-newsletter.shtml">2011 年中期ニュースレター
</a> を発行しました。
このニュースレターは、&os; Foundation が &os;
プロジェクトに対して行ってきた支援についてまとめています。</p>
</event>
</day>
<day>
<name>1</name>