Minor changes to the X11 section: remove the 'fd.o' references as this

merely confuses people; add some application tags and a warning tag;
minor rewording.

Requested by:	trhodes
This commit is contained in:
Mark Linimon 2004-06-10 06:37:32 +00:00
parent 690bd71b77
commit ebdc720adb
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=21131

View file

@ -7008,7 +7008,7 @@ options SYSVMSG # enable for messaging</programlisting>
<answer>
<para>The X Window System is the most popular windowing system
<para>The X Window System is the most widely available windowing system
capable of running on UNIX or UNIX-like systems, including
&os;. <ulink url= "http://www.x.org">X.org</ulink> administers
the <ulink url="http://www.x.org/X11_protocol.html">X protocol
@ -7047,9 +7047,9 @@ options SYSVMSG # enable for messaging</programlisting>
over issues including the pace of code changes, future
directions, and a licensing change. X.org updated its
source tree to the last XFree86 release before the
licensing change (XFree86 version 4.3.99.903), incorporated
licensing change (<application>XFree86 version 4.3.99.903</application>), incorporated
many changes that had previously been maintained separately,
and has released that software as X11R6.7.0. A separate but
and has released that software as <application>X11R6.7.0</application>. A separate but
related project, <ulink url="http://www.freedesktop.org">
freedesktop.org</ulink> (or <literal>fd.o</literal> for short),
is working on rearchitecting the original XFree86 code to
@ -7057,24 +7057,28 @@ options SYSVMSG # enable for messaging</programlisting>
greatly increased performance) and modern software practices
(with the goal of incresed maintainability, and thus faster
releases as well as easier configuration). X.org intends to
incorporate the fd.o changes in its future releases.</para>
incorporate the freedesktop.org changes in its future releases.</para>
<para>The current technology roadmap for &os; includes
replacing XFree86 with fd.o as the default server sometime
replacing XFree86 with freedesktop.org as the default server sometime
later in 2004 under the assumption that the pace of its
development will more closely match that of &os; itself.
The XFree86 ports
(<filename role="package">x11/XFree86-4</filename> and
subports) will remain in the ports collection and be supported
as developer interest permits. Note that it is not currently
as developer interest permits.</para>
<warning>
<para>It is not currently
possible to mix-and-match pieces of each implementation;
work is under way to correct this problem.</para>
</warning>
<note>
<para>The following paragraphs refer to the existing
XFree86 implementation, but most should also be applicable
to the fd.o implementation as well. While the default
configuration filename for the fd.o implementation is
to the freedesktop.org implementation as well. While the default
configuration filename for the freedesktop.org implementation is
<filename>xorg.conf</filename>, it will search for
<filename>XF86Config</filename> if it cannot find it.</para>
</note>