aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2009-02-24 19:54:32 +0000
committerXin LI <delphij@FreeBSD.org>2009-02-24 19:54:32 +0000
commita072c77addbe83249ef3218a19b4c63ebaad172c (patch)
tree8b7ddae50b62a4ff0c628185ec85fd0d5b1f5554
parent229a70ef500169c30a5dfcfe47aaa58f36d29680 (diff)
Notes
-rw-r--r--zh_CN.GB2312/share/sgml/trademarks.ent5
1 files changed, 4 insertions, 1 deletions
diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent
index 7b0c2ac0a9..ed486e5445 100644
--- a/zh_CN.GB2312/share/sgml/trademarks.ent
+++ b/zh_CN.GB2312/share/sgml/trademarks.ent
@@ -8,7 +8,7 @@
Please keep this file sorted.
- Original revision: 1.43
+ Original revision: 1.44
$FreeBSD$
-->
@@ -80,7 +80,9 @@
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, ºÍ IOS
ÊÇ Cisco Systems, Inc. ºÍ/»òÆä¸½Êô»ú¹¹ÔÚÃÀ¹úºÍһЩÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>">
+<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
+<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>">
<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
<!ENTITY tm-attrib.corel "<para>Corel ºÍ WordPerfect ÊÇ Corel Corporation ºÍ/»òÆä×Ó¹«Ë¾
@@ -137,6 +139,7 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢²
<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, ºÍ 802 ÊÇ Institute of Electrical and Electronics Engineers,
Inc. ÔÚÃÀ¹úµÄ×¢²áÉ̱ꡣ</para>">
+<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->