X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/96eb9bb3fa1d805df967f44d13876f57b8ea121d..cb69af55f24290d9b337c320db0162405a0156d9:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ad1faa3a5..68b7d1942 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -14,11 +14,23 @@

-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.