1.1 --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html Fri Sep 28 14:57:35 2007 +0000
1.2 +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html Fri Sep 28 23:30:29 2007 +0000
1.3 @@ -1,20 +1,62 @@
1.4 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
1.5 <!--
1.6 -* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
1.7 +* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1.8 * Use is subject to license terms.
1.9 -->
1.10 <html>
1.11 <head>
1.12 <title>Legal Notices</title>
1.13 -<link rel="stylesheet" href="nbdocs://org.netbeans.modules.usersguide/org/netbeans/modules/usersguide/ide.css" type="text/css">
1.14 + <link rel="stylesheet" href="nbdocs://org.netbeans.modules.usersguide/org/netbeans/modules/usersguide/ide.css" type="text/css">
1.15 </head>
1.16 <body>
1.17 -<p>DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.18 -<p>
1.19 -<p>Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. and Distribution License (the License). You may not use this file except in compliance with the License. </p>
1.20 -<p>You can obtain a copy of the License at <tt>http://www.netbeans.org/cddl.html</tt> or <tt>http://www.netbeans.org/cddl.txt</tt>.</p>
1.21 -<p>When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" </p>
1.22 -<p>The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.</p>
1.23 -<p><b>Note:</b> Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.</p>
1.24 -</body>
1.25 -</html>
1.26 +
1.27 +<p>DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.</p>
1.28 +
1.29 +<p>Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.</p>
1.30 +
1.31 +<p>The contents of this file are subject to the terms of either the GNU
1.32 +General Public License Version 2 only ("GPL") or the Common
1.33 +Development and Distribution License("CDDL") (collectively, the
1.34 +"License"). You may not use this file except in compliance with the
1.35 +License. You can obtain a copy of the License at
1.36 +http://www.netbeans.org/cddl-gplv2.html
1.37 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
1.38 +specific language governing permissions and limitations under the
1.39 +License. When distributing the software, include this License Header
1.40 +Notice in each file and include the License file at
1.41 +nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1.42 +particular file as subject to the "Classpath" exception as provided
1.43 +by Sun in the GPL Version 2 section of the License file that
1.44 +accompanied this code. If applicable, add the following below the
1.45 +License Header, with the fields enclosed by brackets [] replaced by
1.46 +your own identifying information:<br>
1.47 +"Portions Copyrighted [year] [name of copyright owner]"</p>
1.48 +
1.49 +<p>Contributor(s):</p>
1.50 +
1.51 +<p>The Original Software is NetBeans. The Initial Developer of the Original
1.52 +Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
1.53 +Microsystems, Inc. All Rights Reserved.</p>
1.54 +<p>If you wish your version of this file to be governed by only the CDDL
1.55 +or only the GPL Version 2, indicate your decision by adding
1.56 +"[Contributor] elects to include this software in this distribution
1.57 +under the [CDDL or GPL Version 2] license." If you do not indicate a
1.58 +single choice of license, a recipient has the option to distribute
1.59 +your version of this file under either the CDDL, the GPL Version 2 or
1.60 +to extend the choice of license to its licensees as provided above.
1.61 +However, if you add GPL Version 2 code and therefore, elected the GPL
1.62 +Version 2 license, then the option applies only if the new code is
1.63 +made subject to such option by the copyright holder.
1.64 +</p>
1.65 +
1.66 +<p><b>Note:</b> Sun is not responsible for the availability of third-party web
1.67 +sites mentioned in this document and does not endorse and is not
1.68 +responsible or liable for any content, advertising, products, or other
1.69 +materials on or available from such sites or resources. Sun will not be
1.70 +responsible or liable for any damage or loss caused or alleged to be
1.71 +caused by or in connection with use of or reliance on any such content,
1.72 +goods, or services available on or through any such sites or resources.</p>
1.73 +
1.74 +
1.75 + </body>
1.76 +</html>
1.77 \ No newline at end of file
2.1 --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html Fri Sep 28 14:57:35 2007 +0000
2.2 +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html Fri Sep 28 23:30:29 2007 +0000
2.3 @@ -1,20 +1,62 @@
2.4 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2.5 <!--
2.6 -* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
2.7 +* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
2.8 * Use is subject to license terms.
2.9 -->
2.10 <html>
2.11 <head>
2.12 <title>Legal Notices</title>
2.13 -<link rel="stylesheet" href="nbdocs://org.netbeans.modules.usersguide/org/netbeans/modules/usersguide/ide.css" type="text/css">
2.14 + <link rel="stylesheet" href="nbdocs://org.netbeans.modules.usersguide/org/netbeans/modules/usersguide/ide.css" type="text/css">
2.15 </head>
2.16 <body>
2.17 -<p>DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2.18 -<p>
2.19 -<p>Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. and Distribution License (the License). You may not use this file except in compliance with the License. </p>
2.20 -<p>You can obtain a copy of the License at <tt>http://www.netbeans.org/cddl.html</tt> or <tt>http://www.netbeans.org/cddl.txt</tt>.</p>
2.21 -<p>When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" </p>
2.22 -<p>The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.</p>
2.23 -<p><b>Note:</b> Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.</p>
2.24 -</body>
2.25 -</html>
2.26 +
2.27 +<p>DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.</p>
2.28 +
2.29 +<p>Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.</p>
2.30 +
2.31 +<p>The contents of this file are subject to the terms of either the GNU
2.32 +General Public License Version 2 only ("GPL") or the Common
2.33 +Development and Distribution License("CDDL") (collectively, the
2.34 +"License"). You may not use this file except in compliance with the
2.35 +License. You can obtain a copy of the License at
2.36 +http://www.netbeans.org/cddl-gplv2.html
2.37 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
2.38 +specific language governing permissions and limitations under the
2.39 +License. When distributing the software, include this License Header
2.40 +Notice in each file and include the License file at
2.41 +nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2.42 +particular file as subject to the "Classpath" exception as provided
2.43 +by Sun in the GPL Version 2 section of the License file that
2.44 +accompanied this code. If applicable, add the following below the
2.45 +License Header, with the fields enclosed by brackets [] replaced by
2.46 +your own identifying information:<br>
2.47 +"Portions Copyrighted [year] [name of copyright owner]"</p>
2.48 +
2.49 +<p>Contributor(s):</p>
2.50 +
2.51 +<p>The Original Software is NetBeans. The Initial Developer of the Original
2.52 +Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
2.53 +Microsystems, Inc. All Rights Reserved.</p>
2.54 +<p>If you wish your version of this file to be governed by only the CDDL
2.55 +or only the GPL Version 2, indicate your decision by adding
2.56 +"[Contributor] elects to include this software in this distribution
2.57 +under the [CDDL or GPL Version 2] license." If you do not indicate a
2.58 +single choice of license, a recipient has the option to distribute
2.59 +your version of this file under either the CDDL, the GPL Version 2 or
2.60 +to extend the choice of license to its licensees as provided above.
2.61 +However, if you add GPL Version 2 code and therefore, elected the GPL
2.62 +Version 2 license, then the option applies only if the new code is
2.63 +made subject to such option by the copyright holder.
2.64 +</p>
2.65 +
2.66 +<p><b>Note:</b> Sun is not responsible for the availability of third-party web
2.67 +sites mentioned in this document and does not endorse and is not
2.68 +responsible or liable for any content, advertising, products, or other
2.69 +materials on or available from such sites or resources. Sun will not be
2.70 +responsible or liable for any damage or loss caused or alleged to be
2.71 +caused by or in connection with use of or reliance on any such content,
2.72 +goods, or services available on or through any such sites or resources.</p>
2.73 +
2.74 +
2.75 + </body>
2.76 +</html>
2.77 \ No newline at end of file