X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c92ab9cdddddb5eab9579bcdb79e913ce942a135..e54ec757d01fd77001fc5efe1942bdeea8ee468f:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 18e00849b..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,46 +1,9 @@ - -

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

- +
+ + + @@ -57,10 +20,22 @@ Page type: Optional comment about this change:

- - - + + +Attachments +
+ + + + + + + + +
+
+