Date: Sun, 16 Nov 2014 21:53:08 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r45992 - head/share/xml Message-ID: <201411162153.sAGLr8Pq025999@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>">
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411162153.sAGLr8Pq025999>