X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1289beb53ba11693cba6d74c5a7da5c29e7cf7fa..ecac1e79a69894b78daccbd5b79a21a8dbbb1592:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 42d61c188..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,44 +1,6 @@ - -

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

- + + +
@@ -46,22 +8,23 @@ together before saving. -Page location: -Page type: + + -
 +

+
-Optional comment about this change:
-
+ +
 -Attachments +Attachments
@@ -69,12 +32,13 @@ Optional comment about this change:
- +
 +
@@ -85,5 +49,12 @@ Optional comment about this change:
 - - + +
+
+Diff: +
+
+ +
+