os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Break long lines. No content change, translators can ignore.

Browse source
This commit is contained in:
Simon L. B. Nielsen 2006-07-16 11:57:01 +00:00
parent 5466f6bd9b
commit a423ef3561
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28307
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
share/sgml/trademarks.ent
View file

@ -122,7 +122,8 @@
trademarks of Heidelberger Druckmaschinen AG in the U.S. and other trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
countries.</para>"> countries.</para>">
<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, and ThinkPad are <!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2,
PowerPC, PS/2, S/390, and ThinkPad are
trademarks of International Business Machines Corporation in the trademarks of International Business Machines Corporation in the
United States, other countries, or both.</para>"> United States, other countries, or both.</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> <!ENTITY aix "<trademark class='registered'>AIX</trademark>">
@ -299,10 +300,12 @@
<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
<!-- http://www.sun.com/suntrademarks/ --> <!-- http://www.sun.com/suntrademarks/ -->
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, Solaris, StarOffice,
Sun Blade, Sun Enterprise, Sun Fire, SunOS, and Ultra are trademarks or registered trademarks of <!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
Sun Microsystems, Inc. in the United States and other Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra,
countries.</para>"> Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, and
Ultra are trademarks or registered trademarks of Sun Microsystems,
Inc. in the United States and other countries.</para>">
<!ENTITY java "<trademark>Java</trademark>"> <!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> <!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>"> <!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">