From bc8bac2d5673cb1320d80387fb4aa35f16ad58b1 Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Wed, 10 Nov 2004 23:31:16 +0000 Subject: [PATCH] Use &xorg; entity to properly render Xorg. PR: docs/71862 Submitted by: Joel Dahl --- en_US.ISO8859-1/books/faq/book.sgml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml index 3ae7cd1698..cf8b9f01f9 100644 --- a/en_US.ISO8859-1/books/faq/book.sgml +++ b/en_US.ISO8859-1/books/faq/book.sgml @@ -7180,8 +7180,9 @@ options SYSVMSG # enable for messaging 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 + &os;. The X.Org + Foundation administers the X protocol standards. The current release of the specification is 11.6, so you will often see references shortened to X11R6 or even just X11. @@ -7207,7 +7208,7 @@ options SYSVMSG # enable for messaging &xfree86; which is maintained by The XFree86 Project, Inc. This software was installed by default on - &os; versions up until 4.10 and 5.2. Although X.org + &os; versions up until 4.10 and 5.2. Although &xorg; itself maintained an implementation during that time period, it was basically only provided as a reference platform, as it had suffered greatly from bitrot over @@ -7217,7 +7218,7 @@ options SYSVMSG # enable for messaging that project over issues including the pace of code changes, future directions, and interpersonal conflicts, and are now contributing - code directly to X.org instead. At that time, X.org updated its + code directly to &xorg; instead. At that time, &xorg; updated its source tree to the last &xfree86; release before its subsequent licensing change (XFree86 version 4.3.99.903), incorporated many changes that had previously been maintained separately, @@ -7228,11 +7229,11 @@ options SYSVMSG # enable for messaging offload more work onto the graphics cards (with the goal of increased performance) and make it more modular (with the goal of increased maintainability, and thus faster - releases as well as easier configuration). X.org intends to + releases as well as easier configuration). &xorg; intends to incorporate the freedesktop.org changes in its future releases. As of July 2004, in &os.current;, - &xfree86; has been replaced with X.org as the default + &xfree86; has been replaced with &xorg; as the default implementation. The &xfree86; ports (x11/XFree86-4 and subports) remain in the ports collection and are still @@ -7254,8 +7255,8 @@ options SYSVMSG # enable for messaging The following paragraphs refer to the &xfree86; implementation, but most should also be applicable - to the X.org implementation as well. While the default - configuration filename for the X.org implementation is + to the &xorg; implementation as well. While the default + configuration filename for the &xorg; implementation is xorg.conf, it will search for XF86Config if it cannot find it. @@ -7264,11 +7265,11 @@ options SYSVMSG # enable for messaging - Will my existing applications run with the X.org suite? + Will my existing applications run with the &xorg; suite? - The X.org software is written to the same X11R6 specification + The &xorg; software is written to the same X11R6 specification that &xfree86; is, so basic applications should work unchanged. A few lesser-used protocols have been deprecated (XIE, PEX, and @@ -7294,11 +7295,11 @@ options SYSVMSG # enable for messaging - Why did &os; choose to go with the X.org ports by default? + Why did &os; choose to go with the &xorg; ports by default? - The X.org developers claim that their goal is to release + The &xorg; developers claim that their goal is to release more often and incorporate new features more quickly. If they are able to do so, this will be very attractive. Also, their software still uses the traditional X license, while &xfree86;