You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/06/26 19:48:34 UTC
[GitHub] matthiasblaesing closed pull request #606: [NETBEANS-853] Fix
license info for entity definitions and DTDs
matthiasblaesing closed pull request #606: [NETBEANS-853] Fix license info for entity definitions and DTDs
URL: https://github.com/apache/incubator-netbeans/pull/606
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/html.editor/licenseinfo.xml b/html.editor/licenseinfo.xml
index f066a93867..5264cdd3e0 100644
--- a/html.editor/licenseinfo.xml
+++ b/html.editor/licenseinfo.xml
@@ -22,30 +22,26 @@
<licenseinfo>
<fileset>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/3_2/html32.dtd</file>
+ <file>src/org/netbeans/modules/html/editor/resources/DTDs/3_2/lat1.ent</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/frameset.dtd</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/loose.dtd</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/strict.dtd</file>
- <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/frameset.dtd</file>
- <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/loose.dtd</file>
- <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/strict.dtd</file>
- <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-frameset.dtd</file>
- <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-strict.dtd</file>
- <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-transitional.dtd</file>
- <license ref="W3C2" />
- <comment>DTDs and XMLSchemata are used at runtime to offer code completion for HTML/XHTML files.</comment>
- </fileset>
- <fileset>
- <file>src/org/netbeans/modules/html/editor/resources/DTDs/3_2/lat1.ent</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLlat1.ent</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLspecial.ent</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLsymbol.ent</file>
+ <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/frameset.dtd</file>
+ <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/loose.dtd</file>
+ <file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/strict.dtd</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLlat1.ent</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLspecial.ent</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLsymbol.ent</file>
+ <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-frameset.dtd</file>
+ <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-strict.dtd</file>
+ <file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-transitional.dtd</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-lat1.ent</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-special.ent</file>
<file>src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-symbol.ent</file>
- <license ref="ISO-8879-SGML" />
+ <license ref="W3C2" />
<comment>DTDs and XMLSchemata are used at runtime to offer code completion for HTML/XHTML files.</comment>
</fileset>
<fileset>
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/html32.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/html32.dtd
index 5ed78ad1f9..81906d12be 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/html32.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/html32.dtd
@@ -6,38 +6,38 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/lat1.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/lat1.ent
index d3ce4e6190..5b7e886d69 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/lat1.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/lat1.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/REC-html32
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- (C) International Organization for Standardization 1986
Permission to copy in any form is granted for use with
conforming SGML systems and applications as defined in
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLlat1.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLlat1.ent
index c1a1373f06..e15ed10165 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLlat1.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLlat1.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from http://www.w3.org/TR/1998/REC-html40-19980424/HTMLlat1.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Portions © International Organization for Standardization 1986
Permission to copy in any form is granted for use with
conforming SGML systems and applications as defined in
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLspecial.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLspecial.ent
index 370a3670b3..dec67057b9 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLspecial.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLspecial.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from http://www.w3.org/TR/1998/REC-html40-19980424/HTMLspecial.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Special characters for HTML -->
<!-- Character entity set. Typical invocation:
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLsymbol.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLsymbol.ent
index 8c632e472e..64a96417a2 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLsymbol.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/HTMLsymbol.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from http://www.w3.org/TR/1998/REC-html40-19980424/HTMLsymbol.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Mathematical, Greek and Symbolic characters for HTML -->
<!-- Character entity set. Typical invocation:
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/frameset.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/frameset.dtd
index c022068b2e..b52120fd9d 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/frameset.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/frameset.dtd
@@ -6,43 +6,43 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
-- File content extracted from https://www.w3.org/TR/1998/REC-html40-19980424/sgml/framesetdtd.html
+- File content extracted from http://www.w3.org/TR/1998/REC-html40-19980424/frameset.dtd
- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
-->
@@ -50,8 +50,8 @@ Changes:
This is the HTML 4.0 Frameset DTD, which should be
used for documents with frames. This DTD is identical
to the HTML 4.0 Transitional DTD except for the
- content model of the "HTML" element: in frameset
- documents, the "FRAMESET" element replaces the "BODY"
+ content model of the "HTML" element: in frameset
+ documents, the "FRAMESET" element replaces the "BODY"
element.
Draft: $Date: 1997/12/11 15:31:11 $
@@ -82,4 +82,4 @@ Changes:
<!ENTITY % HTML.Frameset "INCLUDE">
<!ENTITY % HTML4.dtd PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-%HTML4.dtd;
\ No newline at end of file
+%HTML4.dtd;
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/loose.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/loose.dtd
index 39fbba9e76..7c7741c608 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/loose.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/loose.dtd
@@ -6,43 +6,43 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
-- File content extracted from https://www.w3.org/TR/1998/REC-html40-19980424/sgml/loosedtd.html
+- File content extracted from http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd
- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
-->
@@ -1138,4 +1138,4 @@ several semantically related columns together.
<!ATTLIST HTML
%i18n; -- lang, dir --
%version;
- >
\ No newline at end of file
+ >
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/strict.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/strict.dtd
index 207a3a7159..cb99c1a375 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/strict.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/strict.dtd
@@ -6,53 +6,53 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
-- File content extracted from https://www.w3.org/TR/1998/REC-html40-19980424/sgml/dtd.html
+- File content extracted from http://www.w3.org/TR/1998/REC-html40-19980424/strict.dtd
- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
-->
<!--
- This is HTML 4.0 Strict DTD, which excludes the presentation
- attributes and elements that W3C expects to phase out as
+ This is HTML 4.0 Strict DTD, which excludes the presentation
+ attributes and elements that W3C expects to phase out as
support for style sheets matures. Authors should use the Strict
DTD when possible, but may use the Transitional DTD when support
for presentation attribute and elements is required.
-
+
HTML 4.0 includes mechanisms for style sheets, scripting,
embedding objects, improved support for right to left and mixed
direction text, and enhancements to forms for improved
@@ -914,4 +914,4 @@ several semantically related columns together.
<!ELEMENT HTML O O (%html.content;) -- document root element -->
<!ATTLIST HTML
%i18n; -- lang, dir --
- >
\ No newline at end of file
+ >
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLlat1.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLlat1.ent
index 88d0c8f9e5..ddb702bc29 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLlat1.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLlat1.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/HTMLlat1.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Portions © International Organization for Standardization 1986
Permission to copy in any form is granted for use with
conforming SGML systems and applications as defined in
@@ -191,4 +239,4 @@
<!ENTITY thorn CDATA "þ" -- latin small letter thorn,
U+00FE ISOlat1 -->
<!ENTITY yuml CDATA "ÿ" -- latin small letter y with diaeresis,
- U+00FF ISOlat1 -->
\ No newline at end of file
+ U+00FF ISOlat1 -->
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLspecial.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLspecial.ent
index f5f79d27fc..0f8c8613fa 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLspecial.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLspecial.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/HTMLspecial.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Special characters for HTML -->
<!-- Character entity set. Typical invocation:
@@ -74,4 +122,4 @@
<!ENTITY rsaquo CDATA "›" -- single right-pointing angle quotation mark,
U+203A ISO proposed -->
<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro CDATA "€" -- euro sign, U+20AC NEW -->
\ No newline at end of file
+<!ENTITY euro CDATA "€" -- euro sign, U+20AC NEW -->
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLsymbol.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLsymbol.ent
index a1eade7853..98311e7b6f 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLsymbol.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/HTMLsymbol.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/HTMLsymbol.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Mathematical, Greek and Symbolic characters for HTML -->
<!-- Character entity set. Typical invocation:
@@ -238,4 +286,4 @@
U+2663 ISOpub -->
<!ENTITY hearts CDATA "♥" -- black heart suit = valentine,
U+2665 ISOpub -->
-<!ENTITY diams CDATA "♦" -- black diamond suit, U+2666 ISOpub -->
\ No newline at end of file
+<!ENTITY diams CDATA "♦" -- black diamond suit, U+2666 ISOpub -->
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/frameset.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/frameset.dtd
index 79aa21ac52..5c9508ca68 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/frameset.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/frameset.dtd
@@ -6,43 +6,43 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
-- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/sgml/framesetdtd.html
+- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd
- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
-->
@@ -50,8 +50,8 @@ Changes:
This is the HTML 4.01 Frameset DTD, which should be
used for documents with frames. This DTD is identical
to the HTML 4.01 Transitional DTD except for the
- content model of the "HTML" element: in frameset
- documents, the "FRAMESET" element replaces the "BODY"
+ content model of the "HTML" element: in frameset
+ documents, the "FRAMESET" element replaces the "BODY"
element.
Draft: $Date: 1999/12/24 23:37:49 $
@@ -82,4 +82,4 @@ Changes:
<!ENTITY % HTML.Frameset "INCLUDE">
<!ENTITY % HTML4.dtd PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-%HTML4.dtd;
\ No newline at end of file
+%HTML4.dtd;
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/loose.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/loose.dtd
index 39927cb28e..0268060e6d 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/loose.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/loose.dtd
@@ -6,43 +6,43 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
-- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/sgml/loosedtd.html
+- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd
- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
-->
@@ -1139,4 +1139,4 @@ several semantically related columns together.
<!ATTLIST HTML
%i18n; -- lang, dir --
%version;
- >
\ No newline at end of file
+ >
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/strict.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/strict.dtd
index 63d6a04023..05acacc02f 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/strict.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/strict.dtd
@@ -6,53 +6,53 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
-- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/sgml/dtd.html
+- File content extracted from https://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd
- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
-->
<!--
- This is HTML 4.01 Strict DTD, which excludes the presentation
- attributes and elements that W3C expects to phase out as
+ This is HTML 4.01 Strict DTD, which excludes the presentation
+ attributes and elements that W3C expects to phase out as
support for style sheets matures. Authors should use the Strict
DTD when possible, but may use the Transitional DTD when support
for presentation attribute and elements is required.
-
+
HTML 4 includes mechanisms for style sheets, scripting,
embedding objects, improved support for right to left and mixed
direction text, and enhancements to forms for improved
@@ -916,4 +916,4 @@ several semantically related columns together.
<!ELEMENT HTML O O (%html.content;) -- document root element -->
<!ATTLIST HTML
%i18n; -- lang, dir --
- >
\ No newline at end of file
+ >
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-lat1.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-lat1.ent
index 2a33e090df..17b5626e38 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-lat1.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-lat1.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-lat1.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Portions (C) International Organization for Standardization 1986
Permission to copy in any form is granted for use with
conforming SGML systems and applications as defined in
@@ -193,4 +241,4 @@
<!ENTITY thorn "þ"> <!-- latin small letter thorn,
U+00FE ISOlat1 -->
<!ENTITY yuml "ÿ"> <!-- latin small letter y with diaeresis,
- U+00FF ISOlat1 -->
\ No newline at end of file
+ U+00FF ISOlat1 -->
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-special.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-special.ent
index 321cc457e9..bb6eb898e2 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-special.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-special.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-special.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Special characters for XHTML -->
<!-- Character entity set. Typical invocation:
@@ -77,4 +125,4 @@
<!-- rsaquo is proposed but not yet ISO standardized -->
<!-- Currency Symbols -->
-<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW -->
\ No newline at end of file
+<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW -->
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-symbol.ent b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-symbol.ent
index 7e91b771d3..f16465f28a 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-symbol.ent
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml-symbol.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-symbol.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Mathematical, Greek and Symbolic characters for XHTML -->
<!-- Character entity set. Typical invocation:
@@ -234,4 +282,4 @@
U+2663 ISOpub -->
<!ENTITY hearts "♥"> <!-- black heart suit = valentine,
U+2665 ISOpub -->
-<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub -->
\ No newline at end of file
+<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub -->
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-frameset.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-frameset.dtd
index 9a6ba2bb30..a601084c74 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-frameset.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-frameset.dtd
@@ -6,38 +6,38 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
@@ -57,7 +57,7 @@ Changes:
For further information, see: http://www.w3.org/TR/xhtml1
Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
- All Rights Reserved.
+ All Rights Reserved.
This DTD module is identified by the PUBLIC and SYSTEM identifiers:
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-strict.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-strict.dtd
index 229617d041..15b9baeedd 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-strict.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-strict.dtd
@@ -6,38 +6,38 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
@@ -57,7 +57,7 @@ Changes:
For further information, see: http://www.w3.org/TR/xhtml1
Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
- All Rights Reserved.
+ All Rights Reserved.
This DTD module is identified by the PUBLIC and SYSTEM identifiers:
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-transitional.dtd b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-transitional.dtd
index 773c45a1fa..f38b36e079 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-transitional.dtd
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/xhtml1-transitional.dtd
@@ -6,38 +6,38 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
@@ -57,7 +57,7 @@ Changes:
For further information, see: http://www.w3.org/TR/xhtml1
Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
- All Rights Reserved.
+ All Rights Reserved.
This DTD module is identified by the PUBLIC and SYSTEM identifiers:
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent
index 2a33e090df..531b56df92 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-lat.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Portions (C) International Organization for Standardization 1986
Permission to copy in any form is granted for use with
conforming SGML systems and applications as defined in
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-special.ent b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-special.ent
index 321cc457e9..a202e339e6 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-special.ent
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-special.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-special.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Special characters for XHTML -->
<!-- Character entity set. Typical invocation:
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-symbol.ent b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-symbol.ent
index 7e91b771d3..c5fcbe5de4 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-symbol.ent
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-symbol.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-symbol.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Mathematical, Greek and Symbolic characters for XHTML -->
<!-- Character entity set. Typical invocation:
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd
index 229617d041..6a381993cb 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd
@@ -6,38 +6,38 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
diff --git a/nbbuild/licenseinfo.xml b/nbbuild/licenseinfo.xml
index f52bd463e6..c4339b1b87 100644
--- a/nbbuild/licenseinfo.xml
+++ b/nbbuild/licenseinfo.xml
@@ -20,16 +20,12 @@
-->
<licenseinfo>
- <fileset>
- <file>antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd</file>
- <license ref="W3C2" />
- <sourceOnly />
- </fileset>
<fileset>
<file>antsrc/org/netbeans/nbbuild/xhtml-lat1.ent</file>
<file>antsrc/org/netbeans/nbbuild/xhtml-special.ent</file>
<file>antsrc/org/netbeans/nbbuild/xhtml-symbol.ent</file>
- <license ref="ISO-8879-SGML" />
+ <file>antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd</file>
+ <license ref="W3C2" />
<sourceOnly />
</fileset>
<fileset>
diff --git a/nbbuild/licenses/ISO-8879-SGML b/nbbuild/licenses/ISO-8879-SGML
deleted file mode 100644
index 37c7a32cff..0000000000
--- a/nbbuild/licenses/ISO-8879-SGML
+++ /dev/null
@@ -1,4 +0,0 @@
-Portions © International Organization for Standardization 1986:
-Permission to copy in any form is granted for use with
-conforming SGML systems and applications as defined in
-ISO 8879, provided this notice is included in all copies.
\ No newline at end of file
diff --git a/welcome/licenseinfo.xml b/welcome/licenseinfo.xml
index af28e7314d..d97a4a76a9 100644
--- a/welcome/licenseinfo.xml
+++ b/welcome/licenseinfo.xml
@@ -22,14 +22,10 @@
<licenseinfo>
<fileset>
<file>src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd</file>
- <license ref="W3C2" />
- <comment>DTDs and XMLSchemata are used at runtime to enable html entity resolution in RSS feeds.</comment>
- </fileset>
- <fileset>
<file>src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent</file>
<file>src/org/netbeans/modules/welcome/resources/xhtml-special.ent</file>
<file>src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent</file>
- <license ref="ISO-8879-SGML" />
+ <license ref="W3C2" />
<comment>DTDs and XMLSchemata are used at runtime to enable html entity resolution in RSS feeds.</comment>
</fileset>
<fileset>
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent b/welcome/src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent
index 2a33e090df..17b5626e38 100644
--- a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent
+++ b/welcome/src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-lat1.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Portions (C) International Organization for Standardization 1986
Permission to copy in any form is granted for use with
conforming SGML systems and applications as defined in
@@ -193,4 +241,4 @@
<!ENTITY thorn "þ"> <!-- latin small letter thorn,
U+00FE ISOlat1 -->
<!ENTITY yuml "ÿ"> <!-- latin small letter y with diaeresis,
- U+00FF ISOlat1 -->
\ No newline at end of file
+ U+00FF ISOlat1 -->
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-special.ent b/welcome/src/org/netbeans/modules/welcome/resources/xhtml-special.ent
index 321cc457e9..bb6eb898e2 100644
--- a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-special.ent
+++ b/welcome/src/org/netbeans/modules/welcome/resources/xhtml-special.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-special.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Special characters for XHTML -->
<!-- Character entity set. Typical invocation:
@@ -77,4 +125,4 @@
<!-- rsaquo is proposed but not yet ISO standardized -->
<!-- Currency Symbols -->
-<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW -->
\ No newline at end of file
+<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW -->
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent b/welcome/src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent
index 7e91b771d3..f16465f28a 100644
--- a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent
+++ b/welcome/src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent
@@ -1,3 +1,51 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml-symbol.ent
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
<!-- Mathematical, Greek and Symbolic characters for XHTML -->
<!-- Character entity set. Typical invocation:
@@ -234,4 +282,4 @@
U+2663 ISOpub -->
<!ENTITY hearts "♥"> <!-- black heart suit = valentine,
U+2665 ISOpub -->
-<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub -->
\ No newline at end of file
+<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub -->
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd b/welcome/src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd
index 773c45a1fa..c2a2c78a69 100644
--- a/welcome/src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd
+++ b/welcome/src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd
@@ -6,38 +6,38 @@ This work is being provided by the copyright holders under the following license
License
-By obtaining and/or copying this work, you (the licensee) agree that you have
+By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
-Permission to copy, modify, and distribute this work, with or without
-modification, for any purpose and without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the work or portions
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
thereof, including modifications:
-- The full text of this NOTICE in a location viewable to users of the
+- The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
-- Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
be included.
- Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document].
- Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
Disclaimers
THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the work without specific, written prior permission.
-Title to copyright in this work will at all times remain with copyright
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
holders.
Changes:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists