Update to 02 April 2013 version.

1 files changed, 67 insertions, 42 deletions

diff --git a/licenses/oracle-binary-code-license b/licenses/oracle-binary-code-license
index 9de6c683166..be686a9b9be 100644
--- a/licenses/oracle-binary-code-license
+++ b/licenses/oracle-binary-code-license
@@ -43,12 +43,12 @@ and applications intended to run on the Java Platform, Standard
 Edition platform on Java-enabled General Purpose Desktop Computers
 and Servers; and (b) JavaFX technology applications intended to
 run on the JavaFX Runtime on JavaFX-enabled General Purpose Desktop
-Computers and Servers. ¡ÈCommercial Features¡É means those features
+Computers and Servers. "Commercial Features" means those features
 identified in Table 1-1 (Commercial Features In Java SE Product
 Editions) of the Java SE documentation accessible at
 http://www.oracle.com/technetwork/java/javase/documentation/index.html.
-¡ÈREADME File¡É means the README file for the Software accessible
-at http://www.oracle.com/technetwork/java/javase/documentation/index.html.
+"README File" means the README file for the Software accessible at
+http://www.oracle.com/technetwork/java/javase/documentation/index.html.
 
 2. LICENSE TO USE. Subject to the terms and conditions of this
 Agreement including, but not limited to, the Java Technology
@@ -97,27 +97,50 @@ may terminate this Agreement at any time by destroying all copies
 of Software. This Agreement will terminate immediately without
 notice from Oracle if you fail to comply with any provision of this
 Agreement. Either party may terminate this Agreement immediately
-should any Software become, or in either party's opinion be likely
-to become, the subject of a claim of infringement of any intellectual
-property right. Upon termination, you must destroy all copies of
-Software.
+should any Software b party's opinion be likely to become, the
+subject of a claim of infringement of any intellectual property
+right. Upon termination, you must destroy all copies of Software.
 
-7. EXPORT REGULATIONS. You agree that U.S. export control lachnical
-data; additional information can be found on Oracle's Global Trade
-Compliance web site (http://www.oracle.com/products/export). You
-agree that neither the Software nor any direct product thereof will
-be exported, directly, or indirectly, in violatr biological weapons
-proliferation.
+7. EXPORT REGULATIONS. You agree that U.S. export control laws and
+other applicablditional information can be found on Oracle's Global
+Trade Compliance web site (http://www.oracle.com/us/products/export).
+You agree that neither the Software nor any direct product thereof
+will be exported, directly, or indirectly, in violation of these
+gical weapons proliferation.
 
 8. TRADEMARKS AND LOGOS. You acknowledge and agree as between you
 and Oracle that Oracle owns the ORACLE and JAVA trademarks and all
 ORACLE- and JAVA-related trademarks, service marks, logos and other
-brand designatioe Guidelines for Oracle Trademarks currently located
-at http://www.oracle.com/us/legal/third-party-trademarks/index.html
+brand designations ("Orasage Guidelines for Oracle Trademarks
+currently located at
+http://www.oracle.com/us/legal/third-party-trademarks/index.html
 . Any use you make of the Oracle Marks inures to Oracle's benefit.
 
-9. U.S. GOVERNMENT LICENSE RIGHTS. If Software is being acquired
-sentative of each party.
+9. U.S. GOVERNMENT LICENSE RIGHTS. If Software is being acquire or
+by a U.S. Government prime contractor or subcontractor (at any
+tier), then the Government's rights in Software and accompanying
+documentation shall be only those set forth in this Agreement.
+
+10. GOVERNING LAW. This agreement is governed by the substantive
+and procedural laws of California. You and Oracle agree to submit
+to the exclusive jurisdiction of, and venue in, the courts of San
+Francisco, or Santa Clara counties in California in any dispute
+arising out of or relating to this agreement.
+
+11. SEVERABILITY. If any provision of this Agreement is held to be
+unenforceable, this Agreement will remain in effect with the
+provision omitted, unless omission would frustrate the intent of
+the parties, in which case this Agreement will immediately terminate.
+
+12. INTEGRATION. This Agreement is the entire agreement between
+you and Oracle relating to its subject matter. It supersedes all
+prior or contemporaneous oral or written communications, proposals,
+representations and warranties and prevails over any conflicting
+or additional terms of any quote, order, acknowledgment, or other
+communication between the parties relating to its subject matter
+during the term of this Agreement. No modification of this Agreement
+will be binding, unless in writing and signed by an authorized
+representative of each party.
 
 SUPPLEMENTAL LICENSE TERMS
 
@@ -200,12 +223,12 @@ any and all Programs and/or Software. The license set forth in this
 Section D does not extend to the Software identified in Section G.
 
 E. DISTRIBUTION BY PUBLISHERS. This section pertains to your
-distribution of the JavaTM SE Development Kit Software (¡ÈJDK¡É)
-with your printed book or magazine (as those terms are commonly
-used in the industry) relating to Java technology ("Publication").
-Subject to and conditioned upon your compliance with the restrictions
-and obligations contained in the Agreement, Oracle hereby grants
-to you a non-exclusive, nontransferable limited right to reproduce
+distribution of the JavaTM SE Development Kit Software ("JDK") with
+your printed book or magazine (as those terms are commonly used in
+the industry) relating to Java technology ("Publication"). Subject
+to and conditioned upon your compliance with the restrictions and
+obligations contained in the Agreement, Oracle hereby grants to
+you a non-exclusive, nontransferable limited right to reproduce
 complete and unmodified copies of the JDK on electronic media (the
 "Media") for the sole purpose of inclusion and distribution with
 your Publication(s), subject to the following terms: (i) You may
@@ -217,18 +240,18 @@ reproduced in its entirety and without any modification whatsoever
 (including with respect to all proprietary notices) and distributed
 with your Publication subject to a license agreement that is a
 complete, unmodified reproduction of this Agreement; (v) The Media
-label shall include the following information: ¡ÈCopyright [YEAR],
+label shall include the following information: "Copyright [YEAR],
 Oracle America, Inc. All rights reserved. Use is subject to license
 terms. ORACLE and JAVA trademarks and all ORACLE- and JAVA-related
 trademarks, service marks, logos and other brand designations are
 trademarks or registered trademarks of Oracle in the U.S. and other
-countries.¡É [YEAR] is the year of Oracle's release of the Software;
-the year information can typically be found in the Software¡Çs
-¡ÈAbout¡É box or screen. This information must be placed on the
-Media label in such a manner as to only apply to the JDK; (vi) You
-must clearly identify the JDK as Oracle's product on the Media
-holder or Media label, and you may not state or imply that Oracle
-is responsible for any third-party software contained on the Media;
+countries." [YEAR] is the year of Oracle's release of the Software;
+the year information can typically be found in the Software's
+"About" box or screen. This information must be placed on the Media
+label in such a manner as to only apply to the JDK; (vi) You must
+clearly identify the JDK as Oracle's product on the Media holder
+or Media label, and you may not state or imply that Oracle is
+responsible for any third-party software contained on the Media;
 (vii) You may not include any third party software on the Media
 which is intended to be a replacement or substitute for the JDK;
 (viii) You agree to defend and indemnify Oracle and its licensors
@@ -246,16 +269,14 @@ California 94065 U.S.A , Attention: General Counsel.
 F. JAVA TECHNOLOGY RESTRICTIONS. You may not create, modify, or
 change the behavior of, or authorize your licensees to create,
 modify, or change the behavior of, classes, interfaces, or subpackages
-that are in any way identified as "java", "javax", "sun", ¡Èoracle¡É
+that are in any way identified as "java", "javax", "sun", "oracle"
 or similar convention as specified by Oracle in any naming convention
 designation.
 
 G. LIMITATIONS ON REDISTRIBUTION. You may not redistribute or
-otherwise transfer: (a) JavaFX Runtime prior to version 2.0.2, (b)
-JavaFX Development Kit prior to version 2.0.2, or (c) any and all
-patches, bug fixes and updates made available by Oracle through
-Oracle Premier Support, including those made available under Oracle's
-Java SE Support program.
+otherwise transfer patches, bug fixes or updates made available by
+Oracle through Oracle Premier Support, including those made available
+under Oracle's Java SE Support program.
 
 H. COMMERCIAL FEATURES NOTICE. For purpose of complying with
 Supplemental Term Section C.(v)(b) and D.(v)(b), your license
@@ -264,12 +285,14 @@ displayed in a manner that anyone using the Software will see the
 notice:
 
 Use of the Commercial Features for any commercial or production
-purpose requires a separate license from Oracle. ¡ÈCommercial
-Features¡É means those features identified Table 1-1 (Commercial
+purpose requires a separate license from Oracle. "Commercial
+Features" means those features identified Table 1-1 (Commercial
 Features In Java SE Product Editions) of the Java SE documentation
 accessible at
 http://www.oracle.com/technetwork/java/javase/documentation/index.html
 
+
+
 I. SOURCE CODE. Software may contain source code that, unless
 expressly licensed for other purposes, is provided solely for
 reference purposes pursuant to the terms of this Agreement. Source
@@ -300,7 +323,9 @@ information about the data Oracle collects as a result of your
 Software download at
 http://www.oracle.com/technetwork/java/javase/documentation/index.html.
 
-For inquiries please contact:  Oracle America, Inc., 500 Oracle
-Parkway, Redwood Shores, California 94065, USA.
+For inquiries please contact: Oracle America, Inc., 500 Oracle
+Parkway,
+
+Redwood Shores, California 94065, USA.
 
-Last updated 2 July 2012
+Last updated 02 April 2013