diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:35:03 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:35:03 +0000 |
commit | 295e3a3d03038e79dd0f593765643febda4e36a3 (patch) | |
tree | 71d0fad5ec325073a71b17e991cebf2d618fa167 | |
parent | ee538370a85616e74dd1acbe2fdd5e0d61d2c6a6 (diff) |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
-rw-r--r-- | README.sgml | 11 | ||||
-rw-r--r-- | man/i740.man | 8 | ||||
-rw-r--r-- | src/i740.h | 2 | ||||
-rw-r--r-- | src/i740_accel.c | 2 | ||||
-rw-r--r-- | src/i740_cursor.c | 2 | ||||
-rw-r--r-- | src/i740_dga.c | 2 | ||||
-rw-r--r-- | src/i740_dga.h | 2 | ||||
-rw-r--r-- | src/i740_driver.c | 4 | ||||
-rw-r--r-- | src/i740_i2c.c | 2 | ||||
-rw-r--r-- | src/i740_io.c | 2 | ||||
-rw-r--r-- | src/i740_macros.h | 2 | ||||
-rw-r--r-- | src/i740_reg.h | 2 | ||||
-rw-r--r-- | src/i740_video.c | 2 |
13 files changed, 22 insertions, 21 deletions
diff --git a/README.sgml b/README.sgml index 3c978ae..c22ff9d 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,6 @@ <author>Precision Insight, Inc. <date>18 February 1999 <ident> -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.3 2000/03/04 00:26:30 dawes Exp $ </ident> <toc> @@ -90,14 +89,14 @@ $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.3 2000/03/04 00: <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 +140,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 9db6041..96fd1d1 100644 --- a/man/i740.man +++ b/man/i740.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.man,v 1.1 2001/01/24 00:06:19 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH I740 __drivermansuffix__ __vendorversion__ @@ -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: ... @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.h,v 1.8 2003/08/23 16:09:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.h,v 1.7 2002/10/23 16:08:36 tsi Exp $ */ /* * Authors: diff --git a/src/i740_accel.c b/src/i740_accel.c index 78c9644..83ee0c0 100644 --- a/src/i740_accel.c +++ b/src/i740_accel.c @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c,v 1.7 2002/10/21 13:32:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c,v 1.6 2002/01/25 21:56:02 tsi Exp $ */ /* * Authors: diff --git a/src/i740_cursor.c b/src/i740_cursor.c index 6f62660..a783a85 100644 --- a/src/i740_cursor.c +++ b/src/i740_cursor.c @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_cursor.c,v 1.5 2002/10/21 13:32:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_cursor.c,v 1.4 2000/02/23 04:47:13 martin Exp $ */ /* * Authors: diff --git a/src/i740_dga.c b/src/i740_dga.c index 0edc0b9..2741e0d 100644 --- a/src/i740_dga.c +++ b/src/i740_dga.c @@ -21,7 +21,7 @@ * * Authors: Patrick LERDA */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.c,v 1.2 2003/02/12 21:46:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.c,v 1.1tsi Exp $ */ #include "xf86.h" diff --git a/src/i740_dga.h b/src/i740_dga.h index ea00de2..4f64ac3 100644 --- a/src/i740_dga.h +++ b/src/i740_dga.h @@ -21,6 +21,6 @@ * * Authors: Patrick LERDA */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.h,v 1.1 2002/10/21 13:32:58 alanh Exp $ */ +/* $XFree86$ */ Bool I740DGAInit(ScreenPtr pScreen); diff --git a/src/i740_driver.c b/src/i740_driver.c index 53240c1..7af3c83 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c,v 1.50 2003/11/03 05:11:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c,v 1.49tsi Exp $ */ /* * Authors: @@ -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, diff --git a/src/i740_i2c.c b/src/i740_i2c.c index 174a578..92e2fdc 100644 --- a/src/i740_i2c.c +++ b/src/i740_i2c.c @@ -21,7 +21,7 @@ * * Authors: Patrick LERDA */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_i2c.c,v 1.1 2002/10/21 13:32:58 alanh Exp $ */ +/* $XFree86$ */ /* not working at this time */ diff --git a/src/i740_io.c b/src/i740_io.c index 0195862..d70aad3 100644 --- a/src/i740_io.c +++ b/src/i740_io.c @@ -24,7 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_io.c,v 1.5 2002/10/21 13:32:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_io.c,v 1.4 2002/01/25 21:56:03 tsi Exp $ */ /* * Authors: diff --git a/src/i740_macros.h b/src/i740_macros.h index 797b89f..84b4c19 100644 --- a/src/i740_macros.h +++ b/src/i740_macros.h @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_macros.h,v 1.4 2002/10/21 13:32:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_macros.h,v 1.3 2002/01/25 21:56:03 tsi Exp $ */ /* * Authors: diff --git a/src/i740_reg.h b/src/i740_reg.h index 0366d7e..28f6a16 100644 --- a/src/i740_reg.h +++ b/src/i740_reg.h @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_reg.h,v 1.2 2000/02/23 04:47:14 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_reg.h,v 1.1 1999/08/29 12:20:59 dawes Exp $ */ /* * Authors: diff --git a/src/i740_video.c b/src/i740_video.c index 1ea5370..1a28b91 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -44,7 +44,7 @@ * 12 September 2002 - Better software scaling with some averaging, giving a * nicer picture. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_video.c,v 1.6 2003/11/10 18:22:21 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_video.c,v 1.5tsi Exp $ */ /* |