366N/Adiff --git a/man/Xserver.man b/man/Xserver.man
1476N/Aindex b103551..82e5370 100644
366N/A--- a/man/Xserver.man
366N/A+++ b/man/Xserver.man
919N/A@@ -1,3 +1,25 @@
919N/A+.\"
919N/A+.\" Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
919N/A+.\"
919N/A+.\" Permission is hereby granted, free of charge, to any person obtaining a
919N/A+.\" copy of this software and associated documentation files (the "Software"),
919N/A+.\" to deal in the Software without restriction, including without limitation
919N/A+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A+.\" and/or sell copies of the Software, and to permit persons to whom the
919N/A+.\" Software is furnished to do so, subject to the following conditions:
919N/A+.\"
919N/A+.\" The above copyright notice and this permission notice (including the next
919N/A+.\" paragraph) shall be included in all copies or substantial portions of the
919N/A+.\" Software.
919N/A+.\"
919N/A+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
366N/A+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
366N/A+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
366N/A+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
366N/A+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
366N/A+.\" DEALINGS IN THE SOFTWARE.
366N/A+.\"
366N/A .\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $
366N/A .\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $
366N/A .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group
366N/A@@ -32,14 +54,22 @@ Xserver \- X Window System display server
366N/A .SH SYNOPSIS
366N/A .B X
366N/A [option ...]
366N/A+.PP
366N/A+\fB/usr/bin/Xserver\fP [\fB-c\fP \fIclass\fP] \fB:\fP\fIdisplaynumber\fP [\fIX server arguments\fP]
366N/A .SH DESCRIPTION
366N/A .I X
366N/A is the generic name for the X Window System display server. It is
366N/A frequently a link or a copy of the appropriate server binary for
366N/A driving the most frequently used server on a given machine.
366N/A+In this release of __distroname__, /usr/bin/X is a link to the
366N/A+Xserver program which starts the appropriate X server based on properties
366N/A+set for the service management facility, under the service identifier
366N/A+\fIsvc:/application/x11/x11-server\fP. The properties are described in the
366N/A+SMF PROPERTIES section below.
366N/A .SH "STARTING THE SERVER"
366N/A-The X server is usually started from the X Display Manager program
366N/A-\fIxdm\fP(1) or a similar display manager program.
366N/A+On __distroname__, the X server is usually started from the GNOME
366N/A+Display Manager program \fIgdm\fP(1m). This role may also be performed
366N/A+by the X Display Manager program \fIxdm\fP(1), or another display manager.
366N/A This utility is run from the system boot files and takes care of keeping
366N/A the server running, prompting for usernames and passwords, and starting up
366N/A the user sessions.
366N/A@@ -195,6 +225,13 @@ with
366N/A .BR "\-nolisten tcp" .
366N/A This option may be issued multiple times to disable listening to different
366N/A transport types.
366N/A+The current transport names supported on __distroname__ are as follows:
366N/A+.sp
366N/A+.nf
366N/A+tcp TCP over IPv4 or IPv6
366N/A+unix UNIX Domain Sockets (/tmp/.X11-unix/X\fIn\fP)
366N/A+pipe Named pipes (/tmp/.X11-pipe/X\fIn\fP)
366N/A+.fi
366N/A .TP 8
366N/A .B \-noreset
366N/A prevents a server reset when the last client connection is closed. This
366N/A@@ -392,7 +429,7 @@ located in the XKB base directory or a subdirectory, and specified as the
366N/A relative path from the XKB base directory. The default XKB base directory is
366N/A .IR __projectroot__/lib/X11/xkb .
821N/A .TP 8
366N/A-.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
366N/A+.BR [+-]accessx " [\fItimeout\fP[\fItimeout_mask\fP[\fIfeedback\fP[\fIoptions_mask\fP]]]]"
366N/A enables(+) or disables(-) AccessX key sequences.
366N/A .TP 8
366N/A .B \-xkbdir \fIdirectory\fP
366N/A@@ -548,6 +585,110 @@ the following font path:
366N/A /usr/share/fonts/default/Type1,
366N/A /usr/share/fonts/default/ghostscript
366N/A .fi
366N/A+
366N/A+.SH SMF PROPERTIES
366N/A+.PP
366N/A+Configuration properties for the \fB/usr/bin/Xserver\fP program are
366N/A+managed by the service management facility, \fBsmf\fR(5), under the service
366N/A+identifier:
366N/A+.PP
1476N/A+.nf
1476N/A+svc:/application/x11/x11-server
1476N/A+.fi
1476N/A+Use \fBsvccfg\fR(1M) to make configuration changes and to view configuration
366N/A+information for this service\&.
366N/A+.PP
366N/A+\fB/usr/bin/Xserver\fP will look for configuration options in the
366N/A+instances in this order, stopping at the first match for the given
366N/A+property:
366N/A+.TP
366N/A+1.
366N/A+\fB:display\fP\fIN\fP (where \fIN\fP is the display number of the X server,
366N/A+i.e. \fB:display0\fP for :0)
366N/A+.TP
366N/A+2.
366N/A+Any class names provided via the \fB-c\fP options to
366N/A+\fB/usr/bin/Xserver\fP. Multiple \fB-c\fP options may be provided, if so,
366N/A+they are searched in the order found on the command line.
366N/A+.TP
366N/A+3.
366N/A+If any XDMCP options are provided to open a remote display connection,
366N/A+\fB:remote\fP, otherwise \fB:local\fP
366N/A+.TP
366N/A+4.
366N/A+The default properties for the service
366N/A+.PP
366N/A+Class names may be any valid FMRI instance name. Sun reserves all class names
366N/A+beginning with lowercase letters for its own use - customers wishing to create
366N/A+their own class names may use names beginning with an uppercase letter.
366N/A+
366N/A+.PP
366N/A+These properties may be set in any instance of x11-server or for the service
366N/A+itself:
366N/A+.TP
366N/A+.B options/server
366N/A+(Type astring) The absolute path to the X server binary to run, currently
366N/A+must be one of:
366N/A+.sp
366N/A+.nf
366N/A+\fB/usr/bin/Xorg\fP
366N/A+\fB/usr/bin/Xdmx\fP
366N/A+\fB/usr/bin/Xvfb\fP
366N/A+\fB/usr/bin/Xvnc\fP
366N/A+.fi
366N/A+.TP
366N/A+.B options/config_file
366N/A+(Type string) Setting this to a filename causes this file to be used as the
366N/A+configuration file for the X server. Currently this property is only
366N/A+available when used with the Xorg server. The value of this property must
366N/A+be a relative path from one of the directories in the Xorg config file
366N/A+search path, and not an absolute path.
366N/A+.TP
366N/A+.B options/tcp_listen
366N/A+(Type boolean) Setting this to false disables listening for incoming TCP/IP
366N/A+connections (see \fB-nolisten tcp\fP option above).
366N/A+.TP
366N/A+.B options/default_depth
366N/A+(Type int) Sets the depth of the default visual of the X server started.
366N/A+.TP
366N/A+.B options/server_args
366N/A+(Type astring) Sets additional arguments to pass to the X server started. Care
366N/A+must be used when using options specific to a particular X server as then it
366N/A+may cause failure to start the X server if the server to be started is later
366N/A+changed to one that does not support those options.
366N/A+.TP
366N/A+.B options/display_0_on_console
366N/A+(Type boolean) Setting this to true starts the X server with a DISPLAY ":0.0"
366N/A+on "/dev/console" rather than the first available "/dev/vt/#", see vt(7i),
366N/A+this preserves backward compatibility with programs such as "xterm -C"
366N/A+that expect have access to "/dev/console". X servers with any other DISPLAY
366N/A+are not affected. The default is false.
366N/A+.SS "Example: Allow remote access"
366N/A+.PP
366N/A+The following command allows access from remote clients.
366N/A+.sp
366N/A+.nf
366N/A+svccfg -s svc:/application/x11/x11-server setprop options/tcp_listen = true
366N/A+.fi
366N/A+.sp
366N/A+Restart the Xserver by either logging out and logging back in, or manually
366N/A+if the Xserver was started from the command line.
366N/A+.sp
366N/A+.SS "Example: Use of VESA driver"
366N/A+.PP
366N/A+The following command overrides the default Xorg driver selection to use the
366N/A+/usr/lib/X11/xorg.conf.vesa configuration file to select the "vesa" driver.
366N/A+.sp
366N/A+.nf
366N/A+svccfg -s svc:/application/x11/x11-server setprop options/config_file=xorg.conf.vesa
366N/A+.fi
366N/A+.SS "Example: Enabling the XINERAMA extension"
366N/A+.PP
366N/A+The following command enables the XINERAMA extension.
366N/A+.sp
366N/A+.nf
366N/A+svccfg -s svc:/application/x11/x11-server setprop options/server_args=+xinerama
366N/A+.fi
366N/A
366N/A .SH FILES
366N/A .TP 30
366N/A@@ -563,8 +704,12 @@ Outline font directories
366N/A .I /tmp/.X11-unix/X\fBn\fP
366N/A Unix domain socket for display number \fBn\fP
366N/A .TP 30
366N/A-.I /usr/adm/X\fBn\fPmsgs
1476N/A-Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)
1476N/A+.I /tmp/.X11-pipe/X\fBn\fP
1476N/A+Named pipe (FIFO) for display number \fBn\fP
1476N/A+.TP 30
1476N/A+.I /var/log/gdm/:\fBn\fP.log
1476N/A+Default error log file for display number \fBn\fP if the server is run
1476N/A+from \fIgdm\fP(1m)
366N/A .TP 30
366N/A .I __projectroot__/lib/X11/xdm/xdm-errors
366N/A Default error log file if the server is run from \fIxdm\fP(1)
366N/A@@ -586,14 +731,22 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
366N/A \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
366N/A .I "Security Extension Specification"
366N/A .PP
366N/A-Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
366N/A+Starting the server: \fIgdm\fP(1m), \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
366N/A .PP
366N/A Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),
366N/A \fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1)
366N/A+.\" Only list the servers shipped on Solaris
366N/A .PP
366N/A Server-specific man pages:
366N/A-\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
366N/A-\fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).
366N/A+\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1), \fIXvnc\fP(1),
366N/A+\fIXnewt\fP(1M).
366N/A+.PP
366N/A+Service management framework:
366N/A+\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M)
366N/A+.PP
366N/A+Dtrace probes:
366N/A+\fI/usr/share/doc/Xserver/Xserver-DTrace.html\fP,
366N/A+\fI/usr/share/doc/Xserver/Xserver-DTrace.txt\fP
366N/A .PP
366N/A Server internal documentation:
366N/A .I "Definition of the Porting Layer for the X v11 Sample Server"
366N/A