component(developer/golang-123): Add Component
[oi-userland.git] / components / x11 / xorg-server / patches / 04-sun-manpage.patch
blobe92861551d2e63b47fbd1077fe8f9d7aa30267a1
1 diff --git a/man/Xserver.man b/man/Xserver.man
2 index ba65c9e..53c7912 100644
3 --- a/man/Xserver.man
4 +++ b/man/Xserver.man
5 @@ -1,4 +1,26 @@
6 '\" t
7 +.\"
8 +.\" Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
9 +.\"
10 +.\" Permission is hereby granted, free of charge, to any person obtaining a
11 +.\" copy of this software and associated documentation files (the "Software"),
12 +.\" to deal in the Software without restriction, including without limitation
13 +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
14 +.\" and/or sell copies of the Software, and to permit persons to whom the
15 +.\" Software is furnished to do so, subject to the following conditions:
16 +.\"
17 +.\" The above copyright notice and this permission notice (including the next
18 +.\" paragraph) shall be included in all copies or substantial portions of the
19 +.\" Software.
20 +.\"
21 +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
22 +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23 +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
24 +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
25 +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
26 +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
27 +.\" DEALINGS IN THE SOFTWARE.
28 +.\"
29 .\"
30 .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group
31 .\"
32 @@ -32,14 +54,22 @@ Xserver \- X Window System display server
33 .SH SYNOPSIS
34 .B X
35 [option ...]
36 +.PP
37 +\fB/usr/bin/Xserver\fP [\fB-c\fP \fIclass\fP] \fB:\fP\fIdisplaynumber\fP [\fIX server arguments\fP]
38 .SH DESCRIPTION
39 .I X
40 is the generic name for the X Window System display server. It is
41 frequently a link or a copy of the appropriate server binary for
42 driving the most frequently used server on a given machine.
43 +In this release of __distroname__, /usr/bin/X is a link to the
44 +Xserver program which starts the appropriate X server based on properties
45 +set for the service management facility, under the service identifier
46 +\fIsvc:/application/x11/x11-server\fP. The properties are described in the
47 +SMF PROPERTIES section below.
48 .SH "STARTING THE SERVER"
49 -The X server is usually started from the X Display Manager program
50 -\fIxdm\fP(1) or a similar display manager program.
51 +On __distroname__, the X server is usually started from the GNOME
52 +Display Manager program \fIgdm\fP(__adminmansuffix__). This role may also be performed
53 +by the X Display Manager program \fIxdm\fP(1), or another display manager.
54 This utility is run from the system boot files and takes care of keeping
55 the server running, prompting for usernames and passwords, and starting up
56 the user sessions.
57 @@ -205,13 +235,14 @@ with
58 .BR "\-nolisten tcp" .
59 This option may be issued multiple times to disable listening to different
60 transport types.
61 -Supported transport types are platform dependent, but commonly include:
62 +The current transport names supported on __distroname__ are as follows:
63 .TS
64 l l.
65 tcp TCP over IPv4 or IPv6
66 inet TCP over IPv4 only
67 inet6 TCP over IPv6 only
68 -unix UNIX Domain Sockets
69 +unix UNIX Domain Sockets (/tmp/.X11-unix/X\fIn\fP)
70 +pipe Named pipes (/tmp/.X11-pipe/X\fIn\fP)
71 local Platform preferred local connection method
72 .TE
73 .TP 8
74 @@ -417,7 +448,7 @@ located in the XKB base directory or a subdirectory, and specified as the
75 relative path from the XKB base directory. The default XKB base directory is
76 .IR __projectroot__/lib/X11/xkb .
77 .TP 8
78 -.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
79 +.BR [+-]accessx " [\fItimeout\fP[\fItimeout_mask\fP[\fIfeedback\fP[\fIoptions_mask\fP]]]]"
80 enables(+) or disables(-) AccessX key sequences.
81 .TP 8
82 .B \-xkbdir \fIdirectory\fP
83 @@ -572,6 +603,110 @@ the following font path:
84 /usr/share/fonts/default/Type1,
85 /usr/share/fonts/default/ghostscript
86 .fi
88 +.SH SMF PROPERTIES
89 +.PP
90 +Configuration properties for the \fB/usr/bin/Xserver\fP program are
91 +managed by the service management facility, \fBsmf\fR(5), under the service
92 +identifier:
93 +.PP
94 +.nf
95 +svc:/application/x11/x11-server
96 +.fi
97 +Use \fBsvccfg\fR(__adminmansuffix__) to make configuration changes and to view configuration
98 +information for this service\&.
99 +.PP
100 +\fB/usr/bin/Xserver\fP will look for configuration options in the
101 +instances in this order, stopping at the first match for the given
102 +property:
103 +.TP
105 +\fB:display\fP\fIN\fP (where \fIN\fP is the display number of the X server,
106 +i.e. \fB:display0\fP for :0)
107 +.TP
109 +Any class names provided via the \fB-c\fP options to
110 +\fB/usr/bin/Xserver\fP. Multiple \fB-c\fP options may be provided, if so,
111 +they are searched in the order found on the command line.
112 +.TP
114 +If any XDMCP options are provided to open a remote display connection,
115 +\fB:remote\fP, otherwise \fB:local\fP
116 +.TP
118 +The default properties for the service
119 +.PP
120 +Class names may be any valid FMRI instance name. Sun reserves all class names
121 +beginning with lowercase letters for its own use - customers wishing to create
122 +their own class names may use names beginning with an uppercase letter.
124 +.PP
125 +These properties may be set in any instance of x11-server or for the service
126 +itself:
127 +.TP
128 +.B options/server
129 +(Type astring) The absolute path to the X server binary to run, currently
130 +must be one of:
131 +.sp
132 +.nf
133 +\fB/usr/bin/Xorg\fP
134 +\fB/usr/bin/Xdmx\fP
135 +\fB/usr/bin/Xvfb\fP
136 +\fB/usr/bin/Xvnc\fP
137 +.fi
138 +.TP
139 +.B options/config_file
140 +(Type string) Setting this to a filename causes this file to be used as the
141 +configuration file for the X server. Currently this property is only
142 +available when used with the Xorg server. The value of this property must
143 +be a relative path from one of the directories in the Xorg config file
144 +search path, and not an absolute path.
145 +.TP
146 +.B options/tcp_listen
147 +(Type boolean) Setting this to false disables listening for incoming TCP/IP
148 +connections (see \fB-nolisten tcp\fP option above).
149 +.TP
150 +.B options/default_depth
151 +(Type int) Sets the depth of the default visual of the X server started.
152 +.TP
153 +.B options/server_args
154 +(Type astring) Sets additional arguments to pass to the X server started. Care
155 +must be used when using options specific to a particular X server as then it
156 +may cause failure to start the X server if the server to be started is later
157 +changed to one that does not support those options.
158 +.TP
159 +.B options/display_0_on_console
160 +(Type boolean) Setting this to true starts the X server with a DISPLAY ":0.0"
161 +on "/dev/console" rather than the first available "/dev/vt/#", see vt(4i),
162 +this preserves backward compatibility with programs such as "xterm -C"
163 +that expect have access to "/dev/console". X servers with any other DISPLAY
164 +are not affected. The default is false.
165 +.SS "Example: Allow remote access"
166 +.PP
167 +The following command allows access from remote clients.
168 +.sp
169 +.nf
170 +svccfg -s svc:/application/x11/x11-server setprop options/tcp_listen = true
171 +.fi
172 +.sp
173 +Restart the Xserver by either logging out and logging back in, or manually
174 +if the Xserver was started from the command line.
175 +.sp
176 +.SS "Example: Use of VESA driver"
177 +.PP
178 +The following command overrides the default Xorg driver selection to use the
179 +/usr/lib/X11/xorg.conf.vesa configuration file to select the "vesa" driver.
180 +.sp
181 +.nf
182 +svccfg -s svc:/application/x11/x11-server setprop options/config_file=xorg.conf.vesa
183 +.fi
184 +.SS "Example: Enabling the XINERAMA extension"
185 +.PP
186 +The following command enables the XINERAMA extension.
187 +.sp
188 +.nf
189 +svccfg -s svc:/application/x11/x11-server setprop options/server_args=+xinerama
190 +.fi
192 .SH FILES
193 .TP 30
194 @@ -587,8 +722,12 @@ Outline font directories
195 .I /tmp/.X11-unix/X\fBn\fP
196 Unix domain socket for display number \fBn\fP
197 .TP 30
198 -.I /usr/adm/X\fBn\fPmsgs
199 -Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)
200 +.I /tmp/.X11-pipe/X\fBn\fP
201 +Named pipe (FIFO) for display number \fBn\fP
202 +.TP 30
203 +.I /var/log/gdm/:\fBn\fP.log
204 +Default error log file for display number \fBn\fP if the server is run
205 +from \fIgdm\fP(__adminmansuffix__)
206 .TP 30
207 .I __projectroot__/lib/X11/xdm/xdm-errors
208 Default error log file if the server is run from \fIxdm\fP(1)
209 @@ -610,14 +749,21 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
210 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
211 .I "Security Extension Specification"
213 -Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
214 +Starting the server: \fIgdm\fP(1m), \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
216 Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),
217 \fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1)
218 +.\" Only list the servers shipped on Solaris
220 Server-specific man pages:
221 -\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
222 -\fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).
223 +\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1), \fIXvnc\fP(1).
224 +.PP
225 +Service management framework:
226 +\fIsmf\fP(__miscmansuffix__), \fIsvcadm\fP(__adminmansuffix__), \fIsvccfg\fP(__adminmansuffix__)
227 +.PP
228 +Dtrace probes:
229 +\fI/usr/share/doc/Xserver/Xserver-DTrace.html\fP,
230 +\fI/usr/share/doc/Xserver/Xserver-DTrace.txt\fP
232 Server internal documentation:
233 .I "Definition of the Porting Layer for the X v11 Sample Server"