6987213 A duplicated and missing entry in mp.conf for locales en_US.UTF-8 and ja_JP.UTF-8
--- a/src/cmd/mp/conf/mp.conf Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/conf/mp.conf Mon Feb 07 17:40:15 2011 +0100
@@ -5,13 +5,13 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -14339,7 +14339,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/C/mp.conf Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/C/mp.conf Mon Feb 07 17:40:15 2011 +0100
@@ -18,12 +18,10 @@
#
# CDDL HEADER END
#
-
#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)mp.conf 1.0 99/02/19 SMI"
+
#
# mp initial config file version
#
@@ -14275,7 +14273,7 @@
CnvCode2Font prnCourierR _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
CnvCode2Font prnCourierB _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
CnvCode2Font prnCourierI _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
-CnvCode2Font prnTimesBI _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
+CnvCode2Font prnCourierBI _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
CnvCode2Font prnHelveticaR _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
CnvCode2Font prnHelveticaB _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
CnvCode2Font prnHelveticaI _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
--- a/src/cmd/mp/locale/ja_JP.UTF-8/mp.conf Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/ja_JP.UTF-8/mp.conf Mon Feb 07 17:40:15 2011 +0100
@@ -26,18 +26,18 @@
FontNameAlias sunudcjaR TrueType $HOME/.fonts/eudc.ttf
FontNameAlias iso88591R TrueType /usr/share/fonts/TrueType/liberation/LiberationMono-Regular.ttf
-FontNameAlias prnHelveticaR Type1 Helvetica
-FontNameAlias prnHelveticaB Type1 Helvetica-Bold
-FontNameAlias prnHelveticaI Type1 Helvetica-Oblique
-FontNameAlias prnHelveticaBI Type1 Helvetica-BoldOblique
-FontNameAlias prnCourierR Type1 Courier
-FontNameAlias prnCourierB Type1 Courier-Bold
-FontNameAlias prnCourierI Type1 Courier-Oblique
-FontNameAlias prnCourierBI Type1 Courier-BoldOblique
-FontNameAlias prnTimesR Type1 Times-Roman
-FontNameAlias prnTimesB Type1 Times-Bold
-FontNameAlias prnTimesI Type1 Times-Italic
-FontNameAlias prnTimesBI Type1 Times-BoldItalic
+FontNameAlias prnHelveticaR Type1 Helvetica
+FontNameAlias prnHelveticaB Type1 Helvetica-Bold
+FontNameAlias prnHelveticaI Type1 Helvetica-Oblique
+FontNameAlias prnHelveticaBI Type1 Helvetica-BoldOblique
+FontNameAlias prnCourierR Type1 Courier
+FontNameAlias prnCourierB Type1 Courier-Bold
+FontNameAlias prnCourierI Type1 Courier-Oblique
+FontNameAlias prnCourierBI Type1 Courier-BoldOblique
+FontNameAlias prnTimesR Type1 Times-Roman
+FontNameAlias prnTimesB Type1 Times-Bold
+FontNameAlias prnTimesI Type1 Times-Italic
+FontNameAlias prnTimesBI Type1 Times-BoldItalic
FontNameAlias iso88592R TrueType /usr/share/fonts/TrueType/liberation/LiberationMono-Regular.ttf
FontNameAlias iso88592B TrueType /usr/share/fonts/TrueType/liberation/LiberationMono-Bold.ttf
FontNameAlias iso88592I TrueType /usr/share/fonts/TrueType/liberation/LiberationMono-Italic.ttf
@@ -32149,14 +32149,14 @@
CnvCode2Font iso88597B _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font iso88597I _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font iso88597BI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font iso88599R _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font iso88599B _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font iso88599I _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font iso88599BI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font iso885913R _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font iso885913B _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font iso885913I _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font iso885913BI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font iso88599R _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font iso88599B _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font iso88599I _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font iso88599BI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font iso885913R _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font iso885913B _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font iso885913I _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font iso885913BI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font big5R _xu2big5 /usr/lib/lp/locale/en_US.UTF-8/mp/xubig5.so
CnvCode2Font gb2312R _xu2gb2312 /usr/lib/lp/locale/en_US.UTF-8/mp/xugb2312.so
CnvCode2Font jisx02131R _xu2jis02131 /usr/lib/lp/locale/ja_JP.UTF-8/mp/xu2UTF8.so
@@ -32167,22 +32167,22 @@
#CnvCode2Font fallbackR _xu2fallback /usr/lib/lp/locale/en_US.UTF-8/mp/xufallback.so
CnvCode2Font fallbackR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font tt_hebrewR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font tt_arabicR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font tt_ctlarabicR _ctlarabic /usr/lib/lp/locale/en_US.UTF-8/mp/ctlarabic.so
-CnvCode2Font tt_ctlhebrewR _ctlhebrew /usr/lib/lp/locale/en_US.UTF-8/mp/ctlhebrew.so
-CnvCode2Font tt_ctlthaiR _ctlthai /usr/lib/lp/locale/en_US.UTF-8/mp/ctlthai.so
-CnvCode2Font tt_thaiR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnHelveticaBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font tt_ctlhindiR _ctlhindi_ucs4 /usr/lib/lp/locale/en_US.UTF-8/mp/ctlhindi.so
-CnvCode2Font tt_hindiR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font tt_arabicR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font tt_ctlarabicR _ctlarabic /usr/lib/lp/locale/en_US.UTF-8/mp/ctlarabic.so
+CnvCode2Font tt_ctlhebrewR _ctlhebrew /usr/lib/lp/locale/en_US.UTF-8/mp/ctlhebrew.so
+CnvCode2Font tt_ctlthaiR _ctlthai /usr/lib/lp/locale/en_US.UTF-8/mp/ctlthai.so
+CnvCode2Font tt_thaiR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnTimesR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnTimesB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnTimesI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnHelveticaBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font tt_ctlhindiR _ctlhindi_ucs4 /usr/lib/lp/locale/en_US.UTF-8/mp/ctlhindi.so
+CnvCode2Font tt_hindiR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/ko.UTF-8/mp.conf.B Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/ko.UTF-8/mp.conf.B Mon Feb 07 17:40:15 2011 +0100
@@ -5,13 +5,13 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -14874,7 +14874,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/ko.UTF-8/mp.conf.T Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/ko.UTF-8/mp.conf.T Mon Feb 07 17:40:15 2011 +0100
@@ -5,13 +5,13 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -14894,7 +14894,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/th_TH/mp.conf Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/th_TH/mp.conf Mon Feb 07 17:40:15 2011 +0100
@@ -5,24 +5,22 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)mp.conf 1.26 09/06/06 SMI"
+
#
# mp initial config file version
#
@@ -78,7 +76,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/zh.UTF-8/mp.conf.B Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/zh.UTF-8/mp.conf.B Mon Feb 07 17:40:15 2011 +0100
@@ -5,13 +5,13 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -6262,7 +6262,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/zh.UTF-8/mp.conf.T Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/zh.UTF-8/mp.conf.T Mon Feb 07 17:40:15 2011 +0100
@@ -5,13 +5,13 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -1582,7 +1582,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/zh_HK.UTF-8/mp.conf Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/zh_HK.UTF-8/mp.conf Mon Feb 07 17:40:15 2011 +0100
@@ -5,13 +5,13 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -12992,7 +12992,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.B Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.B Mon Feb 07 17:40:15 2011 +0100
@@ -5,13 +5,13 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -12054,7 +12054,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.T Fri Jan 28 23:52:39 2011 +0100
+++ b/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.T Mon Feb 07 17:40:15 2011 +0100
@@ -5,13 +5,13 @@
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -8075,7 +8075,7 @@
CnvCode2Font prnCourierR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnCourierI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
-CnvCode2Font prnTimesBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaR _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaB _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
CnvCode2Font prnHelveticaI _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so