sun-manpage.patch revision 851
98N/Adiff -Nurp -x '*~' -x '*.orig' cpprules.in cpprules.in
98N/Adiff -urp -x '*~' -x '*.orig' cpprules.in cpprules.in
684N/A--- cpprules.in 2009-10-21 14:52:55.000000000 -0700
98N/A+++ cpprules.in 2009-11-03 22:28:48.641330995 -0800
235N/A@@ -25,7 +25,7 @@ XORGRELSTRING = @PACKAGE_STRING@
235N/A XORGMANNAME = X Version 11
235N/A XSERVERNAME = Xorg
235N/A
235N/A-MANDEFS = \
235N/A+MANDEFS = -D__SUNSOFT__ \
235N/A -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
235N/A -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
235N/A -D__appmansuffix__=$(APP_MAN_SUFFIX) \
493N/Adiff -urp -x '*~' -x '*.orig' doc/Xserver.man.pre doc/Xserver.man.pre
235N/A--- doc/Xserver.man.pre 2009-08-10 21:00:22.000000000 -0700
235N/A+++ doc/Xserver.man.pre 2009-11-03 22:28:48.641981596 -0800
235N/A@@ -1,3 +1,33 @@
235N/A+.\" ident "@(#)sun-manpage.patch 1.11 09/12/06 SMI"
235N/A+.\"
235N/A+.\" Copyright 2009 Sun Microsystems, Inc. All rights reserved.
235N/A+.\" Use is subject to license terms.
235N/A+.\"
235N/A+.\" Permission is hereby granted, free of charge, to any person obtaining a
493N/A+.\" copy of this software and associated documentation files (the
235N/A+.\" "Software"), to deal in the Software without restriction, including
235N/A+.\" without limitation the rights to use, copy, modify, merge, publish,
235N/A+.\" distribute, and/or sell copies of the Software, and to permit persons
235N/A+.\" to whom the Software is furnished to do so, provided that the above
235N/A+.\" copyright notice(s) and this permission notice appear in all copies of
520N/A+.\" the Software and that both the above copyright notice(s) and this
98N/A+.\" permission notice appear in supporting documentation.
98N/A+.\"
98N/A+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
98N/A+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
98N/A+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98N/A+.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
241N/A+.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
241N/A+.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
520N/A+.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
520N/A+.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
98N/A+.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
98N/A+.\"
98N/A+.\" Except as contained in this notice, the name of a copyright holder
98N/A+.\" shall not be used in advertising or otherwise to promote the sale, use
241N/A+.\" or other dealings in this Software without prior written authorization
98N/A+.\" of the copyright holder.
98N/A+.\"
98N/A .\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $
241N/A .\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $
520N/A .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group
241N/A@@ -32,14 +62,31 @@ Xserver \- X Window System display serve
241N/A .SH SYNOPSIS
241N/A .B X
241N/A [option ...]
241N/A+#ifdef __SUNSOFT__
241N/A+\fB/usr/bin/Xserver\fP [\fB-c\fP \fIclass\fP] \fB:\fP\fIdisplaynumber\fP [\fIX server arguments\fP]
520N/A+#endif
520N/A+.PP
520N/A .SH DESCRIPTION
520N/A .I X
520N/A is the generic name for the X Window System display server. It is
493N/A frequently a link or a copy of the appropriate server binary for
493N/A driving the most frequently used server on a given machine.
493N/A+#ifdef __SUNSOFT__
493N/A+In this release of Solaris and OpenSolaris, /usr/bin/X is a link to the
493N/A+Xserver program which starts the appropriate X server based on properties
493N/A+set for the service management facility, under the service identifier
577N/A+\fIsvc:/application/x11/x11-server\fP. The properties are described in the
493N/A+SMF PROPERTIES section below.
493N/A+#endif
577N/A .SH "STARTING THE SERVER"
577N/A+#ifdef __SUNSOFT__
577N/A+On Solaris and OpenSolaris, the X server is usually started from the GNOME
577N/A+Display Manager program \fIgdm\fP(1m). This role may also be performed
577N/A+by the X Display Manager program \fIxdm\fP(1), or another display manager.
577N/A+#else
577N/A The X server is usually started from the X Display Manager program
577N/A \fIxdm\fP(1) or a similar display manager program.
577N/A+#endif
493N/A This utility is run from the system boot files and takes care of keeping
235N/A the server running, prompting for usernames and passwords, and starting up
493N/A the user sessions.
98N/A@@ -183,6 +230,35 @@ causes all remaining command line argume
235N/A sets the maximum big request to
235N/A .I size
98N/A MB.
98N/A+#ifdef __SUNSOFT__
493N/A+.TP 8
577N/A+.B \-nolisten \fItransport\fP
577N/A+disables listening for client connections on the named transport. The
577N/A+current transport names supported are as follows:
493N/A+.sp
493N/A+.nf
493N/A+tcp TCP over IPv4 or IPv6
493N/A+unix UNIX Domain Sockets (/tmp/.x11-unix)
98N/A+pipe Named pipes (/tmp/.x11-pipe/) and shared memory
577N/A+.fi
577N/A+.PP
577N/A+.in +8
577N/A+By default each of the above servers opens listeners on each of the
577N/A+above transports. The -nolisten command line argument disables listening
493N/A+on the named transports. You can disable multiple transports by listing
493N/A+this option multiple times, for example:
493N/A+.sp
520N/A+.nf
577N/A+-nolisten pipe -nolisten tcp
577N/A+.fi
577N/A+.PP
577N/A+.in -8
577N/A+.in +13
577N/A+If all available transports are disabled, then the commands issue a fatal
577N/A+error message and exit. A server not listening for any clients is of little
577N/A+value.
493N/A+.in -13
98N/A+#else
493N/A .TP 8
98N/A .B \-nolisten \fItrans-type\fP
235N/A disables a transport type. For example, TCP/IP connections can be disabled
98N/A@@ -190,6 +266,7 @@ with
577N/A .BR "\-nolisten tcp" .
577N/A This option may be issued multiple times to disable listening to different
577N/A transport types.
577N/A+#endif
577N/A .TP 8
577N/A .B \-noreset
577N/A prevents a server reset when the last client connection is closed. This
577N/A@@ -389,7 +466,7 @@ located in the XKB base directory or a s
577N/A relative path from the XKB base directory. The default XKB base directory is
577N/A .IR __projectroot__/lib/X11/xkb .
577N/A .TP 8
577N/A-.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
577N/A+.BR [+-]accessx " [\fItimeout\fP[\fItimeout_mask\fP[\fIfeedback\fP[\fIoptions_mask\fP]]]]"
577N/A enables(+) or disables(-) AccessX key sequences.
577N/A .TP 8
577N/A .B \-xkbdir \fIdirectory\fP
577N/A@@ -545,6 +622,95 @@ the following font path:
577N/A /usr/share/fonts/default/Type1,
577N/A /usr/share/fonts/default/ghostscript
577N/A .fi
577N/A+#ifdef __SUNSOFT__
577N/A+
577N/A+.SH SMF PROPERTIES
577N/A+.PP
577N/A+Configuration properties for the \fB/usr/bin/Xserver\fP program are
577N/A+managed by the service management facility, \fBsmf\fR(5), under the service
577N/A+identifier:
577N/A+.PP
577N/A+.nf
577N/A+svc:/application/x11/x11-server
577N/A+.fi
577N/A+Use \fBsvccfg\fR(1M) to make configuration changes and to view configuration
577N/A+information for this service\&.
493N/A+.PP
98N/A+\fB/usr/bin/Xserver\fP will look for configuration options in the
98N/A+instances in this order, stopping at the first match for the given
98N/A+property:
493N/A+.TP
493N/A+1.
493N/A+\fB:display\fP\fIN\fP (where \fIN\fP is the display number of the X server,
493N/A+i.e. \fB:display0\fP for :0)
493N/A+.TP
493N/A+2.
493N/A+Any class names provided via the \fB-c\fP options to
493N/A+\fB/usr/bin/Xserver\fP. Multiple \fB-c\fP options may be provided, if so,
493N/A+they are searched in the order found on the command line.
493N/A+.TP
493N/A+3.
493N/A+If any XDMCP options are provided to open a remote display connection,
493N/A+\fB:remote\fP, otherwise \fB:local\fP
493N/A+.TP
493N/A+4.
493N/A+The default properties for the service
493N/A+.PP
493N/A+Class names may be any valid FMRI instance name. Sun reserves all class names
493N/A+beginning with lowercase letters for its own use - customers wishing to create
493N/A+their own class names may use names beginning with an uppercase letter.
493N/A+
493N/A+.PP
493N/A+These properties may be set in any instance of x11-server or for the service
493N/A+itself:
493N/A+.TP
493N/A+.B options/server
493N/A+(Type astring) The absolute path to the X server binary to run, currently
493N/A+must be one of:
493N/A+.sp
493N/A+.nf
493N/A+\fB/usr/openwin/bin/Xsun\fP
493N/A+\fB/usr/openwin/bin/Xvfb\fP
493N/A+\fB/usr/bin/Xorg\fP
493N/A+\fB/usr/bin/i386/Xorg\fP
493N/A+\fB/usr/bin/amd64/Xorg\fP
493N/A+\fB/usr/bin/Xvfb\fP
493N/A+\fB/usr/bin/i386/Xvfb\fP
493N/A+\fB/usr/bin/amd64/Xvfb\fP
493N/A+\fB/usr/bin/Xvnc\fP
493N/A+.fi
493N/A+.TP
493N/A+.B options/tcp_listen
493N/A+(Type boolean) Setting this to false disables listening for incoming TCP/IP
493N/A+connections (see \fB-nolisten tcp\fP option above).
493N/A+.TP
493N/A+.B options/default_depth
493N/A+(Type int) Sets the depth of the default visual of the X server started.
493N/A+.TP
493N/A+.B options/server_args
493N/A+(Type astring) Sets additional arguments to pass to the X server started. Care
493N/A+must be used when using options specific to a particular X server as then it
493N/A+may cause failure to start the X server if the server to be started is later
493N/A+changed to one that does not support those options.
493N/A+.SS "Example: Allow remote access"
684N/A+.PP
493N/A+The following command allows access from remote clients.
493N/A+.sp
493N/A+.nf
493N/A+svccfg -s svc:/application/x11/x11-server setprop options/tcp_listen = true
493N/A+.fi
493N/A+.sp
493N/A+Restart the Xserver by either logging out and logging back in, or manually
493N/A+if the Xserver was started from the command line.
493N/A+.sp
493N/A+.SS "Example: Enables the XINERAMA extension"
493N/A+.PP
493N/A+The following command enables the XINERAMA extension.
493N/A+.sp
493N/A+.nf
493N/A+svccfg -s svc:/application/x11/x11-server setprop options/server_args=+xinerama
493N/A+.fi
493N/A+#endif
493N/A
493N/A .SH FILES
493N/A .TP 30
493N/A@@ -559,12 +725,23 @@ Outline font directories
493N/A .TP 30
493N/A .I /tmp/.X11-unix/X\fBn\fP
493N/A Unix domain socket for display number \fBn\fP
493N/A+#ifdef __SUNSOFT__
520N/A+.TP 30
520N/A+.I /tmp/.X11-pipe/X\fBn\fP
520N/A+Named pipe (FIFO) for display number \fBn\fP
520N/A+#endif
520N/A .TP 30
520N/A .I /usr/adm/X\fBn\fPmsgs
577N/A Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)
577N/A .TP 30
493N/A .I __projectroot__/lib/X11/xdm/xdm-errors
493N/A Default error log file if the server is run from \fIxdm\fP(1)
577N/A+#ifdef __SUNSOFT__
493N/A+.TP 30
493N/A+.I /var/log/gdm/:\fBn\fP.log
493N/A+Default error log file for display number \fBn\fP if the server is run
577N/A+from \fIgdm\fP(1m)
493N/A+#endif
493N/A .SH "SEE ALSO"
493N/A General information: \fIX\fP(__miscmansuffix__)
493N/A .PP
493N/A@@ -581,14 +758,28 @@ Security: \fIXsecurity\fP(__miscmansuffi
493N/A \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
493N/A .I "Security Extension Specification"
493N/A .PP
493N/A+#ifdef __SUNSOFT__
493N/A+Starting the server: \fIgdm\fP(1m), \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
493N/A+#else
493N/A Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
493N/A+#endif
493N/A .PP
493N/A Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),
684N/A \fIxhost\fP(1)
684N/A+#ifdef __SUNSOFT__
493N/A+.\" Only list the servers shipped on Solaris
493N/A+.PP
493N/A+Server-specific man pages:
493N/A+\fIXsun\fP(1), \fIXorg\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1)
493N/A+.PP
493N/A+Service management framework:
493N/A+\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M)
493N/A+#else
493N/A .PP
493N/A Server-specific man pages:
493N/A \fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
493N/A \fIXvfb\fP(1), \fIXDarwin\fP(1), \fIXWin\fP(1).
493N/A+#endif
493N/A .PP
493N/A Server internal documentation:
493N/A .I "Definition of the Porting Layer for the X v11 Sample Server"
493N/A