diff options
| author | Dave Airlie <airlied@clockmaker.usersys.redhat.com> | 2007-08-23 19:42:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-08-23 19:43:58 +1000 |
| commit | c08e6ec9e7ac06caee53689b0ec50ef6a7a0ba37 (patch) | |
| tree | fcda07f47f2b006ac534c3480c57da870eeb75d4 /man | |
| parent | 5793e8753d11432bf95c7c6dd80c811e16aba058 (diff) | |
| parent | a0d0fcd3bab765b4db25e04884fd8a342abb9c66 (diff) | |
Merge branch 'master' into randr-merge
Conflicts:
src/radeon.h
src/radeon_bios.c
src/radeon_display.c
src/radeon_dri.c
src/radeon_driver.c
src/radeon_modes.c
src/radeon_probe.h
src/radeon_video.c
Diffstat (limited to 'man')
| -rw-r--r-- | man/ati.man | 4 | ||||
| -rw-r--r-- | man/radeon.man | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man/ati.man b/man/ati.man index bc33610..c6c7d01 100644 --- a/man/ati.man +++ b/man/ati.man @@ -17,7 +17,7 @@ ati \- ATI video driver is an __xservername__ wrapper driver for ATI video cards. It autodetects whether your hardware has a Radeon, Rage 128, or Mach64 or earlier class of chipset, and loads the radeon(__drivermansuffix__), -r128(__drivermansuffix__), or atimisc(__drivermansuffix__) driver as +r128(__drivermansuffix__), or atimisc driver as appropriate. .SH SUPPORTED HARDWARE The @@ -29,6 +29,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration details, and the specific card driver for driver configuration details. driver. .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), r128(__drivermansuffix__), radeon(__drivermansuffix__) .SH AUTHORS See the individual driver pages for authors. diff --git a/man/radeon.man b/man/radeon.man index fcb6d73..2f46c44 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -308,7 +308,7 @@ remainder of video RAM is reserved for EXA offscreen management. Specifying 0 results in all offscreen video RAM being reserved for EXA and only GART memory being available for OpenGL textures. This may improve EXA performance, but beware that it may cause problems with OpenGL drivers from Mesa versions older -than 6.4. With XAA, specifiying lower percentage than what gets reserved without +than 6.4. With XAA, specifying lower percentage than what gets reserved without this option has no effect, but the driver tries to increase the video RAM reserved for textures to the amount specified roughly. Default: @@ -417,7 +417,7 @@ Kevin E. Martin \fIkem@freedesktop.org\fP Alan Hourihane \fIalanh@fairlite.demon.co.uk\fP Marc Aurele La France \fItsi@xfree86.org\fP Benjamin Herrenschmidt \fIbenh@kernel.crashing.org\fP -Michel Dänzer \fImichel@tungstengraphics.com\fP +Michel D\(:anzer \fImichel@tungstengraphics.com\fP Alex Deucher \fIalexdeucher@gmail.com\fP Bogdan D. \fIbogdand@users.sourceforge.net\fP Eric Anholt \fIeric@anholt.net\fP |