X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..e823c5912b57d27d187fc3c602b8ba043d6178e3:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..68b7d1942 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,69 @@ + -<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.

-

/

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

Page preview:

+
+
+Page preview: +
+
+