Update Question 11.2:

- Mark up freedesktop.org with <literal>
- Remove XFree86
- Remove text about different X11 implementations

Reviewed by:  trhodes, danger
Approved by:  gabor

en_US.ISO8859-1/books/faq/book.sgml

@@ -6661,31 +6661,16 @@ options    SYSVMSG          # enable for messaging</programlisting>
 	    increased performance) and make it more modular
 	    (with the goal of increased maintainability, and thus faster
 	    releases as well as easier configuration).  &xorg; intends to
-	    incorporate the freedesktop.org changes in its future releases.</para>
+	    incorporate the <literal>freedesktop.org</literal> changes in its future releases.</para>
 
 	  <para>As of July 2004, in &os.current;,
 	    &xfree86; has been replaced with &xorg; as the default
-	    implementation.  The &xfree86; ports
+	    implementation.  Since then the default X11 implementation
-	    (<filename role="package">x11/XFree86-4</filename> and
+	    in &os; is &xorg;.</para>
-	    subports) remain in the ports collection.  But &xorg; is
-	    the default X11 implementation for &os; 5.3 and later.</para>
 
 	  <para>For further information, read the <ulink
 	    url="&url.books.handbook;/x11.html">X11</ulink> section of the
 	    FreeBSD Handbook.</para>
-
-	  <note>
-	    <para>The above describes the default X implementation installed.
-	      It is still possible to install either implementation by
-	      following the instructions in the entry for 20040723 in
-	      <filename>/usr/ports/UPDATING</filename>.</para>
-	  </note>
-
-	  <warning>
-	    <para>It is not currently
-	    possible to mix-and-match pieces of each implementation;
-	      one must choose one or the other.</para>
-	  </warning>
 	</answer>
       </qandaentry>