Fix various licenses, encoding should be UTF-8, bug 389395.

1 files changed, 26 insertions, 26 deletions

diff --git a/licenses/dlj-1.1 b/licenses/dlj-1.1
index 7a243b80699b..b54f383a42dc 100644
--- a/licenses/dlj-1.1
+++ b/licenses/dlj-1.1
@@ -3,8 +3,8 @@
 SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE JAVA PLATFORM
 STANDARD EDITION DEVELOPER KIT ("JDK" - THE "SOFTWARE") TO YOU ONLY
 UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS
-LICENSE AGREEMENT (THE "AGREEMENT").  PLEASE READ THE AGREEMENT
-CAREFULLY.  BY INSTALLING, USING, OR DISTRIBUTING THIS SOFTWARE, YOU
+LICENSE AGREEMENT (THE "AGREEMENT").  PLEASE READ THE AGREEMENT
+CAREFULLY.  BY INSTALLING, USING, OR DISTRIBUTING THIS SOFTWARE, YOU
 ACCEPT ALL OF THE TERMS OF THE AGREEMENT.
 
 1.  DEFINITIONS. "Software" means the code identified above in binary
@@ -167,7 +167,7 @@ ACCEPT ALL OF THE TERMS OF THE AGREEMENT.
     licenses to export, re-export, or import as may be required after
     delivery to you.
 
-13. U.S. GOVERNMENT RESTRICTED RIGHTS.  If Software is being acquired
+13. U.S. GOVERNMENT RESTRICTED RIGHTS.  If Software is being acquired
     by or on behalf of the U.S. Government or by a U.S. Government
     prime contractor or subcontractor (at any tier), then the
     Government's rights in Software and accompanying documentation
@@ -192,12 +192,12 @@ ACCEPT ALL OF THE TERMS OF THE AGREEMENT.
     binding, unless in writing and signed by an authorized
     representative of each party.
 
-For inquiries please contact: Sun Microsystems, Inc., 4150 Network Circle, 
+For inquiries please contact: Sun Microsystems, Inc., 4150 Network Circle,
 Santa Clara, California 95054, U.S.A.
 
 DLJ v1.1                                                  27APR2006ANS
 
-  - - - - -         end of DLJ License text               - - - - -  
+  - - - - -         end of DLJ License text               - - - - -
 
 -------------------------------------------------------------------------------
 *******************************************************************************
@@ -206,15 +206,15 @@ DLJ v1.1                                                  27APR2006ANS
      FAQ for the Operating System Distributor License for Java (DLJ)
 
 The purpose of this FAQ is to provide some insight into Sun's thoughts
-in creating the Operating System Distributor License for Java. 
-Although the FAQ is not a legal document, it is designed to illustrate 
+in creating the Operating System Distributor License for Java.
+Although the FAQ is not a legal document, it is designed to illustrate
 the license terms through explanation and examples. This is a well
 accepted way of helping non-lawyers attain some comfort with legal
-language, which is crafted by attorneys to meet the arcane 
-requirements of statutes and judicial opinions. For example, 
-Creative Commons does a similar thing with its "Deeds," 
-(e.g. http://creativecommons.org/licenses/by-sa/2.5/ ) which are 
-human-readable summaries of the "Legal Code" 
+language, which is crafted by attorneys to meet the arcane
+requirements of statutes and judicial opinions. For example,
+Creative Commons does a similar thing with its "Deeds,"
+(e.g. http://creativecommons.org/licenses/by-sa/2.5/ ) which are
+human-readable summaries of the "Legal Code"
 (e.g. http://creativecommons.org/licenses/by-sa/2.5/legalcode ) and
 and are accompanied by a legal disclaimer
 ( http://creativecommons.org/licenses/disclaimer-popup?lang=en-us ).
@@ -233,7 +233,7 @@ diligently with the community to achieve those objectives.
 Sun expects to periodically update this FAQ to better reflect the
 concerns and questions of the developer community. You will find a
 pointer to the latest version of this FAQ at:
-  https://jdk-distros.dev.java.net/developer.html 
+  https://jdk-distros.dev.java.net/developer.html
 
 1.  What is the Operating System Distribution License for Java
     (a.k.a. the "Distro License for Java" or DLJ)?
@@ -270,8 +270,8 @@ pointer to the latest version of this FAQ at:
 
 4.  What does the DLJ allow me to do?
 
-    You can: 
-    - Use the JDK on your OS to design, develop, test, and run Java programs. 
+    You can:
+    - Use the JDK on your OS to design, develop, test, and run Java programs.
     - Repackage the JDK for use with your OS, within the limitations
       spelled out in the README file.
     - Distribute the JDK on any media, online, and preinstalled on
@@ -317,7 +317,7 @@ pointer to the latest version of this FAQ at:
 
 8.  What are my obligations under this license?
 
-    The license is the best reference for this. Some of the important 
+    The license is the best reference for this. Some of the important
     terms to consider are that you are required to:
     - Keep all copyright and other notices intact.
     - Distribute the entire JDK - no subsetting. Note - the README
@@ -341,7 +341,7 @@ pointer to the latest version of this FAQ at:
       replacement to downstream recipients within 90 days, or stop
       shipment and notify downstream recipients.
 
-9.  What is the README file? Is it part of the license? Why not include 
+9.  What is the README file? Is it part of the license? Why not include
     it with the rest of the license?
 
     The README file is explicitly called out in Section 2. License
@@ -374,7 +374,7 @@ pointer to the latest version of this FAQ at:
     aren't tainted simply by having looked at this code, or having it
     on your hard drive.
 
-12. How do I ensure that my package reproduces all the right copyright 
+12. How do I ensure that my package reproduces all the right copyright
     notices and proprietary legends as required in Section 2(a)?
 
     If you make certain that any copyright notices and licenses for
@@ -407,8 +407,8 @@ pointer to the latest version of this FAQ at:
     your OS, and to use the JDK only for its normal intended purpose
     of running and developing Java programs.
 
-14. Does this license prevent me shipping any alternative technologies 
-    in my OS distribution? 
+14. Does this license prevent me shipping any alternative technologies
+    in my OS distribution?
 
     The DLJ does not restrict you from shipping any other technologies
     you choose to include in your distribution. However, you can't use
@@ -422,7 +422,7 @@ pointer to the latest version of this FAQ at:
     nothing in the DLJ intended to prevent you from shipping
     alternative technologies with your OS distribution.
 
-15. So, can I ship Eclipse, or other language implementations like 
+15. So, can I ship Eclipse, or other language implementations like
     Perl or Python?
 
     Sun can't give you permission to ship these technologies. Only the
@@ -550,7 +550,7 @@ pointer to the latest version of this FAQ at:
     this guide to help you discover potential problems before you
     distribute the JDK with your OS.
 
-25. I'd like to test my OS distribution's compatibility. How do I 
+25. I'd like to test my OS distribution's compatibility. How do I
     obtain the TCK?
 
     The TCK is available under a usage license that includes some
@@ -578,7 +578,7 @@ pointer to the latest version of this FAQ at:
     distributing the software. The JDK must behave in a compatible
     manner when running on your OS.
 
-27. If I'm aware of problems, can I document them for my users 
+27. If I'm aware of problems, can I document them for my users
     and ship anyway?
 
     No, you must fix the problems before distributing the software. It
@@ -608,7 +608,7 @@ pointer to the latest version of this FAQ at:
     are able to fix the problem, you can resume distribution of the
     JDK under the terms of the DLJ.
 
-29. If I decide to stop-ship, must I remove the JDK from archived and 
+29. If I decide to stop-ship, must I remove the JDK from archived and
     compatible distribution bundles as well?
 
     No, archived bundles can contain the JDK as long as there are no
@@ -629,7 +629,7 @@ pointer to the latest version of this FAQ at:
     use and distribution of the Software is in accordance with export
     regulations, as well as any other applicable laws.
 
-31. May I use the Java logo to show that I'm including the JDK in my 
+31. May I use the Java logo to show that I'm including the JDK in my
     OS distribution? What may I do with Java logos?
 
     No, you may not use the logo, as the right to use the logo is
@@ -654,4 +654,4 @@ pointer to the latest version of this FAQ at:
 
 DLJ FAQ v1.2
 
-  - - - - -         end of DLJ FAQ text                   - - - - -  
+  - - - - -         end of DLJ FAQ text                   - - - - -