CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Fri Jul 16 00:11:43 JST 2010

htdocs/ja

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

Log Message:
import from TNF.
  changes/2000.xml: 1.10
  ports/alpha/news.html: 1.6
  ports/mac68k/history.xml: 1.4
  ports/mac68k/info/chap-features.xml: 1.4
  ports/pc532/index.html: 1.6
  releases/formal-1.1/hp300.html: 1.5
  releases/formal-1.2/alpha.html: 1.5
  releases/formal-1.2/hp300.html: 1.5
  releases/formal-1.3/hp300.html: 1.5

Status:

Vendor Tag:	TNF
Release Tags:	date-2010-07-15
		
C htdocs/ja/changes/2000.xml
C htdocs/ja/ports/alpha/news.html
C htdocs/ja/ports/mac68k/history.xml
C htdocs/ja/ports/mac68k/info/chap-features.xml
C htdocs/ja/ports/pc532/index.html
C htdocs/ja/releases/formal-1.1/hp300.html
C htdocs/ja/releases/formal-1.2/alpha.html
C htdocs/ja/releases/formal-1.2/hp300.html
C htdocs/ja/releases/formal-1.3/hp300.html

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja