From c6f0d162ec1b3849c25a57eb2de26768b1e5577f Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 21 Feb 2013 14:07:28 +0000
Subject: [PATCH] Modernize and simplify the X11 chapter.

Reviewed by:	wblock
Approved by:	jkois (mentor)
---
 .../books/handbook/x11/chapter.xml            | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index 362e3de511..f987ddcb99 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -33,8 +33,7 @@
       default and official flavor of X11 in &os; is
       <application>&xorg;</application>, the X11 server developed by
       the X.Org Foundation under a license very similar to the one
-      used by &os;.  Commercial X servers for &os; are also
-      available.</para>
+      used by &os;.</para>
 
     <para>For more information on the video hardware that X11
       supports, check the <ulink
@@ -119,8 +118,8 @@
 	other input or output devices (i.e., a <quote>tablet</quote>
 	can be used as an input device, and a video projector
 	may be an alternative output device).  Each X application
-	(such as <application>XTerm</application>, or
-	<application>&netscape;</application>) is a
+	(such as <application>XTerm</application> or
+	<application>Firefox</application>) is a
 	<quote>client</quote>. A client sends messages to the server
 	such as <quote>Please draw a window at these
 	coordinates</quote>, and the server sends back messages such
@@ -176,22 +175,16 @@
 
       <para>Instead, X delegates this responsibility to an
 	application called a <quote>Window Manager</quote>.  There
-	are dozens of window managers available for X:
-	<application>AfterStep</application>,
-	<application>Blackbox</application>,
-	<application>ctwm</application>,
-	<application>Enlightenment</application>,
-	<application>fvwm</application>,
-	<application>Sawfish</application>,
-	<application>twm</application>,
-	<application>Window Maker</application>, and more.  Each of
+	are <ulink
+	  url="http://xwinman.org/">dozens of window managers</ulink>
+	  available for X.  Each of
 	these window managers provides a different look and feel;
 	some of them support <quote>virtual desktops</quote>; some
 	of them allow customized keystrokes to manage the desktop;
 	some have a <quote>Start</quote> button or similar device;
 	some are <quote>themeable</quote>, allowing a complete change
-	of look-and-feel by applying a new theme.  These window
-	managers, and many more, are available in the
+	of look-and-feel by applying a new theme.  Window managers
+	are available in the
 	<filename>x11-wm</filename> category of the Ports
 	Collection.</para>
 
@@ -300,15 +293,8 @@
 
       <para>As a result, do not expect X applications to have a
 	common look and feel.  There are several popular widget sets
-	and variations, including the original Athena widget set from
-	MIT, <application>&motif;</application> (on which the widget
-	set in &microsoft.windows; was modeled, all bevelled edges and
-	three shades of grey), <application>OpenLook</application>,
-	and others.</para>
-
-      <para>Most newer X applications today will use a
-	modern-looking widget set, either Qt, used by
-	<application>KDE</application>, or GTK+, used by the
+	and variations, including Qt, used by
+	<application>KDE</application>, and GTK+, used by the
 	<application>GNOME</application> project.  In this respect,
 	there is some convergence in look-and-feel of the &unix;
 	desktop, which certainly makes things easier for the novice
@@ -319,7 +305,7 @@
   <sect1 id="x-install">
     <title>Installing X11</title>
 
-    <para><application>&xorg;</application> is the default X11
+    <para><application>&xorg;</application> is the X11
       implementation for &os;.  <application>&xorg;</application>
       is the X server of the open source X Window System
       implementation released by the X.Org Foundation.