From owner-svn-doc-head@FreeBSD.ORG  Sun Nov 16 21:53:08 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B71571AF;
 Sun, 16 Nov 2014 21:53:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A3358E8C;
 Sun, 16 Nov 2014 21:53:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGLr8Iw026000;
 Sun, 16 Nov 2014 21:53:08 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAGLr8Pq025999;
 Sun, 16 Nov 2014 21:53:08 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201411162153.sAGLr8Pq025999@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 16 Nov 2014 21:53:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45992 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Nov 2014 21:53:08 -0000

Author: gavin
Date: Sun Nov 16 21:53:07 2014
New Revision: 45992
URL: https://svnweb.freebsd.org/changeset/doc/45992

Log:
  Update the Apple trademark attribution to match the Apple recommended
  wording.
  
  Submitted by:	Matthew Rezny

Modified:
  head/share/xml/trademarks.ent

Modified: head/share/xml/trademarks.ent
==============================================================================
--- head/share/xml/trademarks.ent	Sun Nov 16 17:45:30 2014	(r45991)
+++ head/share/xml/trademarks.ent	Sun Nov 16 21:53:07 2014	(r45992)
@@ -57,8 +57,8 @@
 <!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>Apple, AirPort, FireWire,
   iMac, iPhone, iPad,
   Mac, Macintosh, Mac OS,
-  Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
-  registered in the United States and other countries.</para>">
+  Quicktime, and TrueType are trademarks of Apple Inc.,
+  registered in the U.S. and other countries.</para>">
 <!ENTITY airport "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AirPort</trademark>">
 <!ENTITY apple "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Apple</trademark>">
 <!ENTITY firewire "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>FireWire</trademark>">