docs/71946: [PATCH] Reference X.org instead of XFree86 in "FreeBSD on Laptops" article

[Joel Dahl]

>Number:         71946
>Category:       docs
>Synopsis:       [PATCH] Reference X.org instead of XFree86 in "FreeBSD on Laptops" article
>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:   Mon Sep 20 17:50:46 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 attached patch changes the laptop article to reference X.org
instead of XFree86. The original link to the "Driver status page for
XFree86" gave me a 404, so I removed it since I could not find
anything equivalent for X.org that was static, not version dependent,
feel free to correct me on this.

I also removed all references to XFree86 because I think that the
move from XFree86 to X.org is enough explained in the handbook.
However, if needed, a note about this would be simple to add to
this article.
>How-To-Repeat:
	
>Fix:
	

--- xorg.diff begins here ---
--- article.sgml	Sun Aug  8 18:28:56 2004
+++ new.article.sgml	Mon Sep 20 19:34:23 2004
@@ -20,7 +20,6 @@
       &tm-attrib.freebsd;
       &tm-attrib.linux;
       &tm-attrib.microsoft;
-      &tm-attrib.xfree86;
       &tm-attrib.general;
     </legalnotice>
   </articleinfo>
@@ -50,32 +49,29 @@
       the &a.mobile.name; list.</para>
 
   <sect1>    
-    <title>&xfree86;</title>
+    <title>&xorg;</title>
       
-    <para>Recent versions of <application>&xfree86;</application> work with most display adapters
+    <para>Recent versions of <application>&xorg;</application> work with most display adapters
       available on laptops these days.  Acceleration may not be
       supported, but a generic SVGA configuration should work.</para>
 
     <para>Check your laptop documentation for which card you have,
-      and check in the <application>&xfree86;</application> documentation or
-      the <ulink
-      url="http://www.xfree86.org/current/Status.html">Driver Status for
-      &xfree86;</ulink> page
+      and check in the <application>&xorg;</application> documentation
       to see whether it is specifically supported.  If it is not, use
       a generic device (do not go for a name which just looks
-      similar).  In <application>&xfree86;</application> version 4, you can try your luck
-      with the command <userinput>XFree86 -configure</userinput>
+      similar).  You can try your luck
+      with the command <userinput>Xorg -configure</userinput>
       which auto-detects a lot of configurations.</para>
 
     <para>The problem often is configuring the monitor.  Common
-      resources for <application>&xfree86;</application> focus on CRT monitors; getting a
+      resources for <application>&xorg;</application> focus on CRT monitors; getting a
       suitable modeline for an LCD display may be tricky.  You may
       be lucky and not need to specify a modeline, or just need to
       specify suitable <literal>HorizSync</literal> and <literal>VertRefresh</literal> ranges.  If that
       does not work, the best option is to check web resources
       devoted to configuring X on laptops (these are often
       Linux oriented sites but it does not matter because both systems
-      use <application>&xfree86;</application>) and copy a modeline posted by someone for similar 
+      use <application>&xorg;</application>) and copy a modeline posted by someone for similar
       hardware.</para>
 
     <para>Most laptops come with two buttons on their pointing
@@ -88,10 +84,8 @@
       Option "Emulate3Buttons"
     </programlisting>
 
-    <para>in the <filename>XF86Config</filename> file in the <literal>InputDevice</literal> 
-      section (for <application>&xfree86;</application> version 4; for version 3, put just the line 
-      <literal>Emulate3Buttons</literal>, without the quotes, in the 
-      <literal>Pointer</literal> section.)</para>
+    <para>in the <filename>xorg.conf</filename> file in the <literal>InputDevice</literal> 
+      section.</para>
   </sect1> 
 
   <sect1> 
@@ -292,7 +286,7 @@
     <sect2>
       <title>Display Power Management</title>
 
-    <para>The X window system (<application>&xfree86;</application>) also includes display power
+    <para>The X window system (<application>&xorg;</application>) also includes display power
       management (look at the &man.xset.1; manual page, and search for
       <quote>dpms</quote> there).  You may want to investigate this.  However, this, 
       too, works inconsistently on laptops: it
--- xorg.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: