aboutsummaryrefslogtreecommitdiff
path: root/fr_FR.ISO8859-1/share/xml/trademarks.ent
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2013-06-20 13:41:44 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2013-06-20 13:41:44 +0000
commitcc22d8bd7c718797aa73b5e29d23c16ea7dc40f5 (patch)
tree9a3f1fe69ba59ea610ebc5d2499fce3178b44f28 /fr_FR.ISO8859-1/share/xml/trademarks.ent
parent5d9f101d74f0baa42f325bf4c58f52c2581fb333 (diff)
downloaddoc-cc22d8bd7c718797aa73b5e29d23c16ea7dc40f5.tar.gz
doc-cc22d8bd7c718797aa73b5e29d23c16ea7dc40f5.zip
- Add back two accidentally removed entity definitions
Notes
Notes: svn path=/projects/db5/; revision=41958
Diffstat (limited to 'fr_FR.ISO8859-1/share/xml/trademarks.ent')
-rw-r--r--fr_FR.ISO8859-1/share/xml/trademarks.ent7
1 files changed, 7 insertions, 0 deletions
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent
index e5d9bb0cab..7fae465297 100644
--- a/fr_FR.ISO8859-1/share/xml/trademarks.ent
+++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent
@@ -66,6 +66,9 @@
Limited.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, and IOS are
registered trademarks of Cisco Systems, Inc. and/or its affiliates
in the United States and certain other countries.</para>">
@@ -87,6 +90,10 @@
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup est une marque déposée de
John D. Polstra.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+ Perfection</trademark>">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD est une marque
déposée de la fondation FreeBSD.</para>">