Merge commit 'smcv/underlay'

[ikiwiki.git] / templates / editcomment.tmpl

diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 1f4c1fc23ae805a8982b2c223bdef38a5157ac7a..891bcae65deb43ddb31aa87141c0dc906f4107e8 100644 (file)
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -9,13 +9,10 @@
 Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
 Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
 </TMPL_IF>
 Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
 Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
 </TMPL_IF>

-</TMPL_IF>
+</TMPL_UNLESS>

 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-EDITCONTENT><br />
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-EDITCONTENT><br />

-Page type: <TMPL_VAR FIELD-TYPE><br />
-<TMPL_VAR FORM-SUBMIT><br />
-<TMPL_VAR HELPONFORMATTINGLINK><br />
-A subset of HTML is allowed.<br />
+<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />

 IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
 <TMPL_VAR NAME="FORM-END">
 
 IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
 <TMPL_VAR NAME="FORM-END">