X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/fb670513bf2372a6a88e5a5bc15eacfe4b88bf35..7910f1c352d4d00551694550f34ab7c3d975e448:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6030fa2c1..aa9436173 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,52 @@ - - -
--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.