1 diff -Nurp -x '*~' -x '*.orig' cpprules.in cpprules.in |
1 diff -Nurp -x '*~' -x '*.orig' cpprules.in cpprules.in |
2 diff -urp -x '*~' -x '*.orig' cpprules.in cpprules.in |
2 diff -Nurp -x '*~' -x '*.orig' cpprules.in cpprules.in |
3 --- cpprules.in 2010-03-12 12:38:21.000000000 +0800 |
3 --- cpprules.in 2010-04-27 13:16:52.000000000 -0700 |
4 +++ cpprules.in 2010-04-21 15:37:09.527675889 +0800 |
4 +++ cpprules.in 2011-02-15 15:53:08.559356397 -0800 |
5 @@ -25,7 +25,7 @@ XORGRELSTRING = @PACKAGE_STRING@ |
5 @@ -23,7 +23,7 @@ XORGRELSTRING = @PACKAGE_STRING@ |
6 XORGMANNAME = X Version 11 |
6 XORGMANNAME = X Version 11 |
7 XSERVERNAME = Xorg |
7 XSERVERNAME = Xorg |
8 |
8 |
9 -MANDEFS = \ |
9 -MANDEFS = \ |
10 +MANDEFS = -D__SUNSOFT__ -D__distroname__="$${DISTRO_NAME}" \ |
10 +MANDEFS = -D__SOLARIS_BUILD__ -D__distroname__="$${DISTRO_NAME}" \ |
11 -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ |
11 -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ |
12 -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ |
12 -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ |
13 -D__appmansuffix__=$(APP_MAN_SUFFIX) \ |
13 -D__appmansuffix__=$(APP_MAN_SUFFIX) \ |
14 diff -urp -x '*~' -x '*.orig' doc/Xserver.man.pre doc/Xserver.man.pre |
14 diff -Nurp -x '*~' -x '*.orig' doc/Xserver.man.pre doc/Xserver.man.pre |
15 --- doc/Xserver.man.pre 2010-03-12 12:38:21.000000000 +0800 |
15 --- doc/Xserver.man.pre 2010-05-21 23:06:42.000000000 -0700 |
16 +++ doc/Xserver.man.pre 2010-04-21 15:37:09.528520653 +0800 |
16 +++ doc/Xserver.man.pre 2011-02-15 15:53:08.559855800 -0800 |
17 @@ -1,3 +1,25 @@ |
17 @@ -1,3 +1,25 @@ |
18 +.\" |
18 +.\" |
19 +.\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. |
19 +.\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. |
20 +.\" |
20 +.\" |
21 +.\" Permission is hereby granted, free of charge, to any person obtaining a |
21 +.\" Permission is hereby granted, free of charge, to any person obtaining a |
42 .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group |
42 .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group |
43 @@ -32,14 +54,31 @@ Xserver \- X Window System display serve |
43 @@ -32,14 +54,31 @@ Xserver \- X Window System display serve |
44 .SH SYNOPSIS |
44 .SH SYNOPSIS |
45 .B X |
45 .B X |
46 [option ...] |
46 [option ...] |
47 +#ifdef __SUNSOFT__ |
47 +#ifdef __SOLARIS_BUILD__ |
48 +\fB/usr/bin/Xserver\fP [\fB-c\fP \fIclass\fP] \fB:\fP\fIdisplaynumber\fP [\fIX server arguments\fP] |
48 +\fB/usr/bin/Xserver\fP [\fB-c\fP \fIclass\fP] \fB:\fP\fIdisplaynumber\fP [\fIX server arguments\fP] |
49 +#endif |
49 +#endif |
50 +.PP |
50 +.PP |
51 .SH DESCRIPTION |
51 .SH DESCRIPTION |
52 .I X |
52 .I X |
53 is the generic name for the X Window System display server. It is |
53 is the generic name for the X Window System display server. It is |
54 frequently a link or a copy of the appropriate server binary for |
54 frequently a link or a copy of the appropriate server binary for |
55 driving the most frequently used server on a given machine. |
55 driving the most frequently used server on a given machine. |
56 +#ifdef __SUNSOFT__ |
56 +#ifdef __SOLARIS_BUILD__ |
57 +In this release of __distroname__, /usr/bin/X is a link to the |
57 +In this release of __distroname__, /usr/bin/X is a link to the |
58 +Xserver program which starts the appropriate X server based on properties |
58 +Xserver program which starts the appropriate X server based on properties |
59 +set for the service management facility, under the service identifier |
59 +set for the service management facility, under the service identifier |
60 +\fIsvc:/application/x11/x11-server\fP. The properties are described in the |
60 +\fIsvc:/application/x11/x11-server\fP. The properties are described in the |
61 +SMF PROPERTIES section below. |
61 +SMF PROPERTIES section below. |
62 +#endif |
62 +#endif |
63 .SH "STARTING THE SERVER" |
63 .SH "STARTING THE SERVER" |
64 +#ifdef __SUNSOFT__ |
64 +#ifdef __SOLARIS_BUILD__ |
65 +On __distroname__, the X server is usually started from the GNOME |
65 +On __distroname__, the X server is usually started from the GNOME |
66 +Display Manager program \fIgdm\fP(1m). This role may also be performed |
66 +Display Manager program \fIgdm\fP(1m). This role may also be performed |
67 +by the X Display Manager program \fIxdm\fP(1), or another display manager. |
67 +by the X Display Manager program \fIxdm\fP(1), or another display manager. |
68 +#else |
68 +#else |
69 The X server is usually started from the X Display Manager program |
69 The X server is usually started from the X Display Manager program |
70 \fIxdm\fP(1) or a similar display manager program. |
70 \fIxdm\fP(1) or a similar display manager program. |
71 +#endif |
71 +#endif |
72 This utility is run from the system boot files and takes care of keeping |
72 This utility is run from the system boot files and takes care of keeping |
73 the server running, prompting for usernames and passwords, and starting up |
73 the server running, prompting for usernames and passwords, and starting up |
74 the user sessions. |
74 the user sessions. |
75 @@ -183,6 +222,35 @@ causes all remaining command line argume |
75 @@ -175,6 +214,35 @@ MB. |
76 sets the maximum big request to |
76 .TP 8 |
77 .I size |
77 .B \-nocursor |
78 MB. |
78 disable the display of the pointer cursor. |
79 +#ifdef __SUNSOFT__ |
79 +#ifdef __SOLARIS_BUILD__ |
80 +.TP 8 |
80 +.TP 8 |
81 +.B \-nolisten \fItransport\fP |
81 +.B \-nolisten \fItransport\fP |
82 +disables listening for client connections on the named transport. The |
82 +disables listening for client connections on the named transport. The |
83 +current transport names supported are as follows: |
83 +current transport names supported are as follows: |
84 +.sp |
84 +.sp |
106 +.in -13 |
106 +.in -13 |
107 +#else |
107 +#else |
108 .TP 8 |
108 .TP 8 |
109 .B \-nolisten \fItrans-type\fP |
109 .B \-nolisten \fItrans-type\fP |
110 disables a transport type. For example, TCP/IP connections can be disabled |
110 disables a transport type. For example, TCP/IP connections can be disabled |
111 @@ -190,6 +258,7 @@ with |
111 @@ -182,6 +250,7 @@ with |
112 .BR "\-nolisten tcp" . |
112 .BR "\-nolisten tcp" . |
113 This option may be issued multiple times to disable listening to different |
113 This option may be issued multiple times to disable listening to different |
114 transport types. |
114 transport types. |
115 +#endif |
115 +#endif |
116 .TP 8 |
116 .TP 8 |
117 .B \-noreset |
117 .B \-noreset |
118 prevents a server reset when the last client connection is closed. This |
118 prevents a server reset when the last client connection is closed. This |
119 @@ -389,7 +458,7 @@ located in the XKB base directory or a s |
119 @@ -381,7 +450,7 @@ located in the XKB base directory or a s |
120 relative path from the XKB base directory. The default XKB base directory is |
120 relative path from the XKB base directory. The default XKB base directory is |
121 .IR __projectroot__/lib/X11/xkb . |
121 .IR __projectroot__/lib/X11/xkb . |
122 .TP 8 |
122 .TP 8 |
123 -.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]" |
123 -.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]" |
124 +.BR [+-]accessx " [\fItimeout\fP[\fItimeout_mask\fP[\fIfeedback\fP[\fIoptions_mask\fP]]]]" |
124 +.BR [+-]accessx " [\fItimeout\fP[\fItimeout_mask\fP[\fIfeedback\fP[\fIoptions_mask\fP]]]]" |
125 enables(+) or disables(-) AccessX key sequences. |
125 enables(+) or disables(-) AccessX key sequences. |
126 .TP 8 |
126 .TP 8 |
127 .B \-xkbdir \fIdirectory\fP |
127 .B \-xkbdir \fIdirectory\fP |
128 @@ -545,6 +614,117 @@ the following font path: |
128 @@ -537,6 +606,117 @@ the following font path: |
129 /usr/share/fonts/default/Type1, |
129 /usr/share/fonts/default/Type1, |
130 /usr/share/fonts/default/ghostscript |
130 /usr/share/fonts/default/ghostscript |
131 .fi |
131 .fi |
132 +#ifdef __SUNSOFT__ |
132 +#ifdef __SOLARIS_BUILD__ |
133 + |
133 + |
134 +.SH SMF PROPERTIES |
134 +.SH SMF PROPERTIES |
135 +.PP |
135 +.PP |
136 +Configuration properties for the \fB/usr/bin/Xserver\fP program are |
136 +Configuration properties for the \fB/usr/bin/Xserver\fP program are |
137 +managed by the service management facility, \fBsmf\fR(5), under the service |
137 +managed by the service management facility, \fBsmf\fR(5), under the service |
241 +.fi |
241 +.fi |
242 +#endif |
242 +#endif |
243 |
243 |
244 .SH FILES |
244 .SH FILES |
245 .TP 30 |
245 .TP 30 |
246 @@ -559,12 +724,23 @@ Outline font directories |
246 @@ -551,12 +731,23 @@ Outline font directories |
247 .TP 30 |
247 .TP 30 |
248 .I /tmp/.X11-unix/X\fBn\fP |
248 .I /tmp/.X11-unix/X\fBn\fP |
249 Unix domain socket for display number \fBn\fP |
249 Unix domain socket for display number \fBn\fP |
250 +#ifdef __SUNSOFT__ |
250 +#ifdef __SOLARIS_BUILD__ |
251 +.TP 30 |
251 +.TP 30 |
252 +.I /tmp/.X11-pipe/X\fBn\fP |
252 +.I /tmp/.X11-pipe/X\fBn\fP |
253 +Named pipe (FIFO) for display number \fBn\fP |
253 +Named pipe (FIFO) for display number \fBn\fP |
254 +#endif |
254 +#endif |
255 .TP 30 |
255 .TP 30 |
256 .I /usr/adm/X\fBn\fPmsgs |
256 .I /usr/adm/X\fBn\fPmsgs |
257 Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__) |
257 Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__) |
258 .TP 30 |
258 .TP 30 |
259 .I __projectroot__/lib/X11/xdm/xdm-errors |
259 .I __projectroot__/lib/X11/xdm/xdm-errors |
260 Default error log file if the server is run from \fIxdm\fP(1) |
260 Default error log file if the server is run from \fIxdm\fP(1) |
261 +#ifdef __SUNSOFT__ |
261 +#ifdef __SOLARIS_BUILD__ |
262 +.TP 30 |
262 +.TP 30 |
263 +.I /var/log/gdm/:\fBn\fP.log |
263 +.I /var/log/gdm/:\fBn\fP.log |
264 +Default error log file for display number \fBn\fP if the server is run |
264 +Default error log file for display number \fBn\fP if the server is run |
265 +from \fIgdm\fP(1m) |
265 +from \fIgdm\fP(1m) |
266 +#endif |
266 +#endif |
267 .SH "SEE ALSO" |
267 .SH "SEE ALSO" |
268 General information: \fIX\fP(__miscmansuffix__) |
268 General information: \fIX\fP(__miscmansuffix__) |
269 .PP |
269 .PP |
270 @@ -581,14 +757,28 @@ Security: \fIXsecurity\fP(__miscmansuffi |
270 @@ -573,14 +764,28 @@ Security: \fIXsecurity\fP(__miscmansuffi |
271 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1), |
271 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1), |
272 .I "Security Extension Specification" |
272 .I "Security Extension Specification" |
273 .PP |
273 .PP |
274 +#ifdef __SUNSOFT__ |
274 +#ifdef __SOLARIS_BUILD__ |
275 +Starting the server: \fIgdm\fP(1m), \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1) |
275 +Starting the server: \fIgdm\fP(1m), \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1) |
276 +#else |
276 +#else |
277 Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1) |
277 Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1) |
278 +#endif |
278 +#endif |
279 .PP |
279 .PP |
280 Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1), |
280 Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1), |
281 \fIxhost\fP(1) |
281 \fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1) |
282 +#ifdef __SUNSOFT__ |
282 +#ifdef __SOLARIS_BUILD__ |
283 +.\" Only list the servers shipped on Solaris |
283 +.\" Only list the servers shipped on Solaris |
284 +.PP |
284 +.PP |
285 +Server-specific man pages: |
285 +Server-specific man pages: |
286 +\fIXorg\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1), \fIXvnc\fP(1) |
286 +\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1), \fIXvnc\fP(1) |
287 +.PP |
287 +.PP |
288 +Service management framework: |
288 +Service management framework: |
289 +\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M) |
289 +\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M) |
290 +#else |
290 +#else |
291 .PP |
291 .PP |
292 Server-specific man pages: |
292 Server-specific man pages: |
293 \fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1), |
293 \fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1), |
294 \fIXvfb\fP(1), \fIXDarwin\fP(1), \fIXWin\fP(1). |
294 \fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1). |
295 +#endif |
295 +#endif |
296 .PP |
296 .PP |
297 Server internal documentation: |
297 Server internal documentation: |
298 .I "Definition of the Porting Layer for the X v11 Sample Server" |
298 .I "Definition of the Porting Layer for the X v11 Sample Server" |