--- a/usr/src/README.build Wed Jun 15 23:19:47 2011 -0400
+++ b/usr/src/README.build Thu Jun 16 17:24:56 2011 -0400
@@ -89,7 +89,7 @@
We are accustomed to building in an ON environment, and are
therefore assuming the existence of environment variables normally
set by the 'ws' script. (You can find this script in
- usr/src/tools/scripts in the OpenSolaris source.) We only use
+ usr/src/tools/scripts in the Solaris source.) We only use
three of them, though.
CODEMGR_WS usually points to the root of your CodeManager (a.k.a.
--- a/usr/src/doc/Makefile.doc Wed Jun 15 23:19:47 2011 -0400
+++ b/usr/src/doc/Makefile.doc Thu Jun 16 17:24:56 2011 -0400
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
#
include $(SRC)/Makefile.env
@@ -30,7 +30,7 @@
# DOCBOOK_XSL URL to a local path.
#
# STYLESHEET would ideally be set to profile-docbook.xsl, but the
-# stylesheets shipped with OpenSolaris are old and broken. The effect
+# stylesheets shipped with Solaris are old and broken. The effect
# is that the STATUS variable, described below, doesn't work.
DOCBOOK_XSL= http://docbook.sourceforge.net/release/xsl/current
--- a/usr/src/doc/rad-dev/Makefile Wed Jun 15 23:19:47 2011 -0400
+++ b/usr/src/doc/rad-dev/Makefile Thu Jun 16 17:24:56 2011 -0400
@@ -48,7 +48,7 @@
html: examples
$(XSLTPROC) --stringparam generate.toc "book toc" -o $(HTML) $(HTML_XSL) $(SRCS)
-# The old OpenSolaris stylesheets misrender FO variablelists. This has
+# The old Solaris stylesheets misrender FO variablelists. This has
# a noticeable effect on pdf output
pdf: fo
--- a/usr/src/java/vpanels/app/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/resources/Resources.properties Wed Jun 15 23:19:47 2011 -0400
+++ b/usr/src/java/vpanels/app/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/resources/Resources.properties Thu Jun 16 17:24:56 2011 -0400
@@ -50,7 +50,7 @@
sysid.sysid.cancel = Abort system configuration and discard changes?
sysid.welcome.title = Welcome
-sysid.welcome.text = Thanks for choosing the OpenSolaris OS! We need a little information to get this computer ready for your use.\n\nAfter the computer has been set up the desktop will appear. Open the "Start Here" icon on the desktop for suggestions on what to do next.
+sysid.welcome.text = Thanks for choosing the Oracle Solaris OS! We need a little information to get this computer ready for your use.\n\nAfter the computer has been set up the desktop will appear. Open the "Start Here" icon on the desktop for suggestions on what to do next.
time.settings.timezone = Time zone:
# Params: