CVS commit: htdocs

[kano@jp.netbsd.org (OKANO Takayoshi)]

Module Name:	htdocs
Committed By:	kano
Date:		Fri Jul 13 21:27:16 JST 2007

htdocs/ja

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

Log Message:
import from TNF.
  docs/Hardware/Machines/ARC/index.xml: 1.2
  docs/bootcd.xml: 1.2
  docs/current/index.xml: 1.2
  docs/index.xml: 1.2
  docs/kernel/index.xml: 1.2
  docs/kernel/kgdb.xml: 1.2
  docs/mirror.xml: 1.2
  docs/misc/index.xml: 1.2
  docs/network/index.xml: 1.2
  docs/network/ipsec/index.xml: 1.2
  docs/network/ipv6/index.xml: 1.2
  docs/network/pf.xml: 1.2
  docs/power-mgmt/index.xml: 1.2
  docs/software/packages.xml: 1.2
  docs/updating.xml: 1.2

Status:

Vendor Tag:	TNF
Release Tags:	date-2007-07-13
		
C htdocs/ja/docs/bootcd.xml
C htdocs/ja/docs/index.xml
C htdocs/ja/docs/mirror.xml
C htdocs/ja/docs/updating.xml
C htdocs/ja/docs/Hardware/Machines/ARC/index.xml
C htdocs/ja/docs/current/index.xml
C htdocs/ja/docs/kernel/index.xml
C htdocs/ja/docs/kernel/kgdb.xml
C htdocs/ja/docs/misc/index.xml
C htdocs/ja/docs/network/index.xml
C htdocs/ja/docs/network/pf.xml
C htdocs/ja/docs/network/ipsec/index.xml
C htdocs/ja/docs/network/ipv6/index.xml
C htdocs/ja/docs/power-mgmt/index.xml
C htdocs/ja/docs/software/packages.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja