X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c20c4066311341e332dc425023f856b6414de9ae..e36d81363d51f67820d5381c19349294d40d5171:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ec48df4c2..02951210f 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -2,21 +2,55 @@ "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. + +
+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. ++
+While you were creating this page, someone else independently created a page +with the same name. ++
+The edit box below contains the page's current content, followed by the +content you entered previously, to allow you to merge the two +together before saving.