From ebdc720adbad908733b5ea774cd2c664421a2925 Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Thu, 10 Jun 2004 06:37:32 +0000 Subject: [PATCH] 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 --- en_US.ISO8859-1/books/faq/book.sgml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml index 9743b2162b..8fbdff2996 100644 --- a/en_US.ISO8859-1/books/faq/book.sgml +++ b/en_US.ISO8859-1/books/faq/book.sgml @@ -7008,7 +7008,7 @@ options SYSVMSG # enable for messaging - The X Window System is the most popular windowing system + The X Window System is the most widely available windowing system capable of running on UNIX or UNIX-like systems, including &os;. X.org administers the X protocol @@ -7047,9 +7047,9 @@ options SYSVMSG # enable for messaging 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 (XFree86 version 4.3.99.903), 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 X11R6.7.0. A separate but related project, freedesktop.org (or fd.o for short), is working on rearchitecting the original XFree86 code to @@ -7057,24 +7057,28 @@ options SYSVMSG # enable for messaging 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. + incorporate the freedesktop.org changes in its future releases. 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 (x11/XFree86-4 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. + + + It is not currently possible to mix-and-match pieces of each implementation; work is under way to correct this problem. + 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 xorg.conf, it will search for XF86Config if it cannot find it.