summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:43:55 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:43:55 +0000
commita18b2a60c586926bf51e40aae0adf65c0b232184 (patch)
treedcabedc70ed9e304dce6cb9cc7d90e5676e5c503
parent5ac2ec8cdbfc35957cca371e11c7dad06d410f73 (diff)
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
-rw-r--r--man/XDGA.man14
-rw-r--r--src/XF86DGA.c2
-rw-r--r--src/XF86DGA2.c2
3 files changed, 8 insertions, 10 deletions
diff --git a/man/XDGA.man b/man/XDGA.man
index d13c4bf..9c7beef 100644
--- a/man/XDGA.man
+++ b/man/XDGA.man
@@ -1,8 +1,8 @@
-.\" $XFree86: xc/lib/Xxf86dga/XDGA.man,v 1.1 2003/11/22 01:33:31 dawes Exp $
+.\" $XFree86$
.\"
-.TH XDGA 3 __vendorversion__ "XFree86"
+.TH XDGA 3 __vendorversion__
.SH NAME
-XDGA \- XFree86 DGA extension client library
+XDGA \- Client library for the XFree86-DGA extension.
.SH SYNOPSIS
.B #include <X11/extensions/xf86dga.h>
.HP
@@ -217,9 +217,7 @@ extension's existence are now better served in other ways. Further
development of this extension is not expected, and it may be deprecated
in a future release. The features that continue to be useful will either
be provided through other existing mechanisms, or through an extension
-that address those needs more specifically. Discussion of these issue
-is encouraged in the XFree86 developer forum
-.RI < devel@xfree86.org >.
+that address those needs more specifically.
.PP
.B XFree86-DGA
is initialized by passing a number corresponding to a valid
@@ -280,7 +278,7 @@ A unique identifying number
> 0) for the mode. This is the number referenced when initializing the mode.
.TP 8
.I name
-The name of the corresponding modeline as given in the XF86Config file.
+The name of the corresponding modeline as given in the __xconfigfile__ file.
.TP 8
.I verticalRefresh
The vertical refresh rate for the modeline (in Hz).
@@ -667,7 +665,7 @@ flag is not set in the
field since concurrent access by the server and client may result in a
system lockup.
.SH SEE ALSO
-XFree86(1), XF86Config(__filemansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__)
.SH AUTHORS
.B XFree86-DGA
version 2 was written by Mark Vojkovich. Version 1 was written by Jon
diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index b60c377..62cf81e 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xxf86dga/XF86DGA.c,v 3.24 2003/05/05 20:42:30 tsi Exp $ */
+/* $XFree86: xc/lib/Xxf86dga/XF86DGA.c,v 3.23tsi Exp $ */
/*
Copyright (c) 1995 Jon Tombs
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 4dd7de8..ab91744 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.24 2003/11/21 05:07:16 dawes Exp $ */
+/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.23 2003/05/05 20:42:30 tsi Exp $ */
/*
Copyright (c) 1995 Jon Tombs