From 882df99b3aca909ffc92667bc276e0dad0a076c6 Mon Sep 17 00:00:00 2001
From: Denis Peplin <den@FreeBSD.org>
Date: Mon, 20 Dec 2004 11:04:26 +0000
Subject: [PATCH] Use X11 where talking about X Window System and only XFree86
 is mentioned

---
 en_US.ISO8859-1/books/handbook/introduction/chapter.sgml | 2 +-
 en_US.ISO8859-1/books/handbook/mac/chapter.sgml          | 2 +-
 en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml   | 4 ++--
 en_US.ISO8859-1/books/handbook/preface/preface.sgml      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
index 5db0989bf6..975c08dd39 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
@@ -346,7 +346,7 @@
 	<listitem>
 	  <para><emphasis>X Window workstation:</emphasis> FreeBSD is a
 	    fine choice for an inexpensive X terminal solution, either
-	    using the freely available &xfree86; server or one of the
+	    using the freely available X11 server or one of the
 	    excellent commercial servers provided by <ulink
 	    url="http://www.xig.com">Xi Graphics</ulink>.  Unlike an
 	    X terminal, FreeBSD allows many applications to be run
diff --git a/en_US.ISO8859-1/books/handbook/mac/chapter.sgml b/en_US.ISO8859-1/books/handbook/mac/chapter.sgml
index e902dad898..9ed07a885d 100644
--- a/en_US.ISO8859-1/books/handbook/mac/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mac/chapter.sgml
@@ -103,7 +103,7 @@
       <para>The improper use of the
 	information in this chapter may cause loss of access to the system,
 	aggravation of users, or inability to access the features
-	provided by &xfree86;.  More importantly, <acronym>MAC</acronym> should not
+	provided by X11.  More importantly, <acronym>MAC</acronym> should not
 	be relied upon to completely secure a system.  The
 	<acronym>MAC</acronym> framework only augments
 	existing security policy; without sound security practices and
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
index 1eb1ffd1f8..dc43516e89 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
@@ -488,7 +488,7 @@ kld snd_ich (1p/2r/0v channels duplex default)</screen>
     <sect2 id="mp3-players">
       <title>MP3 Players</title>
 
-      <para>By far, the most popular <application>&xfree86;</application> MP3 player is
+      <para>By far, the most popular X11 MP3 player is
 	<application>XMMS</application> (X Multimedia System).  
 	<application>Winamp</application>
 	skins can be used with <application>XMMS</application> since the
@@ -938,7 +938,7 @@ no adaptors present</screen>
     <sect3 id="video-interface-DGA">
     <title>Direct Graphics Access</title>
 
-    <para>Direct Graphics Access is an <application>&xfree86;</application> extension which allows
+    <para>Direct Graphics Access is an X11 extension which allows
       a program to bypass the X server and directly alter the
       framebuffer.  Because it relies on a low level memory mapping to
       effect this sharing, programs using it must be run as
diff --git a/en_US.ISO8859-1/books/handbook/preface/preface.sgml b/en_US.ISO8859-1/books/handbook/preface/preface.sgml
index 7136a57134..fe685de2b8 100644
--- a/en_US.ISO8859-1/books/handbook/preface/preface.sgml
+++ b/en_US.ISO8859-1/books/handbook/preface/preface.sgml
@@ -267,7 +267,7 @@
       <term><emphasis><xref linkend="x11">, The X Window System</emphasis></term>
       <listitem>
 	<para>Describes the X Window System in general and using
-	<application>&xfree86;</application> on FreeBSD in particular.  Also describes common
+	X11 on FreeBSD in particular.  Also describes common
 	desktop environments such as <application>KDE</application> and <application>GNOME</application>.</para>
       </listitem>
     </varlistentry>