diff --git a/icu4j/license.html b/icu4j/license.html index 09554f8b60..8ab076a71b 100644 --- a/icu4j/license.html +++ b/icu4j/license.html @@ -1,46 +1,34 @@ -X License - International Components for Unicode for Java +ICU4J license - ICU4J 1.3.1 and later -

Terms and Conditions

+

ICU4J license - ICU4J 1.3.1 and later

COPYRIGHT AND PERMISSION NOTICE

-Copyright (c) 1999,2000,2001 Compaq Computer Corporation
-Copyright (c) 1999,2000,2001 Hewlett-Packard Company
-Copyright (c) 1999,2000,2001 IBM Corporation
-Copyright (c) 1999,2000,2001 Hummingbird Communications Ltd.
-Copyright (c) 1999,2000,2001 Silicon Graphics, Inc.
-Copyright (c) 1999,2000,2001 Sun Microsystems, Inc.
-Copyright (c) 1999,2000,2001 The Open Group
+Copyright (c) 1995-2001 International Business Machines Corporation and others

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"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons +to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization of the copyright holder. -

-

-X Window System is a trademark of The Open Group. +Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.

-OSF/1, OSF/Motif and Motif are registered trademarks, and OSF, the OSF logo, LBX, X Window System, and Xinerama are trademarks of the Open Group. All other trademarks and registered trademarks mentioned herein are the property of their respective owners. + +All trademarks and registered trademarks mentioned herein are the property of their respective owners. diff --git a/icu4j/readme.html b/icu4j/readme.html index 2741cb8deb..1bccd79f8d 100644 --- a/icu4j/readme.html +++ b/icu4j/readme.html @@ -55,7 +55,7 @@ to fixing any bugs, and will also use your feedback to help plan future releases

License Information

-ICU4C and ICU4J have changed their licenses from the IPL (IBM Public License) to the X license. The X license is a non-viral and recommended free software license that is compatible with the GNU GPL license. This is effective starting with release 1.8.1 of ICU4C and release 1.3.1 of ICU4J. All previous ICU releases will continue to utilize the IPL. New ICU releases will adopt the X license. The users of previous releases of ICU will need to accept the terms and conditions of the X license in order to adopt the new ICU releases. +The ICU projects (ICU4C and ICU4J) have changed their licenses from the IPL (IBM Public License) to the X license. The X license is a non-viral and recommended free software license that is compatible with the GNU GPL license. This is effective starting with release 1.8.1 of ICU4C and release 1.3.1 of ICU4J. All previous ICU releases will continue to utilize the IPL. New ICU releases will adopt the X license. The users of previous releases of ICU will need to accept the terms and conditions of the X license in order to adopt the new ICU releases.

The main effect of the change is to provide GPL compatibility. The X license is listed as GPL compatible, see the gnu page at @@ -63,10 +63,10 @@ http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses

-The text of the X license is available at http://www.x.org/terms.htm, and is reproduced in the link below: +The text of the X license is available at http://www.x.org/terms.htm. The IBM version contains the essential text of the license, omitting the X-specific trademarks and copyright notices.

-Please make sure you understand the Copyright and License information. +For more details please see the press announcement and the Project FAQ.

What the International Components for Unicode for Java @@ -209,7 +209,7 @@ directories contain source code and data files:

contains all class files - $Root/docs + $Root/doc contains JavaDoc for all packages @@ -235,21 +235,21 @@ directories contain source code and data files:

The complete API documentation is available on the ICU4J web site:

@@ -335,7 +335,7 @@ Completed in 19 seconds docs Run javadoc over the main class files, generating an HTML documentation tree in the - subdirectory docs. + subdirectory doc. jar