X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e41dd1e24e345c974fe4a070088f0d09d1b6ddac..7978216fb67c9b3c6cc40647f79f7e4a472fdb4a:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f77f45036..08f160881 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,40 +1,93 @@ -<TMPL_VAR FORM-TITLE> + + + +<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 location: +Page type: +
+
-
+
Optional comment about this change:

- + + -
-

Page preview:

+
+
+Page preview: +
+
- - +
+