CVS commit: htdocs

[OKANO Takayoshi <kano@jp.netbsd.org>]

Module Name:	htdocs
Committed By:	kano
Date:		Tue Aug 15 07:29:48 JST 2006

htdocs/ja

Update of /cvsroot/htdocs/ja
In directory mogu:/tmp/cvs-serv25249

Log Message:
import from TNF.
  Changes/index.xml: 1.284
  Documentation/current/index.xml: 1.11
  People/developers.xml: 1.111
  Security/advisory.xml: 1.19
  Security/index.xml: 1.40
  Security/patches-2.0.2.xml: 1.10
  Security/patches-2.0.3.xml: 1.9
  Security/patches-2.0.xml: 1.13
  Security/patches-2.1.xml: 1.10
  Security/patches-3.0.xml: 1.11
  gallery/events.xml: 1.130
  index.html: 1.1273

Status:

Vendor Tag:	TNF
Release Tags:	date-2006-08-14
		
C htdocs/ja/index.html
C htdocs/ja/gallery/events.xml
C htdocs/ja/Documentation/current/index.xml
C htdocs/ja/People/developers.xml
C htdocs/ja/Changes/index.xml
C htdocs/ja/Security/advisory.xml
C htdocs/ja/Security/index.xml
C htdocs/ja/Security/patches-2.0.2.xml
C htdocs/ja/Security/patches-2.1.xml
C htdocs/ja/Security/patches-2.0.xml
C htdocs/ja/Security/patches-2.0.3.xml
C htdocs/ja/Security/patches-3.0.xml

12 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja