X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/03c98d3c79370157d94deef588415e778ab6ca87..e36d81363d51f67820d5381c19349294d40d5171:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 89f01e664..02951210f 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -2,21 +2,55 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - <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.

@@ -26,28 +60,31 @@ confict and commit again to save your changes. + -Page location:
+Page location: +Page type: +
+
-
+
Optional comment about this change:

- + + -
+
Page preview:
- -