6525814 x11-server list of allowed servers needs to be updated for Xorg 7.2 integration
--- a/open-src/xserver/xorg/sun-manpage.patch Fri Feb 16 09:35:46 2007 -0800
+++ b/open-src/xserver/xorg/sun-manpage.patch Wed Feb 21 17:10:42 2007 -0800
@@ -14,7 +14,7 @@
--- doc/Xserver.man.pre 2006-12-21 10:50:46.000000000 -0800
+++ doc/Xserver.man.pre 2007-01-19 16:24:28.082214000 -0800
@@ -1,3 +1,32 @@
-+.\" ident "@(#)sun-manpage.patch 1.3 07/01/19 SMI"
++.\" ident "@(#)sun-manpage.patch 1.4 07/02/21 SMI"
+.\"
+.\" Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+.\"
@@ -281,7 +281,7 @@
.TP 8
.B \-xkbmap \fIfilename\fP
loads keyboard description in \fIfilename\fP on server startup.
-@@ -732,6 +873,80 @@ __default_font_path__ .
+@@ -732,6 +873,90 @@ __default_font_path__ .
.LP
The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)
after the server has started.
@@ -328,8 +328,18 @@
+.TP
+.B options/server
+(Type astring) The absolute path to the X server binary to run, currently
-+must be one of \fB/usr/openwin/bin/Xsun\fP, \fB/usr/openwin/bin/Xvfb\fP, or
-+\fB/usr/X11/bin/Xorg\fP.
++must be one of:
++.sp
++.nf
++\fB/usr/openwin/bin/Xsun\fP
++\fB/usr/openwin/bin/Xvfb\fP
++\fB/usr/X11/bin/Xorg\fP
++\fB/usr/X11/bin/i386/Xorg\fP
++\fB/usr/X11/bin/amd64/Xorg\fP
++\fB/usr/X11/bin/Xvfb\fP
++\fB/usr/X11/bin/i386/Xvfb\fP
++\fB/usr/X11/bin/amd64/Xvfb\fP
++.fi
+.TP
+.B options/tcp_listen
+(Type boolean) Setting this to false disables listening for incoming TCP/IP