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