1 diff -urp -x '*~' cpprules.in cpprules.in |
1 diff -urp -x '*~' -x '*.orig' cpprules.in cpprules.in |
2 --- cpprules.in 2006-12-21 10:50:45.000000000 -0800 |
2 --- cpprules.in 2007-05-29 12:36:50.000000000 -0700 |
3 +++ cpprules.in 2006-12-21 14:20:39.105037000 -0800 |
3 +++ cpprules.in 2008-09-24 20:18:46.328453000 -0700 |
4 @@ -25,7 +25,7 @@ XORGRELSTRING = @PACKAGE_STRING@ |
4 @@ -25,7 +25,7 @@ XORGRELSTRING = @PACKAGE_STRING@ |
5 XORGMANNAME = X Version 11 |
5 XORGMANNAME = X Version 11 |
6 XSERVERNAME = Xorg |
6 XSERVERNAME = Xorg |
7 |
7 |
8 -MANDEFS = \ |
8 -MANDEFS = \ |
9 +MANDEFS = -D__SUNSOFT__ \ |
9 +MANDEFS = -D__SUNSOFT__ \ |
10 -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ |
10 -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ |
11 -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ |
11 -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ |
12 -D__appmansuffix__=$(APP_MAN_SUFFIX) \ |
12 -D__appmansuffix__=$(APP_MAN_SUFFIX) \ |
13 diff -urp -x '*~' doc/Xserver.man.pre doc/Xserver.man.pre |
13 diff -urp -x '*~' -x '*.orig' doc/Xserver.man.pre doc/Xserver.man.pre |
14 --- doc/Xserver.man.pre 2006-12-21 10:50:46.000000000 -0800 |
14 --- doc/Xserver.man.pre 2008-09-23 11:24:56.000000000 -0700 |
15 +++ doc/Xserver.man.pre 2007-01-19 16:24:28.082214000 -0800 |
15 +++ doc/Xserver.man.pre 2008-09-24 20:18:46.329753000 -0700 |
16 @@ -1,3 +1,32 @@ |
16 @@ -1,3 +1,32 @@ |
17 +.\" ident "@(#)sun-manpage.patch 1.5 07/10/10 SMI" |
17 +.\" ident "@(#)sun-manpage.patch 1.6 09/01/14 SMI" |
18 +.\" |
18 +.\" |
19 +.\" Copyright 2007 Sun Microsystems, Inc. All rights reserved. |
19 +.\" Copyright 2007 Sun Microsystems, Inc. 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 |
22 +.\" copy of this software and associated documentation files (the |
22 +.\" copy of this software and associated documentation files (the |
279 +elapse between autorepeat-generated keystrokes). |
279 +elapse between autorepeat-generated keystrokes). |
280 +#endif |
280 +#endif |
281 .TP 8 |
281 .TP 8 |
282 .B \-xkbmap \fIfilename\fP |
282 .B \-xkbmap \fIfilename\fP |
283 loads keyboard description in \fIfilename\fP on server startup. |
283 loads keyboard description in \fIfilename\fP on server startup. |
284 @@ -732,6 +873,91 @@ __default_font_path__ . |
284 @@ -546,6 +687,91 @@ the following font path: |
285 .LP |
285 /usr/share/fonts/default/ghostscript |
286 The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1) |
286 .fi |
287 after the server has started. |
287 |
288 +#ifdef __SUNSOFT__ |
288 +#ifdef __SUNSOFT__ |
289 +.SH SMF PROPERTIES |
289 +.SH SMF PROPERTIES |
290 +.PP |
290 +.PP |
291 +Configuration properties for the \fB/usr/X11/bin/Xserver\fP program are |
291 +Configuration properties for the \fB/usr/X11/bin/Xserver\fP program are |
292 +managed by the service management facility, \fBsmf\fR(5), under the service |
292 +managed by the service management facility, \fBsmf\fR(5), under the service |
371 +.fi |
371 +.fi |
372 +#endif |
372 +#endif |
373 .SH FILES |
373 .SH FILES |
374 .TP 30 |
374 .TP 30 |
375 .I /etc/X\fBn\fP.hosts |
375 .I /etc/X\fBn\fP.hosts |
376 @@ -739,15 +954,26 @@ Initial access control list for display |
376 @@ -553,15 +779,26 @@ Initial access control list for display |
377 .TP 30 |
377 .TP 30 |
378 .IR __projectroot__/lib/X11/fonts/misc , __projectroot__/lib/X11/fonts/75dpi , __projectroot__/lib/X11/fonts/100dpi |
378 .IR __projectroot__/lib/X11/fonts/misc , __projectroot__/lib/X11/fonts/75dpi , __projectroot__/lib/X11/fonts/100dpi |
379 Bitmap font directories |
379 Bitmap font directories |
380 +#ifdef __SUNSOFT__ |
380 +#ifdef __SUNSOFT__ |
381 .TP 30 |
381 .TP 30 |
400 +Named pipe (FIFO) for display number \fBn\fP |
400 +Named pipe (FIFO) for display number \fBn\fP |
401 +#endif |
401 +#endif |
402 .TP 30 |
402 .TP 30 |
403 .IR /tmp/rcX\fBn\fP |
403 .IR /tmp/rcX\fBn\fP |
404 Kerberos 5 replay cache for display number \fBn\fP |
404 Kerberos 5 replay cache for display number \fBn\fP |
405 @@ -757,6 +983,11 @@ Error log file for display number \fBn\f |
405 @@ -571,6 +808,11 @@ Error log file for display number \fBn\f |
406 .TP 30 |
406 .TP 30 |
407 .I __projectroot__/lib/X11/xdm/xdm-errors |
407 .I __projectroot__/lib/X11/xdm/xdm-errors |
408 Default error log file if the server is run from \fIxdm\fP(1) |
408 Default error log file if the server is run from \fIxdm\fP(1) |
409 +#ifdef __SUNSOFT__ |
409 +#ifdef __SUNSOFT__ |
410 +.TP 30 |
410 +.TP 30 |
412 +Default error log file if the server is run from \fIdtlogin\fP(1) |
412 +Default error log file if the server is run from \fIdtlogin\fP(1) |
413 +#endif |
413 +#endif |
414 .SH "SEE ALSO" |
414 .SH "SEE ALSO" |
415 General information: \fIX\fP(__miscmansuffix__) |
415 General information: \fIX\fP(__miscmansuffix__) |
416 .PP |
416 .PP |
417 @@ -773,14 +1004,28 @@ Security: \fIXsecurity\fP(__miscmansuffi |
417 @@ -587,14 +829,28 @@ Security: \fIXsecurity\fP(__miscmansuffi |
418 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1), |
418 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1), |
419 .I "Security Extension Specification" |
419 .I "Security Extension Specification" |
420 .PP |
420 .PP |
421 +#ifdef __SUNSOFT__ |
421 +#ifdef __SUNSOFT__ |
422 +Starting the server: \fIdtlogin\fP(1), \fIgdm\fP(1), \fIxdm\fP(1), \fIxinit\fP(1) |
422 +Starting the server: \fIdtlogin\fP(1), \fIgdm\fP(1), \fIxdm\fP(1), \fIxinit\fP(1) |