xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/doc/man/xorg.conf.man.pre |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1a573e402ec112913a404f092b5b97d8d9210f94
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jul 16 13:41:53 2008 -0400

    Update the Allow*Grabs documentation for xf86misc removal.
    
    The API to turn the grab-break keys back off is gone now, so don't
    say it exists.

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 3af1b78..13a5979 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -647,8 +647,7 @@ Note that the options
 and
 .B AllowClosedownGrabs
 will allow users to remove the grab used by screen saver/locker programs.
-An API was written to such cases.
-If you enable this option, make sure your screen saver/locker is updated.
+Do not use them if you rely on the screen saver for security.
 Default: off.
 .TP 7
 .BI "Option \*qHandleSpecialKeys\*q \*q" when \*q