X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/685475ba8c14fda5eb25a97ad2e2a7be3bb1e598..a1b2d95fb3809654480575fb98e8170b4e941dea:/templates/editpage.tmpl?ds=inline diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index d02eaad70..cf4950ead 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,26 +1,72 @@ - -
+Your changes conflict with other changes made to the page. +
++Conflict markers have been inserted into the page content. Reconcile the +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. +
+