From owner-cvs-doc@FreeBSD.ORG  Thu Jun 30 14:42:49 2005
Return-Path: <owner-cvs-doc@FreeBSD.ORG>
X-Original-To: cvs-doc@FreeBSD.org
Delivered-To: cvs-doc@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 46A8F16A41C;
	Thu, 30 Jun 2005 14:42:49 +0000 (GMT)
	(envelope-from rushani@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D817543D58;
	Thu, 30 Jun 2005 14:42:48 +0000 (GMT)
	(envelope-from rushani@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5UEgm4i036476;
	Thu, 30 Jun 2005 14:42:48 GMT
	(envelope-from rushani@repoman.freebsd.org)
Received: (from rushani@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5UEgmFi036475;
	Thu, 30 Jun 2005 14:42:48 GMT (envelope-from rushani)
Message-Id: <200506301442.j5UEgmFi036475@repoman.freebsd.org>
From: Hideyuki KURASHINA <rushani@FreeBSD.org>
Date: Thu, 30 Jun 2005 14:42:48 +0000 (UTC)
To: doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: doc/ja_JP.eucJP/share/sgml trademarks.ent
X-BeenThere: cvs-doc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the doc and www trees <cvs-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-doc>,
	<mailto:cvs-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-doc>
List-Post: <mailto:cvs-doc@freebsd.org>
List-Help: <mailto:cvs-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-doc>,
	<mailto:cvs-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jun 2005 14:42:49 -0000

rushani     2005-06-30 14:42:48 UTC

  FreeBSD doc repository

  Modified files:
    ja_JP.eucJP/share/sgml trademarks.ent 
  Log:
  Merge the following from the English version:
  
          1.24 -> 1.28    share/sgml/trademarks.ent
  
  Revision  Changes    Path
  1.6       +2 -3      doc/ja_JP.eucJP/share/sgml/trademarks.ent