Merge remote branch 'alanc/docs'

hw/xfree86/doc/Makefile.am

@@ -5,5 +5,4 @@ SUBDIRS = man
 endif
 
 EXTRA_DIST = \
-	README.DRI \
-	README.rapidaccess
+	README.modes

hw/xfree86/doc/README.rapidaccess

@@ -1,48 +0,0 @@
-The IBM Rapid Access keyboard have some extra buttons
-on it to launch programs, control a cd-player and so on.
-
-These buttons is not functional when the computer is turned
-on but have to be activated by sending the codes 0xea 0x71
-to it.
-
-I've written the following hack to send codes to the keyboard:
-
---------------------------------------------------------------
-/* gcc -O2 -s -Wall -osend_to_keyboard send_to_keyboard.c */
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/io.h>
-
-int main( int argc, char *argv[] )
-{
-  int i;
-
-  ioperm( 0x60, 3, 1 );
-
-  for( i = 1; i < argc; i++ ) {
-    int x = strtol( argv[i], 0, 16 );
-
-    usleep( 300 );
-    outb( x, 0x60 );
-  }
-
-  return 0;
-}
---------------------------------------------------------------
-
-As root you can then call this program (in your boot scripts)
-as "send_to_keyboard ea 71" to turn on the extra buttons.
-
-It's not a good idea to run several instances of this program
-at the same time. It is a hack but it works. If you try to
-send other codes to the keyboard it probably will lock up.
-For other codes see:
-
-http://www.win.tue.nl/~aeb/linux/kbd/scancodes-2.html#ss2.22
-
---
-Dennis Björklund <db@zigo.dhs.org>
-
-
-
-$XFree86$

hw/xfree86/doc/man/xorg.conf.man.pre

@@ -2342,8 +2342,7 @@ section for a dual headed configuration with two mice:
 .SH "DRI SECTION"
 This optional section is used to provide some information for the
 Direct Rendering Infrastructure.
-Details about the format of this section
-can be found in the README.DRI document, which is also available on-line at
+Details about the format of this section can be found on-line at
 .IR <http://dri.freedesktop.org/> .
 .SH "VENDOR SECTION"
 The optional