X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1626831cc85307682610e58f4bca2a4b7c583024..687928ead25cb8f62fdfc58c2e126264e0fb149a:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f63a4b089..02951210f 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -21,6 +21,38 @@ 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. +

+
/ @@ -28,6 +60,7 @@ conflict and commit again to save your changes. + Page location: Page type: