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

Include OpenJDK in the list of Sun's trademarks. While here, make sure

Browse source 
the first use of Java and JDK in text paragraphs carry the TM as well.
This commit is contained in:
Mark Linimon 2010-01-09 06:16:56 +00:00
parent fad690046d
commit 8d6020bd8d
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=35160
2 changed files with 4 additions and 3 deletions
en_US.ISO8859-1
books/porters-handbook
book.sgml
share/sgml
trademarks.sgml

4
en_US.ISO8859-1/books/porters-handbook/book.sgml
View file

@ -1619,7 +1619,7 @@ PORTEPOCH= 1</programlisting>
<row>
<entry><filename>java</filename></entry>
<entry>Software related to the Java language.</entry>
<entry>Software related to the Java&trade; language.</entry>
<entry>The <filename>java</filename> category shall not be
the only one for a port. Save for ports directly related to
the Java language, porters are also encouraged not to
@ -5929,7 +5929,7 @@ QT_COMPONENTS= qmake_build moc_build rcc_build uic_build</programlisting>
<sect2 id="java-variables">
<title>Variable definitions</title>
<para>If your port needs a Java&trade; Development Kit (JDK) to
<para>If your port needs a Java&trade; Development Kit (JDK&trade;) to
either build, run or even extract the distfile, then it should
define <makevar>USE_JAVA</makevar>.</para>

3
en_US.ISO8859-1/share/sgml/trademarks.sgml
View file

@ -11,7 +11,8 @@
<para>UNIX is a registered trademark of The Open Group in the US and
other countries.</para>
<para>Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks
<para>Sun, Sun Microsystems, SunOS, Solaris,
Java, JDK, and OpenJDK are trademarks
or registered trademarks of Sun Microsystems, Inc. in the United
States and other countries.</para>