From 4000f55810d8ef5273cab1c719f500a2e62b251e Mon Sep 17 00:00:00 2001
From: Remko Lodder <remko@FreeBSD.org>
Date: Tue, 27 Sep 2005 12:02:17 +0000
Subject: [PATCH] Remove Metro Link references. The URL pointing to Metro Link
 no longer gives the information it once had.

Also fix a grammar nit.

Noticed by:		Lin, Shih-Min <sl151 at waikato dot ac dot nz> on www@
---
 en_US.ISO8859-1/books/faq/book.sgml | 79 ++---------------------------
 1 file changed, 3 insertions(+), 76 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 920bbc3b96..79ced00214 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -4151,42 +4151,6 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
                 </varlistentry>
               </variablelist>
 
-          <para>Contact <link linkend="metrox">Metro Link</link>
-            for an either ELF or a.out &motif; 2.1 distribution for
-            FreeBSD.</para>
-
-          <para>This distribution includes:</para>
-            <itemizedlist>
-              <listitem>
-                <para>OSF/&motif; manager, xmbind, panner, wsm.</para>
-              </listitem>
-
-              <listitem>
-                <para>Development kit with uil, mrm, xm, xmcxx, include
-                  and Imake files.</para>
-              </listitem>
-
-              <listitem>
-                <para>Static and dynamic libraries (specify ELF for use
-                  with FreeBSD 3.0 and later; or a.out for use with FreeBSD
-                  2.2.8 and earlier).</para>
-              </listitem>
-
-              <listitem>
-                <para>Demonstration applets.</para>
-              </listitem>
-
-              <listitem>
-              <para>Preformatted manual pages.</para>
-              </listitem>
-
-              </itemizedlist>
-
-          <para>Be sure to specify that you want the FreeBSD version
-            of &motif; when ordering! Versions for &linux; are also sold by
-            <emphasis>Metro Link</emphasis>. This is available on either a
-            CDROM or for FTP download.</para>
-
           <para>Contact <link linkend="xig">Xi Graphics</link> for an
             a.out &motif; 2.0 distribution for FreeBSD.</para>
 
@@ -4248,46 +4212,9 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 
         <answer>
           <para>Yes, <ulink url="http://www.xig.com/">Xi Graphics</ulink>
-            and <ulink url="http://www.metrolink.com/">Metro Link</ulink>
-            sell Accelerated-X product for FreeBSD and other Intel based
+            sells Accelerated-X products for FreeBSD and other Intel based
             systems.</para>
 
-          <para>The Metro Link offering is a high performance X Server
-            that offers easy configuration using the FreeBSD Package suite
-            of tools, support for multiple concurrent video boards and is
-            distributed in binary form only, in a convenient FTP download.
-            Not to mention the Metro Link offering is available at the very
-            reasonable price of $39. <anchor id="metrox"></para>
-
-          <para>Metro Link also sells both ELF and a.out &motif; for
-            FreeBSD (see above).</para>
-
-            <variablelist>
-              <varlistentry>
-                <term>More info</term>
-                <listitem>
-                  <para><ulink url="http://www.metrolink.com/">
-                    Metro Link WWW page</ulink></para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term>or</term>
-                <listitem>
-                  <para><email>sales@metrolink.com</email>
-                    or <email>tech@metrolink.com</email>
-                    </para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term>or</term>
-                  <listitem>
-                    <para>phone (954) 938-0283  or +1 954 938-0283</para>
-                  </listitem>
-                </varlistentry>
-              </variablelist>
-
           <para>The Xi Graphics offering is a high performance X Server
             that offers easy configuration, support for multiple concurrent
             video boards and is distributed in binary form only, in a
@@ -6975,8 +6902,8 @@ options    SYSVMSG          # enable for messaging</programlisting>
 	    FreeBSD Handbook.</para>
 
           <para>You may also wish to investigate the Xaccel server.
-            See the section on <link linkend="xig">Xi Graphics</link> or
-            <link linkend="metrox">Metro Link</link> for more details.</para>
+            See the section on <link linkend="xig">Xi Graphics</link>
+            for more details.</para>
         </answer>
       </qandaentry>