X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..ffc0be87d7eca4de4dbc91d740d36b7b40bfa911:/templates/editpage.tmpl

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 6aa9ecd1c..c1e7113b4 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -4,6 +4,8 @@
 <TMPL_IF NAME="PAGE_CONFLICT">
 <p>
 <b>Your changes confict with other changes made to the page.</b>
+</p>
+<p>
 Conflict markers have been inserted into the page content. Reconcile the
 confict and commit again to save your changes.
 </p>
@@ -12,6 +14,7 @@ confict and commit again to save your changes.
 <h1><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></h1>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-FROM>
+<TMPL_VAR FIELD-RCSINFO>
 <TMPL_IF NAME="PAGE_SELECT">
 Page location: <TMPL_VAR FIELD-PAGE><br>
 <TMPL_ELSE>
@@ -24,10 +27,12 @@ Optional comment about this change:</br>
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR FORM-END>
-<TMPL_IF NAME="PAGE_PREVIEW">
 <hr>
+<TMPL_IF NAME="PAGE_PREVIEW">
 <h1>Page preview:</h1>
 <TMPL_VAR PAGE_PREVIEW>
+<TMPL_ELSE>
+<TMPL_VAR HELPONFORMATTINGLINK>
 </TMPL_IF>
 </body>
 </html>