The hacker's diff

This document is of historical interest only. In October 2007, NetBeans was Dual Licensed under the CDDL and GPLv2 w/Classpath Exception. For more information, see the license change documentation.

$ diff -bi mpl-1.1.txt spl-1.0.txt

1c1
< MOZILLA PUBLIC LICENSE Version 1.1
---
> SUN PUBLIC LICENSE Version 1.0
17c17,18
<   including portions thereof.
---
>   including portions thereof and corresponding documentation released
>   with the source code.
60c61
<   any associated interface definition files, scripts used
---
>   any associated documentation, interface definition files, scripts used
202c203
<   interface and Contributor has knowledge of patent licenses
---
>   interface ("API") and Contributor has knowledge of patent licenses
287c288
<   Netscape Communications Corporation ("Netscape") may publish revised and/or new versions
---
>   Sun Microsystems, Inc. ("Sun") may publish revised and/or new versions
296,297c297,298
<   of any subsequent version of the License published by Netscape. No one
<   other than Netscape has the right to modify the terms applicable to Covered
---
>   of any subsequent version of the License published by Sun. No one
>   other than Sun has the right to modify the terms applicable to Covered
305c306
<   the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL" or any confusingly
---
>   the phrases "Sun," "Sun Public License," or "SPL" or any confusingly
309c310
<   Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer,
---
>   Sun Public License. (Filling in the name of the Initial Developer,
440c441
<   Your choice of the NPL or the alternative licenses, if any, specified by the
---
>   Your choice of the alternative licenses, if any, specified by the
443c444
< EXHIBIT A -Mozilla Public License.
---
> Exhibit A -Sun Public License Notice.
445,453c446,449
<   The contents of this file are subject to the Mozilla Public License
<   Version 1.1 (the "License"); you may not use this file except in
<   compliance with the License. You may obtain a copy of the License at
<   http://www.mozilla.org/MPL/
<
<   Software distributed under the License is distributed on an "AS IS"
<   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
<   License for the specific language governing rights and limitations
<   under the License.
---
>   The contents of this file are subject to the Sun Public License
>   Version 1.0 (the "License"); you may not use this file except in
>   compliance with the License. A copy of the License is available at
>   http://www.sun.com/
466c462
<   version of this file under the MPL, indicate your decision by deleting
---
>   version of this file under the SPL, indicate your decision by deleting
470c466
<   either the MPL or the [___] License.
---
>   either the SPL or the [___] License."

By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2016, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo