svn commit: r45694 - head/share/xml

[Gavin Atkinson]

Author: gavin
Date: Mon Sep 29 15:53:18 2014
New Revision: 45694
URL: http://svnweb.freebsd.org/changeset/doc/45694

Log:
  Add an Android trademark, I'll be using it soon.

Modified:
  head/share/xml/trademarks.ent

Modified: head/share/xml/trademarks.ent
==============================================================================
--- head/share/xml/trademarks.ent	Mon Sep 29 13:52:00 2014	(r45693)
+++ head/share/xml/trademarks.ent	Mon Sep 29 15:53:18 2014	(r45694)
@@ -122,6 +122,11 @@ Coverity, Inc.</para>">
 <!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Fujitsu</trademark>">
 <!ENTITY primepower "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PRIMEPOWER</trademark>">
 
+<!-- http://www.google.com/permissions/trademark/our-trademarks.html -->
+<!ENTITY tm-attrib.google "<para xmlns='http://docbook.org/ns/docbook'>Android
+  is a trademark of Google Inc.</para>">
+<!ENTITY android "<trademark xmlns='http://docbook.org/ns/docbook'>Android</trademark>">
+
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg, Helvetica,
   Palatino, and Times Roman are either registered trademarks or