CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Thu Mar 30 00:25:07 JST 2006

htdocs/ja

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

Log Message:
import from TNF.
  Changes/index.xml: 1.237
  Documentation/pkgsrc/binary/chapter.xml: 1.12
  Documentation/pkgsrc/features/chapter.xml: 1.12
  Documentation/software/packages.xml: 1.15
  Documentation/x/index.xml: 1.3
  gallery/products.xml: 1.1
  index.html: 1.1233

Status:

Vendor Tag:	TNF
Release Tags:	date-2006-03-29
		
C htdocs/ja/index.html
N htdocs/ja/gallery/products.xml
C htdocs/ja/Changes/index.xml
C htdocs/ja/Documentation/software/packages.xml
C htdocs/ja/Documentation/pkgsrc/binary/chapter.xml
C htdocs/ja/Documentation/pkgsrc/features/chapter.xml
N htdocs/ja/Documentation/x/index.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja