CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Wed Jan 11 01:07:20 JST 2006

htdocs/ja

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

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

Status:

Vendor Tag:	TNF
Release Tags:	date-2006-01-10
		
C htdocs/ja/Hardware/ata.xml
C htdocs/ja/Hardware/cardbus.xml
C htdocs/ja/Hardware/eisa.xml
C htdocs/ja/Hardware/i2c.xml
C htdocs/ja/Hardware/index.xml
C htdocs/ja/Hardware/isa.xml
C htdocs/ja/Hardware/mca.xml
C htdocs/ja/Hardware/mii.xml
C htdocs/ja/Hardware/ofw.xml
C htdocs/ja/Hardware/pci.xml
C htdocs/ja/Hardware/pcmcia.xml
C htdocs/ja/Hardware/podulebus.xml
C htdocs/ja/Hardware/pseudo-device.xml
C htdocs/ja/Hardware/sbus.xml
C htdocs/ja/Hardware/scsipi.xml
C htdocs/ja/Hardware/tc.xml
C htdocs/ja/Hardware/usb.xml
C htdocs/ja/Hardware/vme.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja