X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6643db0cd20be4fdc6d06c767b079575e4e757f2..fc36ba4c1f80d37161967021b7ded6cc7e54819c:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 36b616f5b..4736c95d0 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,27 +8,69 @@ together before saving. -Page location: -Page type: + + -
 +

+
-Optional comment about this change:
-
+ +
 -

-Attach a file: -

+Attachments + + + +
+
+ + + +
+ + + + +
" />
+
+ + + +
+
 - +
@@ -76,3 +80,12 @@ Attach a file:
+ +
+
+Diff: +
+
+ +
+