docs/71862: [PATCH] FAQ update: Use entity &xorg; instead of X.org

[Joel Dahl]

>Number:         71862
>Category:       docs
>Synopsis:       [PATCH] FAQ update: Use entity &xorg; instead of X.org
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 18 11:30:14 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Joel Dahl
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD dude.automatvapen.se 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #1: Sat Jul 10 16:52:28 CEST 2004 root at dude.automatvapen.se:/usr/obj/usr/src/sys/WORKSTATION i386


	
>Description:
The X server from The X Foundation is called Xorg. Therefore, use
the entity &xorg; added by blackend instead of X.org in the FAQ.
	
>How-To-Repeat:
	
>Fix:

	

--- xorg.diff begins here ---
--- book.sgml	Fri Sep 17 19:45:34 2004
+++ new.book.sgml	Sat Sep 18 13:06:17 2004
@@ -7169,8 +7169,9 @@
 
           <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
+	    &os;.  <ulink url= "http://www.x.org">The X.Org
+	    Foundation</ulink> administers the <ulink
+            url="http://www.x.org/X11_protocol.html">X protocol
 	    standards</ulink>.  The current release of the specification
 	    is 11.6, so you will often see references shortened to
 	    <literal>X11R6</literal> or even just <literal>X11</literal>.
@@ -7196,7 +7197,7 @@
 	    &xfree86; which is maintained by
 	    <ulink url="http://www.xfree86.org">The XFree86 Project,
 	    Inc.</ulink>  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
@@ -7206,7 +7207,7 @@
 	    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 (<application>XFree86 version 4.3.99.903</application>), incorporated
 	    many changes that had previously been maintained separately,
@@ -7217,11 +7218,11 @@
 	    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.</para>
 
 	  <para>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
 	    (<filename role="package">x11/XFree86-4</filename> and
 	    subports) remain in the ports collection and are still
@@ -7243,8 +7244,8 @@
 	  <note>
 	    <para>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
 	      <filename>xorg.conf</filename>, it will search for
 	      <filename>XF86Config</filename> if it cannot find it.</para>
 	  </note>
@@ -7253,11 +7254,11 @@
 
       <qandaentry>
         <question id="xorg-compatibility">
-          <para>Will my existing applications run with the X.org suite?</para>
+          <para>Will my existing applications run with the &xorg; suite?</para>
         </question>
 
         <answer>
-	  <para>The X.org software is written to the same X11R6 specification
+	  <para>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
 	    (<literal>XIE</literal>, <literal>PEX</literal>, and
@@ -7283,11 +7284,11 @@
 
       <qandaentry>
         <question id="why-choose-xorg">
-          <para>Why did &os; choose to go with the X.org ports by default?</para>
+          <para>Why did &os; choose to go with the &xorg; ports by default?</para>
         </question>
 
         <answer>
-	  <para>The X.org developers claim that their goal is to release
+	  <para>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;
--- xorg.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: