sun-manpage.patch revision 606
1494N/Adiff -urp -x '*~' -x '*.orig' cpprules.in cpprules.in
1683N/A--- cpprules.in 2007-05-29 12:36:50.000000000 -0700
1494N/A+++ cpprules.in 2008-09-24 20:18:46.328453000 -0700
1494N/A@@ -25,7 +25,7 @@ XORGRELSTRING = @PACKAGE_STRING@
1494N/A XORGMANNAME = X Version 11
1494N/A XSERVERNAME = Xorg
1494N/A
1494N/A-MANDEFS = \
1494N/A+MANDEFS = -D__SUNSOFT__ \
1494N/A -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
1494N/A -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
1494N/A -D__appmansuffix__=$(APP_MAN_SUFFIX) \
1494N/Adiff -urp -x '*~' -x '*.orig' doc/Xserver.man.pre doc/Xserver.man.pre
1494N/A--- doc/Xserver.man.pre 2008-09-23 11:24:56.000000000 -0700
1494N/A+++ doc/Xserver.man.pre 2008-09-24 20:18:46.329753000 -0700
1494N/A@@ -1,3 +1,32 @@
1494N/A+.\" ident "@(#)sun-manpage.patch 1.6 09/01/14 SMI"
1494N/A+.\"
1494N/A+.\" Copyright 2007 Sun Microsystems, Inc. All rights reserved.
1494N/A+.\"
1494N/A+.\" Permission is hereby granted, free of charge, to any person obtaining a
1494N/A+.\" copy of this software and associated documentation files (the
1494N/A+.\" "Software"), to deal in the Software without restriction, including
1494N/A+.\" without limitation the rights to use, copy, modify, merge, publish,
1494N/A+.\" distribute, and/or sell copies of the Software, and to permit persons
1494N/A+.\" to whom the Software is furnished to do so, provided that the above
1494N/A+.\" copyright notice(s) and this permission notice appear in all copies of
1494N/A+.\" the Software and that both the above copyright notice(s) and this
1494N/A+.\" permission notice appear in supporting documentation.
1494N/A+.\"
1494N/A+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
1494N/A+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1494N/A+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
1494N/A+.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
1494N/A+.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
1494N/A+.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
1494N/A+.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
1494N/A+.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
1494N/A+.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1494N/A+.\"
1494N/A+.\" Except as contained in this notice, the name of a copyright holder
1494N/A+.\" shall not be used in advertising or otherwise to promote the sale, use
1494N/A+.\" or other dealings in this Software without prior written authorization
1494N/A+.\" of the copyright holder.
1494N/A+.\"
1494N/A .\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $
1494N/A .\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $
1494N/A .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group
1494N/A@@ -32,14 +61,32 @@ Xserver \- X Window System display serve
1494N/A .SH SYNOPSIS
1494N/A .B X
1494N/A [option ...]
1494N/A+#ifdef __SUNSOFT__
1494N/A+\fB/usr/X11/bin/Xserver\fP [\fB-c\fP \fIclass\fP] \fB:\fP\fIdisplaynumber\fP [\fIX server arguments\fP]
1494N/A+#endif
1494N/A+.PP
1494N/A .SH DESCRIPTION
1494N/A .I X
1494N/A is the generic name for the X Window System display server. It is
1494N/A frequently a link or a copy of the appropriate server binary for
1494N/A driving the most frequently used server on a given machine.
1494N/A+#ifdef __SUNSOFT__
1494N/A+In this release of Solaris, /usr/X11/bin/X is a link to the Xserver program
1494N/A+which starts the appropriate X server based on properties set for the service
1494N/A+management facility, under the service identifier
1494N/A+\fIsvc:/application/x11/x11-server\fP. The properties are described in the
1494N/A+SMF PROPERTIES section below.
1494N/A+#endif
1494N/A .SH "STARTING THE SERVER"
1494N/A+#ifdef __SUNSOFT__
1494N/A+On Solaris, the X server is usually started from the CDE Display Manager
1494N/A+program \fIdtlogin\fP(1). This role may also be performed by the X Display
1494N/A+Manager program \fIxdm\fP(1), the GNOME Display Manager program \fIgdm\fP(1),
1494N/A+or another display manager.
1494N/A+#else
1494N/A The X server is usually started from the X Display Manager program
1494N/A \fIxdm\fP(1) or a similar display manager program.
1494N/A+#endif
1494N/A This utility is run from the system boot files and takes care of keeping
1494N/A the server running, prompting for usernames and passwords, and starting up
1494N/A the user sessions.
1494N/A@@ -100,6 +147,14 @@ specifies a file which contains a collec
1494N/A to authenticate access. See also the \fIxdm\fP(1) and
1494N/A \fIXsecurity\fP(__miscmansuffix__) manual pages.
1494N/A .TP 8
1494N/A+.B bc
1494N/A+disables certain kinds of error checking, for bug compatibility with
1494N/A+previous releases (e.g., to work around bugs in R2 and R3 xterms and toolkits).
1494N/A+Deprecated.
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xsun, not in Xorg.]
1494N/A+#endif
1494N/A+.TP 8
1494N/A .B \-bs
1494N/A disables backing store support on all screens.
1494N/A .TP 8
1494N/A@@ -120,7 +175,7 @@ Not obeyed by all servers.
1494N/A .TP 8
1494N/A .B \-co \fIfilename\fP
1494N/A sets name of RGB color database. The default is
1494N/A-.IR __projectroot__/share/X11/rgb .
1494N/A+.IR __projectroot__/lib/X11/rgb .
1494N/A .ig
1494N/A .TP 8
1494N/A .B \-config \fIfilename\fP
1494N/A@@ -157,10 +212,16 @@ is platform and configuration specific.
1494N/A .BI \-extension extensionName
1494N/A disables named extension. If an unknown extension name is specified,
1494N/A a list of accepted extension names is printed.
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A .TP 8
1494N/A .BI \+extension extensionName
1494N/A enables named extension. If an unknown extension name is specified,
1494N/A a list of accepted extension names is printed.
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A .TP 8
1494N/A .B \-f \fIvolume\fP
1494N/A sets feep (bell) volume (allowable range: 0-100).
1494N/A@@ -187,6 +248,38 @@ causes all remaining command line argume
1494N/A sets the maximum big request to
1494N/A .I size
1494N/A MB.
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A+#ifdef __SUNSOFT__
1494N/A+.TP 8
1494N/A+.B \-nolisten \fItransport\fP
1494N/A+disables listening for client connections on the named transport. The
1494N/A+current transport names supported are as follows:
1494N/A+.sp
1494N/A+.nf
1494N/A+tcp TCP over IPv4 or IPv6
1494N/A+unix UNIX Domain Sockets (/tmp/.x11-unix)
1494N/A+pipe Named pipes (/tmp/.x11-pipe/) and shared memory
1494N/A+.fi
1494N/A+.PP
1494N/A+.in +8
1494N/A+By default each of the above servers opens listeners on each of the
1494N/A+above transports. The -nolisten command line argument disables listening
1494N/A+on the named transports. You can disable multiple transports by listing
1494N/A+this option multiple times, for example:
1494N/A+.sp
1494N/A+.nf
1494N/A+-nolisten pipe -nolisten tcp
1494N/A+.fi
1494N/A+.PP
1494N/A+.in -8
1494N/A+.in +13
1494N/A+If all available transports are disabled, then the commands issue a fatal
1494N/A+error message and exit. A server not listening for any clients is of little
1494N/A+value.
1494N/A+.in -13
1494N/A+#else
1494N/A .TP 8
1494N/A .B \-nolisten \fItrans-type\fP
1494N/A disables a transport type. For example, TCP/IP connections can be disabled
1494N/A@@ -194,6 +287,7 @@ with
1494N/A .BR "\-nolisten tcp" .
1494N/A This option may be issued multiple times to disable listening to different
1494N/A transport types.
1494N/A+#endif
1494N/A .TP 8
1494N/A .B \-noreset
1494N/A prevents a server reset when the last client connection is closed. This
1494N/A@@ -207,11 +301,19 @@ sets screen-saver pattern cycle time in
1494N/A .B \-pn
1494N/A permits the server to continue running if it fails to establish all of
1494N/A its well-known sockets (connection points for clients), but
1494N/A-establishes at least one. This option is set by default.
1494N/A+establishes at least one.
1494N/A+#ifdef __SUNSOFT__
1494N/A+This option is set by default in Xorg, but is off by default in Xsun.
1494N/A+#else
1494N/A+This option is set by default.
1494N/A+#endif
1494N/A .TP 8
1494N/A .B \-nopn
1494N/A causes the server to exit if it fails to establish all of its well-known
1494N/A sockets (connection points for clients).
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A .TP 8
1494N/A .B \-r
1494N/A turns off auto-repeat.
1494N/A@@ -272,6 +374,10 @@ This is a no-op for most implementations
1494N/A .B [+-]xinerama
1494N/A enables(+) or disables(-) the XINERAMA extension. The default state is
1494N/A platform and configuration specific.
1494N/A+#ifdef __SUNSOFT__
1494N/A+See the \fBXINERAMA\fP section of the \fIXsun\fP(1) manual page for more
1494N/A+details.
1494N/A+#endif
1494N/A .SH SERVER DEPENDENT OPTIONS
1494N/A Some X servers accept the following options:
1494N/A .TP 8
1494N/A@@ -315,15 +421,24 @@ use a gray map of 13 color cells for the
1494N/A .TP 8
1494N/A .I color
1494N/A use a color cube of at most 4*4*4 colors (that is 64 color cells).
1494N/A+#ifdef __SUNSOFT__
1494N/A+[This option is only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A .RE
1494N/A .TP 8
1494N/A .B \-dumbSched
1494N/A disables smart scheduling on platforms that support the smart scheduler.
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A .TP
1494N/A .B \-schedInterval \fIinterval\fP
1494N/A sets the smart scheduler's scheduling interval to
1494N/A .I interval
1494N/A milliseconds.
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A .SH XDMCP OPTIONS
1494N/A X servers that support XDMCP have the following options.
1494N/A See the \fIX Display Manager Control Protocol\fP specification for more
1494N/A@@ -361,6 +476,9 @@ specifies the local address to connect f
1494N/A has multiple network interfaces). The \fIlocal-address\fP may be expressed
1494N/A in any form acceptable to the host platform's \fIgethostbyname\fP(3)
1494N/A implementation.
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A .TP 8
1494N/A .B \-once
1494N/A causes the server to terminate (rather than reset) when the XDMCP session
1494N/A@@ -388,22 +506,45 @@ relative path from the XKB base director
1494N/A .TP 8
1494N/A .B [+-]kb
1494N/A enables(+) or disables(-) the XKEYBOARD extension.
1494N/A+#ifdef __SUNSOFT__
1494N/A+The default XKEYBOARD state in Xsun in this release of Solaris is disabled
1494N/A+unless +kb is specified. This may change in a future release. XKEYBOARD
1494N/A+is enabled by default in the Xorg server.
1494N/A+#endif
1494N/A .TP 8
1494N/A-.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
1494N/A+.BR [+-]accessx " [\fItimeout\fP[\fItimeout_mask\fP[\fIfeedback\fP[\fIoptions_mask\fP]]]]"
1494N/A enables(+) or disables(-) AccessX key sequences.
1494N/A+#ifndef __SUNSOFT__
1494N/A .TP 8
1494N/A .B \-xkbdir \fIdirectory\fP
1494N/A base directory for keyboard layout files. This option is not available
1494N/A for setuid X servers (i.e., when the X server's real and effective uids
1494N/A are different).
1494N/A+#endif
1494N/A .TP 8
1494N/A .B \-ardelay \fImilliseconds\fP
1494N/A sets the autorepeat delay (length of time in milliseconds that a key must
1494N/A be depressed before autorepeat starts).
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A .TP 8
1494N/A .B \-arinterval \fImilliseconds\fP
1494N/A sets the autorepeat interval (length of time in milliseconds that should
1494N/A elapse between autorepeat-generated keystrokes).
1494N/A+#ifdef __SUNSOFT__
1494N/A+[Only available in Xorg, not in Xsun.]
1494N/A+#endif
1494N/A+#ifdef __SUNSOFT__
1494N/A+.TP 8
1494N/A+.B \-ar1 \fImilliseconds\fP
1494N/A+sets the autorepeat delay (length of time in milliseconds that a key must
1494N/A+be depressed before autorepeat starts).
1494N/A+.TP 8
1494N/A+.B \-ar2 \fImilliseconds\fP
1494N/A+sets the autorepeat interval (length of time in milliseconds that should
1494N/A+elapse between autorepeat-generated keystrokes).
1494N/A+#endif
1494N/A .TP 8
1494N/A .B \-xkbmap \fIfilename\fP
1494N/A loads keyboard description in \fIfilename\fP on server startup.
1494N/A@@ -546,6 +687,91 @@ the following font path:
1494N/A /usr/share/fonts/default/ghostscript
1494N/A .fi
1494N/A
1494N/A+#ifdef __SUNSOFT__
1494N/A+.SH SMF PROPERTIES
1494N/A+.PP
1494N/A+Configuration properties for the \fB/usr/X11/bin/Xserver\fP program are
1494N/A+managed by the service management facility, \fBsmf\fR(5), under the service
1494N/A+identifier:
1494N/A+.PP
1494N/A+.nf
1494N/A+svc:/application/x11/x11-server
1494N/A+.fi
1494N/A+Use \fBsvccfg\fR(1M) to make configuration changes and to view configuration
1494N/A+information for this service\&.
1494N/A+.PP
1494N/A+\fB/usr/X11/bin/Xserver\fP will look for configuration options in the
1494N/A+instances in this order, stopping at the first match for the given
1494N/A+property:
1494N/A+.TP
1494N/A+1.
1494N/A+\fB:display\fP\fIN\fP (where \fIN\fP is the display number of the X server,
1494N/A+i.e. \fB:display0\fP for :0)
1494N/A+.TP
1494N/A+2.
1494N/A+Any class names provided via the \fB-c\fP options to
1494N/A+\fB/usr/X11/bin/Xserver\fP. Multiple \fB-c\fP options may be provided, if so,
1494N/A+they are searched in the order found on the command line.
1494N/A+.TP
1494N/A+3.
1494N/A+If any XDMCP options are provided to open a remote display connection,
1494N/A+\fB:remote\fP, otherwise \fB:local\fP
1494N/A+.TP
1494N/A+4.
1494N/A+The default properties for the service
1494N/A+.PP
1494N/A+Class names may be any valid FMRI instance name. Sun reserves all class names
1494N/A+beginning with lowercase letters for its own use - customers wishing to create
1494N/A+their own class names may use names beginning with an uppercase letter.
1494N/A+
1494N/A+.PP
1494N/A+These properties may be set in any instance of x11-server or for the service
1494N/A+itself:
1494N/A+.TP
1494N/A+.B options/server
1494N/A+(Type astring) The absolute path to the X server binary to run, currently
1494N/A+must be one of:
1494N/A+.sp
1494N/A+.nf
1494N/A+\fB/usr/openwin/bin/Xsun\fP
1494N/A+\fB/usr/openwin/bin/Xvfb\fP
1494N/A+\fB/usr/X11/bin/Xorg\fP
1494N/A+\fB/usr/X11/bin/i386/Xorg\fP
1494N/A+\fB/usr/X11/bin/amd64/Xorg\fP
1494N/A+\fB/usr/X11/bin/Xvfb\fP
1494N/A+\fB/usr/X11/bin/i386/Xvfb\fP
1494N/A+\fB/usr/X11/bin/amd64/Xvfb\fP
1494N/A+\fB/usr/X11/bin/Xvnc\fP
1494N/A+.fi
1494N/A+.TP
1494N/A+.B options/tcp_listen
1494N/A+(Type boolean) Setting this to false disables listening for incoming TCP/IP
1494N/A+connections (see \fB-nolisten tcp\fP option above).
1494N/A+.TP
1494N/A+.B options/default_depth
1494N/A+(Type int) Sets the depth of the default visual of the X server started.
1494N/A+.TP
1494N/A+.B options/server_args
1494N/A+(Type astring) Sets additional arguments to pass to the X server started. Care
1494N/A+must be used when using options specific to a particular X server as then it
1494N/A+may cause failure to start the X server if the server to be started is later
1494N/A+changed to one that does not support those options.
1494N/A+.SS "Example: Allow remote access"
1494N/A+.PP
1494N/A+The following command allows access from remote clients.
1494N/A+.sp
1494N/A+.nf
1494N/A+svccfg -s svc:/application/x11/x11-server setprop options/tcp_listen = true
1494N/A+.fi
1494N/A+.sp
1494N/A+.SS "Example: Enables the XKEYBOARD extension"
1494N/A+.PP
1683N/A+The following command enables the XKEYBOARD extension.
1683N/A+.sp
1683N/A+.nf
1494N/A+svccfg -s svc:/application/x11/x11-server setprop options/server_args=+kb
1494N/A+.fi
1494N/A+#endif
1494N/A .SH FILES
1494N/A .TP 30
1494N/A .I /etc/X\fBn\fP.hosts
1494N/A@@ -553,15 +779,26 @@ Initial access control list for display
1494N/A .TP 30
1494N/A .IR __projectroot__/lib/X11/fonts/misc , __projectroot__/lib/X11/fonts/75dpi , __projectroot__/lib/X11/fonts/100dpi
1494N/A Bitmap font directories
1494N/A+#ifdef __SUNSOFT__
1494N/A .TP 30
1494N/A-.IR __projectroot__/lib/X11/fonts/TTF , __projectroot__/lib/X11/fonts/Type1
1494N/A+.IR __projectroot__/lib/X11/fonts/TrueType , __projectroot__/lib/X11/fonts/Speedo , __projectroot__/lib/X11/fonts/Type1
1494N/A Outline font directories
1494N/A+#else
1494N/A .TP 30
1494N/A-.I __projectroot__/share/X11/rgb.txt
1494N/A+.IR __projectroot__/lib/X11/fonts/TTF , __projectroot__/lib/X11/fonts/Speedo , __projectroot__/lib/X11/fonts/Type1
1494N/A+Outline font directories
1494N/A+#endif
1494N/A+.TP 30
1494N/A+.I __projectroot__/lib/X11/rgb.txt
1494N/A Color database
1494N/A .TP 30
1494N/A .I /tmp/.X11-unix/X\fBn\fP
1494N/A Unix domain socket for display number \fBn\fP
1683N/A+#ifdef __SUNSOFT__
1683N/A+.TP 30
1683N/A+.I /tmp/.X11-pipe/X\fBn\fP
1683N/A+Named pipe (FIFO) for display number \fBn\fP
1683N/A+#endif
1494N/A .TP 30
1494N/A .IR /tmp/rcX\fBn\fP
1494N/A Kerberos 5 replay cache for display number \fBn\fP
1494N/A@@ -571,6 +808,11 @@ Error log file for display number \fBn\f
1494N/A .TP 30
1494N/A .I __projectroot__/lib/X11/xdm/xdm-errors
1494N/A Default error log file if the server is run from \fIxdm\fP(1)
1494N/A+#ifdef __SUNSOFT__
1494N/A+.TP 30
1494N/A+.I /var/dt/Xerrors
1494N/A+Default error log file if the server is run from \fIdtlogin\fP(1)
1494N/A+#endif
1494N/A .SH "SEE ALSO"
1494N/A General information: \fIX\fP(__miscmansuffix__)
1494N/A .PP
1494N/A@@ -587,14 +829,28 @@ Security: \fIXsecurity\fP(__miscmansuffi
1494N/A \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
1494N/A .I "Security Extension Specification"
1494N/A .PP
1494N/A+#ifdef __SUNSOFT__
1494N/A+Starting the server: \fIdtlogin\fP(1), \fIgdm\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
1494N/A+#else
1494N/A Starting the server: \fIxdm\fP(1), \fIxinit\fP(1)
1494N/A+#endif
1494N/A .PP
1494N/A Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),
1494N/A \fIxhost\fP(1)
1494N/A+#ifdef __SUNSOFT__
1494N/A+.\" Only list the servers shipped on Solaris
1494N/A+.PP
1494N/A+Server-specific man pages:
1494N/A+\fIXsun\fP(1), \fIXorg\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1), \fIXvfb\fP(1), \fIXprt\fP(1)
1494N/A+.PP
1494N/A+Service management framework:
1494N/A+\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M)
1494N/A+#else
1494N/A .PP
1494N/A Server-specific man pages:
1494N/A \fIXorg\fP(1), \fIXdmx\fP(1), \fIXnest\fP(1),
1494N/A \fIXvfb\fP(1), \fIXDarwin\fP(1), \fIXWin\fP(1).
1494N/A+#endif
1494N/A .PP
1494N/A Server internal documentation:
1494N/A .I "Definition of the Porting Layer for the X v11 Sample Server"
1494N/A