Documentation update

Copy list of driver options from README to man page
Remove xorgconfig from README/README.sgml

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

3 files changed, 53 insertions, 8 deletions

diff --git a/README b/README
index 8d22ffc..ceffb0b 100644
--- a/README
+++ b/README
@@ -150,8 +150,6 @@
          EndSection
 
 
-  or let xorgconfig do this for you.
-
   However, if you have problems with auto-detection, you can specify:
 
   +o  VideoRam - in kilobytes
@@ -203,7 +201,7 @@
 
   +o  Daryll Strauss  <daryll@precisioninsight.com>
 
-  The X11R6.8 version of this driver originally came from XFree86 4.4
+  The Xorg version of this driver originally came from XFree86 4.4
   rc2.
 
   The XFree86 version of this driver was donated to The XFree86 Project
diff --git a/README.sgml b/README.sgml
index c22ff9d..eb20607 100644
--- a/README.sgml
+++ b/README.sgml
@@ -96,7 +96,6 @@ section of your xorg.conf file are:
            Driver     "i740"
        EndSection
 </verb>
-or let <tt>xorgconfig</tt> do this for you.
 
 However, if you have problems with auto-detection, you can specify:
 <itemize>
@@ -140,7 +139,7 @@ if it is incorrectly detected.
    <item>Daryll Strauss <email>daryll@precisioninsight.com</email>
 </itemize>
 
-The X11R&relvers; version of this driver originally came from XFree86 4.4 rc2.
+The Xorg version of this driver originally came from XFree86 4.4 rc2.
 
 The XFree86 version of this driver was donated to The XFree86 Project by:
 <verb>
diff --git a/man/i740.man b/man/i740.man
index 8d5585c..230db43 100644
--- a/man/i740.man
+++ b/man/i740.man
@@ -15,16 +15,64 @@ i740 \- Intel i740 video driver
 .SH DESCRIPTION
 .B i740
 is an __xservername__ driver for Intel i740 video cards.
-THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B i740
-driver supports...
+driver supports Intel 740 based cards.  A list of cards reported to work
+is provided in the README file with the driver source.
 .SH CONFIGURATION DETAILS
 Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
+.PP
+The driver auto-detects all device information necessary to initialize
+the card.
+.PP
+However, if you have problems with auto-detection, you can specify:
+.TP
+.BI VideoRam " - in kilobytes"
+.TP
+.BI DacSpeed " - in MHz"
+.TP
+.BI MemBase " - physical address of the linear framebuffer"
+.TP
+.BI IOBase "  - physical address of the memory mapped IO registers"
+.PP
+The following driver
+.B options
+are supported on all chipsets:
+.TP
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
+Disable or enable 2D acceleration. Default: acceleration is enabled.
+.TP
+.BI "Option \*qSWCursor\*q \*q" boolean \*q
+Request a software cursor (hardware is default). Default: off
+.TP
+.BI "Option \*qSDRAM\*q \*q" boolean \*q
+Force the use of SDRAM timings. Default: off
+.TP
+.BI "Option \*qSGRAM\*q \*q" boolean \*q
+Force the use of SGRAM timings. Default: off
+.TP
+.BI "Option \*qSlowRam\*q \*q" boolean \*q
+Force the use of slower ram timings. Default: off
+.TP
+.BI "Option \*qDac6Bit\*q \*q" boolean \*q
+Force the use of a 6 Bit Dac (8 Bit is the default). Default: off
+.TP
+.BI "Option \*qUsePIO\*q \*q" boolean \*q
+Force the use of programmed IO (Memory mapped is the default). Default: off
+.PP
+Note: the i740 X server should automatically detect whether your card
+has SGRAM or SDRAM.  Use the \*qsgram\*q and \*qsdram\*q options if it is
+incorrectly detected.
 .SH "SEE ALSO"
 __xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
-Authors include: ...
+Authors include:  Kevin E Martin and Daryll Strauss of Precision Insight, Inc.
+.PP
+The XFree86 version of this driver was donated to The XFree86 Project by
+Precision Insight, Inc., Cedar Park, TX, USA
+.PP
+The Xorg version of this driver originally came from XFree86 4.4rc2.
+