X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d4c61b72813b880d86b316770f2e3819a6428202..3705d5d4dc49b5e341ffeb79a26c819a67f85023:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 68b7d1942..cf4950ead 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,17 +1,3 @@ - - -
-Your changes conflict with other changes made to the page. @@ -33,13 +19,31 @@ 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. +
+