diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-04-24 15:43:48 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-04-24 15:43:48 -0700 |
| commit | c6e4105ce40ef053e026cc0ffe4925ab568ea700 (patch) | |
| tree | fc0dc085da1e894a95ae8fddd6d06e4703d143ad /man | |
| parent | 5d9b75b432dbc525e10c1c00436a1820456f6fb4 (diff) | |
| parent | 4ff648c85f8aa90b343b7e2df176c0511b3cdaa5 (diff) | |
Merge branch 'randr-1.2'
Conflicts:
configure.ac
man/Makefile.am
man/nv.man
src/g80_display.h
src/g80_output.c
src/nv_driver.c
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.am | 9 | ||||
| -rw-r--r-- | man/nv.man | 13 |
2 files changed, 1 insertions, 21 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index 442d27d..bf7ec17 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -41,12 +41,6 @@ SED = sed XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 -if SUPPORT_G80 -MAN_SUPPORT_G80 = 1 -else -MAN_SUPPORT_G80 = 0 -endif - MAN_SUBSTS = \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ @@ -57,8 +51,7 @@ MAN_SUBSTS = \ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \ - -e 's|__support_g80__|$(MAN_SUPPORT_G80)|g' + -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man @@ -58,12 +58,9 @@ NV40, NV41, NV43, NV44, NV45, C51 .TP 22 .B GeForce 7XXX G70, G71, G72, G73 -.de G8 .TP 22 .B GeForce 8XXX G80, G84, G86 -.. -.if __support_g80__ .G8 .SH CONFIGURATION DETAILS Please refer to __xconfigfile__(__filemansuffix__) for general configuration @@ -136,7 +133,6 @@ Default: no rotation support. Enable or disable use of the shadow framebuffer layer. Default: off. . .\" ******************** begin G80 section ******************** -.de G8 .PP The following driver .B Options @@ -147,15 +143,6 @@ Enable or disable the hardware cursor. Default: on. .TP .BI "Option \*qNoAccel\*q \*q" boolean \*q Disable or enable acceleration. Default: acceleration is enabled. -.TP -.BI "Option \*qBackendMode\*q \*q" mode \*q -Designate a mode to be used as the physical mode driving the display. -The screen will be scaled to fit the requested mode. -For example, if -.B Option \*qBackendMode\*q \*q1280x1024\*q -is specified, the monitor will always display the 1280x1024 mode and the screen will be scaled to match. -.. -.if __support_g80__ .G8 .\" ******************** end G80 section ******************** . .SH "SEE ALSO" |