1.1 --- a/COPYING	Fri Apr 19 10:01:02 2013 +0200
     1.2 +++ b/COPYING	Mon Dec 16 15:00:21 2013 +0100
     1.3 @@ -1,18 +1,40 @@
     1.4 -HTML via Java(tm) Language Bindings
     1.5 -Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
     1.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     1.7  
     1.8 -This program is free software: you can redistribute it and/or modify
     1.9 -it under the terms of the GNU General Public License as published by
    1.10 -the Free Software Foundation, version 2 of the License.
    1.11 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    1.12  
    1.13 -This program is distributed in the hope that it will be useful,
    1.14 -but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.15 -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1.16 -GNU General Public License for more details. apidesign.org 
    1.17 -designates this particular file as subject to the 
    1.18 -"Classpath" exception as provided by apidesign.org 
    1.19 -in the License file that accompanied this code.
    1.20 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    1.21 +Other names may be trademarks of their respective owners.
    1.22  
    1.23 -You should have received a copy of the GNU General Public License
    1.24 -along with this program. Look for COPYING file in the top folder.
    1.25 -If not, see http://wiki.apidesign.org/wiki/GPLwithClassPathException
    1.26 +The contents of this file are subject to the terms of either the GNU
    1.27 +General Public License Version 2 only ("GPL") or the Common
    1.28 +Development and Distribution License("CDDL") (collectively, the
    1.29 +"License"). You may not use this file except in compliance with the
    1.30 +License. You can obtain a copy of the License at
    1.31 +http://www.netbeans.org/cddl-gplv2.html
    1.32 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    1.33 +specific language governing permissions and limitations under the
    1.34 +License.  When distributing the software, include this License Header
    1.35 +Notice in each file and include the License file at
    1.36 +nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    1.37 +particular file as subject to the "Classpath" exception as provided
    1.38 +by Oracle in the GPL Version 2 section of the License file that
    1.39 +accompanied this code. If applicable, add the following below the
    1.40 +License Header, with the fields enclosed by brackets [] replaced by
    1.41 +your own identifying information:
    1.42 +"Portions Copyrighted [year] [name of copyright owner]"
    1.43 +
    1.44 +Contributor(s):
    1.45 +
    1.46 +The Original Software is NetBeans. The Initial Developer of the Original
    1.47 +Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
    1.48 +
    1.49 +If you wish your version of this file to be governed by only the CDDL
    1.50 +or only the GPL Version 2, indicate your decision by adding
    1.51 +"[Contributor] elects to include this software in this distribution
    1.52 +under the [CDDL or GPL Version 2] license." If you do not indicate a
    1.53 +single choice of license, a recipient has the option to distribute
    1.54 +your version of this file under either the CDDL, the GPL Version 2 or
    1.55 +to extend the choice of license to its licensees as provided above.
    1.56 +However, if you add GPL Version 2 code and therefore, elected the GPL
    1.57 +Version 2 license, then the option applies only if the new code is
    1.58 +made subject to such option by the copyright holder.