OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=78

xorg-x11-server.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 16 16:52:03 CEST 2008 - sndirsch@suse.de
+
+- mention ZapWarning also in Xorg manual page (bnc #391352) 
+
 -------------------------------------------------------------------
 Fri May 16 12:15:57 CEST 2008 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -22,7 +22,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        103
+Release:        104
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -569,6 +569,8 @@ exit 0
 
 %changelog
 * Fri May 16 2008 sndirsch@suse.de
+- mention ZapWarning also in Xorg manual page (bnc #391352)
+* Fri May 16 2008 sndirsch@suse.de
 - xorg-server-1.4-vnc-render_sig11.diff
   * fixed sig11 in RENDER code (bnc #385677)
 * Wed May 14 2008 sndirsch@suse.de

zap_warning_xserver.diff

@@ -99,3 +99,20 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/doc/man/xorg.conf.man.pre xorg-se
  .BI "Option \*qDontZoom\*q  \*q" boolean \*q
  This disallows the use of the
  .B Ctrl+Alt+Keypad\-Plus
+--- xorg-server-1.4.0.90-orig/hw/xfree86/doc/man/Xorg.man.pre.orig	2008-05-16 16:46:39.000000000 +0200
++++ xorg-server-1.4.0.90/hw/xfree86/doc/man/Xorg.man.pre	2008-05-16 16:48:50.000000000 +0200
+@@ -461,10 +461,10 @@
+ are:
+ .TP 8
+ .B Ctrl+Alt+Backspace
+-Immediately kills the server -- no questions asked.  This can be disabled
+-with the
+-.B DontZap
+-__xconfigfile__(__filemansuffix__) file option.
++Immediately kills the server -- no questions asked. This behaviour can
++be changed with the
++.B DontZap/ZapWarning
++__xconfigfile__(__filemansuffix__) file options.
+ .TP 8
+ .B Ctrl+Alt+Keypad-Plus
+ Change video mode to next one specified in the configuration file.