svn commit: r45697 - head/share/xml

[Gavin Atkinson]

Author: gavin
Date: Mon Sep 29 17:58:37 2014
New Revision: 45697
URL: http://svnweb.freebsd.org/changeset/doc/45697

Log:
  Add trademark entities for iPad and iPhone

Modified:
  head/share/xml/trademarks.ent

Modified: head/share/xml/trademarks.ent
==============================================================================
--- head/share/xml/trademarks.ent	Mon Sep 29 17:47:53 2014	(r45696)
+++ head/share/xml/trademarks.ent	Mon Sep 29 17:58:37 2014	(r45697)
@@ -51,13 +51,17 @@
 <!ENTITY opteron "<trademark xmlns='http://docbook.org/ns/docbook'>Opteron</trademark>">
 
 <!-- http://www.apple.com/legal/trademark/appletmlist.html -->
-<!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
+<!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>">
 <!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>">
 <!ENTITY imac "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>iMac</trademark>">
+<!ENTITY ipad "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>iPad</trademark>">
+<!ENTITY iphone "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>iPhone</trademark>">
 <!ENTITY mac "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mac</trademark>">
 <!ENTITY macintosh "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Macintosh</trademark>">
 <!ENTITY macos "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mac OS</trademark>">