From owner-cvs-doc@FreeBSD.ORG  Sun Jun 13 20:40:56 2004
Return-Path: <owner-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 E36F216A4CE; Sun, 13 Jun 2004 20:40:56 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C675F43D45; Sun, 13 Jun 2004 20:40:56 +0000 (GMT)
	(envelope-from simon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5DKdkCg047807;
	Sun, 13 Jun 2004 20:39:46 GMT
	(envelope-from simon@repoman.freebsd.org)
Received: (from simon@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5DKdkVx047806;
	Sun, 13 Jun 2004 20:39:46 GMT
	(envelope-from simon)
Message-Id: <200406132039.i5DKdkVx047806@repoman.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sun, 13 Jun 2004 20:39:46 +0000 (UTC)
To: doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: doc/share/sgml trademarks.ent
X-BeenThere: cvs-doc@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 13 Jun 2004 20:40:57 -0000

simon       2004-06-13 20:39:46 UTC

  FreeBSD doc repository

  Modified files:
    share/sgml           trademarks.ent 
  Log:
  - Add IntelliMouse as a Microsoft Trademark.
  - Update Linux trademark entry after I found http://www.linuxmark.org/.
  
  Revision  Changes    Path
  1.20      +5 -2      doc/share/sgml/trademarks.ent