Fix up some trademarks in this (very outdated) article.

This commit is contained in:
Gavin Atkinson 2014-09-21 20:41:21 +00:00
parent 5bf08fa147
commit 2971eed641
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=45651

View file

@ -15,7 +15,7 @@
<legalnotice xml:id="trademarks" role="trademarks"> <legalnotice xml:id="trademarks" role="trademarks">
&tm-attrib.freebsd; &tm-attrib.freebsd;
&tm-attrib.intel; &tm-attrib.intel;
&tm-attrib.xfree86; &tm-attrib.redhat;
&tm-attrib.general; &tm-attrib.general;
</legalnotice> </legalnotice>
@ -135,16 +135,16 @@
<title>Introduction</title> <title>Introduction</title>
<para>At the beginning of 2003 we had a CriticalPath mail system <para>At the beginning of 2003 we had a CriticalPath mail system
running on Solaris x86 plus a Redhat box for SMTP, Radius and running on Solaris x86 plus a Red Hat box for SMTP, Radius and
DNS. The DNS and Radius services were constantly down and we DNS. The DNS and Radius services were constantly down and we
were struggling with huge mail queues. There was an attempt to were struggling with huge mail queues. There was an attempt to
install CriticalPath for Linux into Redhat on an Intel box with install CriticalPath for &linux; into Red Hat on an &intel; box with
a Megaraid card, but the disk latency was enormous and the mail a Megaraid card, but the disk latency was enormous and the mail
application never really worked.</para> application never really worked.</para>
<para>The first step depicted towards the "FreeBSD solution" <para>The first step depicted towards the "FreeBSD solution"
consisted in migrating this hardware and commercial software to consisted in migrating this hardware and commercial software to
FreeBSD 4.8 with Linux emulation.</para> FreeBSD 4.8 with &linux; emulation.</para>
</sect2> </sect2>
<sect2 xml:id="freebsd-choice"> <sect2 xml:id="freebsd-choice">
@ -298,7 +298,7 @@
<title>Results</title> <title>Results</title>
<para>We managed to deploy a FreeBSD based email architecture that <para>We managed to deploy a FreeBSD based email architecture that
is horizontally scalable, using 3 Terabyte Intel based storage is horizontally scalable, using 3 Terabyte &intel; based storage
servers at a current cost of 3 dollars per Gigabyte with servers at a current cost of 3 dollars per Gigabyte with
redundancy.</para> redundancy.</para>