X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/44eefb7f22d946c70429cdba7a6c90f6ffcbb6d3..e34011afcc4c0fe550a673d5629eb8be78b4fe4a:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c23630dfa..b0bb0ecb9 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,25 +1,73 @@ - -<TMPL_VAR FORM-TITLE> - + +

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

+
-

/

+ + + -Page location:
+Page location: +Page type: +
+
-
+
-Optional comment about this change:
-
+Optional comment about this change:
+
+ + -
+
+
+Page preview: +
+
+
- -