X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/fa96eab12016e2f29a0a3522f1229039fbbf2c5e..f6bd81db15340bd1bfa69e98f377099036308b7b:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index a5c44dc4c..cf4950ead 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,49 @@ - - - - - -<TMPL_VAR FORM-TITLE> - - - - - - -

-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.

-
-/ -
+ Page location: Page type: @@ -44,14 +60,13 @@ Optional comment about this change:
+
Page preview:
-
+
- -