X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/edfbd7e1aa8f9f2cb789f45c0668a0d987e0b368..dc9516c1041f06eb96c482898fa8fff3937df92a:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f8eda1b47..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,45 +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. -

-
+ +
@@ -47,36 +8,66 @@ together before saving. -Page location: -Page type: + + -
+

+
-Optional comment about this change:
-
+ +
-Attachments +Attachments
- - +
+ + + +
+
- + - - -
" />
+ + + + +
- +
@@ -86,3 +77,12 @@ Optional comment about this change:
+ +
+
+Diff: +
+
+ +
+