From bmah@employees.org  Thu Jul 11 08:13:46 2002
Return-Path: <bmah@employees.org>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4DAA137B400
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Jul 2002 08:13:46 -0700 (PDT)
Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B8E3F43E4A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Jul 2002 08:13:45 -0700 (PDT)
	(envelope-from bmah@employees.org)
Received: from bmah.dyndns.org ([12.233.149.189]) by rwcrmhc52.attbi.com
          (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP
          id <20020711151328.IHAI8262.rwcrmhc52.attbi.com@bmah.dyndns.org>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Thu, 11 Jul 2002 15:13:28 +0000
Received: from intruder.bmah.org (localhost [IPv6:::1])
	by bmah.dyndns.org (8.12.5/8.12.5) with ESMTP id g6BFDSeU069367
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Jul 2002 08:13:28 -0700 (PDT)
	(envelope-from bmah@intruder.bmah.org)
Received: (from bmah@localhost)
	by intruder.bmah.org (8.12.5/8.12.5/Submit) id g6BFDS8q069366;
	Thu, 11 Jul 2002 08:13:28 -0700 (PDT)
Message-Id: <200207111513.g6BFDS8q069366@intruder.bmah.org>
Date: Thu, 11 Jul 2002 08:13:28 -0700 (PDT)
From: "Bruce A. Mah" <bmah@freebsd.org>
Reply-To: "Bruce A. Mah" <bmah@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Part of the Handbook still claims XFree86 3.X is current
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         40462
>Category:       docs
>Synopsis:       [PATCH] Part of the Handbook still claims XFree86 3.X is current
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    blackend
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 11 08:20:02 PDT 2002
>Closed-Date:    Sat Jul 13 10:35:26 PDT 2002
>Last-Modified:  Sat Jul 13 10:35:26 PDT 2002
>Originator:     Bruce A. Mah
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD intruder.bmah.org 4.6-STABLE FreeBSD 4.6-STABLE #16: Sat Jul 6 11:49:48 PDT 2002 root@intruder.bmah.org:/usr/obj/usr/src/sys/NIMITZ i386


	
>Description:

There's still some text in the X11 section of the Handbook that thinks
XFree86 3.X is current.

>How-To-Repeat:

Read here:

http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/x-install.html

>Fix:

Here's an untested patch that fixes the problem, but I recommend 
someone with more time and/or X11-fu than me give it a review, as well 
as look through this chapter for other occurrances.

--- chapter.sgml.diff begins here ---
Index: chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v
retrieving revision 1.82
diff -u -r1.82 chapter.sgml
--- chapter.sgml	28 May 2002 17:38:52 -0000	1.82
+++ chapter.sgml	11 Jul 2002 15:07:05 -0000
@@ -268,17 +268,17 @@
       cards that were supported in 3.X are not yet supported in 4.X.</para>
 
     <para>The FreeBSD setup program offers users the opportunity to install
-      and configure XFree86 3.3.6 during installation (covered in
-      <xref linkend="x-server">).  To run
-      <application>XFree86 4.X</application>, wait until after the base
+      and configure XFree86 4.X during installation (covered in
+      <xref linkend="x-server">).  To install and run
+      <application>XFree86 3.X</application>, wait until after the base
       FreeBSD system is installed, and then install XFree86.  For example,
-      to build and install <application>XFree86 4.X</application> from the
+      to build and install <application>XFree86 3.X</application> from the
       ports collection:</para>
 
-    <screen>&prompt.root; <userinput>cd /usr/ports/x11/XFree86-4</userinput>
+    <screen>&prompt.root; <userinput>cd /usr/ports/x11/XFree86</userinput>
 &prompt.root; <userinput>make all install clean</userinput></screen>
 
-    <para>Alternatively, <application>XFree86 4.X</application> can be
+    <para>Alternatively, either version of <application>XFree86</application> can be
       installed from a binary package with the
       <command>pkg_add</command> tool or directly from the FreeBSD
       binaries provided on the <ulink
@@ -287,7 +287,7 @@
     <para>The rest of this chapter will explain how to configure
       XFree86, and how to setup a productive desktop environment.</para>
 
-<!-- Easiest way is from sysinstall for XFree86 3.X -->
+<!-- Easiest way is from sysinstall for XFree86 4.X -->
 
   </sect1>
 
--- chapter.sgml.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->blackend 
Responsible-Changed-By: blackend 
Responsible-Changed-When: Thu Jul 11 08:35:18 PDT 2002 
Responsible-Changed-Why:  
I'm working on that chapter :) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=40462 
State-Changed-From-To: open->closed 
State-Changed-By: blackend 
State-Changed-When: Sat Jul 13 10:30:37 PDT 2002 
State-Changed-Why:  
A slightly modified version of your patch was committed, Thanks Bruce! 
You can read it on r1.83 of 
doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml 

http://www.freebsd.org/cgi/query-pr.cgi?pr=40462 
>Unformatted:
