X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b187641376a3d0519005c80c1ef0dd19266dda84..63db4f9dc6616b75ada8c04fd17e2a4f9a61ffd0:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1ee4c4947..68b7d1942 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -2,21 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">-
-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.