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

MFen:

Browse source 
* share/sgml/trademarks.sgml 1.6 -> 1.7
* share/sgml/trademarks.ent 1.46 -> 1.47
This commit is contained in:
Rene Ladan 2010-01-12 20:20:43 +00:00
parent a8d3e08a3f
commit d6dd4f77c2
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=35172
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nl_NL.ISO8859-1/share/sgml/trademarks.ent
View file

@ -11,7 +11,7 @@
$FreeBSD$
%SOURCE% share/sgml/trademarks.ent
%SRCID% 1.46
%SRCID% 1.47
-->
<!ENTITY tm-attrib.3com "<para>3Com en HomeConnect zijn geregistreerde
@ -334,7 +334,7 @@
<!-- http://www.sun.com/suntrademarks/ -->
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra,
Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS,
Ultra en VirtualBox zijn handelsmerken of geregistreerde handelsmerken van
Sun Microsystems, Inc. in de Verenigde Staten en andere landen.</para>">
@ -346,6 +346,7 @@
<!ENTITY jsp "<trademark>JSP</trademark>">
<!ENTITY jvm "<trademark>JVM</trademark>">
<!ENTITY netra "<trademark>Netra</trademark>">
<!ENTITY openjdk "<trademark>OpenJDK</trademark>">
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">

6
nl_NL.ISO8859-1/share/sgml/trademarks.sgml
View file

@ -1,9 +1,9 @@
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
$FreeBSD: $
$FreeBSD$
%SOURCE% en_US.ISO8859-1/share/sgml/trademarks.sgml
%SRCID% 1.6
%SRCID% 1.7
-->
<legalnotice id="trademarks" role="trademarks">
@ -13,7 +13,7 @@
<para>UNIX is een geregistreerd handelsmerk van The Open Group in de
Verenigde Staten en andere landen.</para>
<para>Sun, Sun Microsystems, SunOS, Solaris, en Java zijn
<para>Sun, Sun Microsystems, SunOS, Solaris, Java, JDK, en OpenJDK zijn
handelsmerken of geregistreerde handelsmerken van Sun Microsystems,
Inc. in de Verenigde Staten en andere landen.</para>