X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/d593533af58d5133ef6ecfc4323e3e1d55d71c48..eb8d06b3b61b8a9099fd6782b322880b6fc6013a:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index fdb142c70..118ca4550 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,81 +1,49 @@ - -

-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 type: +
  1. + + +
    2. -
     +

  2. +
    3. -Optional comment about this change:
    +
  3. +
    +
    4.  +
-Attachments +Attachments
- + - + -
 +
@@ -86,5 +54,12 @@ Optional comment about this change:
 - - + +
+
+Diff: +
+
+ +
+