[netbeans] branch delivery updated: No doctype is a fallback for missing doctype

[ne...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/delivery by this push:
     new c72bf12  No doctype is a fallback for missing doctype
     new 38dd781  Merge pull request #3505 from JaroslavTulach/jtulach/FallbackDoctype
c72bf12 is described below

commit c72bf12f38512bef446c1b449d46962ac1f58236
Author: Jaroslav Tulach <ja...@oracle.com>
AuthorDate: Tue Jan 25 20:14:11 2022 +0100

    No doctype is a fallback for missing doctype
---
 ide/html/src/org/netbeans/modules/html/templates/html.html   | 2 +-
 ide/html/src/org/netbeans/modules/html/templates/xhtml.xhtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ide/html/src/org/netbeans/modules/html/templates/html.html b/ide/html/src/org/netbeans/modules/html/templates/html.html
index 3be05dd..859df65 100644
--- a/ide/html/src/org/netbeans/modules/html/templates/html.html
+++ b/ide/html/src/org/netbeans/modules/html/templates/html.html
@@ -18,7 +18,7 @@
     under the License.
 
 -->
-${doctype}
+${doctype!""}
 <#assign licenseFirst = "<!--">
 <#assign licensePrefix = "">
 <#assign licenseLast = "-->">
diff --git a/ide/html/src/org/netbeans/modules/html/templates/xhtml.xhtml b/ide/html/src/org/netbeans/modules/html/templates/xhtml.xhtml
index 430b344..cbcd48f 100644
--- a/ide/html/src/org/netbeans/modules/html/templates/xhtml.xhtml
+++ b/ide/html/src/org/netbeans/modules/html/templates/xhtml.xhtml
@@ -23,7 +23,7 @@
 <#assign licensePrefix = "">
 <#assign licenseLast = "-->">
 <#include "${project.licensePath}">
-${doctype}
+${doctype!""}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>TODO supply a title</title>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists