--- a/open-src/app/accessx/sun-src/accessx.1 Thu Sep 01 19:13:57 2011 -0700
+++ b/open-src/app/accessx/sun-src/accessx.1 Fri Sep 02 16:50:20 2011 -0700
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1994, 2001, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
.\" copy of this software and associated documentation files (the "Software"),
@@ -18,7 +18,7 @@
.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
.\" DEALINGS IN THE SOFTWARE.
-.TH accessx 1 "19 November 2001"
+.TH accessx 1 "29 August 2011"
.IX "accessx" "" "\f3accessx\f1(1) \(em interface to keyboard enhancements" ""
.SH NAME
accessx \- a graphical interface to the accessx keyboard enhancements.
@@ -33,8 +33,7 @@
]
.SH AVAILABILITY
The keyboard enhancements and corresponding graphical interface are
-available on any X server with the "AccessX" or "XKEYBOARD" extensions,
-including Xsun on Solaris 2.4 and later.
+available on any X server with the "AccessX" or "XKEYBOARD" extensions.
.SH DESCRIPTION
.B accessx
is a graphical user interface to available enhancements. These enhancements provide the keyboard with additional capabilities which are primarily designed to aid users with disabilities who are unable to use a keyboard or mouse in the usual fashion.
--- a/open-src/app/kbd_mode/Makefile Thu Sep 01 19:13:57 2011 -0700
+++ b/open-src/app/kbd_mode/Makefile Fri Sep 02 16:50:20 2011 -0700
@@ -2,7 +2,7 @@
#
# kbd_mode module Makefile
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -46,7 +46,7 @@
ADDITIONAL_SOURCE_DIR=sun-src
# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES= # None
+SUNTOUCHED_MANPAGES= kbd_mode.1
MODULE_STABILITY=Committed
# No configure script to run
--- a/open-src/app/kbd_mode/sun-src/kbd_mode.1 Thu Sep 01 19:13:57 2011 -0700
+++ b/open-src/app/kbd_mode/sun-src/kbd_mode.1 Fri Sep 02 16:50:20 2011 -0700
@@ -1,5 +1,4 @@
-'\" t
-.\" Copyright (c) 1987, 2010, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1987, 2011, Oracle and/or its affiliates. All rights reserved.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
.\" copy of this software and associated documentation files (the "Software"),
@@ -20,11 +19,11 @@
.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
.\" DEALINGS IN THE SOFTWARE.
.\"
-.TH kbd_mode 1 "2 July 2010"
+.TH kbd_mode 1 "5 Aug 2011"
.IX "kbd_mode" "" "\f3kbd_mode\f1(1) \(em keyboard translation utility" ""
.IX "keyboard" "trans" "keyboard" "translation utility \(em \f3kbd_mode\f1(1)"
.SH NAME
-/usr/bin/kbd_mode \- change the keyboard translation mode
+kbd_mode \- change the keyboard translation mode
.SH SYNOPSIS
.B kbd_mode -a | -n |
.B -e | -u
@@ -41,9 +40,7 @@
.LP
Note that the text console desires ASCII characters (\f3kbd_mode -a\f1), while
.BR Xorg (1)
-and
-.BR Xsun (1)
-desire untranslated events (\f3kbd_mode -u\f1).
+desires untranslated events (\f3kbd_mode -u\f1).
.SH OPTIONS
.TP
.B -a
@@ -65,19 +62,6 @@
.nf
/dev/kbd
.fi
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE ATTRIBUTE VALUE
-=
-Availability pkg:/system/keyboard/kbd_mode
-Interface Stability Committed
-.TE
.SH "SEE ALSO"
+.BR kbd (1),
.BR kb (7M)
--- a/open-src/lib/libXmu/sun-src/XSolarisCheckColormapEquivalence.3xmu Thu Sep 01 19:13:57 2011 -0700
+++ b/open-src/lib/libXmu/sun-src/XSolarisCheckColormapEquivalence.3xmu Fri Sep 02 16:50:20 2011 -0700
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
.\" copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
.\" DEALINGS IN THE SOFTWARE.
.\"
-.TH XSolarisCheckColormapEquivalence 3Xmu "11 Jan 2008" "X Version 11" "XLIB FUNCTIONS"
+.TH XSolarisCheckColormapEquivalence 3Xmu "29 Aug 2011" "X Version 11" "XLIB FUNCTIONS"
.SH NAME
XSolarisCheckColormapEquivalence \- determines if two visuals are colormap
equivalent
@@ -61,8 +61,9 @@
This function returns True if the two Visuals are Colormap Equivalent,
otherwise it returns False.
.LP
-Colormap Equivalence is a minor relaxation of the X protocol supported by the Solaris X server
-.BR Xsun (1).
+Colormap Equivalence is a minor relaxation of the X protocol supported by the
+.BR Xsun (1)
+X server on Solaris 10 and earlier releases.
Two Visuals are Colormap Equivalent if it is possible
to use a Colormap created with one of the Visuals as the Colormap of a Window
in the other Visual. This is useful on a system that supports Visuals that
--- a/open-src/xserver/xorg/sun-manpage.patch Thu Sep 01 19:13:57 2011 -0700
+++ b/open-src/xserver/xorg/sun-manpage.patch Fri Sep 02 16:50:20 2011 -0700
@@ -1,5 +1,5 @@
diff --git a/doc/man/Xserver.man b/doc/man/Xserver.man
-index b725949..a09b3ed 100644
+index b725949..c562b3f 100644
--- a/doc/man/Xserver.man
+++ b/doc/man/Xserver.man
@@ -1,3 +1,25 @@
@@ -61,8 +61,8 @@
+.sp
+.nf
+tcp TCP over IPv4 or IPv6
-+unix UNIX Domain Sockets (/tmp/.x11-unix)
-+pipe Named pipes (/tmp/.x11-pipe/)
++unix UNIX Domain Sockets (/tmp/.X11-unix/X\fIn\fP)
++pipe Named pipes (/tmp/.X11-pipe/X\fIn\fP)
+.fi
.TP 8
.B \-noreset
@@ -76,7 +76,7 @@
enables(+) or disables(-) AccessX key sequences.
.TP 8
.B \-xkbdir \fIdirectory\fP
-@@ -529,6 +566,115 @@ the following font path:
+@@ -529,6 +566,110 @@ the following font path:
/usr/share/fonts/default/Type1,
/usr/share/fonts/default/ghostscript
.fi
@@ -126,14 +126,9 @@
+must be one of:
+.sp
+.nf
-+\fB/usr/openwin/bin/Xsun\fP
-+\fB/usr/openwin/bin/Xvfb\fP
+\fB/usr/bin/Xorg\fP
-+\fB/usr/bin/i86/Xorg\fP
-+\fB/usr/bin/amd64/Xorg\fP
++\fB/usr/bin/Xdmx\fP
+\fB/usr/bin/Xvfb\fP
-+\fB/usr/bin/i86/Xvfb\fP
-+\fB/usr/bin/amd64/Xvfb\fP
+\fB/usr/bin/Xvnc\fP
+.fi
+.TP
@@ -192,26 +187,22 @@
.SH FILES
.TP 30
-@@ -544,11 +690,18 @@ Outline font directories
+@@ -544,8 +685,12 @@ Outline font directories
.I /tmp/.X11-unix/X\fBn\fP
Unix domain socket for display number \fBn\fP
.TP 30
+-.I /usr/adm/X\fBn\fPmsgs
+-Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)
+.I /tmp/.X11-pipe/X\fBn\fP
+Named pipe (FIFO) for display number \fBn\fP
+.TP 30
- .I /usr/adm/X\fBn\fPmsgs
- Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)
- .TP 30
- .I __projectroot__/lib/X11/xdm/xdm-errors
- Default error log file if the server is run from \fIxdm\fP(1)
-+.TP 30
+.I /var/log/gdm/:\fBn\fP.log
+Default error log file for display number \fBn\fP if the server is run
+from \fIgdm\fP(1m)
- .SH "SEE ALSO"
- General information: \fIX\fP(__miscmansuffix__)
- .PP
-@@ -565,14 +718,21 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
+ .TP 30
+ .I __projectroot__/lib/X11/xdm/xdm-errors
+ Default error log file if the server is run from \fIxdm\fP(1)
+@@ -565,14 +710,22 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
.I "Security Extension Specification"
.PP
@@ -225,7 +216,8 @@
Server-specific man pages:
-\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
-\fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).
-+\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1), \fIXvnc\fP(1)
++\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1), \fIXvnc\fP(1),
++\fIXnewt\fP(1M).
+.PP
+Service management framework:
+\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M)