X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e41dd1e24e345c974fe4a070088f0d09d1b6ddac..22bcc3d1df93e00487c83c4249d746ba19d1955d:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f77f45036..15a4069c0 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,40 +1,79 @@ -
-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. + ++
+The page you were editing has disappeared. +
++Perhaps someone else has deleted it or moved it. If you want to recreate +this page with your text, click "Save Page" again.