This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit e0ee00578ea26326b73681993c12df669c174f40 Merge: cb1c221 ad5f83c Author: Matthias Bläsing <mblaes...@doppel-helix.eu> AuthorDate: Sat Jun 30 20:07:41 2018 +0200 Merge pull request #606 from matthiasblaesing/sgml_w3c [NETBEANS-853] Fix license info for entity definitions and DTDs html.editor/licenseinfo.xml | 20 +++--- .../html/editor/resources/DTDs/3_2/html32.dtd | 34 ++++----- .../html/editor/resources/DTDs/3_2/lat1.ent | 48 +++++++++++++ .../html/editor/resources/DTDs/4_0/HTMLlat1.ent | 48 +++++++++++++ .../html/editor/resources/DTDs/4_0/HTMLspecial.ent | 48 +++++++++++++ .../html/editor/resources/DTDs/4_0/HTMLsymbol.ent | 48 +++++++++++++ .../html/editor/resources/DTDs/4_0/frameset.dtd | 42 +++++------ .../html/editor/resources/DTDs/4_0/loose.dtd | 38 +++++----- .../html/editor/resources/DTDs/4_0/strict.dtd | 44 ++++++------ .../html/editor/resources/DTDs/4_01/HTMLlat1.ent | 50 ++++++++++++- .../editor/resources/DTDs/4_01/HTMLspecial.ent | 50 ++++++++++++- .../html/editor/resources/DTDs/4_01/HTMLsymbol.ent | 50 ++++++++++++- .../html/editor/resources/DTDs/4_01/frameset.dtd | 42 +++++------ .../html/editor/resources/DTDs/4_01/loose.dtd | 38 +++++----- .../html/editor/resources/DTDs/4_01/strict.dtd | 44 ++++++------ .../editor/resources/DTDs/xhtml/xhtml-lat1.ent | 50 ++++++++++++- .../editor/resources/DTDs/xhtml/xhtml-special.ent | 50 ++++++++++++- .../editor/resources/DTDs/xhtml/xhtml-symbol.ent | 50 ++++++++++++- .../resources/DTDs/xhtml/xhtml1-frameset.dtd | 36 +++++----- .../editor/resources/DTDs/xhtml/xhtml1-strict.dtd | 36 +++++----- .../resources/DTDs/xhtml/xhtml1-transitional.dtd | 36 +++++----- maven.coverage/licenseinfo.xml | 32 --------- .../maven/coverage/MavenCoverageProvider.java | 22 +++--- .../modules/maven/coverage/coverage-04.dtd | 60 ---------------- .../netbeans/modules/maven/coverage/jacoco-1.0.dtd | 84 ---------------------- nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent | 48 +++++++++++++ .../antsrc/org/netbeans/nbbuild/xhtml-special.ent | 48 +++++++++++++ .../antsrc/org/netbeans/nbbuild/xhtml-symbol.ent | 48 +++++++++++++ .../antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd | 34 ++++----- nbbuild/licenseinfo.xml | 8 +-- nbbuild/licenses/ISO-8879-SGML | 4 -- welcome/licenseinfo.xml | 6 +- .../modules/welcome/resources/xhtml-lat1.ent | 50 ++++++++++++- .../modules/welcome/resources/xhtml-special.ent | 50 ++++++++++++- .../modules/welcome/resources/xhtml-symbol.ent | 50 ++++++++++++- .../welcome/resources/xhtml1-transitional.dtd | 34 ++++----- 36 files changed, 1028 insertions(+), 452 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists