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

- Use trademark symbols for the XFree86 trademark.

Browse source 
- Add trademark attributions for AMD and XFree86.
- Always use correct case for trademarks.
- Don't join trademarks with other words, e.g. using hyphens.
This commit is contained in:
Simon L. B. Nielsen 2003-10-18 13:35:25 +00:00
parent fe64c6ea1e
commit 42b34dbd78
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=18481
5 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
en/applications.sgml
View file

@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY date "$FreeBSD: www/en/applications.sgml,v 1.22 2003/06/18 23:27:17 murray Exp $">
<!ENTITY date "$FreeBSD: www/en/applications.sgml,v 1.23 2003/10/03 22:42:03 simon Exp $">
<!ENTITY title "About Applications for FreeBSD">
<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
]>
@ -63,7 +63,7 @@
<li><b>X Window workstation. </b>From an inexpensive X terminal to an
advanced X display, FreeBSD works quite well. Free X software (<a
href="http://www.xfree86.org/">XFree86</a>) comes with the
href="http://www.xfree86.org/">XFree86</a>&trade;) comes with the
system. <a href="http://www.xig.com/">Xi Graphics</a> offers
accelerated X software for high-performance graphics hardware (such
as Matrox), as well as the industry standard Motif&reg; and OpenGL&reg;

8
en/copyright/trademarks.sgml
View file

@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/en/copyright/trademarks.sgml,v 1.5 2003/10/03 22:04:28 simon Exp $">
<!ENTITY date "$FreeBSD: www/en/copyright/trademarks.sgml,v 1.6 2003/10/10 23:27:19 simon Exp $">
<!ENTITY title "Trademark Legend">
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
]>
@ -15,6 +15,10 @@
registered trademarks or trademarks of Adobe Systems Incorporated in
the United States and/or other countries.</p>
<p>AMD, Am486, Am5X86, AMD Athlon, AMD Duron, AMD Opteron, AMD-K6,
&Eacute;lan, and PCnet are trademarks of Advanced Micro Devices,
Inc.</p>
<p>IBM and PowerPC are trademarks of International Business Machines
Corporation in the United States, other countries, or both.</p>
@ -41,6 +45,8 @@
registered trademarks of Sun Microsystems, Inc. in the United States
and other countries.</p>
<p>XFree86 is a trademark of The XFree86 Project, Inc.</p>
<p>Many of the designations used by manufacturers and sellers to
distinguish their products are claimed as trademarks. Where those
designations appear on this website, and the FreeBSD Project was aware

4
en/projects/cvsweb.sgml
View file

@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/en/projects/cvsweb.sgml,v 1.13 2003/03/01 11:36:14 knu Exp $">
<!ENTITY date "$FreeBSD: www/en/projects/cvsweb.sgml,v 1.14 2003/10/06 06:08:30 scop Exp $">
<!ENTITY title 'FreeBSD CVSweb Project'>
<!ENTITY email 'freebsd-cvsweb'>
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
@ -46,7 +46,7 @@
<a href="http://cvsweb.netbsd.org/bsdweb.cgi/">NetBSD</a>,
<a href="http://www.opendarwin.org/cgi-bin/cvsweb.cgi/">OpenDarwin</a>,
<a href="http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/">Ruby</a>, and
<a href="http://cvsweb.xfree86.org/cvsweb/">XFree86</a>.</p>
<a href="http://cvsweb.xfree86.org/cvsweb/">XFree86</a>&trade;.</p>
<hr>

14
en/support.sgml
View file

@ -1,5 +1,5 @@
<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.312 2003/10/11 00:09:53 brueffer Exp $">
<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.313 2003/10/16 23:57:31 simon Exp $">
<!ENTITY title "Support">
<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
]>
@ -1010,8 +1010,8 @@
<h2>The X Window System</h2>
<ul>
<li><a href="http://www.xfree86.org/">The XFree86 Project</a> provides
users of a variety of Intel based Unix systems, including FreeBSD,
<li><a href="http://www.xfree86.org/">The XFree86&trade; Project</a> provides
users of a variety of Intel based UNIX systems, including FreeBSD,
with an excellent X Window system.</li>
<li><a href="http://www.soulwax.net/nvidia/faq.shtml">The
@ -1020,7 +1020,7 @@
graphics drivers.</li>
<li>The <a href="http://www.winehq.com/">WINE</a> project is working to
provide the ability to run Microsoft Windows&reg; software on Intel based Unix
provide the ability to run Microsoft Windows&reg; software on Intel based UNIX
systems such as FreeBSD, NetBSD and Linux.</li>
</ul>
@ -1059,15 +1059,15 @@
is another 4.4BSD derivative.</li>
<li><a href="http://www.linux.org/"><strong>Linux</strong></a> is
another free Unix-like system.</li>
another free UNIX like system.</li>
<li><a href="http://www.cs.hut.fi/~jvh/lites.html"><strong>Lites</strong></a>
is a 4.4 BSD Lite based server and emulation library that provides
free Unix functionality to a Mach based system.</li>
free UNIX functionality to a Mach based system.</li>
<li>The <a href="http://www.gnu.org/software/hurd/hurd.html"><strong>GNU
HURD</strong></a> project is another effort to develop a free
Unix-like operating system.</li>
UNIX like operating system.</li>
</ul>
&footer;

14
en/usergroups.sgml
View file

@ -1,5 +1,5 @@
<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.312 2003/10/11 00:09:53 brueffer Exp $">
<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.313 2003/10/16 23:57:31 simon Exp $">
<!ENTITY title "Support">
<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
]>
@ -1010,8 +1010,8 @@
<h2>The X Window System</h2>
<ul>
<li><a href="http://www.xfree86.org/">The XFree86 Project</a> provides
users of a variety of Intel based Unix systems, including FreeBSD,
<li><a href="http://www.xfree86.org/">The XFree86&trade; Project</a> provides
users of a variety of Intel based UNIX systems, including FreeBSD,
with an excellent X Window system.</li>
<li><a href="http://www.soulwax.net/nvidia/faq.shtml">The
@ -1020,7 +1020,7 @@
graphics drivers.</li>
<li>The <a href="http://www.winehq.com/">WINE</a> project is working to
provide the ability to run Microsoft Windows&reg; software on Intel based Unix
provide the ability to run Microsoft Windows&reg; software on Intel based UNIX
systems such as FreeBSD, NetBSD and Linux.</li>
</ul>
@ -1059,15 +1059,15 @@
is another 4.4BSD derivative.</li>
<li><a href="http://www.linux.org/"><strong>Linux</strong></a> is
another free Unix-like system.</li>
another free UNIX like system.</li>
<li><a href="http://www.cs.hut.fi/~jvh/lites.html"><strong>Lites</strong></a>
is a 4.4 BSD Lite based server and emulation library that provides
free Unix functionality to a Mach based system.</li>
free UNIX functionality to a Mach based system.</li>
<li>The <a href="http://www.gnu.org/software/hurd/hurd.html"><strong>GNU
HURD</strong></a> project is another effort to develop a free
Unix-like operating system.</li>
UNIX like operating system.</li>
</ul>
&footer;