CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Sat Mar 22 00:28:16 JST 2008

htdocs/ja

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

Log Message:
import from TNF.
  support/hardware/ata.xml: 1.2
  support/hardware/cardbus.xml: 1.2
  support/hardware/eisa.xml: 1.2
  support/hardware/i2c.xml: 1.2
  support/hardware/index.xml: 1.4
  support/hardware/isa.xml: 1.2
  support/hardware/mca.xml: 1.2
  support/hardware/mii.xml: 1.2
  support/hardware/ofw.xml: 1.2
  support/hardware/pci.xml: 1.3
  support/hardware/pcmcia.xml: 1.2
  support/hardware/podulebus.xml: 1.4
  support/hardware/pseudo-device.xml: 1.2
  support/hardware/sbus.xml: 1.2
  support/hardware/scsipi.xml: 1.2
  support/hardware/tc.xml: 1.2
  support/hardware/usb.xml: 1.2
  support/hardware/vme.xml: 1.2

Status:

Vendor Tag:	TNF
Release Tags:	date-2008-03-21
		
C htdocs/ja/support/hardware/ata.xml
C htdocs/ja/support/hardware/cardbus.xml
C htdocs/ja/support/hardware/eisa.xml
C htdocs/ja/support/hardware/i2c.xml
C htdocs/ja/support/hardware/index.xml
C htdocs/ja/support/hardware/isa.xml
C htdocs/ja/support/hardware/mca.xml
C htdocs/ja/support/hardware/mii.xml
C htdocs/ja/support/hardware/ofw.xml
C htdocs/ja/support/hardware/pci.xml
C htdocs/ja/support/hardware/pcmcia.xml
C htdocs/ja/support/hardware/podulebus.xml
C htdocs/ja/support/hardware/pseudo-device.xml
C htdocs/ja/support/hardware/sbus.xml
C htdocs/ja/support/hardware/scsipi.xml
C htdocs/ja/support/hardware/tc.xml
C htdocs/ja/support/hardware/usb.xml
C htdocs/ja/support/hardware/vme.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja