X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1452b3adf30145e8fd1208ac73da9d12967863bc..e823c5912b57d27d187fc3c602b8ba043d6178e3:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index cf4520575..68b7d1942 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -2,21 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - <TMPL_VAR FORM-TITLE> - + + + + +

-Your changes confict with other changes made to the page. +Your changes conflict with other changes made to the page.

Conflict markers have been inserted into the page content. Reconcile the -confict and commit again to save your changes. +conflict and commit again to save your changes. +

+
+ +

+Failed to save your changes. +

+

+Your changes were not able to be saved to disk. The system gave the error: +

+ +
+Your changes are preserved below, and you can try again to save them.

@@ -28,16 +42,18 @@ confict and commit again to save your changes. Page location: +Page type:
+

Optional comment about this change:

- +