diff options
author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-10 09:04:47 +0000 |
---|---|---|
committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-10 09:04:47 +0000 |
commit | 64640ba07ef36e4e3769768f851fd59cdf8a2685 (patch) | |
tree | dc4b713cc1759138cc7e58a717c1b5392e645a51 | |
parent | 1d2105677f3c2e7584c403749c48def3b1392e5c (diff) |
Resync to 2004-04-10 XORG-RELEASE-1 branchXPRINT_BEGINXPRINT
-rw-r--r-- | README.sgml | 12 | ||||
-rw-r--r-- | man/i740.man | 6 | ||||
-rw-r--r-- | src/i740_driver.c | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/README.sgml b/README.sgml index 07d09c1..453cd48 100644 --- a/README.sgml +++ b/README.sgml @@ -1,4 +1,4 @@ -<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [ +<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [ <!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> @@ -7,7 +7,7 @@ <author>Precision Insight, Inc. <date>18 February 1999 <ident> -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.2 1999/08/23 06:18:34 dawes Exp $ +$Id$ </ident> <toc> @@ -90,14 +90,14 @@ $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.2 1999/08/23 06: <p> The driver auto-detects all device information necessary to initialize the card. The only lines you need in the "Device" -section of your XF86Config file are: +section of your xorg.conf file are: <verb> Section "Device" Identifier "Intel i740" Driver "i740" EndSection </verb> -or let <tt>xf86config</tt> do this for you. +or let <tt>xorgconfig</tt> do this for you. However, if you have problems with auto-detection, you can specify: <itemize> @@ -141,7 +141,9 @@ if it is incorrectly detected. <item>Daryll Strauss <email>daryll@precisioninsight.com</email> </itemize> -This driver was donated to The XFree86 Project by: +The X11R&relvers; 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> Precision Insight, Inc. Cedar Park, TX diff --git a/man/i740.man b/man/i740.man index ecb8308..96fd1d1 100644 --- a/man/i740.man +++ b/man/i740.man @@ -14,17 +14,17 @@ i740 \- Intel i740 video driver .fi .SH DESCRIPTION .B i740 -is an XFree86 driver for Intel i740 video cards. +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... .SH CONFIGURATION DETAILS -Please refer to XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHORS Authors include: ... diff --git a/src/i740_driver.c b/src/i740_driver.c index 4f52953..7af3c83 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -286,7 +286,7 @@ static XF86ModuleVersionInfo i740VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, I740_MAJOR_VERSION, I740_MINOR_VERSION, I740_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, |